diff --git a/covid19/blueprints/admin/views_admin.py b/covid19/blueprints/admin/admin_views.py similarity index 90% rename from covid19/blueprints/admin/views_admin.py rename to covid19/blueprints/admin/admin_views.py index c3c0636b31ad5faab5483a9c9e2febe8365589e2..41dd5e2e6927b565d5ed4d2c0e9c96563c559cb3 100644 --- a/covid19/blueprints/admin/views_admin.py +++ b/covid19/blueprints/admin/admin_views.py @@ -1,4 +1,4 @@ -from flask import render_template, redirect, url_for, flash +from flask import render_template, redirect, url_for, flash, Blueprint from celery import states from celery.utils.log import get_task_logger @@ -12,6 +12,9 @@ from covid19.blueprints.common.common_model_transient import ApplicationPage drop_and_create_data_again = True +app_admin = Blueprint('admin', __name__, template_folder='templates') + + ################################################################################################################# # # Admin @@ -47,7 +50,7 @@ def task_admin_database_drop_create(self): return result -@app.route('/admin/tasks') +@app_admin.route('/admin/tasks') def url_admin_tasks(): page_info = ApplicationPage('Admin', "Tasks") return render_template( @@ -55,7 +58,7 @@ def url_admin_tasks(): page_info=page_info) -@app.route('/admin/info') +@app_admin.route('/admin/info') def url_admin_info(): page_info = ApplicationPage('Admin', "Info") return render_template( @@ -63,7 +66,7 @@ def url_admin_info(): page_info=page_info) -@app.route('/admin/alive_message') +@app_admin.route('/admin/alive_message') def url_alive_message_start(): app.logger.info("url_alive_message_start [start]") task_admin_alive_message.apply_async() @@ -72,7 +75,7 @@ def url_alive_message_start(): return redirect(url_for('url_admin_tasks')) -@app.route('/admin/database/dump') +@app_admin.route('/admin/database/dump') def url_admin_database_dump(): app.logger.info("url_admin_database_dump [start]") admin_service.run_admin_database_dump() @@ -81,7 +84,7 @@ def url_admin_database_dump(): return redirect(url_for('url_admin_tasks')) -@app.route('/admin/database/import') +@app_admin.route('/admin/database/import') def url_admin_database_import(): app.logger.info("url_admin_database_import [start]") admin_service.run_admin_database_import() @@ -90,7 +93,7 @@ def url_admin_database_import(): return redirect(url_for('url_admin_tasks')) -@app.route('/admin/database/drop') +@app_admin.route('/admin/database/drop') def url_admin_database_drop(): app.logger.info("url_admin_database_drop [start]") flash("admin_service.run_admin_database_drop started") diff --git a/covid19/blueprints/europe/views_europe.py b/covid19/blueprints/europe/europe_views.py similarity index 99% rename from covid19/blueprints/europe/views_europe.py rename to covid19/blueprints/europe/europe_views.py index 47b9399da9e8366426cc49727fb8f22bcbea912b..519f46c58da7af505e1c3a455a598a96e4ea728c 100644 --- a/covid19/blueprints/europe/views_europe.py +++ b/covid19/blueprints/europe/europe_views.py @@ -11,7 +11,7 @@ from covid19.blueprints.europe.europe_model import EuropeDateReported, EuropeCon from covid19.blueprints.common.common_model_transient import ApplicationPage -app_europe = Blueprint('europe', __name__, template_folder='templates', static_folder='static') +app_europe = Blueprint('europe', __name__, template_folder='templates') ################################################################################################################## diff --git a/covid19/blueprints/rki/views_rki.py b/covid19/blueprints/rki/rki_views.py similarity index 98% rename from covid19/blueprints/rki/views_rki.py rename to covid19/blueprints/rki/rki_views.py index 8d1bc2b7ea757b3d061903445e55b68481625a27..7566dbeb6bc4c4549ca4c87b45a3f999e09a449e 100644 --- a/covid19/blueprints/rki/views_rki.py +++ b/covid19/blueprints/rki/rki_views.py @@ -9,7 +9,7 @@ from covid19.blueprints.common.common_model_transient import ApplicationPage drop_and_create_data_again = True -app_rki = Blueprint('rki', __name__, template_folder='templates', static_folder='static') +app_rki = Blueprint('rki', __name__, template_folder='templates') ################################################################################################################## diff --git a/covid19/blueprints/vaccination/views_vaccination.py b/covid19/blueprints/vaccination/vaccination_views.py similarity index 98% rename from covid19/blueprints/vaccination/views_vaccination.py rename to covid19/blueprints/vaccination/vaccination_views.py index 1ae14d773cc119b642a45f97e2c43e7ea7ace5f5..4938d3d3948274026ac6233e0dd75ea88cc6a9d1 100644 --- a/covid19/blueprints/vaccination/views_vaccination.py +++ b/covid19/blueprints/vaccination/vaccination_views.py @@ -10,7 +10,7 @@ from covid19.blueprints.vaccination.vaccination_model_import import VaccinationG from covid19.blueprints.common.common_model_transient import ApplicationPage -app_vaccination = Blueprint('vaccination', __name__, template_folder='templates', static_folder='static') +app_vaccination = Blueprint('vaccination', __name__, template_folder='templates') ################################################################################################################## diff --git a/covid19/blueprints/who/views_who.py b/covid19/blueprints/who/who_views.py similarity index 99% rename from covid19/blueprints/who/views_who.py rename to covid19/blueprints/who/who_views.py index bf81a8c40720094b0d8b3bf7eb65a3db9ee70465..e57cc7b1f1295590a14b8a9f4dcc761736535b31 100644 --- a/covid19/blueprints/who/views_who.py +++ b/covid19/blueprints/who/who_views.py @@ -12,7 +12,7 @@ from covid19.blueprints.who.who_model import WhoRegion, WhoCountry, WhoDateRepor from covid19.blueprints.common.common_model_transient import ApplicationPage -app_who = Blueprint('who', __name__, template_folder='templates', static_folder='static') +app_who = Blueprint('who', __name__, template_folder='templates') ################################################################################################################## diff --git a/covid19/views.py b/covid19/views.py index 0edbab50b831e180579214083ab487e54b5a10b5..257d93eb8503cd767276163a38cb32038b1a5d7a 100644 --- a/covid19/views.py +++ b/covid19/views.py @@ -2,11 +2,11 @@ from flask import render_template, redirect, url_for from database import app from covid19.blueprints.common.common_model_transient import ApplicationPage -import covid19.blueprints.who.views_who -import covid19.blueprints.europe.views_europe -import covid19.blueprints.vaccination.views_vaccination -import covid19.blueprints.rki.views_rki -import covid19.blueprints.admin.views_admin +import covid19.blueprints.who.who_views +import covid19.blueprints.europe.europe_views +import covid19.blueprints.vaccination.vaccination_views +import covid19.blueprints.rki.rki_views +import covid19.blueprints.admin.admin_views ############################################################################################