Updating

Author: Moyo Oyegunle

.gitignore

@@ -3,6 +3,7 @@ accounts.db
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+*.pyc
 *$py.class
 
 # C extensions
@@ -162,3 +163,6 @@ htmlcov/
 .coverage
 .coverage.*
 *,cover
+
+#VSCode
+.vscode/

app/main/routes.py

@@ -7,9 +7,7 @@
 from app.main.forms import PostForm
 from app.models import KeyStore
 from config import Config
-
-
-
+from config import myclassvariables
 
 def refresh_db(url):
     form = PostForm()
@@ -37,7 +35,7 @@ def index():
     db_value = {}
     db_time = {}
     db_remove = {}
-    configs = Config.myclassvariables()
+    configs = myclassvariables()
 
 
     if not Config.DB_INIT:

app/templates/index.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    <h1>Jennison Openshift Demo</h1>
+    <h1>Openshift Demo</h1>
 
     <h2> Active Configuration </h2>
       {% for configuration,value in configs.items() %}         

config.py

@@ -5,20 +5,32 @@
 load_dotenv(os.path.join(basedir, '.env'))
 
 
+def create_uri(user,password,host,db):
+        if ( user != "" and password != "" and host != "" and db != ""):
+            return "mysql+pymysql://{}:{}@{}/{}".format(user,password, host,db)
+        else:
+            return "sqlite:///:memory:"
+
+
 class Config(object):
     #Secret key Configuration for Flask not for application
     SECRET_KEY = os.environ.get('SECRET_KEY') or 'you-will-never-guess'
-
-    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URI') or "sqlite:///:memory:"
     SQLALCHEMY_DATABASE_USERNAME = os.environ.get('DATABASE_USERNAME') or ""
     SQLALCHEMY_DATABASE_PASSWORD = os.environ.get('DATABASE_PASSWORD') or ""
+    SQLALCHEMY_DATABASE_HOST = os.environ.get('DATABASE_HOST') or ""
+    SQLALCHEMY_DATABASE_DB = os.environ.get('DATABASE_DB') or ""
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     DB_INIT = False
 
-    def myclassvariables():
-        temp = {}
-        result = vars(Config)
-        for key in result:
-            if "__" not in key and "<" not in key and "myclassvariables" not in key :
-                temp.update({key:result[key]})
-        return temp
+    #Generate URI from Parameters
+    SQLALCHEMY_DATABASE_URI = create_uri(SQLALCHEMY_DATABASE_USERNAME,SQLALCHEMY_DATABASE_PASSWORD,SQLALCHEMY_DATABASE_HOST,
+    SQLALCHEMY_DATABASE_DB)    
+
+def myclassvariables():
+    temp = {}
+    result = vars(Config)
+    for key in result:
+        if "__" not in key and "<" not in key and "myclassvariables" not in key :
+            temp.update({key:result[key]})
+    return temp
+