From 5b0bf5843d40c9921fa269780f8f3c83f907f4c2 Mon Sep 17 00:00:00 2001 From: Maxim Stewart Date: Mon, 9 Mar 2020 13:35:02 -0500 Subject: [PATCH] Changed login stub; added title to session --- src/core/__init__.py | 2 ++ src/core/routes/Routes.py | 14 ++++++++------ src/core/routes/pages/Login.py | 16 +++++++++++++++- src/core/templates/login.html | 25 +++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 src/core/templates/login.html diff --git a/src/core/__init__.py b/src/core/__init__.py index 24a98d4..ccab876 100644 --- a/src/core/__init__.py +++ b/src/core/__init__.py @@ -4,6 +4,8 @@ from flask_sqlalchemy import SQLAlchemy app = Flask(__name__) app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///static/db/database.db" app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +app.config['TITLE'] = ':::APP TITLE:::' + from core.models import db db.init_app(app) diff --git a/src/core/routes/Routes.py b/src/core/routes/Routes.py index 390baff..f1951ae 100644 --- a/src/core/routes/Routes.py +++ b/src/core/routes/Routes.py @@ -1,21 +1,23 @@ -from flask import request, render_template -from core import app, db # Get from __init__ +# Python imports +# Lib imports +from flask import request, render_template + +# App imports +from core import app, db # Get from __init__ from core.models import Table # Get db models from core.MessageHandler import MessageHandler # Get simple message processor -# Python imports - - msgHandler = MessageHandler() +TITLE = app.config['TITLE'] @app.route('/', methods=['GET', 'POST']) def root(): if request.method == 'GET': return render_template('index.html', - title=':::APP TITLE:::') + title=TITLE) return render_template('error.html', title='Error!', diff --git a/src/core/routes/pages/Login.py b/src/core/routes/pages/Login.py index 3770fc3..bb6bdf1 100644 --- a/src/core/routes/pages/Login.py +++ b/src/core/routes/pages/Login.py @@ -1,8 +1,22 @@ +# Python imports + +# Lib imports from flask import request, render_template +# App imports from core import app, db +from core.MessageHandler import MessageHandler # Get simple message processor +msgHandler = MessageHandler() +TITLE = app.config['TITLE'] + @app.route('/login', methods=['GET', 'POST']) def login(): - return "

Login Page Stub...

" + if request.method == 'GET': + return render_template('login.html', + title=TITLE) + + return render_template('error.html', + title='Error!', + message='Must use GET request type...') diff --git a/src/core/templates/login.html b/src/core/templates/login.html new file mode 100644 index 0000000..963c79a --- /dev/null +++ b/src/core/templates/login.html @@ -0,0 +1,25 @@ +{% extends "layout.html" %} + +{% block body_header_additional %} +{% endblock body_header_additional %} + +{% block body_content %} +
+
+
+

Login stub...

+
+
+
+{% endblock body_content %} + + +{% block body_footer_additional %} +{% endblock body_footer_additional %} + +{% block body_scripts_additional %} + + + + +{% endblock body_scripts_additional %}