From 6990fcf6ceca33bbd75face5e74c6e2670642084 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 5 May 2021 19:40:35 +0200
Subject: [PATCH] working on: 0.0.33 Release
---
.../blueprints/app_admin/app_admin_views.py | 40 +++++++++----------
.../navigation/app_admin_navtabs.html | 4 --
src/covid19/blueprints/app_all/all_views.py | 38 +++++++++---------
.../app_application/application_views.py | 14 ++++---
src/covid19/blueprints/app_user/user_views.py | 18 ++++-----
5 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/src/covid19/blueprints/app_admin/app_admin_views.py b/src/covid19/blueprints/app_admin/app_admin_views.py
index 4dc169b5..dc1b804d 100644
--- a/src/covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/covid19/blueprints/app_admin/app_admin_views.py
@@ -12,14 +12,14 @@ from covid19.blueprints.app_application.application_model_transient import Appli
drop_and_create_data_again = True
-app_admin = Blueprint('app_admin', __name__, template_folder='templates', url_prefix='/admin')
+blueprint_app_admin = Blueprint('app_admin', __name__, template_folder='templates', url_prefix='/app/admin')
# ---------------------------------------------------------------------------------------------------------------
# Url Routes Frontend
# ---------------------------------------------------------------------------------------------------------------
-@app_admin.route('/')
+@blueprint_app_admin.route('/')
def url_admin_index():
page_info = ApplicationPage('Admin', "Covid19 Admin")
return render_template(
@@ -27,15 +27,15 @@ def url_admin_index():
page_info=page_info)
-@app_admin.route('/system/tasks')
-def url_system_tasks():
- page_info = ApplicationPage('Admin', "System Tasks")
+@blueprint_app_admin.route('/admin/tasks')
+def url_admin_tasks():
+ page_info = ApplicationPage('Admin', "Admin Tasks")
return render_template(
'app_admin/admin_tasks.html',
page_info=page_info)
-@app_admin.route('/info')
+@blueprint_app_admin.route('/info')
def url_admin_info():
page_info = ApplicationPage('Admin', "Info")
return render_template(
@@ -241,7 +241,7 @@ def task_admin_update_star_schema(self):
# ----------------------------------------------------------------------------------------------------------------
-@app_admin.route('/task/alive_message')
+@blueprint_app_admin.route('/task/alive_message')
def url_task_admin_alive_message():
app.logger.info("url_task_admin_message_start [start]")
task_admin_alive_message.apply_async()
@@ -250,7 +250,7 @@ def url_task_admin_alive_message():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/dump')
+@blueprint_app_admin.route('/task/database/dump')
def url_task_admin_database_dump():
app.logger.info("url_task_admin_database_dump [start]")
app_admin_service.run_admin_database_dump()
@@ -259,7 +259,7 @@ def url_task_admin_database_dump():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/reimport')
+@blueprint_app_admin.route('/task/database/reimport')
def url_task_admin_database_dump_reimport():
app.logger.info("url_task_admin_database_dump_reimport [start]")
app_admin_service.run_admin_database_dump_reimport()
@@ -268,7 +268,7 @@ def url_task_admin_database_dump_reimport():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/drop_create')
+@blueprint_app_admin.route('/task/database/drop_create')
def url_task_admin_database_dropcreate():
app.logger.info("url_task_admin_database_dropcreate [start]")
app_admin_service.run_admin_database_drop_and_create()
@@ -277,7 +277,7 @@ def url_task_admin_database_dropcreate():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/drop')
+@blueprint_app_admin.route('/task/database/drop')
def url_task_admin_database_drop():
flash("url_task_admin_database_drop [start]")
app.logger.info("admin_service.run_admin_database_drop_and_create [start]")
@@ -299,7 +299,7 @@ def url_task_admin_database_drop():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/files/all/download')
+@blueprint_app_admin.route('/task/files/all/download')
def url_task_admin_download_all_files():
app.logger.info("url_task_admin_download_all_files [start]")
who_service.download_all_files()
@@ -312,7 +312,7 @@ def url_task_admin_download_all_files():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/files/all/import')
+@blueprint_app_admin.route('/task/files/all/import')
def url_task_admin_import_all_files():
app.logger.info("url_task_admin_import_all_files [start]")
task_admin_import_all_files.apply_async()
@@ -322,7 +322,7 @@ def url_task_admin_import_all_files():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/update/all/dimension_tables')
+@blueprint_app_admin.route('/task/update/all/dimension_tables')
def url_task_admin_update_dimension_tables():
app.logger.info("url_task_admin_update_dimension_tables [start]")
task_admin_update_dimension_tables.apply_async()
@@ -332,7 +332,7 @@ def url_task_admin_update_dimension_tables():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/all/dimension_tables')
+@blueprint_app_admin.route('/task/full/update/all/dimension_tables')
def url_task_admin_update_full_dimension_tables():
app.logger.info("url_task_admin_update_full_dimension_tables [start]")
task_admin_update_full_dimension_tables.apply_async()
@@ -342,7 +342,7 @@ def url_task_admin_update_full_dimension_tables():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/all/fact_tables')
+@blueprint_app_admin.route('/task/full/update/all/fact_tables')
def url_task_admin_full_update_fact_table():
app.logger.info("url_task_admin_full_update_fact_table [start]")
task_admin_full_update_fact_table.apply_async()
@@ -352,7 +352,7 @@ def url_task_admin_full_update_fact_table():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/update/all/fact_tables')
+@blueprint_app_admin.route('/task/update/all/fact_tables')
def url_task_admin_update_fact_table():
app.logger.info("url_task_admin_update_fact_table [start]")
task_admin_update_fact_table.apply_async()
@@ -362,7 +362,7 @@ def url_task_admin_update_fact_table():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/star_schema')
+@blueprint_app_admin.route('/task/full/update/star_schema')
def url_task_admin_full_update_star_schema():
app.logger.info("url_task_admin_full_update_star_schema [start]")
task_admin_full_update_star_schema.apply_async()
@@ -372,7 +372,7 @@ def url_task_admin_full_update_star_schema():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/update/star_schema')
+@blueprint_app_admin.route('/task/update/star_schema')
def url_task_admin_update_star_schema():
app.logger.info("url_task_admin_update_star_schema [start]")
task_admin_update_star_schema.apply_async()
@@ -382,7 +382,7 @@ def url_task_admin_update_star_schema():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/do/all')
+@blueprint_app_admin.route('/task/full/update/do/all')
def url_task_admin_full_update_do_all():
app.logger.info("url_task_admin_full_update_do_all [start]")
who_service.download_files()
diff --git a/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html b/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html
index 14fdc3f1..7e680cc5 100644
--- a/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html
+++ b/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html
@@ -13,10 +13,6 @@
<a class="nav-link"
href="{{ url_for( 'app_admin.url_admin_tasks') }}">Admin Tasks</a>
</li>
- <li class="nav-item">
- <a class="nav-link"
- href="{{ url_for( 'app_admin.url_system_tasks') }}">System Tasks</a>
- </li>
{% endif %}
<li class="nav-item">
<a class="nav-link"
diff --git a/src/covid19/blueprints/app_all/all_views.py b/src/covid19/blueprints/app_all/all_views.py
index f0914a04..7e33e052 100644
--- a/src/covid19/blueprints/app_all/all_views.py
+++ b/src/covid19/blueprints/app_all/all_views.py
@@ -12,14 +12,14 @@ from covid19.blueprints.app_application.application_model_transient import Appli
drop_and_create_data_again = True
-app_admin = Blueprint('app_admin', __name__, template_folder='templates', url_prefix='/admin')
+blueprint_app_all = Blueprint('app_all', __name__, template_folder='templates', url_prefix='/app/all')
# ---------------------------------------------------------------------------------------------------------------
# Url Routes Frontend
# ---------------------------------------------------------------------------------------------------------------
-@app_admin.route('/')
+@blueprint_app_all.route('/')
def url_admin_index():
page_info = ApplicationPage('Admin', "Covid19 Admin")
return render_template(
@@ -27,7 +27,7 @@ def url_admin_index():
page_info=page_info)
-@app_admin.route('/tasks')
+@blueprint_app_all.route('/tasks')
def url_admin_tasks():
page_info = ApplicationPage('Admin', "Tasks")
return render_template(
@@ -35,7 +35,7 @@ def url_admin_tasks():
page_info=page_info)
-@app_admin.route('/system/tasks')
+@blueprint_app_all.route('/system/tasks')
def url_system_tasks():
page_info = ApplicationPage('Admin', "System Tasks")
return render_template(
@@ -43,7 +43,7 @@ def url_system_tasks():
page_info=page_info)
-@app_admin.route('/info')
+@blueprint_app_all.route('/info')
def url_admin_info():
page_info = ApplicationPage('Admin', "Info")
return render_template(
@@ -249,7 +249,7 @@ def task_admin_update_star_schema(self):
# ----------------------------------------------------------------------------------------------------------------
-@app_admin.route('/task/alive_message')
+@blueprint_app_all.route('/task/alive_message')
def url_task_admin_alive_message():
app.logger.info("url_task_admin_message_start [start]")
task_admin_alive_message.apply_async()
@@ -258,7 +258,7 @@ def url_task_admin_alive_message():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/dump')
+@blueprint_app_all.route('/task/database/dump')
def url_task_admin_database_dump():
app.logger.info("url_task_admin_database_dump [start]")
app_admin_service.run_admin_database_dump()
@@ -267,7 +267,7 @@ def url_task_admin_database_dump():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/reimport')
+@blueprint_app_all.route('/task/database/reimport')
def url_task_admin_database_dump_reimport():
app.logger.info("url_task_admin_database_dump_reimport [start]")
app_admin_service.run_admin_database_dump_reimport()
@@ -276,7 +276,7 @@ def url_task_admin_database_dump_reimport():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/drop_create')
+@blueprint_app_all.route('/task/database/drop_create')
def url_task_admin_database_dropcreate():
app.logger.info("url_task_admin_database_dropcreate [start]")
app_admin_service.run_admin_database_drop_and_create()
@@ -285,7 +285,7 @@ def url_task_admin_database_dropcreate():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/database/drop')
+@blueprint_app_all.route('/task/database/drop')
def url_task_admin_database_drop():
flash("url_task_admin_database_drop [start]")
app.logger.info("admin_service.run_admin_database_drop_and_create [start]")
@@ -307,7 +307,7 @@ def url_task_admin_database_drop():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/files/all/download')
+@blueprint_app_all.route('/task/files/all/download')
def url_task_admin_download_all_files():
app.logger.info("url_task_admin_download_all_files [start]")
who_service.download_all_files()
@@ -320,7 +320,7 @@ def url_task_admin_download_all_files():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/files/all/import')
+@blueprint_app_all.route('/task/files/all/import')
def url_task_admin_import_all_files():
app.logger.info("url_task_admin_import_all_files [start]")
task_admin_import_all_files.apply_async()
@@ -330,7 +330,7 @@ def url_task_admin_import_all_files():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/update/all/dimension_tables')
+@blueprint_app_all.route('/task/update/all/dimension_tables')
def url_task_admin_update_dimension_tables():
app.logger.info("url_task_admin_update_dimension_tables [start]")
task_admin_update_dimension_tables.apply_async()
@@ -340,7 +340,7 @@ def url_task_admin_update_dimension_tables():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/all/dimension_tables')
+@blueprint_app_all.route('/task/full/update/all/dimension_tables')
def url_task_admin_update_full_dimension_tables():
app.logger.info("url_task_admin_update_full_dimension_tables [start]")
task_admin_update_full_dimension_tables.apply_async()
@@ -350,7 +350,7 @@ def url_task_admin_update_full_dimension_tables():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/all/fact_tables')
+@blueprint_app_all.route('/task/full/update/all/fact_tables')
def url_task_admin_full_update_fact_table():
app.logger.info("url_task_admin_full_update_fact_table [start]")
task_admin_full_update_fact_table.apply_async()
@@ -360,7 +360,7 @@ def url_task_admin_full_update_fact_table():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/update/all/fact_tables')
+@blueprint_app_all.route('/task/update/all/fact_tables')
def url_task_admin_update_fact_table():
app.logger.info("url_task_admin_update_fact_table [start]")
task_admin_update_fact_table.apply_async()
@@ -370,7 +370,7 @@ def url_task_admin_update_fact_table():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/star_schema')
+@blueprint_app_all.route('/task/full/update/star_schema')
def url_task_admin_full_update_star_schema():
app.logger.info("url_task_admin_full_update_star_schema [start]")
task_admin_full_update_star_schema.apply_async()
@@ -380,7 +380,7 @@ def url_task_admin_full_update_star_schema():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/update/star_schema')
+@blueprint_app_all.route('/task/update/star_schema')
def url_task_admin_update_star_schema():
app.logger.info("url_task_admin_update_star_schema [start]")
task_admin_update_star_schema.apply_async()
@@ -390,7 +390,7 @@ def url_task_admin_update_star_schema():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/task/full/update/do/all')
+@blueprint_app_all.route('/task/full/update/do/all')
def url_task_admin_full_update_do_all():
app.logger.info("url_task_admin_full_update_do_all [start]")
who_service.download_files()
diff --git a/src/covid19/blueprints/app_application/application_views.py b/src/covid19/blueprints/app_application/application_views.py
index eeeef57e..d57c7526 100644
--- a/src/covid19/blueprints/app_application/application_views.py
+++ b/src/covid19/blueprints/app_application/application_views.py
@@ -4,8 +4,9 @@ from database import app
from covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from covid19.blueprints.app_user.user_views import app_user
-from covid19.blueprints.app_admin.app_admin_views import app_admin
+from covid19.blueprints.app_user.user_views import blueprint_app_user
+from covid19.blueprints.app_admin.app_admin_views import blueprint_app_admin
+from covid19.blueprints.app_all.all_views import blueprint_app_all
from covid19.blueprints.who.who_views import app_who
from covid19.blueprints.owid.owid_views import app_owid
@@ -20,12 +21,13 @@ from covid19.blueprints.ecdc_test.ecdc_test_views import app_ecdc_test
from covid19.blueprints.rki_cases_test.rki_test_views import app_rki_test
from covid19.blueprints.intensivregister_test.divi_test_views import app_divi_test
-app_application = Blueprint('application', __name__, template_folder='templates', url_prefix='/')
+blueprint_application = Blueprint('application', __name__, template_folder='templates', url_prefix='/')
-app.register_blueprint(app_application, url_prefix='/application')
+app.register_blueprint(blueprint_application, url_prefix='/')
-app.register_blueprint(app_user, url_prefix='/usr')
-app.register_blueprint(app_admin, url_prefix='/admin')
+app.register_blueprint(blueprint_app_user, url_prefix='/app/usr')
+app.register_blueprint(blueprint_app_admin, url_prefix='/app/admin')
+app.register_blueprint(blueprint_app_all, url_prefix='/app/all')
app.register_blueprint(app_who, url_prefix='/who')
app.register_blueprint(app_owid, url_prefix='/owid')
diff --git a/src/covid19/blueprints/app_user/user_views.py b/src/covid19/blueprints/app_user/user_views.py
index 6a7c53d3..4a9a5587 100644
--- a/src/covid19/blueprints/app_user/user_views.py
+++ b/src/covid19/blueprints/app_user/user_views.py
@@ -11,8 +11,8 @@ from database import admin, db, login_manager
from covid19.blueprints.app_application.application_model_transient import ApplicationPage
from covid19.blueprints.app_user.user_model import User, LoginForm
-# TODO rename app_user to blueprint_user
-app_user = Blueprint('usr', __name__, template_folder='templates', url_prefix='/usr')
+
+blueprint_app_user = Blueprint('usr', __name__, template_folder='templates', url_prefix='/app/usr')
admin.add_view(ModelView(User, db.session, category="USR"))
@@ -22,7 +22,7 @@ admin.add_view(ModelView(User, db.session, category="USR"))
# ---------------------------------------------------------------------------------------------------------------
-@app_user.route('/login', methods=['GET'])
+@blueprint_app_user.route('/login', methods=['GET'])
def login_form():
page_info = ApplicationPage('usr', "Login")
if current_user.is_authenticated:
@@ -31,7 +31,7 @@ def login_form():
return flask.render_template('usr/login.html', form=form, page_info=page_info)
-@app_user.route('/login', methods=['POST'])
+@blueprint_app_user.route('/login', methods=['POST'])
def login():
page_info = ApplicationPage('USR', "Login")
if current_user.is_authenticated:
@@ -47,14 +47,14 @@ def login():
return flask.render_template('usr/login.html', form=form, page_info=page_info)
-@app_user.route("/profile")
+@blueprint_app_user.route("/profile")
@login_required
def profile():
page_info = ApplicationPage('USR', "profile")
return flask.render_template('usr/profile.html', page_info=page_info)
-@app_user.route("/logout")
+@blueprint_app_user.route("/logout")
@login_required
def logout():
logout_user()
@@ -76,8 +76,8 @@ def unauthorized():
# ---------------------------------------------------------------------------------------------------------------
-@app_user.route('/info/page/<int:page>')
-@app_user.route('/info')
+@blueprint_app_user.route('/info/page/<int:page>')
+@blueprint_app_user.route('/info')
def url_user_info(page=1):
page_info = ApplicationPage('USR', "Info")
try:
@@ -91,7 +91,7 @@ def url_user_info(page=1):
page_info=page_info)
-@app_user.route('/tasks')
+@blueprint_app_user.route('/tasks')
def url_user_tasks():
page_info = ApplicationPage('USR', "Tasks")
return render_template(
--
GitLab