commit 501208730d10f80a44ca46449220fb4451a4447b
parent 5e67d51f4326978a45456a1e7414794e23569482
Author: Nikolas Mazur <nikolas@pop-os.localdomain>
Date: Wed, 18 Jan 2023 20:21:53 -0700
Remove spagetti code
Diffstat:
| M | app.py | | | 38 | +++++++------------------------------- |
1 file changed, 7 insertions(+), 31 deletions(-)
diff --git a/app.py b/app.py
@@ -1,16 +1,17 @@
import datetime
import json
+from models import Users
from flask import Flask, render_template, abort, redirect, url_for, request, session, jsonify;
from flask_login import UserMixin, login_user, LoginManager, login_required, logout_user, current_user;
from pymongo import MongoClient;
from flask_bcrypt import Bcrypt;
-
# import routes
OrganizationName = "Youth Employment Program"
app = Flask(__name__)
+
# Mongo setup
client = MongoClient('localhost', 27017)
bcrypt = Bcrypt(app)
@@ -18,15 +19,6 @@ db = client['simple_timecard_database']
app.config['SECRET_KEY'] = 'secretkey'
# Mongo setup
-# Login manager
-#login_manager = LoginManager()
-#login_manager.init_app(app)
-#login_manager.login_view = 'login'
-
-# @login_manager.user_loader
-# def load_user(user_id):
- # return User.query.get(int(user_id))
-# Login manager
# Database collections/documents
users_col = db.users_collection # Make aditional user info single document/array
@@ -38,7 +30,8 @@ fleet_col = db.fleet_collection
agreement_col = db.agreement_collection
# Database collections/documents
-# Routes
+
+# Page Routes
@app.route('/') #main route should check if user is logged in, then redirect to /dashboard else redirect to /login
def hello():
return render_template('index.html',ORGNAME = OrganizationName) #This implimentation is messy, maybe abstract to a defPage()?
@@ -75,33 +68,16 @@ def agreement():
def knowlegebase():
return render_template('knowlegebase/index.html',ORGNAME=OrganizationName)
-# @app.route("/login",methods = ['POST', 'GET'])
-# def login():
-# if request.method == 'POST':
-# user = request.form['name']
-# return redirect(url_for('dashboard',name = user))
-# else:
-# user = request.args.get('name')
-# return render_template('login.html')
-#
-# @app.route("/logout", methods=["POST", "GET"])
-# def logout():
- # if "email" in session:
- # session.pop("email", None)
- # return render_template("signout.html")
- # else:
- # return render_template("index.html")
-# Routes
+# Page Routes
-# import routes
-from models import Users
+# Model Routes
@app.route('/user/signup', methods=['GET'])
def signup():
return Users().signup()
-
+# Model Routes
if __name__ == '__main__':
app.run(debug=True)
