diff --git a/app.py b/app/__init__.py similarity index 100% rename from app.py rename to app/__init__.py diff --git a/static/favicon.ico b/app/static/favicon.ico similarity index 100% rename from static/favicon.ico rename to app/static/favicon.ico diff --git a/templates/admin/admin_info.html b/app/templates/admin/admin_info.html similarity index 100% rename from templates/admin/admin_info.html rename to app/templates/admin/admin_info.html diff --git a/templates/admin/admin_tasks.html b/app/templates/admin/admin_tasks.html similarity index 100% rename from templates/admin/admin_tasks.html rename to app/templates/admin/admin_tasks.html diff --git a/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/app/templates/admin/fragments/fragment_admin_navbar_dropdown.html similarity index 100% rename from templates/admin/fragments/fragment_admin_navbar_dropdown.html rename to app/templates/admin/fragments/fragment_admin_navbar_dropdown.html diff --git a/templates/admin/fragments/fragment_admin_navtabs.html b/app/templates/admin/fragments/fragment_admin_navtabs.html similarity index 100% rename from templates/admin/fragments/fragment_admin_navtabs.html rename to app/templates/admin/fragments/fragment_admin_navtabs.html diff --git a/templates/europe/continent/europe_continent_all.html b/app/templates/europe/continent/europe_continent_all.html similarity index 100% rename from templates/europe/continent/europe_continent_all.html rename to app/templates/europe/continent/europe_continent_all.html diff --git a/templates/europe/continent/europe_continent_germany.html b/app/templates/europe/continent/europe_continent_germany.html similarity index 100% rename from templates/europe/continent/europe_continent_germany.html rename to app/templates/europe/continent/europe_continent_germany.html diff --git a/templates/europe/continent/europe_continent_one.html b/app/templates/europe/continent/europe_continent_one.html similarity index 100% rename from templates/europe/continent/europe_continent_one.html rename to app/templates/europe/continent/europe_continent_one.html diff --git a/templates/europe/country/europe_country_all.html b/app/templates/europe/country/europe_country_all.html similarity index 100% rename from templates/europe/country/europe_country_all.html rename to app/templates/europe/country/europe_country_all.html diff --git a/templates/europe/country/europe_country_germany.html b/app/templates/europe/country/europe_country_germany.html similarity index 100% rename from templates/europe/country/europe_country_germany.html rename to app/templates/europe/country/europe_country_germany.html diff --git a/templates/europe/country/europe_country_one.html b/app/templates/europe/country/europe_country_one.html similarity index 100% rename from templates/europe/country/europe_country_one.html rename to app/templates/europe/country/europe_country_one.html diff --git a/templates/europe/date_reported/europe_date_reported_all.html b/app/templates/europe/date_reported/europe_date_reported_all.html similarity index 100% rename from templates/europe/date_reported/europe_date_reported_all.html rename to app/templates/europe/date_reported/europe_date_reported_all.html diff --git a/templates/europe/date_reported/europe_date_reported_one.html b/app/templates/europe/date_reported/europe_date_reported_one.html similarity index 100% rename from templates/europe/date_reported/europe_date_reported_one.html rename to app/templates/europe/date_reported/europe_date_reported_one.html diff --git a/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html b/app/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html similarity index 100% rename from templates/europe/date_reported/europe_date_reported_one_cases_weekly.html rename to app/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html diff --git a/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html b/app/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html similarity index 100% rename from templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html rename to app/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html diff --git a/templates/europe/date_reported/europe_date_reported_one_notification_rate.html b/app/templates/europe/date_reported/europe_date_reported_one_notification_rate.html similarity index 100% rename from templates/europe/date_reported/europe_date_reported_one_notification_rate.html rename to app/templates/europe/date_reported/europe_date_reported_one_notification_rate.html diff --git a/templates/europe/europe_data.html b/app/templates/europe/europe_data.html similarity index 100% rename from templates/europe/europe_data.html rename to app/templates/europe/europe_data.html diff --git a/templates/europe/europe_imported.html b/app/templates/europe/europe_imported.html similarity index 100% rename from templates/europe/europe_imported.html rename to app/templates/europe/europe_imported.html diff --git a/templates/europe/europe_info.html b/app/templates/europe/europe_info.html similarity index 100% rename from templates/europe/europe_info.html rename to app/templates/europe/europe_info.html diff --git a/templates/europe/europe_tasks.html b/app/templates/europe/europe_tasks.html similarity index 100% rename from templates/europe/europe_tasks.html rename to app/templates/europe/europe_tasks.html diff --git a/templates/europe/fragments/fragment_europe_navbar_dropdown.html b/app/templates/europe/fragments/fragment_europe_navbar_dropdown.html similarity index 100% rename from templates/europe/fragments/fragment_europe_navbar_dropdown.html rename to app/templates/europe/fragments/fragment_europe_navbar_dropdown.html diff --git a/templates/europe/fragments/fragment_europe_navtabs.html b/app/templates/europe/fragments/fragment_europe_navtabs.html similarity index 100% rename from templates/europe/fragments/fragment_europe_navtabs.html rename to app/templates/europe/fragments/fragment_europe_navtabs.html diff --git a/templates/europe/fragments/fragment_europe_table_continent.html b/app/templates/europe/fragments/fragment_europe_table_continent.html similarity index 100% rename from templates/europe/fragments/fragment_europe_table_continent.html rename to app/templates/europe/fragments/fragment_europe_table_continent.html diff --git a/templates/europe/fragments/fragment_europe_table_country.html b/app/templates/europe/fragments/fragment_europe_table_country.html similarity index 100% rename from templates/europe/fragments/fragment_europe_table_country.html rename to app/templates/europe/fragments/fragment_europe_table_country.html diff --git a/templates/europe/fragments/fragment_europe_table_data.html b/app/templates/europe/fragments/fragment_europe_table_data.html similarity index 100% rename from templates/europe/fragments/fragment_europe_table_data.html rename to app/templates/europe/fragments/fragment_europe_table_data.html diff --git a/templates/europe/fragments/fragment_europe_table_data_imported.html b/app/templates/europe/fragments/fragment_europe_table_data_imported.html similarity index 100% rename from templates/europe/fragments/fragment_europe_table_data_imported.html rename to app/templates/europe/fragments/fragment_europe_table_data_imported.html diff --git a/templates/europe/fragments/fragment_europe_table_date_reported.html b/app/templates/europe/fragments/fragment_europe_table_date_reported.html similarity index 100% rename from templates/europe/fragments/fragment_europe_table_date_reported.html rename to app/templates/europe/fragments/fragment_europe_table_date_reported.html diff --git a/templates/fragment_flashed_messages.html b/app/templates/fragment_flashed_messages.html similarity index 100% rename from templates/fragment_flashed_messages.html rename to app/templates/fragment_flashed_messages.html diff --git a/templates/fragment_navbar.html b/app/templates/fragment_navbar.html similarity index 100% rename from templates/fragment_navbar.html rename to app/templates/fragment_navbar.html diff --git a/templates/fragment_navtabs.html b/app/templates/fragment_navtabs.html similarity index 100% rename from templates/fragment_navtabs.html rename to app/templates/fragment_navtabs.html diff --git a/templates/fragment_pagination.html b/app/templates/fragment_pagination.html similarity index 100% rename from templates/fragment_pagination.html rename to app/templates/fragment_pagination.html diff --git a/templates/nrw/fragment_nrw_navbar_dropdown.html b/app/templates/nrw/fragment_nrw_navbar_dropdown.html similarity index 100% rename from templates/nrw/fragment_nrw_navbar_dropdown.html rename to app/templates/nrw/fragment_nrw_navbar_dropdown.html diff --git a/templates/nrw/fragment_nrw_navtabs.html b/app/templates/nrw/fragment_nrw_navtabs.html similarity index 100% rename from templates/nrw/fragment_nrw_navtabs.html rename to app/templates/nrw/fragment_nrw_navtabs.html diff --git a/templates/nrw/nrw_imported.html b/app/templates/nrw/nrw_imported.html similarity index 100% rename from templates/nrw/nrw_imported.html rename to app/templates/nrw/nrw_imported.html diff --git a/templates/nrw/nrw_info.html b/app/templates/nrw/nrw_info.html similarity index 100% rename from templates/nrw/nrw_info.html rename to app/templates/nrw/nrw_info.html diff --git a/templates/nrw/nrw_stadt.html b/app/templates/nrw/nrw_stadt.html similarity index 100% rename from templates/nrw/nrw_stadt.html rename to app/templates/nrw/nrw_stadt.html diff --git a/templates/nrw/nrw_tasks.html b/app/templates/nrw/nrw_tasks.html similarity index 100% rename from templates/nrw/nrw_tasks.html rename to app/templates/nrw/nrw_tasks.html diff --git a/templates/page_home.html b/app/templates/page_home.html similarity index 100% rename from templates/page_home.html rename to app/templates/page_home.html diff --git a/templates/page_layout.html b/app/templates/page_layout.html similarity index 100% rename from templates/page_layout.html rename to app/templates/page_layout.html diff --git a/templates/rki/fragment_rki_navbar_dropdown.html b/app/templates/rki/fragment_rki_navbar_dropdown.html similarity index 100% rename from templates/rki/fragment_rki_navbar_dropdown.html rename to app/templates/rki/fragment_rki_navbar_dropdown.html diff --git a/templates/rki/fragment_rki_navtabs.html b/app/templates/rki/fragment_rki_navtabs.html similarity index 100% rename from templates/rki/fragment_rki_navtabs.html rename to app/templates/rki/fragment_rki_navtabs.html diff --git a/templates/rki/rki_imported.html b/app/templates/rki/rki_imported.html similarity index 100% rename from templates/rki/rki_imported.html rename to app/templates/rki/rki_imported.html diff --git a/templates/rki/rki_info.html b/app/templates/rki/rki_info.html similarity index 100% rename from templates/rki/rki_info.html rename to app/templates/rki/rki_info.html diff --git a/templates/rki/rki_tasks.html b/app/templates/rki/rki_tasks.html similarity index 100% rename from templates/rki/rki_tasks.html rename to app/templates/rki/rki_tasks.html diff --git a/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html b/app/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html similarity index 100% rename from templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html rename to app/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html diff --git a/templates/vaccination/fragments/fragment_vaccination_navtabs.html b/app/templates/vaccination/fragments/fragment_vaccination_navtabs.html similarity index 100% rename from templates/vaccination/fragments/fragment_vaccination_navtabs.html rename to app/templates/vaccination/fragments/fragment_vaccination_navtabs.html diff --git a/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html b/app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html similarity index 100% rename from templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html rename to app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html diff --git a/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html b/app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html similarity index 100% rename from templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html rename to app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html diff --git a/templates/vaccination/vaccination_info.html b/app/templates/vaccination/vaccination_info.html similarity index 100% rename from templates/vaccination/vaccination_info.html rename to app/templates/vaccination/vaccination_info.html diff --git a/templates/vaccination/vaccination_tasks.html b/app/templates/vaccination/vaccination_tasks.html similarity index 100% rename from templates/vaccination/vaccination_tasks.html rename to app/templates/vaccination/vaccination_tasks.html diff --git a/templates/vaccination/vaccination_timeline_germany.html b/app/templates/vaccination/vaccination_timeline_germany.html similarity index 100% rename from templates/vaccination/vaccination_timeline_germany.html rename to app/templates/vaccination/vaccination_timeline_germany.html diff --git a/templates/who/country/who_country_all.html b/app/templates/who/country/who_country_all.html similarity index 100% rename from templates/who/country/who_country_all.html rename to app/templates/who/country/who_country_all.html diff --git a/templates/who/country/who_country_germany.html b/app/templates/who/country/who_country_germany.html similarity index 100% rename from templates/who/country/who_country_germany.html rename to app/templates/who/country/who_country_germany.html diff --git a/templates/who/country/who_country_one.html b/app/templates/who/country/who_country_one.html similarity index 100% rename from templates/who/country/who_country_one.html rename to app/templates/who/country/who_country_one.html diff --git a/templates/who/country/who_country_one_cases_cumulative.html b/app/templates/who/country/who_country_one_cases_cumulative.html similarity index 100% rename from templates/who/country/who_country_one_cases_cumulative.html rename to app/templates/who/country/who_country_one_cases_cumulative.html diff --git a/templates/who/country/who_country_one_cases_new.html b/app/templates/who/country/who_country_one_cases_new.html similarity index 100% rename from templates/who/country/who_country_one_cases_new.html rename to app/templates/who/country/who_country_one_cases_new.html diff --git a/templates/who/country/who_country_one_deaths_cumulative.html b/app/templates/who/country/who_country_one_deaths_cumulative.html similarity index 100% rename from templates/who/country/who_country_one_deaths_cumulative.html rename to app/templates/who/country/who_country_one_deaths_cumulative.html diff --git a/templates/who/country/who_country_one_deaths_new.html b/app/templates/who/country/who_country_one_deaths_new.html similarity index 100% rename from templates/who/country/who_country_one_deaths_new.html rename to app/templates/who/country/who_country_one_deaths_new.html diff --git a/templates/who/date_reported/who_date_reported_all.html b/app/templates/who/date_reported/who_date_reported_all.html similarity index 100% rename from templates/who/date_reported/who_date_reported_all.html rename to app/templates/who/date_reported/who_date_reported_all.html diff --git a/templates/who/date_reported/who_date_reported_one.html b/app/templates/who/date_reported/who_date_reported_one.html similarity index 100% rename from templates/who/date_reported/who_date_reported_one.html rename to app/templates/who/date_reported/who_date_reported_one.html diff --git a/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/app/templates/who/date_reported/who_date_reported_one_cases_cumulative.html similarity index 100% rename from templates/who/date_reported/who_date_reported_one_cases_cumulative.html rename to app/templates/who/date_reported/who_date_reported_one_cases_cumulative.html diff --git a/templates/who/date_reported/who_date_reported_one_cases_new.html b/app/templates/who/date_reported/who_date_reported_one_cases_new.html similarity index 100% rename from templates/who/date_reported/who_date_reported_one_cases_new.html rename to app/templates/who/date_reported/who_date_reported_one_cases_new.html diff --git a/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/app/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html similarity index 100% rename from templates/who/date_reported/who_date_reported_one_deaths_cumulative.html rename to app/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html diff --git a/templates/who/date_reported/who_date_reported_one_deaths_new.html b/app/templates/who/date_reported/who_date_reported_one_deaths_new.html similarity index 100% rename from templates/who/date_reported/who_date_reported_one_deaths_new.html rename to app/templates/who/date_reported/who_date_reported_one_deaths_new.html diff --git a/templates/who/fragments/fragment_who_navbar_dropdown.html b/app/templates/who/fragments/fragment_who_navbar_dropdown.html similarity index 100% rename from templates/who/fragments/fragment_who_navbar_dropdown.html rename to app/templates/who/fragments/fragment_who_navbar_dropdown.html diff --git a/templates/who/fragments/fragment_who_navtabs.html b/app/templates/who/fragments/fragment_who_navtabs.html similarity index 100% rename from templates/who/fragments/fragment_who_navtabs.html rename to app/templates/who/fragments/fragment_who_navtabs.html diff --git a/templates/who/fragments/fragment_who_table_global_data.html b/app/templates/who/fragments/fragment_who_table_global_data.html similarity index 100% rename from templates/who/fragments/fragment_who_table_global_data.html rename to app/templates/who/fragments/fragment_who_table_global_data.html diff --git a/templates/who/fragments/fragment_who_table_global_data_country.html b/app/templates/who/fragments/fragment_who_table_global_data_country.html similarity index 100% rename from templates/who/fragments/fragment_who_table_global_data_country.html rename to app/templates/who/fragments/fragment_who_table_global_data_country.html diff --git a/templates/who/fragments/fragment_who_table_global_data_date_reported.html b/app/templates/who/fragments/fragment_who_table_global_data_date_reported.html similarity index 100% rename from templates/who/fragments/fragment_who_table_global_data_date_reported.html rename to app/templates/who/fragments/fragment_who_table_global_data_date_reported.html diff --git a/templates/who/fragments/fragment_who_table_who_country.html b/app/templates/who/fragments/fragment_who_table_who_country.html similarity index 100% rename from templates/who/fragments/fragment_who_table_who_country.html rename to app/templates/who/fragments/fragment_who_table_who_country.html diff --git a/templates/who/region/who_region_all.html b/app/templates/who/region/who_region_all.html similarity index 100% rename from templates/who/region/who_region_all.html rename to app/templates/who/region/who_region_all.html diff --git a/templates/who/region/who_region_one.html b/app/templates/who/region/who_region_one.html similarity index 100% rename from templates/who/region/who_region_one.html rename to app/templates/who/region/who_region_one.html diff --git a/templates/who/who_imported.html b/app/templates/who/who_imported.html similarity index 100% rename from templates/who/who_imported.html rename to app/templates/who/who_imported.html diff --git a/templates/who/who_info.html b/app/templates/who/who_info.html similarity index 100% rename from templates/who/who_info.html rename to app/templates/who/who_info.html diff --git a/templates/who/who_tasks.html b/app/templates/who/who_tasks.html similarity index 100% rename from templates/who/who_tasks.html rename to app/templates/who/who_tasks.html diff --git a/app_worker.py b/app_worker/__init__.py similarity index 100% rename from app_worker.py rename to app_worker/__init__.py diff --git a/requirements.txt b/requirements.txt index cb7d7d8106e590f62a09edf69f13fd897b7ee391..b7fcfe32046d9eb04785e02e4bfe4a6bbe346dbb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,25 +1,12 @@ setuptools==52.0.0 -wheel==0.36.2 -autoenv==1.0.0 -packaging==20.8 # # Flask # Flask==1.1.2 -Flask-DB==0.3.0 -Flask-SQLAlchemy==2.4.4 -Flask-UUID==0.2 SQLAlchemy==1.3.22 -SQLAlchemy-Utils==0.36.8 -Jinja2==2.11.2 -Werkzeug==1.0.1 # # Flask extras # -flask-paginate==0.8.0 -python-dotenv==0.15.0 -watchdog==1.0.2 -flask-cors==3.0.10 # # PostgreSQL # diff --git a/run_web.sh b/run_web.sh index 89b5994d38fa85c7582864e18868095edb814a26..33fa189232252a2cd18255e1bfc9e81f0d8871f3 100755 --- a/run_web.sh +++ b/run_web.sh @@ -5,5 +5,5 @@ #pip install -e . #flask run . venv/bin/activate -python app.py +python app