Unify codebase & Add DT

Author: app-generator

apps/__init__.py

@@ -10,43 +10,18 @@
 from flask_sqlalchemy import SQLAlchemy
 from importlib import import_module
 
-
 db = SQLAlchemy()
 login_manager = LoginManager()
 
-
 def register_extensions(app):
     db.init_app(app)
     login_manager.init_app(app)
 
-
 def register_blueprints(app):
-    for module_name in ('authentication', 'home'):
+    for module_name in ('authentication', 'home', 'dyn_dt'):
         module = import_module('apps.{}.routes'.format(module_name))
         app.register_blueprint(module.blueprint)
 
-
-def configure_database(app):
-
-    @app.before_first_request
-    def initialize_database():
-        try:
-            db.create_all()
-        except Exception as e:
-
-            print('> Error: DBMS Exception: ' + str(e) )
-
-            # fallback to SQLite
-            basedir = os.path.abspath(os.path.dirname(__file__))
-            app.config['SQLALCHEMY_DATABASE_URI'] = SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'db.sqlite3')
-
-            print('> Fallback to SQLite ')
-            db.create_all()
-
-    @app.teardown_request
-    def shutdown_session(exception=None):
-        db.session.remove()
-
 from apps.authentication.oauth import github_blueprint
 
 def create_app(config):
@@ -55,5 +30,4 @@ def create_app(config):
     register_extensions(app)
     register_blueprints(app)
     app.register_blueprint(github_blueprint, url_prefix="/login")    
-    configure_database(app)
     return app

apps/authentication/decorators.py

@@ -14,7 +14,7 @@
 
 class Users(db.Model, UserMixin):
 
-    __tablename__ = 'Users'
+    __tablename__ = 'users'
 
     id            = db.Column(db.Integer, primary_key=True)
     username      = db.Column(db.String(64), unique=True)
@@ -27,9 +27,6 @@ class Users(db.Model, UserMixin):
 
     oauth_github  = db.Column(db.String(100), nullable=True)
 
-    api_token     = db.Column(db.String(100))
-    api_token_ts  = db.Column(db.Integer)    
-
     def __init__(self, **kwargs):
         for property, value in kwargs.items():
             # depending on whether value is an iterable or not, we must
@@ -47,19 +44,50 @@ def __init__(self, **kwargs):
     def __repr__(self):
         return str(self.username)
 
+    @classmethod
+    def find_by_email(cls, email: str) -> "Users":
+        return cls.query.filter_by(email=email).first()
+
+    @classmethod
+    def find_by_username(cls, username: str) -> "Users":
+        return cls.query.filter_by(username=username).first()
+    
+    @classmethod
+    def find_by_id(cls, _id: int) -> "Users":
+        return cls.query.filter_by(id=_id).first()
+   
+    def save(self) -> None:
+        try:
+            db.session.add(self)
+            db.session.commit()
+          
+        except SQLAlchemyError as e:
+            db.session.rollback()
+            db.session.close()
+            error = str(e.__dict__['orig'])
+            raise InvalidUsage(error, 422)
+    
+    def delete_from_db(self) -> None:
+        try:
+            db.session.delete(self)
+            db.session.commit()
+        except SQLAlchemyError as e:
+            db.session.rollback()
+            db.session.close()
+            error = str(e.__dict__['orig'])
+            raise InvalidUsage(error, 422)
+        return
 
 @login_manager.user_loader
 def user_loader(id):
     return Users.query.filter_by(id=id).first()
 
-
 @login_manager.request_loader
 def request_loader(request):
     username = request.form.get('username')
     user = Users.query.filter_by(username=username).first()
     return user if user else None
 
 class OAuth(OAuthConsumerMixin, db.Model):
-    user_id = db.Column(db.Integer, db.ForeignKey("Users.id", ondelete="cascade"), nullable=False)
+    user_id = db.Column(db.Integer, db.ForeignKey("users.id", ondelete="cascade"), nullable=False)
     user = db.relationship(Users)
-    

apps/authentication/models.py

@@ -24,7 +24,8 @@
         db.session,
         user=current_user,
         user_required=False,        
-    ),   
+    ),
+   
 )
 
 @oauth_authorized.connect_via(github_blueprint)

apps/authentication/oauth.py

@@ -30,6 +30,7 @@ def login_github():
     res = github.get("/user")
     return redirect(url_for('home_blueprint.index'))
 
+
 @blueprint.route('/login', methods=['GET', 'POST'])
 def login():
     login_form = LoginForm(request.form)
@@ -48,7 +49,7 @@ def login():
             user = Users.find_by_email(user_id)
 
             if not user:
-                return render_template( 'accounts/login.html',
+                return render_template( 'authentication/login.html',
                                         msg='Unknown User or Email',
                                         form=login_form)
 
@@ -59,12 +60,12 @@ def login():
             return redirect(url_for('home_blueprint.index'))
 
         # Something (user or pass) is not ok
-        return render_template('accounts/login.html',
+        return render_template('authentication/login.html',
                                msg='Wrong user or password',
                                form=login_form)
 
     if not current_user.is_authenticated:
-        return render_template('accounts/login.html',
+        return render_template('authentication/login.html',
                                form=login_form)
     return redirect(url_for('home_blueprint.index'))
 
@@ -80,15 +81,15 @@ def register():
         # Check usename exists
         user = Users.query.filter_by(username=username).first()
         if user:
-            return render_template('accounts/register.html',
+            return render_template('authentication/register.html',
                                    msg='Username already registered',
                                    success=False,
                                    form=create_account_form)
 
         # Check email exists
         user = Users.query.filter_by(email=email).first()
         if user:
-            return render_template('accounts/register.html',
+            return render_template('authentication/register.html',
                                    msg='Email already registered',
                                    success=False,
                                    form=create_account_form)
@@ -101,13 +102,13 @@ def register():
         # Delete user from session
         logout_user()
 
-        return render_template('accounts/register.html',
+        return render_template('authentication/register.html',
                                msg='User created successfully.',
                                success=True,
                                form=create_account_form)
 
     else:
-        return render_template('accounts/register.html', form=create_account_form)
+        return render_template('authentication/register.html', form=create_account_form)
 
 
 @blueprint.route('/logout')
@@ -116,27 +117,14 @@ def logout():
     return redirect(url_for('home_blueprint.index'))
 
 # Errors
+
 @blueprint.context_processor
-def is_github():
+def has_github():
     if Config.GITHUB_ID and Config.GITHUB_SECRET:
-        return {'is_github': True}
+        return {'has_github': True}
 
-    return {'is_github': False}
+    return {'has_github': False}
 
 @login_manager.unauthorized_handler
 def unauthorized_handler():
     return redirect('/login')
-
-# @blueprint.errorhandler(403)
-# def access_forbidden(error):
-#     return render_template('home/page-403.html'), 403
-
-
-# @blueprint.errorhandler(404)
-# def not_found_error(error):
-#     return render_template('home/page-404.html'), 404
-
-
-# @blueprint.errorhandler(500)
-# def internal_error(error):
-#     return render_template('home/page-500.html'), 500

apps/authentication/routes.py

@@ -9,7 +9,6 @@
 
 # Inspiration -> https://www.vitoshacademy.com/hashing-passwords-in-python/
 
-
 def hash_pass(password):
     """Hash a password for storing."""
 

apps/authentication/util.py

@@ -3,15 +3,28 @@
 Copyright (c) 2019 - present AppSeed.us
 """
 
-import os, random, string
+import os
 
 class Config(object):
 
     basedir = os.path.abspath(os.path.dirname(__file__))
 
+    # for Product model
+    CURRENCY     = { 'usd' : 'usd' , 'eur' : 'eur' }
+    STATE        = { 'completed' : 1 , 'pending' : 2, 'refunded' : 3 }
+    PAYMENT_TYPE = { 'cc' : 1 , 'paypal' : 2, 'wire' : 3 }
+    
+    USERS_ROLES  = { 'ADMIN'  :1 , 'USER'      : 2 }
+    USERS_STATUS = { 'ACTIVE' :1 , 'SUSPENDED' : 2 }
+    
     # Assets Management
     ASSETS_ROOT = os.getenv('ASSETS_ROOT', '/static/assets')  
 
+    # celery 
+    CELERY_BROKER_URL     = "redis://localhost:6379"
+    CELERY_RESULT_BACKEND = "redis://localhost:6379"
+    CELERY_HOSTMACHINE    = "celery@app-generator"
+
     # Set up the App SECRET_KEY
     SECRET_KEY  = os.getenv('SECRET_KEY', 'S3cret_999')
 
@@ -62,7 +75,11 @@ class Config(object):
 
         # This will create a file in <app> FOLDER
         SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'db.sqlite3')
-    
+
+    DYNAMIC_DATATB = {
+        "products": "apps.models.Product"
+    }
+
 class ProductionConfig(Config):
     DEBUG = False
 

apps/config.py

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+"""
+Copyright (c) 2019 - present AppSeed.us
+"""
+
+from flask import Blueprint
+
+blueprint = Blueprint(
+    'table_blueprint',
+    __name__,
+    url_prefix=''
+)