Migrate to Gunicorn; Resolve prompt bug; Update User model; Style updates.

Author: toddbirchard

Makefile

@@ -5,9 +5,9 @@ LOCAL_PYTHON := $(VIRTUAL_ENV)/bin/python3
 define HELP
 Manage $(PROJECT_NAME). Usage:
 
-make run        - Run $(PROJECT_NAME) locally.
+make run        - Run $(PROJECT_NAME) locally (not suitable to serve `production` applications).
 make install    - Create local virtualenv & install dependencies.
-make deploy     - Set up project & run locally.
+make deploy     - Set up project & run locally (not suitable to serve `production` applications).
 make update     - Update dependencies via Poetry and output resulting `requirements.txt`.
 make format     - Run Python code formatter & sort dependencies.
 make lint       - Check code formatting with flake8.
@@ -33,7 +33,7 @@ $(VIRTUAL_ENV):
 .PHONY: run
 run: env
 	export LESS_BIN=$(shell which lessc) && \
-	$(LOCAL_PYTHON) -m main
+	$(LOCAL_PYTHON) -m gunicorn -w 4 wsgi:app
 
 .PHONY: install
 install: env

README.md

@@ -4,6 +4,7 @@
 ![Flask](https://img.shields.io/badge/Flask-v^2.3.3-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
 ![Flask-Login](https://img.shields.io/badge/Flask--Login-v0.6.2-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
 ![Flask-Session](https://img.shields.io/badge/Flask--Session-v0.5.0-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
+![Flask-SQLAlchemy](https://img.shields.io/badge/Flask--SQLAlchemy-v3.0.5-red.svg?longCache=true&style=flat-square&logo=scala&logoColor=white&colorA=4c566a&colorB=bf616a)
 ![Redis](https://img.shields.io/badge/Redis-v5.0.0-red.svg?longCache=true&style=flat-square&logo=redis&logoColor=white&colorA=4c566a&colorB=bf616a)
 ![GitHub Last Commit](https://img.shields.io/github/last-commit/google/skia.svg?style=flat-square&colorA=4c566a&colorB=a3be8c&logo=GitHub)
 [![GitHub Issues](https://img.shields.io/github/issues/hackersandslackers/flask-session-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-session-tutorial/issues)

config.py

@@ -4,8 +4,8 @@
 import redis
 from dotenv import load_dotenv
 
-basedir = path.abspath(path.dirname(__file__))
-load_dotenv(path.join(basedir, ".env"))
+BASE_DIR = path.abspath(path.dirname(__file__))
+load_dotenv(path.join(BASE_DIR, ".env"))
 
 
 class Config:
@@ -24,15 +24,15 @@ class Config:
     SESSION_TYPE = "redis"
     SESSION_REDIS = redis.from_url(REDIS_URI)
 
-    # Flask-Assets
+    # Flask-SQLAlchemy
+    SQLALCHEMY_DATABASE_URI = environ.get("SQLALCHEMY_DATABASE_URI")
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
+    SQLALCHEMY_ECHO = False
+
+    # Flask-Assets (Optional)
     LESS_BIN = system("which lessc")
     ASSETS_DEBUG = False
     LESS_RUN_IN_DEBUG = False
     STATIC_FOLDER = "static"
     TEMPLATES_FOLDER = "templates"
     COMPRESSOR_DEBUG = environ.get("COMPRESSOR_DEBUG")
-
-    # Flask-SQLAlchemy
-    SQLALCHEMY_DATABASE_URI = environ.get("SQLALCHEMY_DATABASE_URI")
-    SQLALCHEMY_TRACK_MODIFICATIONS = environ.get("SQLALCHEMY_TRACK_MODIFICATIONS")
-    SQLALCHEMY_ECHO = environ.get("SQLALCHEMY_ECHO")

flask_session_tutorial/assets.py

@@ -3,11 +3,21 @@
 from flask_assets import Bundle, Environment
 
 
+def compile_static_assets(app: Flask):
+    """
+    Compile all asset bundles.
+
+    :param Flask app: Top-level Flask application.
+    """
+    compile_stylesheets(app)
+    compile_javascript(app)
+
+
 def compile_stylesheets(app: Flask):
     """
-    Generate stylesheets for thr application.
+    Generate CSS from .LESS source.
 
-    :param Flask app: Parent application to generate styles for.
+    :param Flask app: Top-level Flask application.
     """
     assets = Environment(app)
     Environment.auto_build = True
@@ -36,9 +46,9 @@ def compile_stylesheets(app: Flask):
 
 def compile_javascript(app: Flask):
     """
-    Generate static assets for main views.
+    Bundle and minimize Javascript source files.
 
-    :param Flask app: Parent Flask application to generate Javascript bundles for.
+    :param Flask app: Top-level Flask application.
     """
     assets = Environment(app)
     Environment.auto_build = True
@@ -51,14 +61,4 @@ def compile_javascript(app: Flask):
     assets.register("js_all", js_bundle)
     # Build assets in development mode
     if app.config.get("ENVIRONMENT") != "production":
-        js_bundle.build(force=True)
-
-
-def compile_static_assets(app: Flask):
-    """
-    Compile all asset bundles.
-
-    :param Flask app: Parent Flask application to generate asset bundles for.
-    """
-    compile_stylesheets(app)
-    compile_javascript(app)
+        js_bundle.build(force=True)

flask_session_tutorial/auth.py

@@ -20,21 +20,22 @@
 @auth_blueprint.route("/signup", methods=["GET", "POST"])
 def signup() -> Response:
     """
-    Sign-up form to create new user accounts.
+    View for new users to sign up with new accounts.
 
     GET: Serve sign-up page.
     POST: Validate form, create account, redirect user to dashboard.
+
+    :response: Response
     """
     form = SignupForm()
     if form.validate_on_submit():
-        existing_user = User.query.filter_by(email=form.email.data).first()
+        existing_user = User.query.filter_by(email=form.user_email.data).first()
         if existing_user is None:
-            user = User(name=form.name.data, email=form.email.data, website=form.website.data)
-            user.set_password(form.password.data)
+            user = User(name=form.name.data, email=form.user_email.data, website=form.website.data)
+            user.set_password(form.user_password.data)
             db.session.add(user)
             db.session.commit()  # Create new user
             login_user(user)  # Log in as newly created user
-            print(user)
             return redirect(url_for("main.dashboard"))
         flash("A user already exists with that email address.")
     return render_template(
@@ -46,20 +47,22 @@ def signup() -> Response:
     )
 
 
-@auth_blueprint.route("/login", methods=["GET", "POST"])
+@auth_blueprint.route("/", methods=["GET", "POST"])
 def login() -> Response:
     """
     Log-in page for registered users.
 
     GET: Serve Log-in page.
     POST: Validate form and redirect user to dashboard.
+
+    :returns: Response
     """
     if current_user.is_authenticated:
         return redirect(url_for("main.dashboard"))  # Bypass if user is logged in
     form = LoginForm()
     if form.validate_on_submit():
-        user = User.query.filter_by(email=form.email.data).first()  # Validate Login Attempt
-        if user and user.check_password(password=form.password.data):
+        user = User.query.filter_by(email=form.user_email.data).first()  # Validate Login Attempt
+        if user and user.check_password(password=form.user_password.data):
             login_user(user)
             next_page = request.args.get("next")
             return redirect(next_page or url_for("main.dashboard"))
@@ -68,7 +71,7 @@ def login() -> Response:
     return render_template(
         "login.jinja2",
         form=form,
-        title="Log in.",
+        title="Log In",
         template="login-page",
         body="Log in with your User account.",
     )

flask_session_tutorial/models.py

@@ -6,17 +6,18 @@
 
 
 class User(UserMixin, db.Model):
-    """Model for user accounts."""
+    """User account database model."""
 
     __tablename__ = "flasksession-users"
 
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(200), nullable=False, unique=False)
-    email = db.Column(db.String(40), unique=True, nullable=False)
-    password = db.Column(db.String(200), primary_key=False, unique=False, nullable=False)
-    website = db.Column(db.String(60), index=False, unique=False, nullable=True)
-    created_on = db.Column(db.DateTime, index=False, unique=False, nullable=True)
-    last_login = db.Column(db.DateTime, index=False, unique=False, nullable=True)
+    name = db.Column(db.String(255), nullable=False, unique=False)
+    email = db.Column(db.String(255), unique=True, nullable=False)
+    password = db.Column(db.String(255), nullable=False)
+    website = db.Column(db.String(255), nullable=True)
+    last_login = db.Column(db.DateTime)
+    created_at = db.Column(db.DateTime, server_default=db.func.now())
+    updated_at = db.Column(db.DateTime, server_default=db.func.now(), server_onupdate=db.func.now())
 
     def set_password(self, password):
         """Create hashed password."""

flask_session_tutorial/routes.py

@@ -11,7 +11,7 @@
 )
 
 
-@main_blueprint.route("/", methods=["GET"])
+@main_blueprint.route("/dashboard", methods=["GET"])
 @login_required
 def dashboard() -> Response:
     """

flask_session_tutorial/static/dist/css/account.css

@@ -23,19 +23,19 @@
       margin: 0 auto 20px;
 
       img {
-        width: 30px;
+        width: 40px;
         margin: auto;
 
         @media (max-width: 600px) {
-          width: 25px;
+          width: 30px;
         }
       }
     }
 
     .alert-warning {
-      color: #856404;
-      background-color: #fff3cd;
-      border-color: #ffeeba;
+      color: @alert-font-color;
+      background-color: @alert-background-color;
+      border-color: @alert-border-color;
       font-weight: 300;
       font-size: .8em;
       margin: 30px 0;
@@ -47,7 +47,7 @@
       }
 
       .close {
-        color: #856404;
+        color: @alert-font-color;
         font-weight: 300;
         order: 1;
         outline: none !important;
@@ -64,7 +64,8 @@
       font-family: @body-font;
 
       button.close {
-        padding: 0;
+        color: @alert-font-color !important;
+        padding: 0 0 0 10px;
         background-color: transparent;
         border: 0;
         -webkit-appearance: none;

flask_session_tutorial/static/src/less/account.less

@@ -1,9 +1,13 @@
 // Colors
-@theme-color: #5eb9d7;
+@theme-color: #0297f6;
 @background-color: #e1eaf5;
 @box-shadow: 0 0 5px rgba(65, 67, 144, 0.15);
 @header-color: #5f6988;
 
+@alert-font-color: #856404;
+@alert-background-color: #fff3cd;
+@alert-border-color: #ffeeba;
+
 // Fonts
 @body-font: 'Poppins', sans-serif;