Skip to content

Commit f358f33

Browse files
committed
Add credits page and make repeated html into a layout
1 parent e97a135 commit f358f33

File tree

7 files changed

+222
-322
lines changed

7 files changed

+222
-322
lines changed

server/flaskserver.py

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,7 @@
44
from flask import Flask, redirect, url_for, request, render_template, flash, send_from_directory
55
from werkzeug.utils import secure_filename
66
from api import maincall, analyze
7-
import pyrebase
87

9-
config = {
10-
"apiKey": "AIzaSyBUgnKb_q1B-z5UVaUPlMNVq8Hf8yhdQL0",
11-
"authDomain": "cheqify.firebaseapp.com",
12-
"databaseURL": "https://cheqify.firebaseio.com",
13-
"projectId": "cheqify",
14-
"storageBucket": "cheqify.appspot.com",
15-
"appId": "1:250796738064:web:81c3fa872c7d8ccce7ec95",
16-
"serviceAccount": "/Users/adishrao/Desktop/Projects/cheqify-python/server/serviceAccount.json"
17-
}
18-
19-
firebase = pyrebase.initialize_app(config)
20-
storage = firebase.storage()
218

229
UPLOAD_FOLDER = './static/images/cheques'
2310
ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'}
@@ -47,41 +34,41 @@ def upload_file():
4734
if file and allowed_file(file.filename):
4835
filename = secure_filename(file.filename)
4936
file.save(os.path.join(app.config['UPLOAD_FOLDER'], filename))
50-
return redirect(url_for('uploaded_file',
51-
filename=filename))
37+
return redirect(url_for('gallery'))
5238
return render_template('upload.html')
5339

5440
@app.route('/uploads/<filename>')
5541
def uploaded_file(filename):
5642
return send_from_directory(app.config['UPLOAD_FOLDER'],
5743
filename)
5844

59-
@app.route('/view', methods = ['POST', 'GET'])
60-
def view():
45+
@app.route('/gallery')
46+
def gallery():
6147
images = os.listdir('./static/images/cheques')
48+
# Get list of (filename without ext, full filename)
6249
res = [(img[:-4],img) for img in images]
6350
return render_template('gallery.html', res = res)
6451

52+
fields = ['chq_num','amount_words', 'amount_digit', 'chq_date',
53+
'micr_code','san_no','ben_name','payee_ac_no','chq_stale','amt_match']
54+
6555
@app.route('/evaluate/<chq_num>')
6656
def evaluate(chq_num):
67-
res = None
68-
user_data = {
69-
'chq_num': chq_num,
70-
'amount_words': 'Hundred only',
71-
'amount_digit': 100,
72-
'chq_date': 'Never',
73-
'micr_code': '1234',
74-
'san_no': '5567',
75-
'ben_name': 'Aniruddha',
76-
'payee_ac_no': '8302013',
77-
'chq_stale': 'Stale Bread',
78-
'amt_match': 'Yes',
79-
}
57+
with open('./static/data/'+str(chq_num)[:-4]+'.txt') as f:
58+
user_data = dict()
59+
for i,val in enumerate(f.read().splitlines()):
60+
user_data[fields[i]] = val
61+
62+
user_data['chq_num'] = chq_num
8063
eval_data = analyze(chq_num)
8164
return render_template('evaluate.html', eval_data=eval_data, user_data=user_data)
8265

83-
@app.route('/',methods = ['POST', 'GET'])
84-
def new():
66+
@app.route('/credits')
67+
def credits():
68+
return render_template('credits.html')
69+
70+
@app.route('/')
71+
def index():
8572
return render_template('index.html')
8673

8774
if __name__ == '__main__':

server/templates/credits.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{% extends 'layout.html' %}
2+
{% block content %}
3+
<h1 class="header center orange-text">Credits</h1>
4+
<div class="center">
5+
<h5 class="header col s12 light">
6+
Made for Web Lab Mini Project.
7+
</h5>
8+
<br> <br>
9+
<p>
10+
Aniruddha Mysore - 1PE16CS019
11+
<br>
12+
Adish Rao - 1PE16CS006.
13+
</p>
14+
</div>
15+
{% endblock %}

server/templates/evaluate.html

Lines changed: 82 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,82 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
4-
<head>
5-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
7-
<title>Cheqify</title>
8-
9-
<!-- CSS -->
10-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
11-
<link href="{{ url_for('static', filename='css/materialize.css') }}" type="text/css" rel="stylesheet" media="screen,projection"
12-
/>
13-
<link href="{{ url_for('static', filename='css/style.css') }}" type="text/css" rel="stylesheet" media="screen,projection"
14-
/>
15-
</head>
16-
17-
<body>
18-
<nav class="blue" role="navigation">
19-
<div class="nav-wrapper container">
20-
<a id="logo-container" href="#" class="brand-logo">Cheqify</a>
21-
<!--<ul class="right hide-on-med-and-down">
22-
<li><a href="#">Navbar Link</a></li>
23-
</ul>
24-
25-
<ul id="nav-mobile" class="side-nav">
26-
<li><a href="#">Navbar Link</a></li>
27-
</ul>-->
28-
<a href="#" data-activates="nav-mobile" class="button-collapse">
29-
<i class="material-icons">menu</i>
30-
</a>
31-
</div>
32-
</nav>
33-
<div class="section no-pad-bot" id="index-banner" style="margin-bottom: 18%">
34-
<div class="container">
35-
<br>
36-
<h1 class="header center orange-text">Analysis</h1>
37-
<div class="row center">
38-
<div class="col s8 offset-s2">
39-
<img class="responsive-img" src="{{ url_for('static', filename='images/cheques/'+user_data.chq_num | string) }}">
40-
</div>
41-
<table class="bordered striped">
42-
<thead>
43-
<tr>
44-
<th>Number</th>
45-
<th>Field</th>
46-
<th>Data from API</th>
47-
<th>Extracted Data</th>
48-
</tr>
49-
</thead>
50-
<tbody>
51-
<tr>
52-
<td>1</td>
53-
<td>Chq_Num</td>
54-
<td> {{ user_data.chq_num }} </td>
55-
<td> {{ eval_data.chq_num }} </td>
56-
</tr>
57-
<tr>
58-
<td>2</td>
59-
<td>Amount in Words</td>
60-
<td> {{ user_data.amount_words }} </td>
61-
<td> {{ eval_data.amount_words }} </td>
62-
</tr>
63-
<tr>
64-
<td>3</td>
65-
<td>Amount in Digits</td>
66-
<td> {{ user_data.amount_digit }} </td>
67-
<td> {{ eval_data.amount_digit }} </td>
68-
</tr>
69-
<tr>
70-
<td>4</td>
71-
<td>Chq Date</td>
72-
<td> {{ user_data.chq_date }} </td>
73-
<td> {{ eval_data.chq_date }} </td>
74-
</tr>
75-
<tr>
76-
<td>5</td>
77-
<td>MICR Code</td>
78-
<td> {{ user_data.micr_code }} </td>
79-
<td> {{ eval_data.micr_code }} </td>
80-
</tr>
81-
<tr>
82-
<td>6</td>
83-
<td>SAN No</td>
84-
<td> {{ user_data.san_no }} </td>
85-
<td> {{ eval_data.san_no }} </td>
86-
</tr>
87-
<tr>
88-
<td>7</td>
89-
<td>Beneficiary Name</td>
90-
<td> {{ user_data.ben_name }} </td>
91-
<td> {{ eval_data.ben_name }} </td>
92-
</tr>
93-
<tr>
94-
<td>8</td>
95-
<td>Payee Account Number</td>
96-
<td> {{ user_data.payee_ac_no }} </td>
97-
<td> {{ eval_data.payee_ac_no }} </td>
98-
</tr>
99-
<tr>
100-
<td>9</td>
101-
<td>Chq Stale</td>
102-
<td> {{ user_data.chq_stale }} </td>
103-
<td> {{ eval_data.chq_stale }} </td>
104-
</tr>
105-
<tr>
106-
<td>10</td>
107-
<td>Amount Match</td>
108-
<td> {{ user_data.amt_match }} </td>
109-
<td> {{ eval_data.amt_match }} </td>
110-
</tr>
111-
</tbody>
112-
</table>
113-
</div>
114-
</div>
115-
</div>
116-
117-
118-
<footer class="page-footer blue">
119-
<div class="container">
120-
121-
</div>
122-
<div class="footer-copyright">
123-
<div class="container">
124-
Made by Aniruddha Mysore and Adish Rao | 2019
125-
</div>
126-
</div>
127-
</footer>
128-
129-
130-
<!-- Scripts-->
131-
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
132-
<script src="{{ url_for('static', filename='js/materialize.js') }}"></script>
133-
<script src="{{ url_for('static', filename='js/init.js') }}"></script>
134-
135-
</body>
136-
137-
</html>
1+
{% extends 'layout.html' %}
2+
{% block content %}
3+
<h1 class="header center orange-text">Analysis</h1>
4+
<div class="row center">
5+
<div class="col s8 offset-s2">
6+
<img class="responsive-img"
7+
src="{{ url_for('static', filename='images/cheques/'+user_data.chq_num | string) }}">
8+
</div>
9+
<table class="bordered striped">
10+
<thead>
11+
<tr>
12+
<th>Number</th>
13+
<th>Field</th>
14+
<th>Data from API</th>
15+
<th>Extracted Data</th>
16+
</tr>
17+
</thead>
18+
<tbody>
19+
<tr>
20+
<td>1</td>
21+
<td>Chq_Num</td>
22+
<td> {{ user_data.chq_num }} </td>
23+
<td> {{ eval_data.chq_num }} </td>
24+
</tr>
25+
<tr>
26+
<td>2</td>
27+
<td>Amount in Words</td>
28+
<td> {{ user_data.amount_words }} </td>
29+
<td> {{ eval_data.amount_words }} </td>
30+
</tr>
31+
<tr>
32+
<td>3</td>
33+
<td>Amount in Digits</td>
34+
<td> {{ user_data.amount_digit }} </td>
35+
<td> {{ eval_data.amount_digit }} </td>
36+
</tr>
37+
<tr>
38+
<td>4</td>
39+
<td>Chq Date</td>
40+
<td> {{ user_data.chq_date }} </td>
41+
<td> {{ eval_data.chq_date }} </td>
42+
</tr>
43+
<tr>
44+
<td>5</td>
45+
<td>MICR Code</td>
46+
<td> {{ user_data.micr_code }} </td>
47+
<td> {{ eval_data.micr_code }} </td>
48+
</tr>
49+
<tr>
50+
<td>6</td>
51+
<td>SAN No</td>
52+
<td> {{ user_data.san_no }} </td>
53+
<td> {{ eval_data.san_no }} </td>
54+
</tr>
55+
<tr>
56+
<td>7</td>
57+
<td>Beneficiary Name</td>
58+
<td> {{ user_data.ben_name }} </td>
59+
<td> {{ eval_data.ben_name }} </td>
60+
</tr>
61+
<tr>
62+
<td>8</td>
63+
<td>Payee Account Number</td>
64+
<td> {{ user_data.payee_ac_no }} </td>
65+
<td> {{ eval_data.payee_ac_no }} </td>
66+
</tr>
67+
<tr>
68+
<td>9</td>
69+
<td>Chq Stale</td>
70+
<td> {{ user_data.chq_stale }} </td>
71+
<td> {{ eval_data.chq_stale }} </td>
72+
</tr>
73+
<tr>
74+
<td>10</td>
75+
<td>Amount Match</td>
76+
<td> {{ user_data.amt_match }} </td>
77+
<td> {{ eval_data.amt_match }} </td>
78+
</tr>
79+
</tbody>
80+
</table>
81+
</div>
82+
{% endblock %}

0 commit comments

Comments
 (0)