From d04d93eb7a7a570647f79ab56e733de9c775a75d Mon Sep 17 00:00:00 2001
From: hok7z <hok7zv@tutanota.com>
Date: Sat, 26 Nov 2022 19:22:25 +0200
Subject: [PATCH] Add  environment variables

---
 .env.dist                         |  1 +
 app.py                            | 17 +++++++++--------
 apps/auth.py                      |  2 +-
 config.py                         |  8 ++++++++
 database/models.py => database.py |  9 ++++-----
 database/__init__.py              |  0
 database/database.py              |  1 -
 7 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 .env.dist
 create mode 100644 config.py
 rename database/models.py => database.py (85%)
 delete mode 100644 database/__init__.py
 delete mode 100644 database/database.py

diff --git a/.env.dist b/.env.dist
new file mode 100644
index 0000000..1f08d64
--- /dev/null
+++ b/.env.dist
@@ -0,0 +1 @@
+db_url = "sqlite:///db.db"
diff --git a/app.py b/app.py
index 8a2734b..21fac38 100644
--- a/app.py
+++ b/app.py
@@ -1,20 +1,21 @@
 from flask import Flask
-from os import urandom
-
-from apps.admin import admin  as blueprint_admin
-from apps.auth  import auth   as blueprint_auth 
-
-from database.models import build_models
 
 import logging
 
+from apps.admin import admin as blueprint_admin
+from apps.auth  import auth  as blueprint_auth 
+
+from config import secret_key
+
 app = Flask(__name__)
-app.secret_key = urandom(24)
+app.secret_key = secret_key
 
 app.register_blueprint(blueprint_auth)
 app.register_blueprint(blueprint_admin)
 
 if __name__ == '__main__':
+    from database import build_database
+    build_database()
     logging.info("Build database models")
-    build_models()
+    
     app.run(host="0.0.0.0")
diff --git a/apps/auth.py b/apps/auth.py
index 2a10924..a64c33a 100644
--- a/apps/auth.py
+++ b/apps/auth.py
@@ -1,7 +1,7 @@
 from flask import Blueprint,render_template,request,redirect,url_for,session
 from werkzeug.security import check_password_hash
 
-from database.models import WebUser
+from database import WebUser
 
 auth = Blueprint('auth',__name__)
 
diff --git a/config.py b/config.py
new file mode 100644
index 0000000..ba4b351
--- /dev/null
+++ b/config.py
@@ -0,0 +1,8 @@
+from environs import Env
+from os import urandom
+
+env = Env()
+env.read_env()
+
+db_url = env.str("db_url")
+secret_key = urandom(48) 
diff --git a/database/models.py b/database.py
similarity index 85%
rename from database/models.py
rename to database.py
index f1438b3..6d6a2c5 100644
--- a/database/models.py
+++ b/database.py
@@ -1,10 +1,9 @@
 from peewee import Model,CharField
+
 from playhouse.db_url import connect
 
-
-# TODO: create connection to bot database
-db = connect("sqlite:///db.db") 
-
+from config import db_url 
+db = connect(db_url)
 
 class WebUser(Model):
     username = CharField()
@@ -25,5 +24,5 @@ class WebUser(Model):
 
         return False
 
-def build_models():
+def build_database():
     db.create_tables([WebUser])
diff --git a/database/__init__.py b/database/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/database/database.py b/database/database.py
deleted file mode 100644
index aa37ad0..0000000
--- a/database/database.py
+++ /dev/null
@@ -1 +0,0 @@
-from models import WebUser