From 64324a1785cc1693b49189eaa84df22dda09ef1b Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Sat, 30 Jan 2021 21:01:54 +0100 Subject: [PATCH] ### 0.0.13 Release * Fixed #49 EuropeServiceUpdate.__update_data_short() (wontfix) * Fixed #52 download vaccination timeline data file * Fixed #53 import vaccination timeline data file into db * Fixed #54 /vaccination/imported * Fixed #57 frontend: use npm for handling 3rdParty css and javascript modules like jQuery, Bootstrap * Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as main content on home page * Fixed #47 major refactoring: Routes from app.py to org...who,europe,... (Doublette von #65) * Fixed #48 major refactoring: Tasks from server_mq.py to org...who,europe,... (Doublette von #65) * Fixed #64 major refactoring: create two packages: for web app and for celery worker * Issue #65 major refactoring: add flask-blueprints for admin, common, europe, rki, vaccination, who ### 0.0.14 Release * Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular * Issue #67 implement Flask-Login ### 0.0.15 Release * Issue #5 Visual Graphs for Data per Countries order by Date * Issue #59 frontend: add correct breadcrumb to every page * Issue #60 frontend: better design for tables * Issue #61 frontend: better design for navtabs * Issue #62 frontend: better design for pages * Issue #63 frontend: add footer design ### 0.0.16 Release * Issue #28 /admin/database/import * Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all() * Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep() * Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent() * Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array() --- covid19/blueprints/admin/admin_views.py | 4 +-- .../blueprints/admin/templates/__init__.py | 0 .../admin}/templates/admin/admin_info.html | 2 +- .../admin}/templates/admin/admin_tasks.html | 2 +- .../fragment_admin_navbar_dropdown.html | 0 .../fragments/fragment_admin_navtabs.html | 0 covid19/blueprints/europe/europe_views.py | 24 ++++++------- .../blueprints/europe/templates/__init__.py | 0 .../continent/europe_continent_all.html | 4 +-- .../continent/europe_continent_germany.html | 4 +-- .../continent/europe_continent_one.html | 4 +-- .../europe/country/europe_country_all.html | 4 +-- .../country/europe_country_germany.html | 4 +-- .../europe/country/europe_country_one.html | 4 +-- .../europe_date_reported_all.html | 4 +-- .../europe_date_reported_one.html | 4 +-- ...europe_date_reported_one_cases_weekly.html | 4 +-- ...urope_date_reported_one_deaths_weekly.html | 4 +-- ...e_date_reported_one_notification_rate.html | 4 +-- .../europe}/templates/europe/europe_data.html | 4 +-- .../templates/europe/europe_imported.html | 4 +-- .../europe}/templates/europe/europe_info.html | 2 +- .../templates/europe/europe_tasks.html | 2 +- .../fragment_europe_navbar_dropdown.html | 0 .../fragments/fragment_europe_navtabs.html | 0 .../fragment_europe_table_continent.html | 0 .../fragment_europe_table_country.html | 0 .../fragments/fragment_europe_table_data.html | 0 .../fragment_europe_table_data_imported.html | 0 .../fragment_europe_table_date_reported.html | 0 covid19/blueprints/rki/rki_views.py | 6 ++-- covid19/blueprints/rki/templates/__init__.py | 0 .../rki/fragment_rki_navbar_dropdown.html | 0 .../templates/rki/fragment_rki_navtabs.html | 0 .../rki}/templates/rki/rki_imported.html | 0 .../rki}/templates/rki/rki_info.html | 0 .../rki}/templates/rki/rki_tasks.html | 0 .../vaccination/templates/__init__.py | 0 .../fragment_vaccination_navbar_dropdown.html | 0 .../fragment_vaccination_navtabs.html | 0 ...nt_vaccination_timeline_germany_table.html | 0 ...ccination_timeline_germany_table_head.html | 0 .../vaccination/vaccination_info.html | 2 +- .../vaccination/vaccination_tasks.html | 2 +- .../vaccination_timeline_germany.html | 4 +-- covid19/blueprints/who/templates/__init__.py | 0 .../who/country/who_country_all.html | 4 +-- .../who/country/who_country_germany.html | 4 +-- .../who/country/who_country_one.html | 4 +-- .../who_country_one_cases_cumulative.html | 4 +-- .../country/who_country_one_cases_new.html | 4 +-- .../who_country_one_deaths_cumulative.html | 4 +-- .../country/who_country_one_deaths_new.html | 4 +-- .../date_reported/who_date_reported_all.html | 2 +- .../date_reported/who_date_reported_one.html | 4 +-- ...ho_date_reported_one_cases_cumulative.html | 4 +-- .../who_date_reported_one_cases_new.html | 4 +-- ...o_date_reported_one_deaths_cumulative.html | 4 +-- .../who_date_reported_one_deaths_new.html | 4 +-- .../fragment_who_navbar_dropdown.html | 0 .../who/fragments/fragment_who_navtabs.html | 0 .../fragment_who_table_global_data.html | 0 ...ragment_who_table_global_data_country.html | 0 ...t_who_table_global_data_date_reported.html | 0 .../fragment_who_table_who_country.html | 0 .../templates/who/region/who_region_all.html | 2 +- .../templates/who/region/who_region_one.html | 4 +-- .../who}/templates/who/who_imported.html | 2 +- .../who}/templates/who/who_info.html | 2 +- .../who}/templates/who/who_tasks.html | 2 +- covid19/blueprints/who/who_views.py | 36 +++++++++---------- covid19/templates/common/fragment_navbar.html | 10 +++--- covid19/views.py | 12 +++++++ 73 files changed, 117 insertions(+), 105 deletions(-) create mode 100644 covid19/blueprints/admin/templates/__init__.py rename covid19/{ => blueprints/admin}/templates/admin/admin_info.html (76%) rename covid19/{ => blueprints/admin}/templates/admin/admin_tasks.html (91%) rename covid19/{ => blueprints/admin}/templates/admin/fragments/fragment_admin_navbar_dropdown.html (100%) rename covid19/{ => blueprints/admin}/templates/admin/fragments/fragment_admin_navtabs.html (100%) create mode 100644 covid19/blueprints/europe/templates/__init__.py rename covid19/{ => blueprints/europe}/templates/europe/continent/europe_continent_all.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/continent/europe_continent_germany.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/continent/europe_continent_one.html (93%) rename covid19/{ => blueprints/europe}/templates/europe/country/europe_country_all.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/country/europe_country_germany.html (91%) rename covid19/{ => blueprints/europe}/templates/europe/country/europe_country_one.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/date_reported/europe_date_reported_all.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/date_reported/europe_date_reported_one.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html (93%) rename covid19/{ => blueprints/europe}/templates/europe/date_reported/europe_date_reported_one_notification_rate.html (93%) rename covid19/{ => blueprints/europe}/templates/europe/europe_data.html (93%) rename covid19/{ => blueprints/europe}/templates/europe/europe_imported.html (92%) rename covid19/{ => blueprints/europe}/templates/europe/europe_info.html (97%) rename covid19/{ => blueprints/europe}/templates/europe/europe_tasks.html (93%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_navbar_dropdown.html (100%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_navtabs.html (100%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_table_continent.html (100%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_table_country.html (100%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_table_data.html (100%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_table_data_imported.html (100%) rename covid19/{ => blueprints/europe}/templates/europe/fragments/fragment_europe_table_date_reported.html (100%) create mode 100644 covid19/blueprints/rki/templates/__init__.py rename covid19/{ => blueprints/rki}/templates/rki/fragment_rki_navbar_dropdown.html (100%) rename covid19/{ => blueprints/rki}/templates/rki/fragment_rki_navtabs.html (100%) rename covid19/{ => blueprints/rki}/templates/rki/rki_imported.html (100%) rename covid19/{ => blueprints/rki}/templates/rki/rki_info.html (100%) rename covid19/{ => blueprints/rki}/templates/rki/rki_tasks.html (100%) create mode 100644 covid19/blueprints/vaccination/templates/__init__.py rename covid19/{ => blueprints/vaccination}/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html (100%) rename covid19/{ => blueprints/vaccination}/templates/vaccination/fragments/fragment_vaccination_navtabs.html (100%) rename covid19/{ => blueprints/vaccination}/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html (100%) rename covid19/{ => blueprints/vaccination}/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html (100%) rename covid19/{ => blueprints/vaccination}/templates/vaccination/vaccination_info.html (89%) rename covid19/{ => blueprints/vaccination}/templates/vaccination/vaccination_tasks.html (86%) rename covid19/{ => blueprints/vaccination}/templates/vaccination/vaccination_timeline_germany.html (90%) create mode 100644 covid19/blueprints/who/templates/__init__.py rename covid19/{ => blueprints/who}/templates/who/country/who_country_all.html (92%) rename covid19/{ => blueprints/who}/templates/who/country/who_country_germany.html (93%) rename covid19/{ => blueprints/who}/templates/who/country/who_country_one.html (93%) rename covid19/{ => blueprints/who}/templates/who/country/who_country_one_cases_cumulative.html (93%) rename covid19/{ => blueprints/who}/templates/who/country/who_country_one_cases_new.html (93%) rename covid19/{ => blueprints/who}/templates/who/country/who_country_one_deaths_cumulative.html (93%) rename covid19/{ => blueprints/who}/templates/who/country/who_country_one_deaths_new.html (93%) rename covid19/{ => blueprints/who}/templates/who/date_reported/who_date_reported_all.html (98%) rename covid19/{ => blueprints/who}/templates/who/date_reported/who_date_reported_one.html (93%) rename covid19/{ => blueprints/who}/templates/who/date_reported/who_date_reported_one_cases_cumulative.html (93%) rename covid19/{ => blueprints/who}/templates/who/date_reported/who_date_reported_one_cases_new.html (93%) rename covid19/{ => blueprints/who}/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html (93%) rename covid19/{ => blueprints/who}/templates/who/date_reported/who_date_reported_one_deaths_new.html (93%) rename covid19/{ => blueprints/who}/templates/who/fragments/fragment_who_navbar_dropdown.html (100%) rename covid19/{ => blueprints/who}/templates/who/fragments/fragment_who_navtabs.html (100%) rename covid19/{ => blueprints/who}/templates/who/fragments/fragment_who_table_global_data.html (100%) rename covid19/{ => blueprints/who}/templates/who/fragments/fragment_who_table_global_data_country.html (100%) rename covid19/{ => blueprints/who}/templates/who/fragments/fragment_who_table_global_data_date_reported.html (100%) rename covid19/{ => blueprints/who}/templates/who/fragments/fragment_who_table_who_country.html (100%) rename covid19/{ => blueprints/who}/templates/who/region/who_region_all.html (96%) rename covid19/{ => blueprints/who}/templates/who/region/who_region_one.html (93%) rename covid19/{ => blueprints/who}/templates/who/who_imported.html (97%) rename covid19/{ => blueprints/who}/templates/who/who_info.html (91%) rename covid19/{ => blueprints/who}/templates/who/who_tasks.html (89%) diff --git a/covid19/blueprints/admin/admin_views.py b/covid19/blueprints/admin/admin_views.py index 41dd5e2e..dbf157a0 100644 --- a/covid19/blueprints/admin/admin_views.py +++ b/covid19/blueprints/admin/admin_views.py @@ -54,7 +54,7 @@ def task_admin_database_drop_create(self): def url_admin_tasks(): page_info = ApplicationPage('Admin', "Tasks") return render_template( - 'admin/admin_tasks.html', + 'templates/admin/admin_tasks.html', page_info=page_info) @@ -62,7 +62,7 @@ def url_admin_tasks(): def url_admin_info(): page_info = ApplicationPage('Admin', "Info") return render_template( - 'admin/admin_info.html', + 'templates/admin/admin_info.html', page_info=page_info) diff --git a/covid19/blueprints/admin/templates/__init__.py b/covid19/blueprints/admin/templates/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/covid19/templates/admin/admin_info.html b/covid19/blueprints/admin/templates/admin/admin_info.html similarity index 76% rename from covid19/templates/admin/admin_info.html rename to covid19/blueprints/admin/templates/admin/admin_info.html index 2f3f9caf..04baf972 100644 --- a/covid19/templates/admin/admin_info.html +++ b/covid19/blueprints/admin/templates/admin/admin_info.html @@ -5,7 +5,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'admin/fragments/fragment_admin_navtabs.html' %} + {% include 'admin/fragments/fragments/fragment_admin_navtabs.html' %} {% endblock %} {% block main_container %} diff --git a/covid19/templates/admin/admin_tasks.html b/covid19/blueprints/admin/templates/admin/admin_tasks.html similarity index 91% rename from covid19/templates/admin/admin_tasks.html rename to covid19/blueprints/admin/templates/admin/admin_tasks.html index d30234c9..766b2df8 100644 --- a/covid19/templates/admin/admin_tasks.html +++ b/covid19/blueprints/admin/templates/admin/admin_tasks.html @@ -5,7 +5,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'admin/fragments/fragment_admin_navtabs.html' %} + {% include 'admin/fragments/fragments/fragment_admin_navtabs.html' %} {% endblock %} {% block main_container %} diff --git a/covid19/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html similarity index 100% rename from covid19/templates/admin/fragments/fragment_admin_navbar_dropdown.html rename to covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html diff --git a/covid19/templates/admin/fragments/fragment_admin_navtabs.html b/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html similarity index 100% rename from covid19/templates/admin/fragments/fragment_admin_navtabs.html rename to covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html diff --git a/covid19/blueprints/europe/europe_views.py b/covid19/blueprints/europe/europe_views.py index 519f46c5..72ba62f5 100644 --- a/covid19/blueprints/europe/europe_views.py +++ b/covid19/blueprints/europe/europe_views.py @@ -51,7 +51,7 @@ def task_europe_update_short(self): def url_europe_info(): page_info = ApplicationPage('Europe', "Info") return render_template( - 'europe/europe_info.html', + 'templates/europe/europe_info.html', title='Europe', page_info=page_info) @@ -60,7 +60,7 @@ def url_europe_info(): def url_europe_tasks(): page_info = ApplicationPage('Europe', "Tasks") return render_template( - 'europe/europe_tasks.html', + 'templates/europe/europe_tasks.html', title='Europe Tasks', page_info=page_info) @@ -79,7 +79,7 @@ def url_europe_data_imported(page=1): page_info = ApplicationPage('Europe', "Last Import") page_data = EuropeDataImportTable.get_all_as_page(page) return render_template( - 'europe/europe_imported.html', + 'templates/europe/europe_imported.html', page_data=page_data, page_info=page_info) @@ -90,7 +90,7 @@ def url_europe_date_reported_all(page=1): page_info = ApplicationPage('Europe', "date_reported") page_data = EuropeDateReported.get_all_as_page(page) return render_template( - 'europe/date_reported/europe_date_reported_all.html', + 'templates/europe/date_reported/europe_date_reported_all.html', page_data=page_data, page_info=page_info) @@ -104,7 +104,7 @@ def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id) page_data = EuropeData.find_by_date_reported_notification_rate(europe_date_reported, page) return render_template( - 'europe/date_reported/europe_date_reported_one_notification_rate.html', + 'templates/europe/date_reported/europe_date_reported_one_notification_rate.html', europe_date_reported=europe_date_reported, page_data=page_data, page_info=page_info) @@ -117,7 +117,7 @@ def url_europe_date_reported_one_deaths_weekly(europe_date_reported_id, page=1): europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id) page_data = EuropeData.find_by_date_reported_deaths_weekly(europe_date_reported, page) return render_template( - 'europe/date_reported/europe_date_reported_one_deaths_weekly.html', + 'templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html', europe_date_reported=europe_date_reported, page_data=page_data, page_info=page_info) @@ -130,7 +130,7 @@ def url_europe_date_reported_one_cases_weekly(europe_date_reported_id, page=1): europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id) page_data = EuropeData.find_by_date_reported_cases_weekly(europe_date_reported, page) return render_template( - 'europe/date_reported/europe_date_reported_one_cases_weekly.html', + 'templates/europe/date_reported/europe_date_reported_one_cases_weekly.html', europe_date_reported=europe_date_reported, page_data=page_data, page_info=page_info) @@ -142,7 +142,7 @@ def url_europe_continent_all(page=1): page_info = ApplicationPage('Europe', "continent") page_data = EuropeContinent.get_all_as_page(page) return render_template( - 'europe/continent/europe_continent_all.html', + 'templates/europe/continent/europe_continent_all.html', page_data=page_data, page_info=page_info) @@ -154,7 +154,7 @@ def url_europe_continent_one(continent_id, page=1): continent = EuropeContinent.get_by_id(continent_id) page_data = EuropeCountry.find_by_continent(continent, page) return render_template( - 'europe/continent/europe_continent_one.html', + 'templates/europe/continent/europe_continent_one.html', continent=continent, page_data=page_data, page_info=page_info) @@ -166,7 +166,7 @@ def url_europe_country_all(page=1): page_info = ApplicationPage('Europe', "country") page_data = EuropeCountry.get_all_as_page(page) return render_template( - 'europe/country/europe_country_all.html', + 'templates/europe/country/europe_country_all.html', page_data=page_data, page_info=page_info) @@ -178,7 +178,7 @@ def url_europe_country_one(country_id, page=1): europe_country = EuropeCountry.get_by_id(country_id) page_data = EuropeData.find_by_country(europe_country, page) return render_template( - 'europe/country/europe_country_one.html', + 'templates/europe/country/europe_country_one.html', europe_country=europe_country, page_data=page_data, page_info=page_info) @@ -194,7 +194,7 @@ def url_europe_country_germany(page=1): return redirect(url_for('url_europe_tasks')) page_data = EuropeData.find_by_country(europe_country, page) return render_template( - 'europe/country/europe_country_germany.html', + 'templates/europe/country/europe_country_germany.html', europe_country=europe_country, page_data=page_data, page_info=page_info) diff --git a/covid19/blueprints/europe/templates/__init__.py b/covid19/blueprints/europe/templates/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/covid19/templates/europe/continent/europe_continent_all.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html similarity index 92% rename from covid19/templates/europe/continent/europe_continent_all.html rename to covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html index ae1c59b8..c32f8575 100644 --- a/covid19/templates/europe/continent/europe_continent_all.html +++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -57,7 +57,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_continent.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_continent.html' %} {% endblock %} diff --git a/covid19/templates/europe/continent/europe_continent_germany.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html similarity index 92% rename from covid19/templates/europe/continent/europe_continent_germany.html rename to covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html index e3c8dbb9..3e16b8be 100644 --- a/covid19/templates/europe/continent/europe_continent_germany.html +++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -57,7 +57,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_country.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %} {% endblock %} diff --git a/covid19/templates/europe/continent/europe_continent_one.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html similarity index 93% rename from covid19/templates/europe/continent/europe_continent_one.html rename to covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html index 40f0d16c..d80e6d7e 100644 --- a/covid19/templates/europe/continent/europe_continent_one.html +++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -57,7 +57,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_country.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %} {% endblock %} diff --git a/covid19/templates/europe/country/europe_country_all.html b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html similarity index 92% rename from covid19/templates/europe/country/europe_country_all.html rename to covid19/blueprints/europe/templates/europe/country/europe_country_all.html index b779f911..e902e4df 100644 --- a/covid19/templates/europe/country/europe_country_all.html +++ b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -57,7 +57,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_country.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %} {% endblock %} diff --git a/covid19/templates/europe/country/europe_country_germany.html b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html similarity index 91% rename from covid19/templates/europe/country/europe_country_germany.html rename to covid19/blueprints/europe/templates/europe/country/europe_country_germany.html index 603cc87d..b0f92e66 100644 --- a/covid19/templates/europe/country/europe_country_germany.html +++ b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html @@ -1,7 +1,7 @@ {% extends 'common/page_layout.html' %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -47,7 +47,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/country/europe_country_one.html b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html similarity index 92% rename from covid19/templates/europe/country/europe_country_one.html rename to covid19/blueprints/europe/templates/europe/country/europe_country_one.html index 4cdf7182..2e01bb29 100644 --- a/covid19/templates/europe/country/europe_country_one.html +++ b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html @@ -1,7 +1,7 @@ {% extends 'common/page_layout.html' %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -52,7 +52,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/date_reported/europe_date_reported_all.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html similarity index 92% rename from covid19/templates/europe/date_reported/europe_date_reported_all.html rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html index 0124a4fc..0b3cd118 100644 --- a/covid19/templates/europe/date_reported/europe_date_reported_all.html +++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -57,7 +57,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_date_reported.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_date_reported.html' %} {% endblock %} diff --git a/covid19/templates/europe/date_reported/europe_date_reported_one.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html similarity index 92% rename from covid19/templates/europe/date_reported/europe_date_reported_one.html rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html index a5468298..eb6c8418 100644 --- a/covid19/templates/europe/date_reported/europe_date_reported_one.html +++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html @@ -4,7 +4,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -55,7 +55,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html similarity index 92% rename from covid19/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html index 2526106f..bc4fa5c1 100644 --- a/covid19/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html +++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html @@ -4,7 +4,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -55,7 +55,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html similarity index 93% rename from covid19/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html index 12ac115c..b8d31dc0 100644 --- a/covid19/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html +++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html @@ -4,7 +4,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -55,7 +55,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/date_reported/europe_date_reported_one_notification_rate.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html similarity index 93% rename from covid19/templates/europe/date_reported/europe_date_reported_one_notification_rate.html rename to covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html index dd2a5d23..2bd48023 100644 --- a/covid19/templates/europe/date_reported/europe_date_reported_one_notification_rate.html +++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html @@ -4,7 +4,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -55,7 +55,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/europe_data.html b/covid19/blueprints/europe/templates/europe/europe_data.html similarity index 93% rename from covid19/templates/europe/europe_data.html rename to covid19/blueprints/europe/templates/europe/europe_data.html index 548cdf07..504ac784 100644 --- a/covid19/templates/europe/europe_data.html +++ b/covid19/blueprints/europe/templates/europe/europe_data.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -57,7 +57,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data.html' %} + {% include 'europe/fragments/fragments/fragment_europe_table_data.html' %} {% endblock %} diff --git a/covid19/templates/europe/europe_imported.html b/covid19/blueprints/europe/templates/europe/europe_imported.html similarity index 92% rename from covid19/templates/europe/europe_imported.html rename to covid19/blueprints/europe/templates/europe/europe_imported.html index a2159a28..a4e10c84 100644 --- a/covid19/templates/europe/europe_imported.html +++ b/covid19/blueprints/europe/templates/europe/europe_imported.html @@ -12,7 +12,7 @@ {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %} {% endblock %} @@ -53,7 +53,7 @@ </ul> {% endif %} - {% include 'europe/fragments/fragment_europe_table_data_imported.html' %} + {% include 'europe/fragments/fragments/fragment_europe_table_data_imported.html' %} {% endblock %} diff --git a/covid19/templates/europe/europe_info.html b/covid19/blueprints/europe/templates/europe/europe_info.html similarity index 97% rename from covid19/templates/europe/europe_info.html rename to covid19/blueprints/europe/templates/europe/europe_info.html index 34445d4a..dae19afa 100644 --- a/covid19/templates/europe/europe_info.html +++ b/covid19/blueprints/europe/templates/europe/europe_info.html @@ -12,7 +12,7 @@ {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %} {% endblock %} diff --git a/covid19/templates/europe/europe_tasks.html b/covid19/blueprints/europe/templates/europe/europe_tasks.html similarity index 93% rename from covid19/templates/europe/europe_tasks.html rename to covid19/blueprints/europe/templates/europe/europe_tasks.html index 97fc88a4..4953e23f 100644 --- a/covid19/templates/europe/europe_tasks.html +++ b/covid19/blueprints/europe/templates/europe/europe_tasks.html @@ -11,7 +11,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'europe/fragments/fragment_europe_navtabs.html' %} + {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %} {% endblock %} diff --git a/covid19/templates/europe/fragments/fragment_europe_navbar_dropdown.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_navbar_dropdown.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html diff --git a/covid19/templates/europe/fragments/fragment_europe_navtabs.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navtabs.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_navtabs.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navtabs.html diff --git a/covid19/templates/europe/fragments/fragment_europe_table_continent.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_continent.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_table_continent.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_continent.html diff --git a/covid19/templates/europe/fragments/fragment_europe_table_country.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_country.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_table_country.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_country.html diff --git a/covid19/templates/europe/fragments/fragment_europe_table_data.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_table_data.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html diff --git a/covid19/templates/europe/fragments/fragment_europe_table_data_imported.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data_imported.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_table_data_imported.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data_imported.html diff --git a/covid19/templates/europe/fragments/fragment_europe_table_date_reported.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_date_reported.html similarity index 100% rename from covid19/templates/europe/fragments/fragment_europe_table_date_reported.html rename to covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_date_reported.html diff --git a/covid19/blueprints/rki/rki_views.py b/covid19/blueprints/rki/rki_views.py index 7566dbeb..0162a0da 100644 --- a/covid19/blueprints/rki/rki_views.py +++ b/covid19/blueprints/rki/rki_views.py @@ -21,7 +21,7 @@ app_rki = Blueprint('rki', __name__, template_folder='templates') def url_rki_info(): page_info = ApplicationPage('RKI', "Info") return render_template( - 'rki/rki_info.html', + 'templates/rki/rki_info.html', page_info=page_info) @@ -29,7 +29,7 @@ def url_rki_info(): def url_rki_tasks(): page_info = ApplicationPage('RKI', "Tasks") return render_template( - 'rki/rki_tasks.html', + 'templates/rki/rki_tasks.html', page_info=page_info) @@ -43,6 +43,6 @@ def url_rki_imported(page=1): flash("No data in the database.") page_data = None return render_template( - 'rki/rki_imported.html', + 'templates/rki/rki_imported.html', page_data=page_data, page_info=page_info) diff --git a/covid19/blueprints/rki/templates/__init__.py b/covid19/blueprints/rki/templates/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/covid19/templates/rki/fragment_rki_navbar_dropdown.html b/covid19/blueprints/rki/templates/rki/fragment_rki_navbar_dropdown.html similarity index 100% rename from covid19/templates/rki/fragment_rki_navbar_dropdown.html rename to covid19/blueprints/rki/templates/rki/fragment_rki_navbar_dropdown.html diff --git a/covid19/templates/rki/fragment_rki_navtabs.html b/covid19/blueprints/rki/templates/rki/fragment_rki_navtabs.html similarity index 100% rename from covid19/templates/rki/fragment_rki_navtabs.html rename to covid19/blueprints/rki/templates/rki/fragment_rki_navtabs.html diff --git a/covid19/templates/rki/rki_imported.html b/covid19/blueprints/rki/templates/rki/rki_imported.html similarity index 100% rename from covid19/templates/rki/rki_imported.html rename to covid19/blueprints/rki/templates/rki/rki_imported.html diff --git a/covid19/templates/rki/rki_info.html b/covid19/blueprints/rki/templates/rki/rki_info.html similarity index 100% rename from covid19/templates/rki/rki_info.html rename to covid19/blueprints/rki/templates/rki/rki_info.html diff --git a/covid19/templates/rki/rki_tasks.html b/covid19/blueprints/rki/templates/rki/rki_tasks.html similarity index 100% rename from covid19/templates/rki/rki_tasks.html rename to covid19/blueprints/rki/templates/rki/rki_tasks.html diff --git a/covid19/blueprints/vaccination/templates/__init__.py b/covid19/blueprints/vaccination/templates/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html similarity index 100% rename from covid19/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_navtabs.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html similarity index 100% rename from covid19/templates/vaccination/fragments/fragment_vaccination_navtabs.html rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html similarity index 100% rename from covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html diff --git a/covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html b/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html similarity index 100% rename from covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html rename to covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html diff --git a/covid19/templates/vaccination/vaccination_info.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html similarity index 89% rename from covid19/templates/vaccination/vaccination_info.html rename to covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html index a2dc028b..614e1d06 100644 --- a/covid19/templates/vaccination/vaccination_info.html +++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html @@ -6,7 +6,7 @@ {% block navigation_navtabs %} - {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %} + {% include 'vaccination/fragments/fragments/fragment_vaccination_navtabs.html' %} {% endblock %} diff --git a/covid19/templates/vaccination/vaccination_tasks.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html similarity index 86% rename from covid19/templates/vaccination/vaccination_tasks.html rename to covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html index ebf1cfd1..da60b047 100644 --- a/covid19/templates/vaccination/vaccination_tasks.html +++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html @@ -5,7 +5,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %} + {% include 'vaccination/fragments/fragments/fragment_vaccination_navtabs.html' %} {% endblock %} {% block main_container %} diff --git a/covid19/templates/vaccination/vaccination_timeline_germany.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html similarity index 90% rename from covid19/templates/vaccination/vaccination_timeline_germany.html rename to covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html index fe8e7949..d4330a26 100644 --- a/covid19/templates/vaccination/vaccination_timeline_germany.html +++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html @@ -8,7 +8,7 @@ {% block navigation_navtabs %} - {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %} + {% include 'vaccination/fragments/fragments/fragment_vaccination_navtabs.html' %} {% endblock %} @@ -49,7 +49,7 @@ </ul> {% endif %} - {% include 'vaccination/fragments/fragment_vaccination_timeline_germany_table.html' %} + {% include 'vaccination/fragments/fragments/fragment_vaccination_timeline_germany_table.html' %} {% endblock %} diff --git a/covid19/blueprints/who/templates/__init__.py b/covid19/blueprints/who/templates/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/covid19/templates/who/country/who_country_all.html b/covid19/blueprints/who/templates/who/country/who_country_all.html similarity index 92% rename from covid19/templates/who/country/who_country_all.html rename to covid19/blueprints/who/templates/who/country/who_country_all.html index ecaa1c45..dd739966 100644 --- a/covid19/templates/who/country/who_country_all.html +++ b/covid19/blueprints/who/templates/who/country/who_country_all.html @@ -12,7 +12,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -52,7 +52,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_who_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %} {% endblock %} diff --git a/covid19/templates/who/country/who_country_germany.html b/covid19/blueprints/who/templates/who/country/who_country_germany.html similarity index 93% rename from covid19/templates/who/country/who_country_germany.html rename to covid19/blueprints/who/templates/who/country/who_country_germany.html index e03bb4f2..76e05b8e 100644 --- a/covid19/templates/who/country/who_country_germany.html +++ b/covid19/blueprints/who/templates/who/country/who_country_germany.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %} {% endblock %} diff --git a/covid19/templates/who/country/who_country_one.html b/covid19/blueprints/who/templates/who/country/who_country_one.html similarity index 93% rename from covid19/templates/who/country/who_country_one.html rename to covid19/blueprints/who/templates/who/country/who_country_one.html index 01115252..92d210e7 100644 --- a/covid19/templates/who/country/who_country_one.html +++ b/covid19/blueprints/who/templates/who/country/who_country_one.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %} {% endblock %} diff --git a/covid19/templates/who/country/who_country_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html similarity index 93% rename from covid19/templates/who/country/who_country_one_cases_cumulative.html rename to covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html index 45ec6418..f743b1d7 100644 --- a/covid19/templates/who/country/who_country_one_cases_cumulative.html +++ b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %} {% endblock %} diff --git a/covid19/templates/who/country/who_country_one_cases_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html similarity index 93% rename from covid19/templates/who/country/who_country_one_cases_new.html rename to covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html index 762f1696..13880351 100644 --- a/covid19/templates/who/country/who_country_one_cases_new.html +++ b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %} {% endblock %} diff --git a/covid19/templates/who/country/who_country_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html similarity index 93% rename from covid19/templates/who/country/who_country_one_deaths_cumulative.html rename to covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html index ee46e9a0..e0934567 100644 --- a/covid19/templates/who/country/who_country_one_deaths_cumulative.html +++ b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %} {% endblock %} diff --git a/covid19/templates/who/country/who_country_one_deaths_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html similarity index 93% rename from covid19/templates/who/country/who_country_one_deaths_new.html rename to covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html index 93d92ebe..78b5b18a 100644 --- a/covid19/templates/who/country/who_country_one_deaths_new.html +++ b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %} {% endblock %} diff --git a/covid19/templates/who/date_reported/who_date_reported_all.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html similarity index 98% rename from covid19/templates/who/date_reported/who_date_reported_all.html rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html index a3aac1bf..6c50492f 100644 --- a/covid19/templates/who/date_reported/who_date_reported_all.html +++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html @@ -12,7 +12,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} diff --git a/covid19/templates/who/date_reported/who_date_reported_one.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html similarity index 93% rename from covid19/templates/who/date_reported/who_date_reported_one.html rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html index 392ededd..16f25e24 100644 --- a/covid19/templates/who/date_reported/who_date_reported_one.html +++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html @@ -15,7 +15,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %} {% endblock %} diff --git a/covid19/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html similarity index 93% rename from covid19/templates/who/date_reported/who_date_reported_one_cases_cumulative.html rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html index 0df5ea69..23250f00 100644 --- a/covid19/templates/who/date_reported/who_date_reported_one_cases_cumulative.html +++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html @@ -15,7 +15,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %} {% endblock %} diff --git a/covid19/templates/who/date_reported/who_date_reported_one_cases_new.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html similarity index 93% rename from covid19/templates/who/date_reported/who_date_reported_one_cases_new.html rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html index 466d412a..51019646 100644 --- a/covid19/templates/who/date_reported/who_date_reported_one_cases_new.html +++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html @@ -15,7 +15,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %} {% endblock %} diff --git a/covid19/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html similarity index 93% rename from covid19/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html index 0df5ea69..23250f00 100644 --- a/covid19/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html +++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html @@ -15,7 +15,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %} {% endblock %} diff --git a/covid19/templates/who/date_reported/who_date_reported_one_deaths_new.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html similarity index 93% rename from covid19/templates/who/date_reported/who_date_reported_one_deaths_new.html rename to covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html index 34a059a0..f4f8bb52 100644 --- a/covid19/templates/who/date_reported/who_date_reported_one_deaths_new.html +++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html @@ -15,7 +15,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} @@ -59,7 +59,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %} {% endblock %} diff --git a/covid19/templates/who/fragments/fragment_who_navbar_dropdown.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html similarity index 100% rename from covid19/templates/who/fragments/fragment_who_navbar_dropdown.html rename to covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html diff --git a/covid19/templates/who/fragments/fragment_who_navtabs.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html similarity index 100% rename from covid19/templates/who/fragments/fragment_who_navtabs.html rename to covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html diff --git a/covid19/templates/who/fragments/fragment_who_table_global_data.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html similarity index 100% rename from covid19/templates/who/fragments/fragment_who_table_global_data.html rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html diff --git a/covid19/templates/who/fragments/fragment_who_table_global_data_country.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_country.html similarity index 100% rename from covid19/templates/who/fragments/fragment_who_table_global_data_country.html rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_country.html diff --git a/covid19/templates/who/fragments/fragment_who_table_global_data_date_reported.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_date_reported.html similarity index 100% rename from covid19/templates/who/fragments/fragment_who_table_global_data_date_reported.html rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_date_reported.html diff --git a/covid19/templates/who/fragments/fragment_who_table_who_country.html b/covid19/blueprints/who/templates/who/fragments/fragment_who_table_who_country.html similarity index 100% rename from covid19/templates/who/fragments/fragment_who_table_who_country.html rename to covid19/blueprints/who/templates/who/fragments/fragment_who_table_who_country.html diff --git a/covid19/templates/who/region/who_region_all.html b/covid19/blueprints/who/templates/who/region/who_region_all.html similarity index 96% rename from covid19/templates/who/region/who_region_all.html rename to covid19/blueprints/who/templates/who/region/who_region_all.html index 874b1184..d125b884 100644 --- a/covid19/templates/who/region/who_region_all.html +++ b/covid19/blueprints/who/templates/who/region/who_region_all.html @@ -12,7 +12,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} diff --git a/covid19/templates/who/region/who_region_one.html b/covid19/blueprints/who/templates/who/region/who_region_one.html similarity index 93% rename from covid19/templates/who/region/who_region_one.html rename to covid19/blueprints/who/templates/who/region/who_region_one.html index 60884870..a44d717d 100644 --- a/covid19/templates/who/region/who_region_one.html +++ b/covid19/blueprints/who/templates/who/region/who_region_one.html @@ -13,7 +13,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container_fluid %} @@ -53,7 +53,7 @@ </ul> {% endif %} - {% include 'who/fragments/fragment_who_table_who_country.html' %} + {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %} {% endblock %} diff --git a/covid19/templates/who/who_imported.html b/covid19/blueprints/who/templates/who/who_imported.html similarity index 97% rename from covid19/templates/who/who_imported.html rename to covid19/blueprints/who/templates/who/who_imported.html index 41a7b0ee..f75cdbff 100644 --- a/covid19/templates/who/who_imported.html +++ b/covid19/blueprints/who/templates/who/who_imported.html @@ -10,7 +10,7 @@ {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/fragments/fragment_who_navtabs.html' %} {% endblock %} diff --git a/covid19/templates/who/who_info.html b/covid19/blueprints/who/templates/who/who_info.html similarity index 91% rename from covid19/templates/who/who_info.html rename to covid19/blueprints/who/templates/who/who_info.html index 85470ad8..4f1327cb 100644 --- a/covid19/templates/who/who_info.html +++ b/covid19/blueprints/who/templates/who/who_info.html @@ -6,7 +6,7 @@ {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/fragments/fragment_who_navtabs.html' %} {% endblock %} diff --git a/covid19/templates/who/who_tasks.html b/covid19/blueprints/who/templates/who/who_tasks.html similarity index 89% rename from covid19/templates/who/who_tasks.html rename to covid19/blueprints/who/templates/who/who_tasks.html index 7754283b..30be589b 100644 --- a/covid19/templates/who/who_tasks.html +++ b/covid19/blueprints/who/templates/who/who_tasks.html @@ -5,7 +5,7 @@ {% endblock %} {% block navigation_navtabs %} - {% include 'who/fragments/fragment_who_navtabs.html' %} + {% include 'who/fragments/fragments/fragment_who_navtabs.html' %} {% endblock %} {% block main_container %} diff --git a/covid19/blueprints/who/who_views.py b/covid19/blueprints/who/who_views.py index e57cc7b1..702d8f16 100644 --- a/covid19/blueprints/who/who_views.py +++ b/covid19/blueprints/who/who_views.py @@ -65,7 +65,7 @@ def task_who_update_initial(self): def url_who_info(): page_info = ApplicationPage('WHO', "Info") return render_template( - 'who/who_info.html', + 'templates/who/who_info.html', page_info=page_info) @@ -73,7 +73,7 @@ def url_who_info(): def url_who_tasks(): page_info = ApplicationPage('WHO', "Tasks") return render_template( - 'who/who_tasks.html', + 'templates/who/who_tasks.html', page_info=page_info) @@ -87,7 +87,7 @@ def url_who_imported(page=1): flash("No data in the database.") page_data = None return render_template( - 'who/who_imported.html', + 'templates/who/who_imported.html', page_data=page_data, page_info=page_info) @@ -102,7 +102,7 @@ def url_who_date_reported_all(page=1): flash("No regions in the database.") page_data = None return render_template( - 'who/date_reported/who_date_reported_all.html', + 'templates/who/date_reported/who_date_reported_all.html', page_data=page_data, page_info=page_info) @@ -122,7 +122,7 @@ def url_who_date_reported(date_reported_id, page=1): flash("No data in the database.") page_data = None return render_template( - 'who/date_reported/who_date_reported_one.html', + 'templates/who/date_reported/who_date_reported_one.html', who_date_reported=date_reported, page_data=page_data, page_info=page_info) @@ -143,7 +143,7 @@ def url_who_date_reported_cases_new(date_reported_id, page=1): flash("No data in the database.") page_data = None return render_template( - 'who/date_reported/who_date_reported_one_cases_new.html', + 'templates/who/date_reported/who_date_reported_one_cases_new.html', who_date_reported=date_reported, page_data=page_data, page_info=page_info) @@ -164,7 +164,7 @@ def url_who_date_reported_cases_cumulative(date_reported_id, page=1): flash("No data in the database.") page_data = None return render_template( - 'who/date_reported/who_date_reported_one_cases_cumulative.html', + 'templates/who/date_reported/who_date_reported_one_cases_cumulative.html', who_date_reported=date_reported, page_data=page_data, page_info=page_info) @@ -185,7 +185,7 @@ def url_who_date_reported_deaths_new(date_reported_id, page=1): flash("No data in the database.") page_data = None return render_template( - 'who/date_reported/who_date_reported_one_deaths_new.html', + 'templates/who/date_reported/who_date_reported_one_deaths_new.html', who_date_reported=date_reported, page_data=page_data, page_info=page_info) @@ -206,7 +206,7 @@ def url_who_date_reported_deaths_cumulative(date_reported_id, page=1): flash("No data in the database.") page_data = None return render_template( - 'who/date_reported/who_date_reported_one_deaths_cumulative.html', + 'templates/who/date_reported/who_date_reported_one_deaths_cumulative.html', who_date_reported=date_reported, page_data=page_data, page_info=page_info) @@ -222,7 +222,7 @@ def url_who_region_all(page=1): flash("No regions in the database.") page_data = None return render_template( - 'who/region/who_region_all.html', + 'templates/who/region/who_region_all.html', page_data=page_data, page_info=page_info) @@ -242,7 +242,7 @@ def url_who_region(region_id, page=1): flash("No countries of that region in the database.") page_data = None return render_template( - 'who/region/who_region_one.html', + 'templates/who/region/who_region_one.html', who_region=who_region, page_data=page_data, page_info=page_info) @@ -258,7 +258,7 @@ def url_who_country_all(page=1): flash("No regions in the database.") page_data = None return render_template( - 'who/country/who_country_all.html', + 'templates/who/country/who_country_all.html', page_data=page_data, page_info=page_info) @@ -272,7 +272,7 @@ def url_who_country(country_id, page=1): "Country "+who_country.country_code, "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region) return render_template( - 'who/country/who_country_one.html', + 'templates/who/country/who_country_one.html', who_country=who_country, page_data=page_data, page_info=page_info) @@ -287,7 +287,7 @@ def url_who_country_cases_new(country_id, page=1): "Country "+who_country.country_code, "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region) return render_template( - 'who/country/who_country_one_cases_new.html', + 'templates/who/country/who_country_one_cases_new.html', who_country=who_country, page_data=page_data, page_info=page_info) @@ -302,7 +302,7 @@ def url_who_country_cases_cumulative(country_id, page=1): "Country "+who_country.country_code, "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region) return render_template( - 'who/country/who_country_one_cases_cumulative.html', + 'templates/who/country/who_country_one_cases_cumulative.html', who_country=who_country, page_data=page_data, page_info=page_info) @@ -317,7 +317,7 @@ def url_who_country_deaths_new(country_id, page=1): "Country "+who_country.country_code, "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region) return render_template( - 'who/country/who_country_one_deaths_new.html', + 'templates/who/country/who_country_one_deaths_new.html', who_country=who_country, page_data=page_data, page_info=page_info) @@ -332,7 +332,7 @@ def url_who_country_deaths_cumulative(country_id, page=1): "Country "+who_country.country_code, "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region) return render_template( - 'who/country/who_country_one_deaths_cumulative.html', + 'templates/who/country/who_country_one_deaths_cumulative.html', who_country=who_country, page_data=page_data, page_info=page_info) @@ -348,7 +348,7 @@ def url_who_germany(page=1): return redirect(url_for('url_who_tasks')) page_data = WhoGlobalData.get_data_for_country(who_country_germany, page) return render_template( - 'who/country/who_country_germany.html', + 'templates/who/country/who_country_germany.html', who_country=who_country_germany, page_data=page_data, page_info=page_info) diff --git a/covid19/templates/common/fragment_navbar.html b/covid19/templates/common/fragment_navbar.html index 414b4ecb..3719ba9f 100644 --- a/covid19/templates/common/fragment_navbar.html +++ b/covid19/templates/common/fragment_navbar.html @@ -13,15 +13,15 @@ <a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a> </li> - {% include 'who/fragments/fragment_who_navbar_dropdown.html' %} + {% include '../../blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html' %} - {% include 'europe/fragments/fragment_europe_navbar_dropdown.html' %} + {% include '../../blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html' %} - {% include 'vaccination/fragments/fragment_vaccination_navbar_dropdown.html' %} + {% include '../../blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html' %} - {% include 'rki/fragment_rki_navbar_dropdown.html' %} + {% include '../../blueprints/rki/templates/rki/fragment_rki_navbar_dropdown.html' %} - {% include 'admin/fragments/fragment_admin_navbar_dropdown.html' %} + {% include '../../blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html' %} <li class="nav-item"> <a class="nav-link" href="#">Link</a> diff --git a/covid19/views.py b/covid19/views.py index 257d93eb..bb0c0217 100644 --- a/covid19/views.py +++ b/covid19/views.py @@ -8,6 +8,18 @@ import covid19.blueprints.vaccination.vaccination_views import covid19.blueprints.rki.rki_views import covid19.blueprints.admin.admin_views +from covid19.blueprints.who.who_views import app_who +from covid19.blueprints.europe.europe_views import app_europe +from covid19.blueprints.vaccination.vaccination_views import app_vaccination +from covid19.blueprints.rki.rki_views import app_rki +from covid19.blueprints.admin.admin_views import app_admin + +app.register_blueprint(app_who, url_prefix='/who') +app.register_blueprint(app_europe, url_prefix='/europe') +app.register_blueprint(app_vaccination, url_prefix='/vaccination') +app.register_blueprint(app_rki, url_prefix='/rki') +app.register_blueprint(app_admin, url_prefix='/admin') + ############################################################################################ # -- GitLab