From c1dc14bd00f6295264e0168cde8aa27ce64d135d Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Thu, 20 May 2021 06:17:14 +0200 Subject: [PATCH] Refactoring: rename covid19 to flask_covid19 --- .gitignore | 8 ++--- src/covid19/__init__.py | 12 ------- .../blueprints/app_all/all_services.py | 29 ----------------- src/{covid19 => flask_covid19}/Gruntfile.js | 0 src/flask_covid19/__init__.py | 12 +++++++ .../blueprints/__init__.py | 0 .../blueprints/app_admin/__init__.py | 0 .../blueprints/app_admin/app_admin_service.py | 0 .../blueprints/app_admin/app_admin_views.py | 12 +++---- .../app_admin/templates/__init__.py | 0 .../templates/app_admin/admin_info.html | 0 .../templates/app_admin/admin_tasks.html | 0 .../app_admin/templates/app_admin/index.html | 0 .../navigation/app_admin_navbar_dropdown.html | 0 .../navigation/app_admin_navtabs.html | 0 .../blueprints/app_all/__init__.py | 0 .../blueprints/app_all/all_model.py | 0 .../blueprints/app_all/all_service.py | 12 +++---- .../blueprints/app_all/all_service_config.py | 12 +++---- .../app_all/all_service_download.py | 2 +- .../blueprints/app_all/all_services.py | 29 +++++++++++++++++ .../blueprints/app_all/all_views.py | 12 +++---- .../blueprints/app_all/templates/__init__.py | 0 .../templates/app_all/app_all_info.html | 0 .../templates/app_all/app_all_tasks.html | 0 .../fragments/fragment_flashed_messages.html | 0 .../fragments/fragment_pagination.html | 0 .../templates/app_all/layout/page_layout.html | 0 .../app_all/layout/page_layout_old.html | 0 .../navigation/app_all_navbar_dropdown.html | 0 .../app_all/navigation/app_all_navtabs.html | 0 .../blueprints/app_application/__init__.py | 0 .../application_model_transient.py | 0 .../app_application/application_service.py | 0 .../app_application/application_views.py | 30 +++++++++--------- .../fragments/fragment_flashed_messages.html | 0 .../fragments/fragment_pagination.html | 0 .../app_application/navigation/navbar.html | 0 .../app_application/navigation/navtabs.html | 0 .../templates/app_application/page_home.html | 0 .../blueprints/app_mq/__init__.py | 0 .../blueprints/app_mq/application_workers.py | 6 ++-- .../blueprints/app_user/__init__.py | 0 .../blueprints/app_user/templates/__init__.py | 0 .../app_user/templates/usr/login.html | 0 .../usr/navigation/usr_navbar_dropdown.html | 0 .../templates/usr/navigation/usr_navtabs.html | 0 .../app_user/templates/usr/profile.html | 0 .../app_user/templates/usr/user_info.html | 0 .../app_user/templates/usr/user_tasks.html | 0 .../app_user/templates/usr/usr_table.html | 0 .../blueprints/app_user/user_model.py | 0 .../blueprints/app_user/user_service.py | 2 +- .../blueprints/app_user/user_views.py | 4 +-- .../blueprints/divi/__init__.py | 0 .../blueprints/divi/divi_model.py | 2 +- .../blueprints/divi/divi_model_import.py | 0 .../blueprints/divi/divi_service.py | 8 ++--- .../blueprints/divi/divi_service_import.py | 4 +-- .../blueprints/divi/divi_service_update.py | 6 ++-- .../blueprints/divi/divi_views.py | 10 +++--- .../blueprints/divi/templates/__init__.py | 0 .../divi/country/divi_country_all.html | 0 .../country/divi_country_all_pagination.html | 0 .../divi/country/divi_country_all_table.html | 0 .../divi/country/divi_country_germany.html | 0 .../divi_country_germany_pagination.html | 0 .../divi/country/divi_country_one.html | 0 .../divi_country_one_cases_cumulative.html | 0 ...untry_one_cases_cumulative_pagination.html | 0 .../country/divi_country_one_cases_new.html | 0 ...divi_country_one_cases_new_pagination.html | 0 .../divi_country_one_deaths_cumulative.html | 0 ...ntry_one_deaths_cumulative_pagination.html | 0 .../country/divi_country_one_deaths_new.html | 0 ...ivi_country_one_deaths_new_pagination.html | 0 .../country/divi_country_one_pagination.html | 0 .../divi/country/divi_country_one_table.html | 0 .../date_reported/divi_date_reported_all.html | 0 .../divi_date_reported_all_pagination.html | 0 .../divi_date_reported_all_table.html | 0 .../date_reported/divi_date_reported_one.html | 0 ...vi_date_reported_one_cases_cumulative.html | 0 ...orted_one_cases_cumulative_pagination.html | 0 .../divi_date_reported_one_cases_new.html | 0 ...ate_reported_one_cases_new_pagination.html | 0 ...i_date_reported_one_deaths_cumulative.html | 0 ...rted_one_deaths_cumulative_pagination.html | 0 .../divi_date_reported_one_deaths_new.html | 0 .../divi_date_reported_one_pagination.html | 0 .../divi_date_reported_one_table.html | 0 .../divi/templates/divi/divi_imported.html | 0 .../divi/templates/divi/divi_info.html | 0 .../divi/templates/divi/divi_tasks.html | 0 .../fragment_divi_imported_pagination.html | 0 .../fragment_divi_imported_table.html | 0 .../fragment_divi_table_global_data.html | 0 .../divi/navigation/divi_navbar_dropdown.html | 0 .../divi/navigation/divi_navtabs.html | 0 .../divi/region/divi_region_all.html | 0 .../region/divi_region_all_pagination.html | 0 .../divi/region/divi_region_all_table.html | 0 .../divi/region/divi_region_one.html | 0 .../region/divi_region_one_pagination.html | 0 .../blueprints/divi_test/__init__.py | 0 .../blueprints/divi_test/divi_test_service.py | 4 +-- .../blueprints/divi_test/divi_test_views.py | 12 +++---- .../divi_test/templates/__init__.py | 0 .../templates/divi_test/divi_tests.html | 0 .../blueprints/ecdc/__init__.py | 0 .../blueprints/ecdc/ecdc_model.py | 2 +- .../blueprints/ecdc/ecdc_model_import.py | 0 .../blueprints/ecdc/ecdc_service.py | 8 ++--- .../blueprints/ecdc/ecdc_service_import.py | 6 ++-- .../blueprints/ecdc/ecdc_service_update.py | 6 ++-- .../blueprints/ecdc/ecdc_views.py | 16 ++++------ .../blueprints/ecdc/templates/__init__.py | 0 .../ecdc/continent/ecdc_continent_all.html | 0 .../ecdc_continent_all_pagination.html | 0 .../continent/ecdc_continent_all_table.html | 0 .../ecdc/continent/ecdc_continent_one.html | 0 .../ecdc_continent_one_pagination.html | 0 .../ecdc/country/ecdc_country_all.html | 0 .../country/ecdc_country_all_pagination.html | 0 .../ecdc/country/ecdc_country_all_table.html | 0 .../ecdc/country/ecdc_country_germany.html | 0 .../ecdc_country_germany_pagination.html | 0 .../ecdc/country/ecdc_country_one.html | 0 .../country/ecdc_country_one_pagination.html | 0 .../date_reported/ecdc_date_reported_all.html | 0 .../ecdc_date_reported_all_pagination.html | 0 .../ecdc_date_reported_all_table.html | 0 .../date_reported/ecdc_date_reported_one.html | 0 .../ecdc_date_reported_one_cases_weekly.html | 0 ..._reported_one_cases_weekly_pagination.html | 0 .../ecdc_date_reported_one_deaths_weekly.html | 0 ...reported_one_deaths_weekly_pagination.html | 0 ...c_date_reported_one_notification_rate.html | 0 ...rted_one_notification_rate_pagination.html | 0 .../ecdc_date_reported_one_pagination.html | 0 .../templates/ecdc/ecdc_data/ecdc_data.html | 0 .../ecdc/ecdc_data/ecdc_data_pagination.html | 0 .../ecdc/ecdc_data/ecdc_data_table.html | 0 .../ecdc/templates/ecdc/ecdc_info.html | 0 .../ecdc/templates/ecdc/ecdc_tasks.html | 0 .../ecdc/imported/ecdc_imported.html | 0 .../imported/ecdc_imported_pagination.html | 0 .../ecdc/imported/ecdc_imported_table.html | 0 .../ecdc/navigation/ecdc_navbar_dropdown.html | 0 .../ecdc/navigation/ecdc_navtabs.html | 0 .../blueprints/ecdc_test/__init__.py | 0 .../blueprints/ecdc_test/ecdc_test_service.py | 4 +-- .../blueprints/ecdc_test/ecdc_test_views.py | 18 +++++------ .../ecdc_test/templates/__init__.py | 0 .../templates/ecdc_test/ecdc_tests.html | 0 .../blueprints/intensivregister/__init__.py | 0 .../intensivregister_test/__init__.py | 0 .../blueprints/owid/__init__.py | 0 .../blueprints/owid/owid_model.py | 2 +- .../blueprints/owid/owid_model_import.py | 0 .../blueprints/owid/owid_service.py | 8 ++--- .../blueprints/owid/owid_service_import.py | 6 ++-- .../blueprints/owid/owid_service_update.py | 6 ++-- .../blueprints/owid/owid_views.py | 16 +++++----- .../blueprints/owid/templates/__init__.py | 0 .../owid/continent/owid_continent_all.html | 0 .../owid_continent_all_pagination.html | 0 .../continent/owid_continent_all_table.html | 0 .../owid/continent/owid_continent_one.html | 0 .../owid_continent_one_pagination.html | 0 .../owid/country/owid_country_all.html | 0 .../country/owid_country_all_pagination.html | 0 .../owid/country/owid_country_all_table.html | 0 .../owid/country/owid_country_one.html | 0 .../country/owid_country_one_germany.html | 0 .../owid_country_one_germany_pagination.html | 0 .../country/owid_country_one_pagination.html | 0 .../date_reported/owid_date_reported_all.html | 0 .../owid_date_reported_all_pagination.html | 0 .../owid_date_reported_all_table.html | 0 .../date_reported/owid_date_reported_one.html | 0 ...id_date_reported_one_cases_cumulative.html | 0 ...orted_one_cases_cumulative_pagination.html | 0 .../owid_date_reported_one_cases_new.html | 0 ...ate_reported_one_cases_new_pagination.html | 0 ...d_date_reported_one_deaths_cumulative.html | 0 ...rted_one_deaths_cumulative_pagination.html | 0 .../owid_date_reported_one_deaths_new.html | 0 ...te_reported_one_deaths_new_pagination.html | 0 .../owid_date_reported_one_pagination.html | 0 .../owid/imported/owid_imported.html | 0 .../imported/owid_imported_pagination.html | 0 .../owid/imported/owid_imported_table.html | 0 .../owid/navigation/owid_navbar_dropdown.html | 0 .../owid/navigation/owid_navtabs.html | 0 .../owid/owid_data/owid_data_table.html | 0 .../owid/templates/owid/owid_info.html | 0 .../owid/templates/owid/owid_tasks.html | 0 .../blueprints/owid_test/__init__.py | 0 .../blueprints/owid_test/owid_test_service.py | 6 ++-- .../blueprints/owid_test/owid_test_views.py | 20 ++++++------ .../owid_test/templates/__init__.py | 0 .../templates/owid_test/owid_tests.html | 0 .../blueprints/rki_cases/__init__.py | 0 .../blueprints/rki_cases/a.py | 0 .../blueprints/rki_cases/rki_model.py | 2 +- .../blueprints/rki_cases/rki_model_import.py | 0 .../blueprints/rki_cases/rki_service.py | 8 ++--- .../rki_cases/rki_service_import.py | 4 +-- .../rki_cases/rki_service_update.py | 6 ++-- .../blueprints/rki_cases/rki_views.py | 16 +++++----- .../rki_cases/templates/__init__.py | 0 .../date_reported/rki_date_reported_all.html | 0 .../rki_date_reported_all_pagination.html | 0 .../rki_date_reported_all_table.html | 0 .../rki/navigation/rki_navbar_dropdown.html | 0 .../templates/rki/navigation/rki_navtabs.html | 0 .../rki_cases/templates/rki/rki_imported.html | 0 .../rki_cases/templates/rki/rki_info.html | 0 .../rki_cases/templates/rki/rki_tasks.html | 0 .../rki_cases/templates/rki/rki_test.html | 0 .../blueprints/rki_cases_test/__init__.py | 0 .../rki_cases_test/rki_test_service.py | 6 ++-- .../rki_cases_test/rki_test_views.py | 17 ++++------ .../rki_cases_test/templates/__init__.py | 0 .../templates/rki_test/rki_tests.html | 0 .../blueprints/rki_vaccination/__init__.py | 0 .../rki_vaccination/rki_vaccination_model.py | 2 +- .../rki_vaccination_model_import.py | 0 .../rki_vaccination_service.py | 8 ++--- .../rki_vaccination_service_import.py | 6 ++-- .../rki_vaccination_service_update.py | 6 ++-- .../rki_vaccination/rki_vaccination_views.py | 18 +++++------ .../rki_vaccination/templates/__init__.py | 0 .../data/rki_vaccination_data.html | 0 .../data/rki_vaccination_data_pagination.html | 0 .../data/rki_vaccination_data_table.html | 0 .../data/rki_vaccination_data_table_head.html | 0 .../imported/rki_vaccination_imported.html | 0 .../rki_vaccination_imported_pagination.html | 0 .../rki_vaccination_imported_table.html | 0 .../rki_vaccination_navbar_dropdown.html | 0 .../navigation/rki_vaccination_navtabs.html | 0 .../rki_vaccination/rki_vaccination_info.html | 0 .../rki_vaccination_tasks.html | 0 .../blueprints/who/__init__.py | 0 .../blueprints/who/templates/__init__.py | 0 .../who/country/who_country_all.html | 0 .../country/who_country_all_pagination.html | 0 .../who/country/who_country_all_table.html | 0 .../who/country/who_country_germany.html | 0 .../who_country_germany_pagination.html | 0 .../who/country/who_country_one.html | 0 .../who_country_one_cases_cumulative.html | 0 ...untry_one_cases_cumulative_pagination.html | 0 .../country/who_country_one_cases_new.html | 0 .../who_country_one_cases_new_pagination.html | 0 .../who_country_one_deaths_cumulative.html | 0 ...ntry_one_deaths_cumulative_pagination.html | 0 .../country/who_country_one_deaths_new.html | 0 ...who_country_one_deaths_new_pagination.html | 0 .../country/who_country_one_pagination.html | 0 .../who/country/who_country_one_table.html | 0 .../date_reported/who_date_reported_all.html | 0 .../who_date_reported_all_pagination.html | 0 .../who_date_reported_all_table.html | 0 .../date_reported/who_date_reported_one.html | 0 ...ho_date_reported_one_cases_cumulative.html | 0 ...orted_one_cases_cumulative_pagination.html | 0 .../who_date_reported_one_cases_new.html | 0 ...ate_reported_one_cases_new_pagination.html | 0 ...o_date_reported_one_deaths_cumulative.html | 0 ...rted_one_deaths_cumulative_pagination.html | 0 .../who_date_reported_one_deaths_new.html | 0 .../who_date_reported_one_pagination.html | 0 .../who_date_reported_one_table.html | 0 .../fragment_who_imported_pagination.html | 0 .../fragment_who_imported_table.html | 0 .../fragment_who_table_global_data.html | 0 .../who/navigation/who_navbar_dropdown.html | 0 .../templates/who/navigation/who_navtabs.html | 0 .../templates/who/region/who_region_all.html | 0 .../who/region/who_region_all_pagination.html | 0 .../who/region/who_region_all_table.html | 0 .../templates/who/region/who_region_one.html | 0 .../who/region/who_region_one_pagination.html | 0 .../who/templates/who/who_imported.html | 0 .../who/templates/who/who_info.html | 0 .../who/templates/who/who_tasks.html | 0 .../blueprints/who/who_model.py | 2 +- .../blueprints/who/who_model_import.py | 0 .../blueprints/who/who_service.py | 8 ++--- .../blueprints/who/who_service_import.py | 6 ++-- .../blueprints/who/who_service_update.py | 6 ++-- .../blueprints/who/who_views.py | 10 +++--- .../blueprints/who_test/__init__.py | 0 .../blueprints/who_test/templates/__init__.py | 0 .../templates/who_test/who_tests.html | 0 .../blueprints/who_test/who_test_service.py | 4 +-- .../blueprints/who_test/who_test_views.py | 12 +++---- src/{covid19 => flask_covid19}/browserslist | 0 .../package-lock.json | 0 src/{covid19 => flask_covid19}/package.json | 2 +- .../static/css/covid19python.css | 0 .../static/favicon.ico | Bin .../static/index.js | 0 .../static/js/covid19python.js | 0 .../static/styles.css | 0 src/mq.py | 6 ++-- src/web.py | 2 +- 310 files changed, 252 insertions(+), 257 deletions(-) delete mode 100644 src/covid19/__init__.py delete mode 100644 src/covid19/blueprints/app_all/all_services.py rename src/{covid19 => flask_covid19}/Gruntfile.js (100%) rename src/{covid19 => flask_covid19}/blueprints/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/app_admin_service.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/app_admin_views.py (88%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/templates/app_admin/admin_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/templates/app_admin/admin_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/templates/app_admin/index.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/all_model.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/all_service.py (89%) rename src/{covid19 => flask_covid19}/blueprints/app_all/all_service_config.py (90%) rename src/{covid19 => flask_covid19}/blueprints/app_all/all_service_download.py (97%) create mode 100644 src/flask_covid19/blueprints/app_all/all_services.py rename src/{covid19 => flask_covid19}/blueprints/app_all/all_views.py (96%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/app_all_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/app_all_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/layout/page_layout.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/layout/page_layout_old.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/application_model_transient.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/application_service.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/application_views.py (59%) rename src/{covid19 => flask_covid19}/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/templates/app_application/navigation/navbar.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/templates/app_application/navigation/navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_application/templates/app_application/page_home.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_mq/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_mq/application_workers.py (74%) rename src/{covid19 => flask_covid19}/blueprints/app_user/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/login.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/navigation/usr_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/navigation/usr_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/profile.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/user_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/user_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/templates/usr/usr_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/user_model.py (100%) rename src/{covid19 => flask_covid19}/blueprints/app_user/user_service.py (94%) rename src/{covid19 => flask_covid19}/blueprints/app_user/user_views.py (95%) rename src/{covid19 => flask_covid19}/blueprints/divi/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/divi_model.py (99%) rename src/{covid19 => flask_covid19}/blueprints/divi/divi_model_import.py (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/divi_service.py (84%) rename src/{covid19 => flask_covid19}/blueprints/divi/divi_service_import.py (95%) rename src/{covid19 => flask_covid19}/blueprints/divi/divi_service_update.py (98%) rename src/{covid19 => flask_covid19}/blueprints/divi/divi_views.py (98%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_germany.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_germany_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_cases_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_cases_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_deaths_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_deaths_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/country/divi_country_one_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/divi_imported.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/divi_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/divi_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/fragments/fragment_divi_imported_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/fragments/fragment_divi_imported_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/fragments/fragment_divi_table_global_data.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/navigation/divi_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/navigation/divi_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/region/divi_region_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/region/divi_region_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/region/divi_region_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/region/divi_region_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi/templates/divi/region/divi_region_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/divi_test/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/divi_test/divi_test_service.py (94%) rename src/{covid19 => flask_covid19}/blueprints/divi_test/divi_test_views.py (94%) rename src/{covid19 => flask_covid19}/blueprints/divi_test/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/divi_test/templates/divi_test/divi_tests.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/ecdc_model.py (99%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/ecdc_model_import.py (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/ecdc_service.py (84%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/ecdc_service_import.py (94%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/ecdc_service_update.py (98%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/ecdc_views.py (95%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/ecdc_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/ecdc_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc_test/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc_test/ecdc_test_service.py (94%) rename src/{covid19 => flask_covid19}/blueprints/ecdc_test/ecdc_test_views.py (92%) rename src/{covid19 => flask_covid19}/blueprints/ecdc_test/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html (100%) rename src/{covid19 => flask_covid19}/blueprints/intensivregister/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/intensivregister_test/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/owid_model.py (99%) rename src/{covid19 => flask_covid19}/blueprints/owid/owid_model_import.py (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/owid_service.py (84%) rename src/{covid19 => flask_covid19}/blueprints/owid/owid_service_import.py (97%) rename src/{covid19 => flask_covid19}/blueprints/owid/owid_service_update.py (98%) rename src/{covid19 => flask_covid19}/blueprints/owid/owid_views.py (97%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/continent/owid_continent_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/continent/owid_continent_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/continent/owid_continent_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/continent/owid_continent_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/continent/owid_continent_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_one_germany.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/country/owid_country_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/imported/owid_imported.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/imported/owid_imported_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/imported/owid_imported_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/navigation/owid_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/owid_data/owid_data_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/owid_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid/templates/owid/owid_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/owid_test/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/owid_test/owid_test_service.py (96%) rename src/{covid19 => flask_covid19}/blueprints/owid_test/owid_test_views.py (93%) rename src/{covid19 => flask_covid19}/blueprints/owid_test/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/owid_test/templates/owid_test/owid_tests.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/a.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/rki_model.py (98%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/rki_model_import.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/rki_service.py (84%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/rki_service_import.py (96%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/rki_service_update.py (97%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/rki_views.py (92%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/navigation/rki_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/navigation/rki_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/rki_imported.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/rki_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/rki_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases/templates/rki/rki_test.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases_test/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases_test/rki_test_service.py (96%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases_test/rki_test_views.py (93%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases_test/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_cases_test/templates/rki_test/rki_tests.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/rki_vaccination_model.py (97%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/rki_vaccination_model_import.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/rki_vaccination_service.py (81%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/rki_vaccination_service_import.py (94%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/rki_vaccination_service_update.py (98%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/rki_vaccination_views.py (92%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_germany.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_germany_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_cases_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_cases_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_cases_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_deaths_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_deaths_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_deaths_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/country/who_country_one_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/fragments/fragment_who_imported_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/fragments/fragment_who_imported_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/navigation/who_navbar_dropdown.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/navigation/who_navtabs.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/region/who_region_all.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/region/who_region_all_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/region/who_region_all_table.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/region/who_region_one.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/region/who_region_one_pagination.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/who_imported.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/who_info.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/templates/who/who_tasks.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who/who_model.py (99%) rename src/{covid19 => flask_covid19}/blueprints/who/who_model_import.py (100%) rename src/{covid19 => flask_covid19}/blueprints/who/who_service.py (88%) rename src/{covid19 => flask_covid19}/blueprints/who/who_service_import.py (94%) rename src/{covid19 => flask_covid19}/blueprints/who/who_service_update.py (99%) rename src/{covid19 => flask_covid19}/blueprints/who/who_views.py (98%) rename src/{covid19 => flask_covid19}/blueprints/who_test/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/who_test/templates/__init__.py (100%) rename src/{covid19 => flask_covid19}/blueprints/who_test/templates/who_test/who_tests.html (100%) rename src/{covid19 => flask_covid19}/blueprints/who_test/who_test_service.py (94%) rename src/{covid19 => flask_covid19}/blueprints/who_test/who_test_views.py (94%) rename src/{covid19 => flask_covid19}/browserslist (100%) rename src/{covid19 => flask_covid19}/package-lock.json (100%) rename src/{covid19 => flask_covid19}/package.json (96%) rename src/{covid19 => flask_covid19}/static/css/covid19python.css (100%) rename src/{covid19 => flask_covid19}/static/favicon.ico (100%) rename src/{covid19 => flask_covid19}/static/index.js (100%) rename src/{covid19 => flask_covid19}/static/js/covid19python.js (100%) rename src/{covid19 => flask_covid19}/static/styles.css (100%) diff --git a/.gitignore b/.gitignore index f6f4d5f7..561c7b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1132,9 +1132,9 @@ Debug*/Debug*\ Libs /requirements/req_tests.py /dump.rdb /1.0.0 -/src/covid19/blueprints/owid/x.py -/src/covid19/blueprints/owid/x2.py -/src/covid19/blueprints/owid/x3.py +/src/flask_covid19/blueprints/owid/x.py +/src/flask_covid19/blueprints/owid/x2.py +/src/flask_covid19/blueprints/owid/x3.py /.checkmate/ /lsp/ dump.rdb @@ -1145,6 +1145,6 @@ dump.rdb /logfile4.txt /logfile5.txt /logfile*.txt -/src/covid19/static/vendor/ +/src/flask_covid19/static/vendor/ /.checkmate /.run diff --git a/src/covid19/__init__.py b/src/covid19/__init__.py deleted file mode 100644 index 86021858..00000000 --- a/src/covid19/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from database import app, run_run_with_debug, port, db - -import covid19.blueprints.app_application.application_views -from covid19.blueprints.app_all.all_services import app_user_service -from covid19.blueprints.app_application.application_service import ApplicationService - - -def run_web(): - application_service = ApplicationService(db, app_user_service) - application_service.prepare_run_web() - app.run(debug=run_run_with_debug, port=port) - diff --git a/src/covid19/blueprints/app_all/all_services.py b/src/covid19/blueprints/app_all/all_services.py deleted file mode 100644 index a595c952..00000000 --- a/src/covid19/blueprints/app_all/all_services.py +++ /dev/null @@ -1,29 +0,0 @@ -from database import db - -from covid19.blueprints.app_admin.app_admin_service import AdminService -from covid19.blueprints.app_all.all_service import AllService -from covid19.blueprints.app_user.user_service import UserService -from covid19.blueprints.ecdc.ecdc_service import EcdcService -from covid19.blueprints.owid.owid_service import OwidService -from covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService -from covid19.blueprints.who.who_service import WhoService -from covid19.blueprints.divi.divi_service import DiviService -from covid19.blueprints.rki_cases.rki_service import RkiService - -############################################################################################ -# -# Services -# -app_admin_service = AdminService(db) -app_user_service = UserService(db) - -who_service = WhoService(db) -owid_service = OwidService(db) -ecdc_service = EcdcService(db) -rki_vaccination_service = RkiVaccinationService(db) -rki_service = RkiService(db) -divi_service = DiviService(db) - -all_service = AllService(who_service, owid_service, ecdc_service, rki_vaccination_service, rki_service, divi_service) - -db.create_all() diff --git a/src/covid19/Gruntfile.js b/src/flask_covid19/Gruntfile.js similarity index 100% rename from src/covid19/Gruntfile.js rename to src/flask_covid19/Gruntfile.js diff --git a/src/flask_covid19/__init__.py b/src/flask_covid19/__init__.py index e69de29b..c5688473 100644 --- a/src/flask_covid19/__init__.py +++ b/src/flask_covid19/__init__.py @@ -0,0 +1,12 @@ +from database import app, run_run_with_debug, port, db + +import flask_covid19.blueprints.app_application.application_views +from flask_covid19 import app_user_service +from flask_covid19 import ApplicationService + + +def run_web(): + application_service = ApplicationService(db, app_user_service) + application_service.prepare_run_web() + app.run(debug=run_run_with_debug, port=port) + diff --git a/src/covid19/blueprints/__init__.py b/src/flask_covid19/blueprints/__init__.py similarity index 100% rename from src/covid19/blueprints/__init__.py rename to src/flask_covid19/blueprints/__init__.py diff --git a/src/covid19/blueprints/app_admin/__init__.py b/src/flask_covid19/blueprints/app_admin/__init__.py similarity index 100% rename from src/covid19/blueprints/app_admin/__init__.py rename to src/flask_covid19/blueprints/app_admin/__init__.py diff --git a/src/covid19/blueprints/app_admin/app_admin_service.py b/src/flask_covid19/blueprints/app_admin/app_admin_service.py similarity index 100% rename from src/covid19/blueprints/app_admin/app_admin_service.py rename to src/flask_covid19/blueprints/app_admin/app_admin_service.py diff --git a/src/covid19/blueprints/app_admin/app_admin_views.py b/src/flask_covid19/blueprints/app_admin/app_admin_views.py similarity index 88% rename from src/covid19/blueprints/app_admin/app_admin_views.py rename to src/flask_covid19/blueprints/app_admin/app_admin_views.py index 27e1e2ac..f76d1209 100644 --- a/src/covid19/blueprints/app_admin/app_admin_views.py +++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py @@ -3,12 +3,12 @@ from celery import states from celery.utils.log import get_task_logger from database import app -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage drop_and_create_data_again = True diff --git a/src/covid19/blueprints/app_admin/templates/__init__.py b/src/flask_covid19/blueprints/app_admin/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/app_admin/templates/__init__.py rename to src/flask_covid19/blueprints/app_admin/templates/__init__.py diff --git a/src/covid19/blueprints/app_admin/templates/app_admin/admin_info.html b/src/flask_covid19/blueprints/app_admin/templates/app_admin/admin_info.html similarity index 100% rename from src/covid19/blueprints/app_admin/templates/app_admin/admin_info.html rename to src/flask_covid19/blueprints/app_admin/templates/app_admin/admin_info.html diff --git a/src/covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html b/src/flask_covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html similarity index 100% rename from src/covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html rename to src/flask_covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html diff --git a/src/covid19/blueprints/app_admin/templates/app_admin/index.html b/src/flask_covid19/blueprints/app_admin/templates/app_admin/index.html similarity index 100% rename from src/covid19/blueprints/app_admin/templates/app_admin/index.html rename to src/flask_covid19/blueprints/app_admin/templates/app_admin/index.html diff --git a/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html b/src/flask_covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html rename to src/flask_covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html diff --git a/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html b/src/flask_covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html similarity index 100% rename from src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html rename to src/flask_covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html diff --git a/src/covid19/blueprints/app_all/__init__.py b/src/flask_covid19/blueprints/app_all/__init__.py similarity index 100% rename from src/covid19/blueprints/app_all/__init__.py rename to src/flask_covid19/blueprints/app_all/__init__.py diff --git a/src/covid19/blueprints/app_all/all_model.py b/src/flask_covid19/blueprints/app_all/all_model.py similarity index 100% rename from src/covid19/blueprints/app_all/all_model.py rename to src/flask_covid19/blueprints/app_all/all_model.py diff --git a/src/covid19/blueprints/app_all/all_service.py b/src/flask_covid19/blueprints/app_all/all_service.py similarity index 89% rename from src/covid19/blueprints/app_all/all_service.py rename to src/flask_covid19/blueprints/app_all/all_service.py index 08cc12cd..2faae911 100644 --- a/src/covid19/blueprints/app_all/all_service.py +++ b/src/flask_covid19/blueprints/app_all/all_service.py @@ -1,11 +1,11 @@ from database import app -from covid19.blueprints.ecdc.ecdc_service import EcdcService -from covid19.blueprints.owid.owid_service import OwidService -from covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService -from covid19.blueprints.who.who_service import WhoService -from covid19.blueprints.divi.divi_service import DiviService -from covid19.blueprints.rki_cases.rki_service import RkiService +from flask_covid19 import EcdcService +from flask_covid19 import OwidService +from flask_covid19 import RkiVaccinationService +from flask_covid19 import WhoService +from flask_covid19 import DiviService +from flask_covid19 import RkiService class AllService: diff --git a/src/covid19/blueprints/app_all/all_service_config.py b/src/flask_covid19/blueprints/app_all/all_service_config.py similarity index 90% rename from src/covid19/blueprints/app_all/all_service_config.py rename to src/flask_covid19/blueprints/app_all/all_service_config.py index b823003a..57671edc 100644 --- a/src/covid19/blueprints/app_all/all_service_config.py +++ b/src/flask_covid19/blueprints/app_all/all_service_config.py @@ -1,10 +1,10 @@ import os -from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport -from covid19.blueprints.who.who_model_import import WhoImport -from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport -from covid19.blueprints.owid.owid_model_import import OwidImport -from covid19.blueprints.rki_cases.rki_model_import import RkiImport -from covid19.blueprints.divi.divi_model_import import DiviImport +from flask_covid19 import EcdcImport +from flask_covid19 import WhoImport +from flask_covid19 import RkiVaccinationImport +from flask_covid19 import OwidImport +from flask_covid19 import RkiImport +from flask_covid19 import DiviImport class ApplicationServiceConfig: diff --git a/src/covid19/blueprints/app_all/all_service_download.py b/src/flask_covid19/blueprints/app_all/all_service_download.py similarity index 97% rename from src/covid19/blueprints/app_all/all_service_download.py rename to src/flask_covid19/blueprints/app_all/all_service_download.py index 1bf3e780..f0974b9e 100644 --- a/src/covid19/blueprints/app_all/all_service_download.py +++ b/src/flask_covid19/blueprints/app_all/all_service_download.py @@ -2,7 +2,7 @@ import os import wget import subprocess from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceConfig class ApplicationServiceDownload: diff --git a/src/flask_covid19/blueprints/app_all/all_services.py b/src/flask_covid19/blueprints/app_all/all_services.py new file mode 100644 index 00000000..0f62f722 --- /dev/null +++ b/src/flask_covid19/blueprints/app_all/all_services.py @@ -0,0 +1,29 @@ +from database import db + +from flask_covid19 import AdminService +from flask_covid19 import AllService +from flask_covid19 import UserService +from flask_covid19 import EcdcService +from flask_covid19 import OwidService +from flask_covid19 import RkiVaccinationService +from flask_covid19 import WhoService +from flask_covid19 import DiviService +from flask_covid19 import RkiService + +############################################################################################ +# +# Services +# +app_admin_service = AdminService(db) +app_user_service = UserService(db) + +who_service = WhoService(db) +owid_service = OwidService(db) +ecdc_service = EcdcService(db) +rki_vaccination_service = RkiVaccinationService(db) +rki_service = RkiService(db) +divi_service = DiviService(db) + +all_service = AllService(who_service, owid_service, ecdc_service, rki_vaccination_service, rki_service, divi_service) + +db.create_all() diff --git a/src/covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py similarity index 96% rename from src/covid19/blueprints/app_all/all_views.py rename to src/flask_covid19/blueprints/app_all/all_views.py index a84c20a4..ee63dce4 100644 --- a/src/covid19/blueprints/app_all/all_views.py +++ b/src/flask_covid19/blueprints/app_all/all_views.py @@ -3,12 +3,12 @@ from celery import states from celery.utils.log import get_task_logger from database import app -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service, all_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service, all_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage drop_and_create_data_again = True diff --git a/src/covid19/blueprints/app_all/templates/__init__.py b/src/flask_covid19/blueprints/app_all/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/app_all/templates/__init__.py rename to src/flask_covid19/blueprints/app_all/templates/__init__.py diff --git a/src/covid19/blueprints/app_all/templates/app_all/app_all_info.html b/src/flask_covid19/blueprints/app_all/templates/app_all/app_all_info.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/app_all_info.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/app_all_info.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html b/src/flask_covid19/blueprints/app_all/templates/app_all/app_all_tasks.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/app_all_tasks.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html b/src/flask_covid19/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html b/src/flask_covid19/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/layout/page_layout.html b/src/flask_covid19/blueprints/app_all/templates/app_all/layout/page_layout.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/layout/page_layout.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/layout/page_layout.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html b/src/flask_covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html b/src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html diff --git a/src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html b/src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html similarity index 100% rename from src/covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html rename to src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navtabs.html diff --git a/src/covid19/blueprints/app_application/__init__.py b/src/flask_covid19/blueprints/app_application/__init__.py similarity index 100% rename from src/covid19/blueprints/app_application/__init__.py rename to src/flask_covid19/blueprints/app_application/__init__.py diff --git a/src/covid19/blueprints/app_application/application_model_transient.py b/src/flask_covid19/blueprints/app_application/application_model_transient.py similarity index 100% rename from src/covid19/blueprints/app_application/application_model_transient.py rename to src/flask_covid19/blueprints/app_application/application_model_transient.py diff --git a/src/covid19/blueprints/app_application/application_service.py b/src/flask_covid19/blueprints/app_application/application_service.py similarity index 100% rename from src/covid19/blueprints/app_application/application_service.py rename to src/flask_covid19/blueprints/app_application/application_service.py diff --git a/src/covid19/blueprints/app_application/application_views.py b/src/flask_covid19/blueprints/app_application/application_views.py similarity index 59% rename from src/covid19/blueprints/app_application/application_views.py rename to src/flask_covid19/blueprints/app_application/application_views.py index 5ef5b72f..b6e7cf96 100644 --- a/src/covid19/blueprints/app_application/application_views.py +++ b/src/flask_covid19/blueprints/app_application/application_views.py @@ -1,25 +1,25 @@ from flask import render_template, redirect, url_for, Blueprint from database import app -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import ApplicationPage -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 flask_covid19 import blueprint_app_user +from flask_covid19 import blueprint_app_admin +from flask_covid19 import blueprint_app_all -from covid19.blueprints.who.who_views import app_who -from covid19.blueprints.owid.owid_views import app_owid -from covid19.blueprints.ecdc.ecdc_views import app_ecdc -from covid19.blueprints.rki_vaccination.rki_vaccination_views import app_rki_vaccination -from covid19.blueprints.rki_cases.rki_views import app_rki -from covid19.blueprints.divi.divi_views import app_divi +from flask_covid19 import app_who +from flask_covid19 import app_owid +from flask_covid19 import app_ecdc +from flask_covid19 import app_rki_vaccination +from flask_covid19 import app_rki +from flask_covid19 import app_divi -from covid19.blueprints.who_test.who_test_views import app_who_test -from covid19.blueprints.owid_test.owid_test_views import app_owid_test -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.divi_test.divi_test_views import app_divi_test +from flask_covid19 import app_who_test +from flask_covid19.blueprints.owid_test import app_owid_test +from flask_covid19 import app_ecdc_test +from flask_covid19 import app_rki_test +from flask_covid19 import app_divi_test blueprint_application = Blueprint('application', __name__, template_folder='templates', url_prefix='/') diff --git a/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html b/src/flask_covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html similarity index 100% rename from src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html rename to src/flask_covid19/blueprints/app_application/templates/app_application/fragments/fragment_flashed_messages.html diff --git a/src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html b/src/flask_covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html similarity index 100% rename from src/covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html rename to src/flask_covid19/blueprints/app_application/templates/app_application/fragments/fragment_pagination.html diff --git a/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html b/src/flask_covid19/blueprints/app_application/templates/app_application/navigation/navbar.html similarity index 100% rename from src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html rename to src/flask_covid19/blueprints/app_application/templates/app_application/navigation/navbar.html diff --git a/src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html b/src/flask_covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html similarity index 100% rename from src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html rename to src/flask_covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html diff --git a/src/covid19/blueprints/app_application/templates/app_application/page_home.html b/src/flask_covid19/blueprints/app_application/templates/app_application/page_home.html similarity index 100% rename from src/covid19/blueprints/app_application/templates/app_application/page_home.html rename to src/flask_covid19/blueprints/app_application/templates/app_application/page_home.html diff --git a/src/covid19/blueprints/app_mq/__init__.py b/src/flask_covid19/blueprints/app_mq/__init__.py similarity index 100% rename from src/covid19/blueprints/app_mq/__init__.py rename to src/flask_covid19/blueprints/app_mq/__init__.py diff --git a/src/covid19/blueprints/app_mq/application_workers.py b/src/flask_covid19/blueprints/app_mq/application_workers.py similarity index 74% rename from src/covid19/blueprints/app_mq/application_workers.py rename to src/flask_covid19/blueprints/app_mq/application_workers.py index 3c0be69d..05ce1a7c 100644 --- a/src/covid19/blueprints/app_mq/application_workers.py +++ b/src/flask_covid19/blueprints/app_mq/application_workers.py @@ -1,8 +1,8 @@ import sys -from covid19 import app +from flask_covid19 import app from database import create_celery, db -from covid19.blueprints.app_all.all_services import app_user_service -from covid19.blueprints.app_application.application_service import ApplicationService +from flask_covid19 import app_user_service +from flask_covid19 import ApplicationService def start_redis(application_service): diff --git a/src/covid19/blueprints/app_user/__init__.py b/src/flask_covid19/blueprints/app_user/__init__.py similarity index 100% rename from src/covid19/blueprints/app_user/__init__.py rename to src/flask_covid19/blueprints/app_user/__init__.py diff --git a/src/covid19/blueprints/app_user/templates/__init__.py b/src/flask_covid19/blueprints/app_user/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/app_user/templates/__init__.py rename to src/flask_covid19/blueprints/app_user/templates/__init__.py diff --git a/src/covid19/blueprints/app_user/templates/usr/login.html b/src/flask_covid19/blueprints/app_user/templates/usr/login.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/login.html rename to src/flask_covid19/blueprints/app_user/templates/usr/login.html diff --git a/src/covid19/blueprints/app_user/templates/usr/navigation/usr_navbar_dropdown.html b/src/flask_covid19/blueprints/app_user/templates/usr/navigation/usr_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/navigation/usr_navbar_dropdown.html rename to src/flask_covid19/blueprints/app_user/templates/usr/navigation/usr_navbar_dropdown.html diff --git a/src/covid19/blueprints/app_user/templates/usr/navigation/usr_navtabs.html b/src/flask_covid19/blueprints/app_user/templates/usr/navigation/usr_navtabs.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/navigation/usr_navtabs.html rename to src/flask_covid19/blueprints/app_user/templates/usr/navigation/usr_navtabs.html diff --git a/src/covid19/blueprints/app_user/templates/usr/profile.html b/src/flask_covid19/blueprints/app_user/templates/usr/profile.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/profile.html rename to src/flask_covid19/blueprints/app_user/templates/usr/profile.html diff --git a/src/covid19/blueprints/app_user/templates/usr/user_info.html b/src/flask_covid19/blueprints/app_user/templates/usr/user_info.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/user_info.html rename to src/flask_covid19/blueprints/app_user/templates/usr/user_info.html diff --git a/src/covid19/blueprints/app_user/templates/usr/user_tasks.html b/src/flask_covid19/blueprints/app_user/templates/usr/user_tasks.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/user_tasks.html rename to src/flask_covid19/blueprints/app_user/templates/usr/user_tasks.html diff --git a/src/covid19/blueprints/app_user/templates/usr/usr_table.html b/src/flask_covid19/blueprints/app_user/templates/usr/usr_table.html similarity index 100% rename from src/covid19/blueprints/app_user/templates/usr/usr_table.html rename to src/flask_covid19/blueprints/app_user/templates/usr/usr_table.html diff --git a/src/covid19/blueprints/app_user/user_model.py b/src/flask_covid19/blueprints/app_user/user_model.py similarity index 100% rename from src/covid19/blueprints/app_user/user_model.py rename to src/flask_covid19/blueprints/app_user/user_model.py diff --git a/src/covid19/blueprints/app_user/user_service.py b/src/flask_covid19/blueprints/app_user/user_service.py similarity index 94% rename from src/covid19/blueprints/app_user/user_service.py rename to src/flask_covid19/blueprints/app_user/user_service.py index c4a503f2..e592ca3f 100644 --- a/src/covid19/blueprints/app_user/user_service.py +++ b/src/flask_covid19/blueprints/app_user/user_service.py @@ -1,5 +1,5 @@ from database import app -from covid19.blueprints.app_user.user_model import User, LoginForm +from flask_covid19 import User, LoginForm class UserService: diff --git a/src/covid19/blueprints/app_user/user_views.py b/src/flask_covid19/blueprints/app_user/user_views.py similarity index 95% rename from src/covid19/blueprints/app_user/user_views.py rename to src/flask_covid19/blueprints/app_user/user_views.py index 4a9a5587..242e228f 100644 --- a/src/covid19/blueprints/app_user/user_views.py +++ b/src/flask_covid19/blueprints/app_user/user_views.py @@ -8,8 +8,8 @@ import flask 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 +from flask_covid19 import ApplicationPage +from flask_covid19 import User, LoginForm blueprint_app_user = Blueprint('usr', __name__, template_folder='templates', url_prefix='/app/usr') diff --git a/src/covid19/blueprints/divi/__init__.py b/src/flask_covid19/blueprints/divi/__init__.py similarity index 100% rename from src/covid19/blueprints/divi/__init__.py rename to src/flask_covid19/blueprints/divi/__init__.py diff --git a/src/covid19/blueprints/divi/divi_model.py b/src/flask_covid19/blueprints/divi/divi_model.py similarity index 99% rename from src/covid19/blueprints/divi/divi_model.py rename to src/flask_covid19/blueprints/divi/divi_model.py index f1b6eadf..96fd0f45 100644 --- a/src/covid19/blueprints/divi/divi_model.py +++ b/src/flask_covid19/blueprints/divi/divi_model.py @@ -2,7 +2,7 @@ from sqlalchemy import and_ from datetime import date from sqlalchemy.orm import joinedload, subqueryload from database import db, ITEMS_PER_PAGE -from covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion +from flask_covid19 import ApplicationDateReported, ApplicationRegion class DiviDateReported(ApplicationDateReported): diff --git a/src/covid19/blueprints/divi/divi_model_import.py b/src/flask_covid19/blueprints/divi/divi_model_import.py similarity index 100% rename from src/covid19/blueprints/divi/divi_model_import.py rename to src/flask_covid19/blueprints/divi/divi_model_import.py diff --git a/src/covid19/blueprints/divi/divi_service.py b/src/flask_covid19/blueprints/divi/divi_service.py similarity index 84% rename from src/covid19/blueprints/divi/divi_service.py rename to src/flask_covid19/blueprints/divi/divi_service.py index bbb8a263..8d74cadd 100644 --- a/src/covid19/blueprints/divi/divi_service.py +++ b/src/flask_covid19/blueprints/divi/divi_service.py @@ -1,9 +1,9 @@ from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload -from covid19.blueprints.divi.divi_service_import import DiviServiceImport -from covid19.blueprints.divi.divi_service_update import DiviServiceUpdate, DiviServiceUpdateFull +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceDownload +from flask_covid19 import DiviServiceImport +from flask_covid19 import DiviServiceUpdate, DiviServiceUpdateFull class DiviService: diff --git a/src/covid19/blueprints/divi/divi_service_import.py b/src/flask_covid19/blueprints/divi/divi_service_import.py similarity index 95% rename from src/covid19/blueprints/divi/divi_service_import.py rename to src/flask_covid19/blueprints/divi/divi_service_import.py index af2bc434..d90dbe02 100644 --- a/src/covid19/blueprints/divi/divi_service_import.py +++ b/src/flask_covid19/blueprints/divi/divi_service_import.py @@ -3,8 +3,8 @@ import csv import psycopg2 from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.divi.divi_model_import import DiviImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import DiviImport class DiviServiceImport: diff --git a/src/covid19/blueprints/divi/divi_service_update.py b/src/flask_covid19/blueprints/divi/divi_service_update.py similarity index 98% rename from src/covid19/blueprints/divi/divi_service_update.py rename to src/flask_covid19/blueprints/divi/divi_service_update.py index 5aaabe91..b0f1ab60 100644 --- a/src/covid19/blueprints/divi/divi_service_update.py +++ b/src/flask_covid19/blueprints/divi/divi_service_update.py @@ -1,8 +1,8 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceConfig -from covid19.blueprints.divi.divi_model import DiviRegion, DiviDateReported, DiviCountry, DiviData -from covid19.blueprints.divi.divi_model_import import DiviImport +from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData +from flask_covid19 import DiviImport class DiviServiceUpdateBase: diff --git a/src/covid19/blueprints/divi/divi_views.py b/src/flask_covid19/blueprints/divi/divi_views.py similarity index 98% rename from src/covid19/blueprints/divi/divi_views.py rename to src/flask_covid19/blueprints/divi/divi_views.py index e32c895f..95779ed5 100644 --- a/src/covid19/blueprints/divi/divi_views.py +++ b/src/flask_covid19/blueprints/divi/divi_views.py @@ -6,12 +6,12 @@ from flask_admin.contrib.sqla import ModelView from flask_login import login_required from database import app, admin, db -from covid19.blueprints.app_all.all_services import divi_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import divi_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage -from covid19.blueprints.divi.divi_model import DiviRegion, DiviDateReported, DiviCountry, DiviData -from covid19.blueprints.divi.divi_model_import import DiviImport +from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData +from flask_covid19 import DiviImport app_divi = Blueprint('divi', __name__, template_folder='templates', url_prefix='/divi') diff --git a/src/covid19/blueprints/divi/templates/__init__.py b/src/flask_covid19/blueprints/divi/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/divi/templates/__init__.py rename to src/flask_covid19/blueprints/divi/templates/__init__.py diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_all.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_all.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_all.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_all.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_all_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_all_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_all_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_all_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_all_table.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_all_table.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_all_table.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_all_table.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_germany.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_germany.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_germany.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_germany.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_germany_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_germany_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_germany_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_germany_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_cumulative_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_cases_new_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_deaths_new_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/country/divi_country_one_table.html b/src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_table.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/country/divi_country_one_table.html rename to src/flask_covid19/blueprints/divi/templates/divi/country/divi_country_one_table.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_table.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_table.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_table.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_all_table.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_new.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_new.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_new.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_deaths_new.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_table.html b/src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_table.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_table.html rename to src/flask_covid19/blueprints/divi/templates/divi/date_reported/divi_date_reported_one_table.html diff --git a/src/covid19/blueprints/divi/templates/divi/divi_imported.html b/src/flask_covid19/blueprints/divi/templates/divi/divi_imported.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/divi_imported.html rename to src/flask_covid19/blueprints/divi/templates/divi/divi_imported.html diff --git a/src/covid19/blueprints/divi/templates/divi/divi_info.html b/src/flask_covid19/blueprints/divi/templates/divi/divi_info.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/divi_info.html rename to src/flask_covid19/blueprints/divi/templates/divi/divi_info.html diff --git a/src/covid19/blueprints/divi/templates/divi/divi_tasks.html b/src/flask_covid19/blueprints/divi/templates/divi/divi_tasks.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/divi_tasks.html rename to src/flask_covid19/blueprints/divi/templates/divi/divi_tasks.html diff --git a/src/covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_table.html b/src/flask_covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_table.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_table.html rename to src/flask_covid19/blueprints/divi/templates/divi/fragments/fragment_divi_imported_table.html diff --git a/src/covid19/blueprints/divi/templates/divi/fragments/fragment_divi_table_global_data.html b/src/flask_covid19/blueprints/divi/templates/divi/fragments/fragment_divi_table_global_data.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/fragments/fragment_divi_table_global_data.html rename to src/flask_covid19/blueprints/divi/templates/divi/fragments/fragment_divi_table_global_data.html diff --git a/src/covid19/blueprints/divi/templates/divi/navigation/divi_navbar_dropdown.html b/src/flask_covid19/blueprints/divi/templates/divi/navigation/divi_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/navigation/divi_navbar_dropdown.html rename to src/flask_covid19/blueprints/divi/templates/divi/navigation/divi_navbar_dropdown.html diff --git a/src/covid19/blueprints/divi/templates/divi/navigation/divi_navtabs.html b/src/flask_covid19/blueprints/divi/templates/divi/navigation/divi_navtabs.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/navigation/divi_navtabs.html rename to src/flask_covid19/blueprints/divi/templates/divi/navigation/divi_navtabs.html diff --git a/src/covid19/blueprints/divi/templates/divi/region/divi_region_all.html b/src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_all.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/region/divi_region_all.html rename to src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_all.html diff --git a/src/covid19/blueprints/divi/templates/divi/region/divi_region_all_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_all_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/region/divi_region_all_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_all_pagination.html diff --git a/src/covid19/blueprints/divi/templates/divi/region/divi_region_all_table.html b/src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_all_table.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/region/divi_region_all_table.html rename to src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_all_table.html diff --git a/src/covid19/blueprints/divi/templates/divi/region/divi_region_one.html b/src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_one.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/region/divi_region_one.html rename to src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_one.html diff --git a/src/covid19/blueprints/divi/templates/divi/region/divi_region_one_pagination.html b/src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_one_pagination.html similarity index 100% rename from src/covid19/blueprints/divi/templates/divi/region/divi_region_one_pagination.html rename to src/flask_covid19/blueprints/divi/templates/divi/region/divi_region_one_pagination.html diff --git a/src/covid19/blueprints/divi_test/__init__.py b/src/flask_covid19/blueprints/divi_test/__init__.py similarity index 100% rename from src/covid19/blueprints/divi_test/__init__.py rename to src/flask_covid19/blueprints/divi_test/__init__.py diff --git a/src/covid19/blueprints/divi_test/divi_test_service.py b/src/flask_covid19/blueprints/divi_test/divi_test_service.py similarity index 94% rename from src/covid19/blueprints/divi_test/divi_test_service.py rename to src/flask_covid19/blueprints/divi_test/divi_test_service.py index 2021dc8b..06a61752 100644 --- a/src/covid19/blueprints/divi_test/divi_test_service.py +++ b/src/flask_covid19/blueprints/divi_test/divi_test_service.py @@ -1,6 +1,6 @@ from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.divi.divi_model import DiviDateReported, DiviData +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import DiviDateReported, DiviData class DiviTestService: diff --git a/src/covid19/blueprints/divi_test/divi_test_views.py b/src/flask_covid19/blueprints/divi_test/divi_test_views.py similarity index 94% rename from src/covid19/blueprints/divi_test/divi_test_views.py rename to src/flask_covid19/blueprints/divi_test/divi_test_views.py index 37e4dfe6..5bc85130 100644 --- a/src/covid19/blueprints/divi_test/divi_test_views.py +++ b/src/flask_covid19/blueprints/divi_test/divi_test_views.py @@ -4,14 +4,14 @@ from celery.utils.log import get_task_logger from flask_login import login_required from database import app, db -from covid19.blueprints.app_all.all_services import divi_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import divi_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage -from covid19.blueprints.divi.divi_model_import import DiviImport -from covid19.blueprints.divi.divi_model import DiviData +from flask_covid19 import DiviImport +from flask_covid19 import DiviData -from covid19.blueprints.divi_test.divi_test_service import DiviTestService +from flask_covid19 import DiviTestService divi_test_service = DiviTestService(db, divi_service) diff --git a/src/covid19/blueprints/divi_test/templates/__init__.py b/src/flask_covid19/blueprints/divi_test/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/divi_test/templates/__init__.py rename to src/flask_covid19/blueprints/divi_test/templates/__init__.py diff --git a/src/covid19/blueprints/divi_test/templates/divi_test/divi_tests.html b/src/flask_covid19/blueprints/divi_test/templates/divi_test/divi_tests.html similarity index 100% rename from src/covid19/blueprints/divi_test/templates/divi_test/divi_tests.html rename to src/flask_covid19/blueprints/divi_test/templates/divi_test/divi_tests.html diff --git a/src/covid19/blueprints/ecdc/__init__.py b/src/flask_covid19/blueprints/ecdc/__init__.py similarity index 100% rename from src/covid19/blueprints/ecdc/__init__.py rename to src/flask_covid19/blueprints/ecdc/__init__.py diff --git a/src/covid19/blueprints/ecdc/ecdc_model.py b/src/flask_covid19/blueprints/ecdc/ecdc_model.py similarity index 99% rename from src/covid19/blueprints/ecdc/ecdc_model.py rename to src/flask_covid19/blueprints/ecdc/ecdc_model.py index d7127da3..adca19a5 100644 --- a/src/covid19/blueprints/ecdc/ecdc_model.py +++ b/src/flask_covid19/blueprints/ecdc/ecdc_model.py @@ -1,6 +1,6 @@ from sqlalchemy import and_ from database import db, ITEMS_PER_PAGE -from covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion +from flask_covid19 import ApplicationDateReported, ApplicationRegion class EcdcDateReported(ApplicationDateReported): diff --git a/src/covid19/blueprints/ecdc/ecdc_model_import.py b/src/flask_covid19/blueprints/ecdc/ecdc_model_import.py similarity index 100% rename from src/covid19/blueprints/ecdc/ecdc_model_import.py rename to src/flask_covid19/blueprints/ecdc/ecdc_model_import.py diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/flask_covid19/blueprints/ecdc/ecdc_service.py similarity index 84% rename from src/covid19/blueprints/ecdc/ecdc_service.py rename to src/flask_covid19/blueprints/ecdc/ecdc_service.py index 2b8a836a..bcedfa24 100644 --- a/src/covid19/blueprints/ecdc/ecdc_service.py +++ b/src/flask_covid19/blueprints/ecdc/ecdc_service.py @@ -1,8 +1,8 @@ from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload -from covid19.blueprints.ecdc.ecdc_service_import import EcdcServiceImport -from covid19.blueprints.ecdc.ecdc_service_update import EcdcServiceUpdate, EcdcServiceUpdateFull +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceDownload +from flask_covid19 import EcdcServiceImport +from flask_covid19 import EcdcServiceUpdate, EcdcServiceUpdateFull class EcdcService: diff --git a/src/covid19/blueprints/ecdc/ecdc_service_import.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py similarity index 94% rename from src/covid19/blueprints/ecdc/ecdc_service_import.py rename to src/flask_covid19/blueprints/ecdc/ecdc_service_import.py index 7e3928e9..734674ef 100644 --- a/src/covid19/blueprints/ecdc/ecdc_service_import.py +++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py @@ -2,9 +2,9 @@ import csv import psycopg2 from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported -from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import EcdcDateReported +from flask_covid19 import EcdcImport class EcdcServiceImport: diff --git a/src/covid19/blueprints/ecdc/ecdc_service_update.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py similarity index 98% rename from src/covid19/blueprints/ecdc/ecdc_service_update.py rename to src/flask_covid19/blueprints/ecdc/ecdc_service_update.py index 102bba87..aa040927 100644 --- a/src/covid19/blueprints/ecdc/ecdc_service_update.py +++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py @@ -1,7 +1,7 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport -from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import EcdcImport +from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData class EcdcServiceUpdateBase: diff --git a/src/covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py similarity index 95% rename from src/covid19/blueprints/ecdc/ecdc_views.py rename to src/flask_covid19/blueprints/ecdc/ecdc_views.py index 9c90dc76..5d737100 100644 --- a/src/covid19/blueprints/ecdc/ecdc_views.py +++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py @@ -4,15 +4,13 @@ from celery.utils.log import get_task_logger from flask_admin.contrib.sqla import ModelView from database import admin, db -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery - -from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport -from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import who_service, owid_service +from flask_covid19 import ecdc_service +from flask_covid19 import celery + +from flask_covid19 import EcdcImport +from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData +from flask_covid19 import ApplicationPage app_ecdc = Blueprint('ecdc', __name__, template_folder='templates', url_prefix='/ecdc') diff --git a/src/covid19/blueprints/ecdc/templates/__init__.py b/src/flask_covid19/blueprints/ecdc/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/ecdc/templates/__init__.py rename to src/flask_covid19/blueprints/ecdc/templates/__init__.py diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all_table.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all_table.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_table.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_table.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_table.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data_table.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_pagination.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported_table.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html b/src/flask_covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html similarity index 100% rename from src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html rename to src/flask_covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html diff --git a/src/covid19/blueprints/ecdc_test/__init__.py b/src/flask_covid19/blueprints/ecdc_test/__init__.py similarity index 100% rename from src/covid19/blueprints/ecdc_test/__init__.py rename to src/flask_covid19/blueprints/ecdc_test/__init__.py diff --git a/src/covid19/blueprints/ecdc_test/ecdc_test_service.py b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py similarity index 94% rename from src/covid19/blueprints/ecdc_test/ecdc_test_service.py rename to src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py index 3fb08270..a3522388 100644 --- a/src/covid19/blueprints/ecdc_test/ecdc_test_service.py +++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py @@ -1,6 +1,6 @@ from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcData +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import EcdcDateReported, EcdcData class EcdcTestService: diff --git a/src/covid19/blueprints/ecdc_test/ecdc_test_views.py b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py similarity index 92% rename from src/covid19/blueprints/ecdc_test/ecdc_test_views.py rename to src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py index dd6bac1c..93a74f17 100644 --- a/src/covid19/blueprints/ecdc_test/ecdc_test_views.py +++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py @@ -4,15 +4,15 @@ from celery.utils.log import get_task_logger from flask_login import login_required from database import app, db -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage - -from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport -from covid19.blueprints.ecdc_test.ecdc_test_service import EcdcTestService +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage + +from flask_covid19 import EcdcImport +from flask_covid19 import EcdcTestService ecdc_test_service = EcdcTestService(db, ecdc_service) diff --git a/src/covid19/blueprints/ecdc_test/templates/__init__.py b/src/flask_covid19/blueprints/ecdc_test/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/ecdc_test/templates/__init__.py rename to src/flask_covid19/blueprints/ecdc_test/templates/__init__.py diff --git a/src/covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html b/src/flask_covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html similarity index 100% rename from src/covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html rename to src/flask_covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html diff --git a/src/covid19/blueprints/intensivregister/__init__.py b/src/flask_covid19/blueprints/intensivregister/__init__.py similarity index 100% rename from src/covid19/blueprints/intensivregister/__init__.py rename to src/flask_covid19/blueprints/intensivregister/__init__.py diff --git a/src/covid19/blueprints/intensivregister_test/__init__.py b/src/flask_covid19/blueprints/intensivregister_test/__init__.py similarity index 100% rename from src/covid19/blueprints/intensivregister_test/__init__.py rename to src/flask_covid19/blueprints/intensivregister_test/__init__.py diff --git a/src/covid19/blueprints/owid/__init__.py b/src/flask_covid19/blueprints/owid/__init__.py similarity index 100% rename from src/covid19/blueprints/owid/__init__.py rename to src/flask_covid19/blueprints/owid/__init__.py diff --git a/src/covid19/blueprints/owid/owid_model.py b/src/flask_covid19/blueprints/owid/owid_model.py similarity index 99% rename from src/covid19/blueprints/owid/owid_model.py rename to src/flask_covid19/blueprints/owid/owid_model.py index 591028bc..13200b2b 100644 --- a/src/covid19/blueprints/owid/owid_model.py +++ b/src/flask_covid19/blueprints/owid/owid_model.py @@ -3,7 +3,7 @@ from datetime import date from sqlalchemy.orm import joinedload, subqueryload from database import db, ITEMS_PER_PAGE -from covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion +from flask_covid19 import ApplicationDateReported, ApplicationRegion class OwidDateReported(ApplicationDateReported): diff --git a/src/covid19/blueprints/owid/owid_model_import.py b/src/flask_covid19/blueprints/owid/owid_model_import.py similarity index 100% rename from src/covid19/blueprints/owid/owid_model_import.py rename to src/flask_covid19/blueprints/owid/owid_model_import.py diff --git a/src/covid19/blueprints/owid/owid_service.py b/src/flask_covid19/blueprints/owid/owid_service.py similarity index 84% rename from src/covid19/blueprints/owid/owid_service.py rename to src/flask_covid19/blueprints/owid/owid_service.py index ffc4b5b7..3e3026fe 100644 --- a/src/covid19/blueprints/owid/owid_service.py +++ b/src/flask_covid19/blueprints/owid/owid_service.py @@ -2,10 +2,10 @@ from flask import flash from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload -from covid19.blueprints.owid.owid_service_import import OwidServiceImport -from covid19.blueprints.owid.owid_service_update import OwidServiceUpdate, OwidServiceUpdateFull +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceDownload +from flask_covid19 import OwidServiceImport +from flask_covid19 import OwidServiceUpdate, OwidServiceUpdateFull class OwidService: diff --git a/src/covid19/blueprints/owid/owid_service_import.py b/src/flask_covid19/blueprints/owid/owid_service_import.py similarity index 97% rename from src/covid19/blueprints/owid/owid_service_import.py rename to src/flask_covid19/blueprints/owid/owid_service_import.py index 1a44ef38..29020bc3 100644 --- a/src/covid19/blueprints/owid/owid_service_import.py +++ b/src/flask_covid19/blueprints/owid/owid_service_import.py @@ -1,9 +1,9 @@ import csv import psycopg2 from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.owid.owid_model import OwidDateReported -from covid19.blueprints.owid.owid_model_import import OwidImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import OwidDateReported +from flask_covid19 import OwidImport class OwidServiceImport: diff --git a/src/covid19/blueprints/owid/owid_service_update.py b/src/flask_covid19/blueprints/owid/owid_service_update.py similarity index 98% rename from src/covid19/blueprints/owid/owid_service_update.py rename to src/flask_covid19/blueprints/owid/owid_service_update.py index 02b4c44d..1d1c4980 100644 --- a/src/covid19/blueprints/owid/owid_service_update.py +++ b/src/flask_covid19/blueprints/owid/owid_service_update.py @@ -1,7 +1,7 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry -from covid19.blueprints.owid.owid_model_import import OwidImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry +from flask_covid19 import OwidImport class OwidServiceUpdateBase: diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py similarity index 97% rename from src/covid19/blueprints/owid/owid_views.py rename to src/flask_covid19/blueprints/owid/owid_views.py index fcd5b554..d1bd6c34 100644 --- a/src/covid19/blueprints/owid/owid_views.py +++ b/src/flask_covid19/blueprints/owid/owid_views.py @@ -5,14 +5,14 @@ from celery.utils.log import get_task_logger from flask_admin.contrib.sqla import ModelView from database import app, admin, db -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage -from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry -from covid19.blueprints.owid.owid_model_import import OwidImport +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage +from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry +from flask_covid19 import OwidImport app_owid = Blueprint('owid', __name__, template_folder='templates', url_prefix='/owid ') diff --git a/src/covid19/blueprints/owid/templates/__init__.py b/src/flask_covid19/blueprints/owid/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/owid/templates/__init__.py rename to src/flask_covid19/blueprints/owid/templates/__init__.py diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html b/src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html rename to src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_all_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_all_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all_table.html b/src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_all_table.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all_table.html rename to src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_all_table.html diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html b/src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html rename to src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_one_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/continent/owid_continent_one_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_all.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_all.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_all_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_table.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_table.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_table.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all_table.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html b/src/flask_covid19/blueprints/owid/templates/owid/imported/owid_imported.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html rename to src/flask_covid19/blueprints/owid/templates/owid/imported/owid_imported.html diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported_pagination.html b/src/flask_covid19/blueprints/owid/templates/owid/imported/owid_imported_pagination.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/imported/owid_imported_pagination.html rename to src/flask_covid19/blueprints/owid/templates/owid/imported/owid_imported_pagination.html diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported_table.html b/src/flask_covid19/blueprints/owid/templates/owid/imported/owid_imported_table.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/imported/owid_imported_table.html rename to src/flask_covid19/blueprints/owid/templates/owid/imported/owid_imported_table.html diff --git a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html b/src/flask_covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html rename to src/flask_covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html diff --git a/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html b/src/flask_covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html rename to src/flask_covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html diff --git a/src/covid19/blueprints/owid/templates/owid/owid_data/owid_data_table.html b/src/flask_covid19/blueprints/owid/templates/owid/owid_data/owid_data_table.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/owid_data/owid_data_table.html rename to src/flask_covid19/blueprints/owid/templates/owid/owid_data/owid_data_table.html diff --git a/src/covid19/blueprints/owid/templates/owid/owid_info.html b/src/flask_covid19/blueprints/owid/templates/owid/owid_info.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/owid_info.html rename to src/flask_covid19/blueprints/owid/templates/owid/owid_info.html diff --git a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html b/src/flask_covid19/blueprints/owid/templates/owid/owid_tasks.html similarity index 100% rename from src/covid19/blueprints/owid/templates/owid/owid_tasks.html rename to src/flask_covid19/blueprints/owid/templates/owid/owid_tasks.html diff --git a/src/covid19/blueprints/owid_test/__init__.py b/src/flask_covid19/blueprints/owid_test/__init__.py similarity index 100% rename from src/covid19/blueprints/owid_test/__init__.py rename to src/flask_covid19/blueprints/owid_test/__init__.py diff --git a/src/covid19/blueprints/owid_test/owid_test_service.py b/src/flask_covid19/blueprints/owid_test/owid_test_service.py similarity index 96% rename from src/covid19/blueprints/owid_test/owid_test_service.py rename to src/flask_covid19/blueprints/owid_test/owid_test_service.py index 7b24b3e8..8cbddfa1 100644 --- a/src/covid19/blueprints/owid_test/owid_test_service.py +++ b/src/flask_covid19/blueprints/owid_test/owid_test_service.py @@ -1,7 +1,7 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry -from covid19.blueprints.owid.owid_model_import import OwidImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry +from flask_covid19 import OwidImport class OwidTestService: diff --git a/src/covid19/blueprints/owid_test/owid_test_views.py b/src/flask_covid19/blueprints/owid_test/owid_test_views.py similarity index 93% rename from src/covid19/blueprints/owid_test/owid_test_views.py rename to src/flask_covid19/blueprints/owid_test/owid_test_views.py index c6cc073a..eb7e44f9 100644 --- a/src/covid19/blueprints/owid_test/owid_test_views.py +++ b/src/flask_covid19/blueprints/owid_test/owid_test_views.py @@ -4,16 +4,16 @@ from celery.utils.log import get_task_logger from flask_login import login_required from database import app, db -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.owid.owid_model import OwidData -from covid19.blueprints.owid.owid_model_import import OwidImport -from covid19.blueprints.app_application.application_model_transient import ApplicationPage - -from covid19.blueprints.owid_test.owid_test_service import OwidTestService +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service +from flask_covid19 import celery +from flask_covid19 import OwidData +from flask_covid19 import OwidImport +from flask_covid19 import ApplicationPage + +from flask_covid19.blueprints.owid_test import OwidTestService owid_test_service = OwidTestService(db, owid_service) diff --git a/src/covid19/blueprints/owid_test/templates/__init__.py b/src/flask_covid19/blueprints/owid_test/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/owid_test/templates/__init__.py rename to src/flask_covid19/blueprints/owid_test/templates/__init__.py diff --git a/src/covid19/blueprints/owid_test/templates/owid_test/owid_tests.html b/src/flask_covid19/blueprints/owid_test/templates/owid_test/owid_tests.html similarity index 100% rename from src/covid19/blueprints/owid_test/templates/owid_test/owid_tests.html rename to src/flask_covid19/blueprints/owid_test/templates/owid_test/owid_tests.html diff --git a/src/covid19/blueprints/rki_cases/__init__.py b/src/flask_covid19/blueprints/rki_cases/__init__.py similarity index 100% rename from src/covid19/blueprints/rki_cases/__init__.py rename to src/flask_covid19/blueprints/rki_cases/__init__.py diff --git a/src/covid19/blueprints/rki_cases/a.py b/src/flask_covid19/blueprints/rki_cases/a.py similarity index 100% rename from src/covid19/blueprints/rki_cases/a.py rename to src/flask_covid19/blueprints/rki_cases/a.py diff --git a/src/covid19/blueprints/rki_cases/rki_model.py b/src/flask_covid19/blueprints/rki_cases/rki_model.py similarity index 98% rename from src/covid19/blueprints/rki_cases/rki_model.py rename to src/flask_covid19/blueprints/rki_cases/rki_model.py index c3923ad3..28de848b 100644 --- a/src/covid19/blueprints/rki_cases/rki_model.py +++ b/src/flask_covid19/blueprints/rki_cases/rki_model.py @@ -3,7 +3,7 @@ from datetime import date from sqlalchemy.orm import joinedload, subqueryload from database import db, ITEMS_PER_PAGE -from covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion +from flask_covid19 import ApplicationDateReported, ApplicationRegion class RkiMeldedatum(ApplicationDateReported): diff --git a/src/covid19/blueprints/rki_cases/rki_model_import.py b/src/flask_covid19/blueprints/rki_cases/rki_model_import.py similarity index 100% rename from src/covid19/blueprints/rki_cases/rki_model_import.py rename to src/flask_covid19/blueprints/rki_cases/rki_model_import.py diff --git a/src/covid19/blueprints/rki_cases/rki_service.py b/src/flask_covid19/blueprints/rki_cases/rki_service.py similarity index 84% rename from src/covid19/blueprints/rki_cases/rki_service.py rename to src/flask_covid19/blueprints/rki_cases/rki_service.py index d019e63e..16a767ce 100644 --- a/src/covid19/blueprints/rki_cases/rki_service.py +++ b/src/flask_covid19/blueprints/rki_cases/rki_service.py @@ -1,10 +1,10 @@ from flask import flash from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload -from covid19.blueprints.rki_cases.rki_service_import import RkiServiceImport -from covid19.blueprints.rki_cases.rki_service_update import RkiServiceUpdate, RkiServiceUpdateFull +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceDownload +from flask_covid19 import RkiServiceImport +from flask_covid19 import RkiServiceUpdate, RkiServiceUpdateFull class RkiService: diff --git a/src/covid19/blueprints/rki_cases/rki_service_import.py b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py similarity index 96% rename from src/covid19/blueprints/rki_cases/rki_service_import.py rename to src/flask_covid19/blueprints/rki_cases/rki_service_import.py index 71702ab9..e40e9461 100644 --- a/src/covid19/blueprints/rki_cases/rki_service_import.py +++ b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py @@ -2,8 +2,8 @@ import csv import psycopg2 from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.rki_cases.rki_model_import import RkiImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import RkiImport class RkiServiceImport: diff --git a/src/covid19/blueprints/rki_cases/rki_service_update.py b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py similarity index 97% rename from src/covid19/blueprints/rki_cases/rki_service_update.py rename to src/flask_covid19/blueprints/rki_cases/rki_service_update.py index 6df9ad9b..8f72ccf5 100644 --- a/src/covid19/blueprints/rki_cases/rki_service_update.py +++ b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py @@ -1,8 +1,8 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum -from covid19.blueprints.rki_cases.rki_model_import import RkiImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import RkiData, RkiMeldedatum +from flask_covid19 import RkiImport class RkiServiceUpdateBase: diff --git a/src/covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py similarity index 92% rename from src/covid19/blueprints/rki_cases/rki_views.py rename to src/flask_covid19/blueprints/rki_cases/rki_views.py index 0d6b112c..50b092d1 100644 --- a/src/covid19/blueprints/rki_cases/rki_views.py +++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py @@ -4,14 +4,14 @@ from flask_admin.contrib.sqla import ModelView from celery import states from database import app, admin, db -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum -from covid19.blueprints.rki_cases.rki_model_import import RkiImport -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import celery +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service +from flask_covid19 import RkiData, RkiMeldedatum +from flask_covid19 import RkiImport +from flask_covid19 import ApplicationPage drop_and_create_data_again = True diff --git a/src/covid19/blueprints/rki_cases/templates/__init__.py b/src/flask_covid19/blueprints/rki_cases/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/__init__.py rename to src/flask_covid19/blueprints/rki_cases/templates/__init__.py diff --git a/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_pagination.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_pagination.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_pagination.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_pagination.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_table.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_table.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_table.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all_table.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/navigation/rki_navbar_dropdown.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/navigation/rki_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/navigation/rki_navbar_dropdown.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/navigation/rki_navbar_dropdown.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/navigation/rki_navtabs.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/navigation/rki_navtabs.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/navigation/rki_navtabs.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/navigation/rki_navtabs.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_imported.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/rki_imported.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/rki_imported.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/rki_imported.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_info.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/rki_info.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/rki_info.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/rki_info.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_tasks.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/rki_tasks.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/rki_tasks.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/rki_tasks.html diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_test.html b/src/flask_covid19/blueprints/rki_cases/templates/rki/rki_test.html similarity index 100% rename from src/covid19/blueprints/rki_cases/templates/rki/rki_test.html rename to src/flask_covid19/blueprints/rki_cases/templates/rki/rki_test.html diff --git a/src/covid19/blueprints/rki_cases_test/__init__.py b/src/flask_covid19/blueprints/rki_cases_test/__init__.py similarity index 100% rename from src/covid19/blueprints/rki_cases_test/__init__.py rename to src/flask_covid19/blueprints/rki_cases_test/__init__.py diff --git a/src/covid19/blueprints/rki_cases_test/rki_test_service.py b/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py similarity index 96% rename from src/covid19/blueprints/rki_cases_test/rki_test_service.py rename to src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py index 8bc2880d..f6084f34 100644 --- a/src/covid19/blueprints/rki_cases_test/rki_test_service.py +++ b/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py @@ -1,7 +1,7 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.rki.rki_model import RkiData, RkiDateReported, RkiCountryRegion, RkiCountry -from covid19.blueprints.rki.rki_model_import import RkiImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import RkiData, RkiDateReported, RkiCountryRegion, RkiCountry +from flask_covid19 import RkiImport class RkiTestService: diff --git a/src/covid19/blueprints/rki_cases_test/rki_test_views.py b/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py similarity index 93% rename from src/covid19/blueprints/rki_cases_test/rki_test_views.py rename to src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py index 5ce409c5..28b780aa 100644 --- a/src/covid19/blueprints/rki_cases_test/rki_test_views.py +++ b/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py @@ -5,16 +5,13 @@ from flask_login import login_required from database import app, db -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.rki_cases.rki_model import RkiData -from covid19.blueprints.rki_cases.rki_model_import import RkiImport -from covid19.blueprints.app_application.application_model_transient import ApplicationPage - -from covid19.blueprints.owid_test.owid_test_service import OwidTestService +from flask_covid19 import rki_service +from flask_covid19 import celery +from flask_covid19 import RkiData +from flask_covid19 import RkiImport +from flask_covid19 import ApplicationPage + +from flask_covid19.blueprints.owid_test import OwidTestService rki_test_service = OwidTestService(db, rki_service) diff --git a/src/covid19/blueprints/rki_cases_test/templates/__init__.py b/src/flask_covid19/blueprints/rki_cases_test/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/rki_cases_test/templates/__init__.py rename to src/flask_covid19/blueprints/rki_cases_test/templates/__init__.py diff --git a/src/covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html b/src/flask_covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html similarity index 100% rename from src/covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html rename to src/flask_covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html diff --git a/src/covid19/blueprints/rki_vaccination/__init__.py b/src/flask_covid19/blueprints/rki_vaccination/__init__.py similarity index 100% rename from src/covid19/blueprints/rki_vaccination/__init__.py rename to src/flask_covid19/blueprints/rki_vaccination/__init__.py diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_model.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py similarity index 97% rename from src/covid19/blueprints/rki_vaccination/rki_vaccination_model.py rename to src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py index 873bd31e..92648afd 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_model.py +++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py @@ -1,7 +1,7 @@ from datetime import date from database import db, ITEMS_PER_PAGE -from covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion +from flask_covid19 import ApplicationDateReported, ApplicationRegion class RkiVaccinationDateReported(ApplicationDateReported): diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py similarity index 100% rename from src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py rename to src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py similarity index 81% rename from src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py rename to src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py index 1b8a383a..8a778a20 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py +++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py @@ -1,10 +1,10 @@ from flask import flash from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload -from covid19.blueprints.rki_vaccination.rki_vaccination_service_import import RkiVaccinationServiceImport -from covid19.blueprints.rki_vaccination.rki_vaccination_service_update import RkiVaccinationServiceUpdate, RkiVaccinationServiceUpdateFull +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceDownload +from flask_covid19 import RkiVaccinationServiceImport +from flask_covid19 import RkiVaccinationServiceUpdate, RkiVaccinationServiceUpdateFull class RkiVaccinationService: diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py similarity index 94% rename from src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py rename to src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py index 398fce90..bdb5cdea 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py +++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py @@ -3,9 +3,9 @@ import psycopg2 from database import db, app -from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported -from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig +from flask_covid19 import RkiVaccinationDateReported +from flask_covid19 import RkiVaccinationImport +from flask_covid19 import ApplicationServiceConfig class RkiVaccinationServiceImport: diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py similarity index 98% rename from src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py rename to src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py index 407c81bb..378595bc 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py +++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py @@ -1,8 +1,8 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport -from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported, RkiVaccinationData +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import RkiVaccinationImport +from flask_covid19 import RkiVaccinationDateReported, RkiVaccinationData class RkiVaccinationServiceUpdateBase: def __init__(self, database, config: ApplicationServiceConfig): diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py similarity index 92% rename from src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py rename to src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py index b3938265..8ad8ba63 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py +++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py @@ -4,15 +4,15 @@ from celery.utils.log import get_task_logger from flask_admin.contrib.sqla import ModelView from database import admin, db -from covid19.blueprints.app_all.all_services import who_service, owid_service -from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service -from covid19.blueprints.app_all.all_services import ecdc_service, divi_service -from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from covid19.blueprints.app_mq.application_workers import celery - -from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationData, RkiVaccinationDateReported -from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import who_service, owid_service +from flask_covid19 import rki_service, rki_vaccination_service +from flask_covid19 import ecdc_service, divi_service +from flask_covid19 import app_admin_service, app_user_service +from flask_covid19 import celery + +from flask_covid19 import RkiVaccinationData, RkiVaccinationDateReported +from flask_covid19 import RkiVaccinationImport +from flask_covid19 import ApplicationPage app_rki_vaccination = Blueprint('rki_vaccination', __name__, template_folder='templates', url_prefix='/rki/vaccination') diff --git a/src/covid19/blueprints/rki_vaccination/templates/__init__.py b/src/flask_covid19/blueprints/rki_vaccination/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/__init__.py rename to src/flask_covid19/blueprints/rki_vaccination/templates/__init__.py diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_pagination.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_pagination.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_pagination.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_pagination.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_table.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_table.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_table.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported_table.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html b/src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html similarity index 100% rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html rename to src/flask_covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html diff --git a/src/covid19/blueprints/who/__init__.py b/src/flask_covid19/blueprints/who/__init__.py similarity index 100% rename from src/covid19/blueprints/who/__init__.py rename to src/flask_covid19/blueprints/who/__init__.py diff --git a/src/covid19/blueprints/who/templates/__init__.py b/src/flask_covid19/blueprints/who/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/who/templates/__init__.py rename to src/flask_covid19/blueprints/who/templates/__init__.py diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_all.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_all.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_all.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_all_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_all_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_all_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all_table.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_all_table.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_all_table.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_all_table.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_germany.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_germany.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_germany.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_germany_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_germany_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_germany_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_germany_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_new_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_cases_new_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_new_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_deaths_new_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_pagination.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_table.html b/src/flask_covid19/blueprints/who/templates/who/country/who_country_one_table.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/country/who_country_one_table.html rename to src/flask_covid19/blueprints/who/templates/who/country/who_country_one_table.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html b/src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html rename to src/flask_covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_imported_pagination.html b/src/flask_covid19/blueprints/who/templates/who/fragments/fragment_who_imported_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/fragments/fragment_who_imported_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/fragments/fragment_who_imported_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_imported_table.html b/src/flask_covid19/blueprints/who/templates/who/fragments/fragment_who_imported_table.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/fragments/fragment_who_imported_table.html rename to src/flask_covid19/blueprints/who/templates/who/fragments/fragment_who_imported_table.html diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html b/src/flask_covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html rename to src/flask_covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html diff --git a/src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html b/src/flask_covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html rename to src/flask_covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html diff --git a/src/covid19/blueprints/who/templates/who/navigation/who_navtabs.html b/src/flask_covid19/blueprints/who/templates/who/navigation/who_navtabs.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/navigation/who_navtabs.html rename to src/flask_covid19/blueprints/who/templates/who/navigation/who_navtabs.html diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all.html b/src/flask_covid19/blueprints/who/templates/who/region/who_region_all.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/region/who_region_all.html rename to src/flask_covid19/blueprints/who/templates/who/region/who_region_all.html diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all_pagination.html b/src/flask_covid19/blueprints/who/templates/who/region/who_region_all_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/region/who_region_all_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/region/who_region_all_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all_table.html b/src/flask_covid19/blueprints/who/templates/who/region/who_region_all_table.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/region/who_region_all_table.html rename to src/flask_covid19/blueprints/who/templates/who/region/who_region_all_table.html diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_one.html b/src/flask_covid19/blueprints/who/templates/who/region/who_region_one.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/region/who_region_one.html rename to src/flask_covid19/blueprints/who/templates/who/region/who_region_one.html diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_one_pagination.html b/src/flask_covid19/blueprints/who/templates/who/region/who_region_one_pagination.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/region/who_region_one_pagination.html rename to src/flask_covid19/blueprints/who/templates/who/region/who_region_one_pagination.html diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/flask_covid19/blueprints/who/templates/who/who_imported.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/who_imported.html rename to src/flask_covid19/blueprints/who/templates/who/who_imported.html diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/flask_covid19/blueprints/who/templates/who/who_info.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/who_info.html rename to src/flask_covid19/blueprints/who/templates/who/who_info.html diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/flask_covid19/blueprints/who/templates/who/who_tasks.html similarity index 100% rename from src/covid19/blueprints/who/templates/who/who_tasks.html rename to src/flask_covid19/blueprints/who/templates/who/who_tasks.html diff --git a/src/covid19/blueprints/who/who_model.py b/src/flask_covid19/blueprints/who/who_model.py similarity index 99% rename from src/covid19/blueprints/who/who_model.py rename to src/flask_covid19/blueprints/who/who_model.py index cbd0230e..6b016cb7 100644 --- a/src/covid19/blueprints/who/who_model.py +++ b/src/flask_covid19/blueprints/who/who_model.py @@ -2,7 +2,7 @@ from sqlalchemy import and_ from datetime import date from sqlalchemy.orm import joinedload, subqueryload from database import db, cache, ITEMS_PER_PAGE -from covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion +from flask_covid19 import ApplicationDateReported, ApplicationRegion class WhoDateReported(ApplicationDateReported): diff --git a/src/covid19/blueprints/who/who_model_import.py b/src/flask_covid19/blueprints/who/who_model_import.py similarity index 100% rename from src/covid19/blueprints/who/who_model_import.py rename to src/flask_covid19/blueprints/who/who_model_import.py diff --git a/src/covid19/blueprints/who/who_service.py b/src/flask_covid19/blueprints/who/who_service.py similarity index 88% rename from src/covid19/blueprints/who/who_service.py rename to src/flask_covid19/blueprints/who/who_service.py index 6cfa5d0f..d9c63fca 100644 --- a/src/covid19/blueprints/who/who_service.py +++ b/src/flask_covid19/blueprints/who/who_service.py @@ -1,10 +1,10 @@ from flask import flash from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload -from covid19.blueprints.who.who_service_import import WhoServiceImport -from covid19.blueprints.who.who_service_update import WhoServiceUpdate, WhoServiceUpdateFull +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import ApplicationServiceDownload +from flask_covid19 import WhoServiceImport +from flask_covid19 import WhoServiceUpdate, WhoServiceUpdateFull class WhoService: diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/flask_covid19/blueprints/who/who_service_import.py similarity index 94% rename from src/covid19/blueprints/who/who_service_import.py rename to src/flask_covid19/blueprints/who/who_service_import.py index 2e30a877..6e30124c 100644 --- a/src/covid19/blueprints/who/who_service_import.py +++ b/src/flask_covid19/blueprints/who/who_service_import.py @@ -2,9 +2,9 @@ import sys import csv import psycopg2 from database import db, app -from covid19.blueprints.who.who_model import WhoDateReported -from covid19.blueprints.who.who_model_import import WhoImport -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig +from flask_covid19 import WhoDateReported +from flask_covid19 import WhoImport +from flask_covid19 import ApplicationServiceConfig class WhoServiceImport: diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/flask_covid19/blueprints/who/who_service_update.py similarity index 99% rename from src/covid19/blueprints/who/who_service_update.py rename to src/flask_covid19/blueprints/who/who_service_update.py index 0712d6a7..26de9ba0 100644 --- a/src/covid19/blueprints/who/who_service_update.py +++ b/src/flask_covid19/blueprints/who/who_service_update.py @@ -1,7 +1,7 @@ from database import db, app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.who.who_model import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData -from covid19.blueprints.who.who_model_import import WhoImport +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData +from flask_covid19 import WhoImport class WhoServiceUpdateBase: diff --git a/src/covid19/blueprints/who/who_views.py b/src/flask_covid19/blueprints/who/who_views.py similarity index 98% rename from src/covid19/blueprints/who/who_views.py rename to src/flask_covid19/blueprints/who/who_views.py index 241eb798..ebda6358 100644 --- a/src/covid19/blueprints/who/who_views.py +++ b/src/flask_covid19/blueprints/who/who_views.py @@ -6,12 +6,12 @@ from flask_admin.contrib.sqla import ModelView from flask_login import login_required from database import app, admin, db -from covid19.blueprints.app_all.all_services import who_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import who_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage -from covid19.blueprints.who.who_model_import import WhoImport -from covid19.blueprints.who.who_model import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData +from flask_covid19 import WhoImport +from flask_covid19 import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData app_who = Blueprint('who', __name__, template_folder='templates', url_prefix='/who') diff --git a/src/covid19/blueprints/who_test/__init__.py b/src/flask_covid19/blueprints/who_test/__init__.py similarity index 100% rename from src/covid19/blueprints/who_test/__init__.py rename to src/flask_covid19/blueprints/who_test/__init__.py diff --git a/src/covid19/blueprints/who_test/templates/__init__.py b/src/flask_covid19/blueprints/who_test/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/who_test/templates/__init__.py rename to src/flask_covid19/blueprints/who_test/templates/__init__.py diff --git a/src/covid19/blueprints/who_test/templates/who_test/who_tests.html b/src/flask_covid19/blueprints/who_test/templates/who_test/who_tests.html similarity index 100% rename from src/covid19/blueprints/who_test/templates/who_test/who_tests.html rename to src/flask_covid19/blueprints/who_test/templates/who_test/who_tests.html diff --git a/src/covid19/blueprints/who_test/who_test_service.py b/src/flask_covid19/blueprints/who_test/who_test_service.py similarity index 94% rename from src/covid19/blueprints/who_test/who_test_service.py rename to src/flask_covid19/blueprints/who_test/who_test_service.py index 93f2fce3..b2301214 100644 --- a/src/covid19/blueprints/who_test/who_test_service.py +++ b/src/flask_covid19/blueprints/who_test/who_test_service.py @@ -1,6 +1,6 @@ from database import app -from covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig -from covid19.blueprints.who.who_model import WhoDateReported, WhoData +from flask_covid19 import ApplicationServiceConfig +from flask_covid19 import WhoDateReported, WhoData class WhoTestService: diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/flask_covid19/blueprints/who_test/who_test_views.py similarity index 94% rename from src/covid19/blueprints/who_test/who_test_views.py rename to src/flask_covid19/blueprints/who_test/who_test_views.py index c04cba9b..925eaf84 100644 --- a/src/covid19/blueprints/who_test/who_test_views.py +++ b/src/flask_covid19/blueprints/who_test/who_test_views.py @@ -4,14 +4,14 @@ from celery.utils.log import get_task_logger from flask_login import login_required from database import app, db -from covid19.blueprints.app_all.all_services import who_service -from covid19.blueprints.app_mq.application_workers import celery -from covid19.blueprints.app_application.application_model_transient import ApplicationPage +from flask_covid19 import who_service +from flask_covid19 import celery +from flask_covid19 import ApplicationPage -from covid19.blueprints.who.who_model_import import WhoImport -from covid19.blueprints.who.who_model import WhoData +from flask_covid19 import WhoImport +from flask_covid19 import WhoData -from covid19.blueprints.who_test.who_test_service import WhoTestService +from flask_covid19 import WhoTestService who_test_service = WhoTestService(db, who_service) diff --git a/src/covid19/browserslist b/src/flask_covid19/browserslist similarity index 100% rename from src/covid19/browserslist rename to src/flask_covid19/browserslist diff --git a/src/covid19/package-lock.json b/src/flask_covid19/package-lock.json similarity index 100% rename from src/covid19/package-lock.json rename to src/flask_covid19/package-lock.json diff --git a/src/covid19/package.json b/src/flask_covid19/package.json similarity index 96% rename from src/covid19/package.json rename to src/flask_covid19/package.json index 3350c6b3..6c6b7f5f 100644 --- a/src/covid19/package.json +++ b/src/flask_covid19/package.json @@ -27,7 +27,7 @@ "build:version": "node scripts/version.js", "docker:build": "node scripts/docker/docker-build.js", "docker:run": "node scripts/docker/docker-run.js", - "postinstall": "./node_modules/.bin/grunt" + "postinstall": "../covid19/node_modules/.bin/grunt" }, "private": true, "dependencies": { diff --git a/src/covid19/static/css/covid19python.css b/src/flask_covid19/static/css/covid19python.css similarity index 100% rename from src/covid19/static/css/covid19python.css rename to src/flask_covid19/static/css/covid19python.css diff --git a/src/covid19/static/favicon.ico b/src/flask_covid19/static/favicon.ico similarity index 100% rename from src/covid19/static/favicon.ico rename to src/flask_covid19/static/favicon.ico diff --git a/src/covid19/static/index.js b/src/flask_covid19/static/index.js similarity index 100% rename from src/covid19/static/index.js rename to src/flask_covid19/static/index.js diff --git a/src/covid19/static/js/covid19python.js b/src/flask_covid19/static/js/covid19python.js similarity index 100% rename from src/covid19/static/js/covid19python.js rename to src/flask_covid19/static/js/covid19python.js diff --git a/src/covid19/static/styles.css b/src/flask_covid19/static/styles.css similarity index 100% rename from src/covid19/static/styles.css rename to src/flask_covid19/static/styles.css diff --git a/src/mq.py b/src/mq.py index 9ab036d1..8dacd3b1 100644 --- a/src/mq.py +++ b/src/mq.py @@ -1,8 +1,8 @@ import sys import subprocess -import covid19 -from covid19 import app -from covid19.blueprints.app_mq.application_workers import celery, run_mq +import flask_covid19 +from flask_covid19 import app +from flask_covid19 import celery, run_mq # Celery: https://docs.celeryproject.org/en/stable/userguide/index.html diff --git a/src/web.py b/src/web.py index cd585a01..47ea9596 100644 --- a/src/web.py +++ b/src/web.py @@ -1,4 +1,4 @@ -from covid19 import run_web +from flask_covid19 import run_web # --------------------------------------------------------------------------------- # MAIN -- GitLab