From 323f36e7dc57bf9219b75e32f778d96ff5f3323e Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <yuki@vachot.fr>
Date: Wed, 8 Dec 2021 14:39:45 +0100
Subject: [PATCH] Update: Only issues with DB

---
 backend/application/__init__.py | 11 +++++------
 backend/application/manage.py   | 14 --------------
 backend/application/routes.py   |  7 +++----
 backend/config.py               |  1 -
 backend/env.sh                  |  2 +-
 5 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 backend/application/manage.py

diff --git a/backend/application/__init__.py b/backend/application/__init__.py
index 2b1a123..5eabb51 100644
--- a/backend/application/__init__.py
+++ b/backend/application/__init__.py
@@ -9,7 +9,7 @@ patch_all()
 
 
 def create_app():
-    app = Flask(__name__)
+    app = Flask(__name__, instance_relative_config=False)
     FLASK_ENV = os.environ.get('FLASK_ENV', None)
     if FLASK_ENV == 'production':
         app.config.from_object("config.ProductionConfig")
@@ -26,10 +26,9 @@ def create_app():
     else:
         print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS'])
 
-    # import routes
-    return app
-
     # db.init_app(app)
-    # db.create_all()
+    with app.app_context():
+        from . import routes
+        # db.create_all()
 
-    # return app
+    return app
diff --git a/backend/application/manage.py b/backend/application/manage.py
deleted file mode 100644
index 92f82bc..0000000
--- a/backend/application/manage.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from flask_script import Manager
-from flask_migrate import Migrate, MigrateCommand
-
-from flask import current_app as app
-from backend import db
-
-migrate = Migrate(app, db)
-manager = Manager(app)
-
-manager.add_command('db', MigrateCommand)
-
-
-if __name__ == '__main__':
-    manager.run()
\ No newline at end of file
diff --git a/backend/application/routes.py b/backend/application/routes.py
index f5e814d..0def9de 100644
--- a/backend/application/routes.py
+++ b/backend/application/routes.py
@@ -1,11 +1,10 @@
-# from application import app
-# from ..run import app
+from flask import current_app as app
 from flask import request
 from .users_model import Users, db
-from responses import send_message, send_error
-
+from .responses import send_message, send_error
 
 
+# Login
 @app.route('/api/login', methods=['POST'])
 def login():
     return send_message('Login not implemented', None)
diff --git a/backend/config.py b/backend/config.py
index a924e0a..9f49597 100644
--- a/backend/config.py
+++ b/backend/config.py
@@ -8,7 +8,6 @@ class Config(object):
     TESTING = False
     CSRF_ENABLED = True
 
-    PORT = int(os.environ.get('PORT', 33507))
     SECRET_KEY = os.environ.get('SECRET_KEY', None)
     FLASK_APP = os.environ.get('FLASK_APP', None)
     FLASK_ENV = os.environ.get('FLASK_ENV', None)
diff --git a/backend/env.sh b/backend/env.sh
index 601ce5a..de9ad71 100755
--- a/backend/env.sh
+++ b/backend/env.sh
@@ -1,4 +1,4 @@
-export FLASK_APP=run.py
+export FLASK_APP=app.py
 export FLASK_ENV=development
 export FLASK_DEBUG=1
 export PYTHONUNBUFFERED=1