From e257b169d67604f914d4bddf2df3c3686ccbd0af Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 20:46:37 +0100
Subject: [PATCH] ### 0.0.13 Release * Fixed #49
EuropeServiceUpdate.__update_data_short() (wontfix) * Fixed #52 download
vaccination timeline data file * Fixed #53 import vaccination timeline data
file into db * Fixed #54 /vaccination/imported * Fixed #57 frontend: use npm
for handling 3rdParty css and javascript modules like jQuery, Bootstrap *
Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as
main content on home page * Fixed #47 major refactoring: Routes from app.py
to org...who,europe,... (Doublette von #65) * Fixed #48 major refactoring:
Tasks from server_mq.py to org...who,europe,... (Doublette von #65) * Fixed
#64 major refactoring: create two packages: for web app and for celery worker
* Issue #65 major refactoring: add flask-blueprints for admin, common,
europe, rki, vaccination, who
### 0.0.14 Release
* Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular
* Issue #67 implement Flask-Login
### 0.0.15 Release
* Issue #5 Visual Graphs for Data per Countries order by Date
* Issue #59 frontend: add correct breadcrumb to every page
* Issue #60 frontend: better design for tables
* Issue #61 frontend: better design for navtabs
* Issue #62 frontend: better design for pages
* Issue #63 frontend: add footer design
### 0.0.16 Release
* Issue #28 /admin/database/import
* Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep()
* Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent()
* Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array()
---
.../admin/{views_admin.py => admin_views.py} | 17 ++++++++++-------
.../europe/{views_europe.py => europe_views.py} | 2 +-
.../rki/{views_rki.py => rki_views.py} | 2 +-
...iews_vaccination.py => vaccination_views.py} | 2 +-
.../who/{views_who.py => who_views.py} | 2 +-
covid19/views.py | 10 +++++-----
6 files changed, 19 insertions(+), 16 deletions(-)
rename covid19/blueprints/admin/{views_admin.py => admin_views.py} (90%)
rename covid19/blueprints/europe/{views_europe.py => europe_views.py} (99%)
rename covid19/blueprints/rki/{views_rki.py => rki_views.py} (98%)
rename covid19/blueprints/vaccination/{views_vaccination.py => vaccination_views.py} (98%)
rename covid19/blueprints/who/{views_who.py => who_views.py} (99%)
diff --git a/covid19/blueprints/admin/views_admin.py b/covid19/blueprints/admin/admin_views.py
similarity index 90%
rename from covid19/blueprints/admin/views_admin.py
rename to covid19/blueprints/admin/admin_views.py
index c3c0636b..41dd5e2e 100644
--- a/covid19/blueprints/admin/views_admin.py
+++ b/covid19/blueprints/admin/admin_views.py
@@ -1,4 +1,4 @@
-from flask import render_template, redirect, url_for, flash
+from flask import render_template, redirect, url_for, flash, Blueprint
from celery import states
from celery.utils.log import get_task_logger
@@ -12,6 +12,9 @@ from covid19.blueprints.common.common_model_transient import ApplicationPage
drop_and_create_data_again = True
+app_admin = Blueprint('admin', __name__, template_folder='templates')
+
+
#################################################################################################################
#
# Admin
@@ -47,7 +50,7 @@ def task_admin_database_drop_create(self):
return result
-@app.route('/admin/tasks')
+@app_admin.route('/admin/tasks')
def url_admin_tasks():
page_info = ApplicationPage('Admin', "Tasks")
return render_template(
@@ -55,7 +58,7 @@ def url_admin_tasks():
page_info=page_info)
-@app.route('/admin/info')
+@app_admin.route('/admin/info')
def url_admin_info():
page_info = ApplicationPage('Admin', "Info")
return render_template(
@@ -63,7 +66,7 @@ def url_admin_info():
page_info=page_info)
-@app.route('/admin/alive_message')
+@app_admin.route('/admin/alive_message')
def url_alive_message_start():
app.logger.info("url_alive_message_start [start]")
task_admin_alive_message.apply_async()
@@ -72,7 +75,7 @@ def url_alive_message_start():
return redirect(url_for('url_admin_tasks'))
-@app.route('/admin/database/dump')
+@app_admin.route('/admin/database/dump')
def url_admin_database_dump():
app.logger.info("url_admin_database_dump [start]")
admin_service.run_admin_database_dump()
@@ -81,7 +84,7 @@ def url_admin_database_dump():
return redirect(url_for('url_admin_tasks'))
-@app.route('/admin/database/import')
+@app_admin.route('/admin/database/import')
def url_admin_database_import():
app.logger.info("url_admin_database_import [start]")
admin_service.run_admin_database_import()
@@ -90,7 +93,7 @@ def url_admin_database_import():
return redirect(url_for('url_admin_tasks'))
-@app.route('/admin/database/drop')
+@app_admin.route('/admin/database/drop')
def url_admin_database_drop():
app.logger.info("url_admin_database_drop [start]")
flash("admin_service.run_admin_database_drop started")
diff --git a/covid19/blueprints/europe/views_europe.py b/covid19/blueprints/europe/europe_views.py
similarity index 99%
rename from covid19/blueprints/europe/views_europe.py
rename to covid19/blueprints/europe/europe_views.py
index 47b9399d..519f46c5 100644
--- a/covid19/blueprints/europe/views_europe.py
+++ b/covid19/blueprints/europe/europe_views.py
@@ -11,7 +11,7 @@ from covid19.blueprints.europe.europe_model import EuropeDateReported, EuropeCon
from covid19.blueprints.common.common_model_transient import ApplicationPage
-app_europe = Blueprint('europe', __name__, template_folder='templates', static_folder='static')
+app_europe = Blueprint('europe', __name__, template_folder='templates')
##################################################################################################################
diff --git a/covid19/blueprints/rki/views_rki.py b/covid19/blueprints/rki/rki_views.py
similarity index 98%
rename from covid19/blueprints/rki/views_rki.py
rename to covid19/blueprints/rki/rki_views.py
index 8d1bc2b7..7566dbeb 100644
--- a/covid19/blueprints/rki/views_rki.py
+++ b/covid19/blueprints/rki/rki_views.py
@@ -9,7 +9,7 @@ from covid19.blueprints.common.common_model_transient import ApplicationPage
drop_and_create_data_again = True
-app_rki = Blueprint('rki', __name__, template_folder='templates', static_folder='static')
+app_rki = Blueprint('rki', __name__, template_folder='templates')
##################################################################################################################
diff --git a/covid19/blueprints/vaccination/views_vaccination.py b/covid19/blueprints/vaccination/vaccination_views.py
similarity index 98%
rename from covid19/blueprints/vaccination/views_vaccination.py
rename to covid19/blueprints/vaccination/vaccination_views.py
index 1ae14d77..4938d3d3 100644
--- a/covid19/blueprints/vaccination/views_vaccination.py
+++ b/covid19/blueprints/vaccination/vaccination_views.py
@@ -10,7 +10,7 @@ from covid19.blueprints.vaccination.vaccination_model_import import VaccinationG
from covid19.blueprints.common.common_model_transient import ApplicationPage
-app_vaccination = Blueprint('vaccination', __name__, template_folder='templates', static_folder='static')
+app_vaccination = Blueprint('vaccination', __name__, template_folder='templates')
##################################################################################################################
diff --git a/covid19/blueprints/who/views_who.py b/covid19/blueprints/who/who_views.py
similarity index 99%
rename from covid19/blueprints/who/views_who.py
rename to covid19/blueprints/who/who_views.py
index bf81a8c4..e57cc7b1 100644
--- a/covid19/blueprints/who/views_who.py
+++ b/covid19/blueprints/who/who_views.py
@@ -12,7 +12,7 @@ from covid19.blueprints.who.who_model import WhoRegion, WhoCountry, WhoDateRepor
from covid19.blueprints.common.common_model_transient import ApplicationPage
-app_who = Blueprint('who', __name__, template_folder='templates', static_folder='static')
+app_who = Blueprint('who', __name__, template_folder='templates')
##################################################################################################################
diff --git a/covid19/views.py b/covid19/views.py
index 0edbab50..257d93eb 100644
--- a/covid19/views.py
+++ b/covid19/views.py
@@ -2,11 +2,11 @@ from flask import render_template, redirect, url_for
from database import app
from covid19.blueprints.common.common_model_transient import ApplicationPage
-import covid19.blueprints.who.views_who
-import covid19.blueprints.europe.views_europe
-import covid19.blueprints.vaccination.views_vaccination
-import covid19.blueprints.rki.views_rki
-import covid19.blueprints.admin.views_admin
+import covid19.blueprints.who.who_views
+import covid19.blueprints.europe.europe_views
+import covid19.blueprints.vaccination.vaccination_views
+import covid19.blueprints.rki.rki_views
+import covid19.blueprints.admin.admin_views
############################################################################################
--
GitLab