Merge branch 'master' of github.com:joostsijm/ssg

app/__init__.py

@@ -11,6 +11,7 @@ from flask_migrate import Migrate
 from flask_login import LoginManager
 from flask_compress import Compress
 from flask_argon2 import Argon2
+from flask_menu import Menu
 from dotenv import load_dotenv
 
 
@@ -41,6 +42,7 @@ COMPRESS_MIMETYPES = [
 COMPRESS_LEVEL = 6
 COMPRESS_MIN_SIZE = 500
 Compress(app)
+Menu(app=app)
 
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)

app/flaskr.py

@@ -4,108 +4,12 @@ Simple flask thing
 """
 
 from flask_login import login_required, login_user, logout_user
-from flask_menu import Menu, register_menu
+from flask_menu import register_menu
 from flask import render_template, request, redirect, url_for, flash
 from app import app, login_manager, db
 from app.models import User
+from app.modules.static import Static
+from app.modules.backend import Backend
 
-Menu(app=app)
-
-
-@login_manager.user_loader
-def load_user(user_id):
-    """Return user"""
-    return User.query.get(user_id)
-
-
-@app.route("/login", methods=["GET", "POST"])
-def login():
-    """Handle login page and data"""
-    if request.method == 'POST':
-        email = request.form['email']
-        password = request.form['password']
-        user = User.query.filter(User.email == email).first()
-        if user is not None:
-            if user.check_password(password):
-                login_user(user, remember=True)
-                flash('You were successfully logged in.', 'success')
-                if request.args.get("next") is not None:
-                    return redirect(request.args.get("next"))
-                return redirect(url_for('index'))
-            else:
-                flash('Incorrect password.', 'danger')
-        else:
-            flash('User not found.', 'danger')
-
-        return redirect(url_for('login'))
-    else:
-        return render_template('user/login.html')
-
-
-@app.route("/register", methods=["POST"])
-def register():
-    """Register a new user"""
-    if request.method != "POST":
-        return redirect(url_for('login'))
-
-    if "name" not in request.form or not request.form['name']:
-        flash('Fill in the name.', 'warning')
-        return render_template('user/login.html')
-
-    if "email" not in request.form or not request.form['email']:
-        flash('Fill in the email.', 'warning')
-        return render_template('user/login.html', name=request.form['name'])
-
-    if "password" not in request.form or not request.form['password']:
-        flash('Fill in the password.', 'warning')
-        return render_template(
-            'user/login.html',
-            name=request.form['name'],
-            email=request.form['email']
-        )
-
-    user = User.query.filter(User.name == request.form['name']).first()
-    if user is None:
-        flash('Name not found.', 'warning')
-        return render_template(
-            'user/login.html',
-            name=request.form['name'],
-            email=request.form['email']
-        )
-
-    if user.email is not None:
-        flash('User already taken.', 'warning')
-        return render_template(
-            'user/login.html',
-            name=request.form['name'],
-            email=request.form['email']
-        )
-
-    user.email = request.form['email']
-    user.password = request.form['password']
-
-    db.session.commit()
-    login_user(user, remember=True)
-    flash('Succesfully registered account "%s".' % (user.name), 'success')
-
-    if request.args.get("next") is not None:
-        return redirect(request.args.get("next"))
-    else:
-        return redirect(url_for('index'))
-
-
-@app.route("/logout")
-@login_required
-def logout():
-    """Logout function for users"""
-    logout_user()
-    flash('succesfully logged out.', 'success')
-    return redirect(url_for('login'))
-
-
-@app.route('/')
-@register_menu(app, '.', 'Home')
-def index():
-    """Show homepage"""
-
-    return render_template('site/index.html')
+app.register_blueprint(Static)
+app.register_blueprint(Backend, url_prefix='/backend')

app/models.py

@@ -6,7 +6,7 @@ All models for module
 from datetime import datetime
 # from sqlalchemy.ext.hybrid import hybrid_method, hybrid_property
 from flask_login import UserMixin
-from app import db, argon2
+from app import db, argon2, login_manager
 
 
 class Base():
@@ -25,6 +25,13 @@ class User(Base, db.Model, UserMixin):
     _password = db.Column("password", db.String(255))
     registration_at = db.Column(db.DateTime, default=datetime.utcnow)
 
+    def __init__(self, id=None):
+        self.id = id
+
+    @login_manager.user_loader
+    def load_user(user_id):
+        return User.query.get(user_id)
+
     @property
     def password(self):
         """Return the password"""
@@ -49,9 +56,9 @@ class Page(Base, db.Model):
 
     user_id = db.Column(
         db.Integer,
-        db.ForeignKey("sp_users.id")
+        db.ForeignKey("user.id")
     )
     user = db.relationship(
         "User",
-        backref=db.backref("players", lazy="dynamic")
+        backref=db.backref("Pages", lazy="dynamic")
     )

app/modules/backend/__init__.py

@@ -0,0 +1,6 @@
+
+"""
+Server static pages
+"""
+
+from .app import BLUEPRINT as Backend

app/modules/backend/app.py

@@ -0,0 +1,110 @@
+
+"""
+Backend
+"""
+
+from flask_login import login_required, login_user, logout_user
+from flask_menu import Menu, register_menu
+from flask import render_template, request, redirect, url_for, flash, Blueprint, abort
+from jinja2 import TemplateNotFound
+from app import app, login_manager, db
+from app.models import User
+
+
+BLUEPRINT = Blueprint(
+    'backend',
+    __name__,
+    template_folder='templates'
+)
+
+@BLUEPRINT.route("/login", methods=["GET", "POST"])
+def login():
+    """Handle login page and data"""
+    if request.method == 'POST':
+        email = request.form['email']
+        password = request.form['password']
+        user = User.query.filter(User.email == email).first()
+        if user is not None:
+            if user.check_password(password):
+                login_user(user, remember=True)
+                flash('You were successfully logged in.', 'success')
+                if request.args.get("next") is not None:
+                    return redirect(request.args.get("next"))
+                return redirect(url_for('index'))
+            else:
+                flash('Incorrect password.', 'danger')
+        else:
+            flash('User not found.', 'danger')
+
+        return redirect(url_for('login'))
+    else:
+        return render_template('user/login.j2')
+
+
+@BLUEPRINT.route("/register", methods=["POST"])
+def register():
+    """Register a new user"""
+    if request.method != "POST":
+        return redirect(url_for('login'))
+
+    if "name" not in request.form or not request.form['name']:
+        flash('Fill in the name.', 'warning')
+        return render_template('user/login.j2')
+
+    if "email" not in request.form or not request.form['email']:
+        flash('Fill in the email.', 'warning')
+        return render_template('user/login.j2', name=request.form['name'])
+
+    if "password" not in request.form or not request.form['password']:
+        flash('Fill in the password.', 'warning')
+        return render_template(
+            'user/login.j2',
+            name=request.form['name'],
+            email=request.form['email']
+        )
+
+    user = User.query.filter(User.name == request.form['name']).first()
+    if user is None:
+        flash('Name not found.', 'warning')
+        return render_template(
+            'user/login.j2',
+            name=request.form['name'],
+            email=request.form['email']
+        )
+
+    if user.email is not None:
+        flash('User already taken.', 'warning')
+        return render_template(
+            'user/login.j2',
+            name=request.form['name'],
+            email=request.form['email']
+        )
+
+    user.email = request.form['email']
+    user.password = request.form['password']
+
+    db.session.commit()
+    login_user(user, remember=True)
+    flash('Succesfully registered account "%s".' % (user.name), 'success')
+
+    if request.args.get("next") is not None:
+        return redirect(request.args.get("next"))
+    else:
+        return redirect(url_for('index'))
+
+
+@BLUEPRINT.route("/logout")
+@login_required
+def logout():
+    """Logout function for users"""
+    logout_user()
+    flash('succesfully logged out.', 'success')
+    return redirect(url_for('login'))
+
+
+@BLUEPRINT.route('/')
+@register_menu(BLUEPRINT, '.', 'Home')
+def index():
+    """Show homepage"""
+
+    return render_template('site/index.j2')

app/modules/static/__init__.py

@@ -0,0 +1,6 @@
+
+"""
+Server static pages
+"""
+
+from .app import BLUEPRINT as Static

app/modules/static/app.py

@@ -0,0 +1,27 @@
+
+"""
+Serve static content
+"""
+
+from flask_login import login_required, login_user, logout_user
+from flask_menu import Menu, register_menu
+from flask import render_template, request, redirect, url_for, flash, Blueprint, abort
+from jinja2 import TemplateNotFound
+from app import app, login_manager, db
+from app.models import User
+
+
+BLUEPRINT = Blueprint(
+    "static",
+    __name__,
+    template_folder="pages"
+)
+
+@BLUEPRINT.route("/", defaults={"page": "index"})
+@BLUEPRINT.route("/<page>")
+def show(page):
+    """Display static page"""
+    try:
+        return render_template("%s.html" % page)
+    except TemplateNotFound:
+        abort(404)

app/modules/static/pages/index.html

@@ -0,0 +1 @@
+Static index

app/modules/static/pages/test.html

@@ -0,0 +1 @@
+Test page

migrations/README

@@ -0,0 +1 @@
+Generic single-database configuration.

migrations/alembic.ini

@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

migrations/env.py

@@ -0,0 +1,91 @@
+from __future__ import with_statement
+from alembic import context
+from sqlalchemy import engine_from_config, pool
+from logging.config import fileConfig
+import logging
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+from flask import current_app
+config.set_main_option('sqlalchemy.url',
+                       current_app.config.get('SQLALCHEMY_DATABASE_URI'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(url=url)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    engine = engine_from_config(config.get_section(config.config_ini_section),
+                                prefix='sqlalchemy.',
+                                poolclass=pool.NullPool)
+
+    connection = engine.connect()
+    context.configure(connection=connection,
+                      target_metadata=target_metadata,
+                      process_revision_directives=process_revision_directives,
+                      compare_type=True,
+                      **current_app.extensions['migrate'].configure_args)
+    
+    try:
+        with context.begin_transaction():
+            context.run_migrations()
+    except Exception as exception:
+        logger.error(exception)
+        raise exception
+    finally:
+        connection.close()
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

migrations/script.py.mako

@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}

migrations/versions/476b167aef80_initial_migration.py

@@ -0,0 +1,43 @@
+"""initial_migration
+
+Revision ID: 476b167aef80
+Revises: 
+Create Date: 2019-01-03 17:03:37.684091
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '476b167aef80'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table('user',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=True),
+    sa.Column('password', sa.String(length=255), nullable=True),
+    sa.Column('registration_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('email'),
+    sa.UniqueConstraint('name')
+    )
+    op.create_table('page',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.String(), nullable=False),
+    sa.Column('datetime', sa.DateTime(), nullable=True),
+    sa.Column('source', sa.String(), nullable=True),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+
+
+def downgrade():
+    op.drop_table('page')
+    op.drop_table('user')