Merge remote-tracking branch 'origin/frontend'

README.md

@@ -1,3 +1,9 @@
 # freeriders
 
-Web app for tracking current ticket numbers
+Web app for tracking current ticket numbers
+
+# Architecture
+
+- keep all ticket numbers and timestamps in SQL table "tickets"
+- display last ticket number
+- don't allow tickets that are out of probable ticket number range

build-deb/freeriders/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Architecture: all
 Essential: no
 Installed-Size: 2000
-Depends: python3-flask, gunicorn
+Depends: gunicorn, python3-flask-sqlalchemy
 Homepage: https://gitea.dmz.rs/Decentrala/freeriders
 Maintainer: Decentrala <dmz@dmz.rs>
 Description: Web app that tracks bus transport ticket numbers

freeriders/__init__.py

@@ -1,5 +1,16 @@
 from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+import os # if you wanna have db credenitalas in os.environ
 
 app = Flask(__name__)
 
+# SQLAlchemy setup
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///freeriders.db'
+
+#MySql setup
+#app.config['SQLALCHEMY_DATABASE_URI'] = 'mysql://user:pass@localhost/dbname'
+
+app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+db = SQLAlchemy(app)
+
 from freeriders import routes

freeriders/models.py

@@ -0,0 +1,6 @@
+from freeriders import db
+
+class Tickets(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    ticket = db.Column(db.Integer, nullable=False)
+    timestamp = db.Column(db.Integer, nullable=False)

freeriders/routes.py

@@ -1,10 +1,38 @@
 from flask import render_template, request, redirect
-from freeriders import app
+from freeriders import app, db
+from freeriders.models import Ticket
+import time
 
-@app.route('/', methods=['POST', 'GET'])
-def changepassword():
+@app.route('/sms', methods=['GET'])
+def sms():
     if request.method == 'GET':
-        return render_template('index.html')
-    elif request.method == 'POST':
+        try:
+            lastticket = Ticket.query.order_by(Ticket.timestamp.desc()).first()
+            return render_template('sms.html', ticket = lastticket)
+        except:
+            return 'Error retriving last ticket'
+    else:
+        return 'HTTP request method not recogniezed'
+
+@app.route('/submit', methods=['POST', 'GET'])
+def submit():
+    if request.method == 'GET':
+        return render_template('submit.html')
+    elif request.method == 'POST':
+        timenow = int(time.time())
+        ticket_input = request.form['ticket']
+
+        if ticket_input.isdigit() and len(ticket_input) == 10:
+            ticket = Ticket(ticket = int(ticket_input), timestamp = timenow)
+        else:
+            return 'Ticket format is wrong. Only 10 digits allowed.'
+
+        try:
+            db.session.add(ticket)
+            db.session.commit()
+            return 'Ticket added'
+        except:
+            return 'Adding ticket failed'
+
     else:
         return 'HTTP request method not recogniezed'

init_db.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from freeriders import db
+
+print('[i] Trying to create databse...')
+try:
+    db.create_all()
+    print('[+] Success you can proceed with deployment!')
+except:
+    print('[-] Creating db failed :/')
+

requirments.txt

@@ -1 +1,2 @@
 flask
+SQLAlchemy