diff --git a/TFR/server/__init__.py b/TFR/server/__init__.py index 6afcc49..a100871 100644 --- a/TFR/server/__init__.py +++ b/TFR/server/__init__.py @@ -6,14 +6,15 @@ from werkzeug.exceptions import HTTPException from server.extensions import db, migrate, cache, assets, login_manager from server.models import Users +from server.config import MIGRATION_DIR, INSTANCE_DIR from server import views, auth, api -app = Flask(__name__) +app = Flask(__name__, instance_path=INSTANCE_DIR) app.config.from_pyfile("config.py") db.init_app(app) -migrate.init_app(app, db) +migrate.init_app(app, db, directory=MIGRATION_DIR) with app.app_context(): db.create_all() diff --git a/TFR/server/config.py b/TFR/server/config.py index 85b50f0..fb532cd 100644 --- a/TFR/server/config.py +++ b/TFR/server/config.py @@ -10,7 +10,6 @@ USER_MAX_TOKENS = 3 MAX_TOP_SCORES = 15 MAX_SEARCH_RESULTS = 5 -""" # Postgres SECRET_KEY = os.getenv("FLASK_KEY") @@ -25,8 +24,9 @@ SQLALCHEMY_POOL_RECYCLE = 621 MIGRATION_DIR = "/data/storage/migrations" INSTANCE_DIR = "/data/storage/instance" -""" +""" # SQLite SECRET_KEY = "dev" SQLALCHEMY_DATABASE_URI = "sqlite:///tfr.db" +""" \ No newline at end of file diff --git a/TFR/server/static/sass/style.sass b/TFR/server/static/sass/style.sass index 714cd3e..aa4ca8e 100644 --- a/TFR/server/static/sass/style.sass +++ b/TFR/server/static/sass/style.sass @@ -80,12 +80,12 @@ body > th padding: 0.5rem background-image: linear-gradient(to bottom, RGBA($white, 0.05), transparent) - text-align: left + text-align: center font-weight: bolder > td padding: 0.5rem - text-align: left + text-align: center &.player color: RGB($secondary)