diff --git a/reqs/app.in b/reqs/app.in index 68fc4101..f80caa1e 100644 Binary files a/reqs/app.in and b/reqs/app.in differ diff --git a/reqs/app.txt b/reqs/app.txt index 0b263297..59ebd7b4 100644 --- a/reqs/app.txt +++ b/reqs/app.txt @@ -1,5 +1,9 @@ -# This file was autogenerated by uv via the following command: -# uv pip compile reqs/app.in -o reqs/app.txt +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile app.in +# alembic==1.7.3 # via flask-migrate click==8.0.1 @@ -7,11 +11,14 @@ click==8.0.1 dnspython==2.1.0 # via email-validator email-validator==1.1.3 - # via shopyo + # via + # -r app.in + # shopyo et-xmlfile==1.1.0 # via openpyxl flask==2.2.0 # via + # -r app.in # flask-admin # flask-login # flask-mailman @@ -24,7 +31,9 @@ flask==2.2.0 flask-admin==1.6.0 # via shopyo flask-login==0.6.2 - # via shopyo + # via + # -r app.in + # shopyo flask-mailman==0.3.0 # via shopyo flask-marshmallow==0.14.0 @@ -32,8 +41,10 @@ flask-marshmallow==0.14.0 flask-migrate==3.1.0 # via shopyo flask-reuploaded==1.2.0 + # via -r app.in flask-sqlalchemy==2.5.1 # via + # -r app.in # flask-migrate # shopyo flask-wtf==1.0.0 @@ -68,12 +79,19 @@ mkdocs-material-extensions==1.0.3 numpy==1.23.2 # via pandas openpyxl==3.0.10 + # via -r app.in pandas==2.2.2 + # via -r app.in pillow==9.2.0 + # via -r app.in pymysql==1.0.2 + # via -r app.in python-dateutil==2.8.2 # via pandas +python-dotenv==1.0.1 + # via -r app.in pythoncms==1.2.1 + # via -r app.in pytz==2022.2.1 # via pandas shopyo==4.8.6 diff --git a/src/shopcube/app.py b/src/shopcube/app.py index a401e94d..7d487849 100644 --- a/src/shopcube/app.py +++ b/src/shopcube/app.py @@ -39,7 +39,8 @@ def create_app(config_name="development"): - + from dotenv import load_dotenv + load_dotenv() global_template_variables = {} global_configs = {} app = Flask( diff --git a/src/shopcube/config.py b/src/shopcube/config.py index cc222187..8948cd6b 100644 --- a/src/shopcube/config.py +++ b/src/shopcube/config.py @@ -39,8 +39,9 @@ class BaseConfig: ) UPLOADED_PRODUCTEXCEL_DEST = os.path.join(STATIC, "uploads") UPLOADED_PRODUCTEXCEL_ALLOW = ("xls", "xlsx", "xlsm", "xlsb", "odf") - PASSWORD_SALT = "abcdefghi" - + + SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI') + SALT = os.environ.get('SALT') class ProductionConfig(BaseConfig): """Configurations for production""" @@ -61,10 +62,6 @@ class ProductionConfig(BaseConfig): MAIL_PASSWORD = os.environ.get("MAIL_PASSWORD") MAIL_DEFAULT_SENDER = os.environ.get("MAIL_DEFAULT_SENDER") - # database configs - SQLALCHEMY_DATABASE_URI = ( - os.environ.get("SQLALCHEMY_DATABASE_URI") or "sqlite:///shopyo.db" - ) class DevelopmentConfig(BaseConfig): @@ -88,12 +85,6 @@ class DevelopmentConfig(BaseConfig): MAIL_PASSWORD = "" MAIL_DEFAULT_SENDER = "ma@mail.com" - # database configs - SQLALCHEMY_DATABASE_URI = "sqlite:///shopyo.db" - - # unknown configs - PASSWORD_SALT = "some pasword salt" - class TestingConfig(BaseConfig): """Configurations for testsing"""