From 869ba826952c5dfabd3875bdd1daded7dda219c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= Date: Sun, 11 Jun 2023 18:09:00 +0200 Subject: [PATCH] Refactor project structure Add version, multiple configs and pyproject --- app/.gitignore => .gitignore | 1 + app/__init__.py | 0 app/config.py | 17 ----- app/env.dist | 1 - app/templates/status.html | 5 -- beflask/__init__.py | 16 +++++ beflask/_version.py | 1 + {app => beflask}/admin/forms.py | 2 +- {app => beflask}/admin/main_admin.py | 0 .../admin/templates/_table_benchmarks.html | 0 .../admin/templates/_table_users.html | 0 .../admin/templates/benchmark.html | 0 .../admin/templates/benchmarks.html | 0 .../admin/templates/password.html | 0 {app => beflask}/admin/templates/user.html | 0 {app => beflask}/admin/templates/users.html | 2 +- {app => beflask}/app.py | 8 ++- beflask/config.py | 68 ++++++++++++++++++ beflask/env.dist | 5 ++ {app => beflask}/forms.py | 0 {app => beflask}/interactive/forms.py | 0 .../interactive/main_interactive.py | 0 .../interactive/templates/iobase.html | 0 .../interactive/templates/ranking.html | 0 {app => beflask}/main.py | 0 {app => beflask}/models.py | 0 {app => beflask}/results/main_results.py | 0 .../results/templates/_table_dataset.html | 0 .../results/templates/_table_datasets.html | 0 .../results/templates/_table_report.html | 0 .../results/templates/_table_select.html | 0 {app => beflask}/results/templates/best.html | 0 .../results/templates/dataset.html | 0 .../results/templates/datasets.html | 0 {app => beflask}/results/templates/error.html | 0 .../results/templates/macros.html | 0 .../results/templates/report.html | 0 .../results/templates/report_tables.html | 0 .../results/templates/select.html | 0 {app => beflask}/static/.gitignore | 0 {app => beflask}/static/css/main.css | 0 {app => beflask}/static/excel/.gitignore | 0 .../robert-lukeman-_RBcxo9AU-U-unsplash.jpg | Bin {app => beflask}/static/js/excelFiles.js | 0 {app => beflask}/static/js/report.js | 0 {app => beflask}/static/js/select.js | 0 {app => beflask}/templates/_benchmarks.html | 0 .../templates/_header.html | 0 {app => beflask}/templates/base.html | 2 +- {app => beflask}/templates/config.html | 0 {app => beflask}/templates/index.html | 0 {app => beflask}/templates/login.html | 0 beflask/templates/status.html | 12 ++++ dbseed.py | 4 +- dbseed_docker.py | 4 +- pyproject.toml | 48 +++++++++++++ requirements.txt | 1 + run.py | 5 +- 58 files changed, 167 insertions(+), 35 deletions(-) rename app/.gitignore => .gitignore (99%) delete mode 100644 app/__init__.py delete mode 100644 app/config.py delete mode 100644 app/env.dist delete mode 100644 app/templates/status.html create mode 100644 beflask/__init__.py create mode 100644 beflask/_version.py rename {app => beflask}/admin/forms.py (98%) rename {app => beflask}/admin/main_admin.py (100%) rename {app => beflask}/admin/templates/_table_benchmarks.html (100%) rename {app => beflask}/admin/templates/_table_users.html (100%) rename {app => beflask}/admin/templates/benchmark.html (100%) rename {app => beflask}/admin/templates/benchmarks.html (100%) rename {app => beflask}/admin/templates/password.html (100%) rename {app => beflask}/admin/templates/user.html (100%) rename {app => beflask}/admin/templates/users.html (95%) rename {app => beflask}/app.py (87%) create mode 100644 beflask/config.py create mode 100644 beflask/env.dist rename {app => beflask}/forms.py (100%) rename {app => beflask}/interactive/forms.py (100%) rename {app => beflask}/interactive/main_interactive.py (100%) rename {app => beflask}/interactive/templates/iobase.html (100%) rename {app => beflask}/interactive/templates/ranking.html (100%) rename {app => beflask}/main.py (100%) rename {app => beflask}/models.py (100%) rename {app => beflask}/results/main_results.py (100%) rename {app => beflask}/results/templates/_table_dataset.html (100%) rename {app => beflask}/results/templates/_table_datasets.html (100%) rename {app => beflask}/results/templates/_table_report.html (100%) rename {app => beflask}/results/templates/_table_select.html (100%) rename {app => beflask}/results/templates/best.html (100%) rename {app => beflask}/results/templates/dataset.html (100%) rename {app => beflask}/results/templates/datasets.html (100%) rename {app => beflask}/results/templates/error.html (100%) rename {app => beflask}/results/templates/macros.html (100%) rename {app => beflask}/results/templates/report.html (100%) rename {app => beflask}/results/templates/report_tables.html (100%) rename {app => beflask}/results/templates/select.html (100%) rename {app => beflask}/static/.gitignore (100%) rename {app => beflask}/static/css/main.css (100%) rename {app => beflask}/static/excel/.gitignore (100%) rename {app => beflask}/static/img/robert-lukeman-_RBcxo9AU-U-unsplash.jpg (100%) rename {app => beflask}/static/js/excelFiles.js (100%) rename {app => beflask}/static/js/report.js (100%) rename {app => beflask}/static/js/select.js (100%) rename {app => beflask}/templates/_benchmarks.html (100%) rename app/templates/_nav.html => beflask/templates/_header.html (100%) rename {app => beflask}/templates/base.html (96%) rename {app => beflask}/templates/config.html (100%) rename {app => beflask}/templates/index.html (100%) rename {app => beflask}/templates/login.html (100%) create mode 100644 beflask/templates/status.html mode change 100644 => 100755 run.py diff --git a/app/.gitignore b/.gitignore similarity index 99% rename from app/.gitignore rename to .gitignore index 7a280a2..b8c7796 100644 --- a/app/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ share/python-wheels/ *.egg-info/ .installed.cfg *.egg +*.egg-info/* MANIFEST # PyInstaller diff --git a/app/__init__.py b/app/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/config.py b/app/config.py deleted file mode 100644 index 5516de2..0000000 --- a/app/config.py +++ /dev/null @@ -1,17 +0,0 @@ -import os -from dotenv import load_dotenv - -dotenv_file = ".env" -basedir = os.path.abspath(os.path.dirname(__file__)) -load_dotenv(os.path.join(basedir, dotenv_file)) - - -class Config(object): - COMPARE = os.environ.get("COMPARE") == "True" or False - TEMPLATES_AUTO_RELOAD = True - SECRET_KEY = os.environ.get("SECRET_KEY") or "really-hard-to-guess-key" - SQLALCHEMY_DATABASE_URI = os.environ.get( - "DATABASE_URL" - ) or "sqlite:///" + os.path.join(basedir, "app.db") - SQLALCHEMY_TRACK_MODIFICATIONS = False - INDEX = "main.index" diff --git a/app/env.dist b/app/env.dist deleted file mode 100644 index 6cebbe8..0000000 --- a/app/env.dist +++ /dev/null @@ -1 +0,0 @@ -SECRET=Really-hard-to-guess-secret. \ No newline at end of file diff --git a/app/templates/status.html b/app/templates/status.html deleted file mode 100644 index 6d6d7f9..0000000 --- a/app/templates/status.html +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/beflask/__init__.py b/beflask/__init__.py new file mode 100644 index 0000000..bd2a745 --- /dev/null +++ b/beflask/__init__.py @@ -0,0 +1,16 @@ +from ._version import __version__ + +__author__ = "Ricardo Montañana Gómez" +__copyright__ = "Copyright 2020-2023, Ricardo Montañana Gómez" +__license__ = "MIT License" +__author_email__ = "ricardo.montanana@alu.uclm.es" +__status__ = "Development" + +__all__ = [ + "__version__", + "__author__", + "__copyright__", + "__license__", + "__author_email__", + "__status__", +] diff --git a/beflask/_version.py b/beflask/_version.py new file mode 100644 index 0000000..5becc17 --- /dev/null +++ b/beflask/_version.py @@ -0,0 +1 @@ +__version__ = "1.0.0" diff --git a/app/admin/forms.py b/beflask/admin/forms.py similarity index 98% rename from app/admin/forms.py rename to beflask/admin/forms.py index 7b2f39c..e735f81 100644 --- a/app/admin/forms.py +++ b/beflask/admin/forms.py @@ -13,7 +13,7 @@ from wtforms.validators import ( Email, ValidationError, ) -from app.models import User +from beflask.models import User class UserForm(FlaskForm): diff --git a/app/admin/main_admin.py b/beflask/admin/main_admin.py similarity index 100% rename from app/admin/main_admin.py rename to beflask/admin/main_admin.py diff --git a/app/admin/templates/_table_benchmarks.html b/beflask/admin/templates/_table_benchmarks.html similarity index 100% rename from app/admin/templates/_table_benchmarks.html rename to beflask/admin/templates/_table_benchmarks.html diff --git a/app/admin/templates/_table_users.html b/beflask/admin/templates/_table_users.html similarity index 100% rename from app/admin/templates/_table_users.html rename to beflask/admin/templates/_table_users.html diff --git a/app/admin/templates/benchmark.html b/beflask/admin/templates/benchmark.html similarity index 100% rename from app/admin/templates/benchmark.html rename to beflask/admin/templates/benchmark.html diff --git a/app/admin/templates/benchmarks.html b/beflask/admin/templates/benchmarks.html similarity index 100% rename from app/admin/templates/benchmarks.html rename to beflask/admin/templates/benchmarks.html diff --git a/app/admin/templates/password.html b/beflask/admin/templates/password.html similarity index 100% rename from app/admin/templates/password.html rename to beflask/admin/templates/password.html diff --git a/app/admin/templates/user.html b/beflask/admin/templates/user.html similarity index 100% rename from app/admin/templates/user.html rename to beflask/admin/templates/user.html diff --git a/app/admin/templates/users.html b/beflask/admin/templates/users.html similarity index 95% rename from app/admin/templates/users.html rename to beflask/admin/templates/users.html index 38ab065..41aebe8 100644 --- a/app/admin/templates/users.html +++ b/beflask/admin/templates/users.html @@ -1,6 +1,6 @@ {% extends "report_tables.html" %} {% block content %} -
+