From ea56c43eab672623d6ce0187cd1cc9095e03e10f Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Sat, 14 Mar 2020 01:15:31 -0500
Subject: [PATCH] Implimented some validation logic plus added flash messages

---
 src/core/routes/Routes.py           |  2 +-
 src/core/routes/pages/Login.py      | 12 +++----
 src/core/routes/pages/Register.py   | 18 +++++------
 src/core/templates/body-footer.html |  6 ++--
 src/core/templates/body-header.html |  4 +--
 src/core/templates/index.html       |  2 --
 src/core/templates/layout.html      | 11 +++++++
 src/core/templates/login.html       | 27 ++++++++++++----
 src/core/templates/register.html    | 49 ++++++++++++++++++++++++-----
 9 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/src/core/routes/Routes.py b/src/core/routes/Routes.py
index aae3349..8b0c752 100644
--- a/src/core/routes/Routes.py
+++ b/src/core/routes/Routes.py
@@ -14,7 +14,7 @@ TITLE      = app.config['TITLE']
 
 
 @app.route('/', methods=['GET', 'POST'])
-def root():
+def home():
     if request.method == 'GET':
         return render_template('index.html',
                                 title=TITLE)
diff --git a/src/core/routes/pages/Login.py b/src/core/routes/pages/Login.py
index dbf3bce..16800b8 100644
--- a/src/core/routes/pages/Login.py
+++ b/src/core/routes/pages/Login.py
@@ -13,12 +13,8 @@ TITLE      = app.config['TITLE']
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
-    if request.method == 'GET':
-        _form = LoginForm()
-        return render_template('login.html',
-                                title=TITLE,
-                                form=_form)
+    _form = LoginForm()
 
-    return render_template('error.html',
-                            title='Error!',
-                            message='Must use GET request type...')
+    return render_template('login.html',
+                            title=TITLE,
+                            form=_form)
diff --git a/src/core/routes/pages/Register.py b/src/core/routes/pages/Register.py
index f212333..64e5701 100644
--- a/src/core/routes/pages/Register.py
+++ b/src/core/routes/pages/Register.py
@@ -1,7 +1,7 @@
 # Python imports
 
 # Lib imports
-from flask import request, render_template
+from flask import request, render_template, url_for, redirect, flash
 
 # App imports
 from core import app, db, RegisterForm
@@ -13,12 +13,12 @@ TITLE      = app.config['TITLE']
 
 @app.route('/register', methods=['GET', 'POST'])
 def register():
-    if request.method == 'GET':
-        _form = RegisterForm()
-        return render_template('register.html',
-                                title=TITLE,
-                                form=_form)
+    _form = RegisterForm()
 
-    return render_template('error.html',
-                            title='Error!',
-                            message='Must use GET request type...')
+    if _form.validate_on_submit():
+        flash("Account created successfully!", "success")
+        return redirect(url_for("home"))
+
+    return render_template('register.html',
+                            title=TITLE,
+                            form=_form)
diff --git a/src/core/templates/body-footer.html b/src/core/templates/body-footer.html
index d6eb0d3..ffff3aa 100644
--- a/src/core/templates/body-footer.html
+++ b/src/core/templates/body-footer.html
@@ -1,10 +1,10 @@
-<div class="container">
+<div class="container" style="position: fixed; bottom: 2em;">
     <div class="row">
         <div class="col justify-content-center text-center">
             <nav>
                 <a href="mailto:"><i title="Send Us an Email" class="fas fa-envelope"></i></a>
-                <a href="#"><i title="Find Us on Twitter" class="fab fa-twitter"></i></a>
-                <a href="#"><i title="Find Us on LinkedIn" class="fab fa-linkedin"></i></a>
+                <a href="https://twitter.com/"><i title="Find Us on Twitter" class="fab fa-twitter"></i></a>
+                <a href="https://www.linkedin.com/"><i title="Find Us on LinkedIn" class="fab fa-linkedin"></i></a>
                 <br/>
                 <i class="fas fa-map-marker-alt">US, Earth</i>
             </nav>
diff --git a/src/core/templates/body-header.html b/src/core/templates/body-header.html
index 4fe8b41..0543d68 100644
--- a/src/core/templates/body-header.html
+++ b/src/core/templates/body-header.html
@@ -4,7 +4,7 @@
         <div class="navbar-brand justify-content-center text-center">
             <div class="site-branding">
                 <h1 class="site-title">
-                    <a href="{{ url_for('root') }}" title="TITLE" rel="home">
+                    <a href="{{ url_for('home') }}" title="TITLE" rel="home">
                         Hello World!
                     </a>
                 </h1>
@@ -17,7 +17,7 @@
         <!-- Links -->
         <ul class="navbar-nav">
             <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('root') }}">
+                <a class="nav-link" href="{{ url_for('home') }}">
                     <i class="fas fa-home"></i>&nbsp;&nbsp;Home</a>
             </li>
 
diff --git a/src/core/templates/index.html b/src/core/templates/index.html
index 9f0fe60..8b7ed1c 100644
--- a/src/core/templates/index.html
+++ b/src/core/templates/index.html
@@ -1,7 +1,6 @@
 {% extends "layout.html" %}
 
 {% block body_header_additional %}
-<h1 style=" position: fixed; top: 0em;">Header</h1>
 {% endblock body_header_additional %}
 
 {% block body_content %}
@@ -19,7 +18,6 @@
 
 
 {% block body_footer_additional %}
-<h1 style=" position: fixed; bottom: 0em;">Footer</h1>
 {% endblock body_footer_additional %}
 
 {% block body_scripts_additional %}
diff --git a/src/core/templates/layout.html b/src/core/templates/layout.html
index 9d7621d..f6dd7b8 100644
--- a/src/core/templates/layout.html
+++ b/src/core/templates/layout.html
@@ -30,6 +30,17 @@
         {% endblock header_css_additional %}
     {% endblock %}
 
+    <!-- System flashed messages! -->
+    {% with messages = get_flashed_messages(with_categories=true) %}
+        {% if messages %}
+            <div class=flashes>
+                {% for category, message in messages %}
+                    <li class="alert alert-{{ category }}">{{ message }}</li>
+                {% endfor %}
+            </div>
+        {% endif %}
+    {% endwith %}
+
     {% block header_scripts %}
         {% block header_scripts_additional %}
         {% endblock header_scripts_additional %}
diff --git a/src/core/templates/login.html b/src/core/templates/login.html
index 662caa3..3bbeed7 100644
--- a/src/core/templates/login.html
+++ b/src/core/templates/login.html
@@ -15,11 +15,30 @@
                         <a href="/register">Register</a>
                         <div class="form-group">
                             {{ form.username.label(class="form-control-label") }}
-                            {{ form.username(class="form-control form-control-sm", autocomplete="off") }}
+
+                            {% if form.username.errors %}
+                                {{ form.username(class="form-control form-control-sm is-invalid", autocomplete="off") }}
+                                <div class="invalid-feedback">
+                                    {% for error in form.username.errors %}
+                                        <span class="">{{ error }}</span>
+                                    {% endfor %}
+                                </div>
+                            {% else %}
+                                {{ form.username(class="form-control form-control-sm", autocomplete="off") }}
+                            {% endif %}
                         </div>
                         <div class="form-group">
                             {{ form.password.label(class="form-control-label") }}
-                            {{ form.password(class="form-control form-control-sm", autocomplete="off") }}
+
+                            {% if form.email.errors %}
+                                {{ form.email(class="form-control form-control-sm is-invalid", autocomplete="off") }}
+                                <div class="invalid-feedback">
+                                    {% for error in form.email.errors %}
+                                        <span class="">{{ error }}</span>
+                                    {% endfor %}
+                            {% else %}
+                                {{ form.password(class="form-control form-control-sm", autocomplete="off") }}
+                            {% endif %}
                         </div>
                     </fieldset>
                     <div class="form-group justify-content-right text-right">
@@ -36,8 +55,4 @@
 {% endblock body_footer_additional %}
 
 {% block body_scripts_additional %}
-    <script src="{{ url_for('static', filename='js/ui-logic.js')}}"></script>
-    <script src="{{ url_for('static', filename='js/post-ajax.js')}}"></script>
-    <script src="{{ url_for('static', filename='js/ajax.js')}}"></script>
-    <script src="{{ url_for('static', filename='js/events.js')}}"></script>
 {% endblock body_scripts_additional %}
diff --git a/src/core/templates/register.html b/src/core/templates/register.html
index 3c25b8b..50bf53f 100644
--- a/src/core/templates/register.html
+++ b/src/core/templates/register.html
@@ -14,19 +14,56 @@
                         <legend class="border-bottom mb-4">Create Account</legend>
                         <div class="form-group">
                             {{ form.username.label(class="form-control-label") }}
-                            {{ form.username(class="form-control form-control-sm", autocomplete="off") }}
+
+                            {% if form.username.errors %}
+                                {{ form.username(class="form-control form-control-sm is-invalid", autocomplete="off") }}
+                                <div class="invalid-feedback">
+                                    {% for error in form.username.errors %}
+                                        <span class="">{{ error }}</span>
+                                    {% endfor %}
+                                </div>
+                            {% else %}
+                                {{ form.username(class="form-control form-control-sm", autocomplete="off") }}
+                            {% endif %}
                         </div>
                         <div class="form-group">
                             {{ form.email.label(class="form-control-label") }}
-                            {{ form.email(class="form-control form-control-sm", autocomplete="off") }}
+
+                            {% if form.email.errors %}
+                                {{ form.email(class="form-control form-control-sm is-invalid", autocomplete="off") }}
+                                <div class="invalid-feedback">
+                                    {% for error in form.email.errors %}
+                                        <span class="">{{ error }}</span>
+                                    {% endfor %}
+                            {% else %}
+                                {{ form.email(class="form-control form-control-sm", autocomplete="off") }}
+                            {% endif %}
                         </div>
                         <div class="form-group">
                             {{ form.password.label(class="form-control-label") }}
-                            {{ form.password(class="form-control form-control-sm", autocomplete="off") }}
+
+                            {% if form.password.errors %}
+                                {{ form.password(class="form-control form-control-sm is-invalid", autocomplete="off") }}
+                                <div class="invalid-feedback">
+                                    {% for error in form.password.errors %}
+                                        <span class="">{{ error }}</span>
+                                    {% endfor %}
+                            {% else %}
+                                {{ form.password(class="form-control form-control-sm", autocomplete="off") }}
+                            {% endif %}
                         </div>
                         <div class="form-group">
                             {{ form.confirm_password.label(class="form-control-label") }}
-                            {{ form.confirm_password(class="form-control form-control-sm", autocomplete="off") }}
+
+                            {% if form.confirm_password.errors %}
+                                {{ form.confirm_password(class="form-control form-control-sm is-invalid", autocomplete="off") }}
+                                <div class="invalid-feedback">
+                                    {% for error in form.confirm_password.errors %}
+                                        <span class="">{{ error }}</span>
+                                    {% endfor %}
+                            {% else %}
+                                {{ form.confirm_password(class="form-control form-control-sm", autocomplete="off") }}
+                            {% endif %}
                         </div>
                     </fieldset>
                     <div class="form-group justify-content-right text-right">
@@ -46,8 +83,4 @@
 {% endblock body_footer_additional %}
 
 {% block body_scripts_additional %}
-    <script src="{{ url_for('static', filename='js/ui-logic.js')}}"></script>
-    <script src="{{ url_for('static', filename='js/post-ajax.js')}}"></script>
-    <script src="{{ url_for('static', filename='js/ajax.js')}}"></script>
-    <script src="{{ url_for('static', filename='js/events.js')}}"></script>
 {% endblock body_scripts_additional %}