diff --git a/.gitignore b/.gitignore index 65f564de55838b9a91dac1a71e870f7c6927cad1..d6f923645ee5af0466b85d167b7b6a390bcc6eb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1149,3 +1149,8 @@ Debug*/Debug*\ Libs /src/covid19/blueprints/owid/x.py /src/covid19/blueprints/owid/x2.py /src/covid19/blueprints/owid/x3.py +/.run/ +/.checkmate/ +/.run/ +/lsp/ +/src/covid19_worker/dump.rdb diff --git a/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html index e20f88a89d0ad16059705f768b5c222ac16b9aa5..f917e1be06ce9e08fb7a83b39382ac919cb6a3b2 100644 --- a/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html +++ b/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html @@ -10,6 +10,10 @@ <div class="collapse navbar-collapse" id="navbarSupportedContent"> <ul class="navbar-nav mr-auto"> + <li class="nav-item"> + <a class="nav-link" href="{{ url_for( 'url_home') }}">Home</a> + </li> + {% include 'who/fragments/fragment_who_navbar_dropdown.html' %} {% include 'ecdc/fragments/fragment_ecdc_navbar_dropdown.html' %} diff --git a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html index 2f4e4d623c0181b683da88263b208be7ebaa7a12..5ffb16c830357c924ea81ac04e8bd31a50124fae 100644 --- a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html +++ b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html @@ -32,7 +32,7 @@ </li> <li class="nav-item"> <a class="nav-link" - href="{{ url_for('rki_bundeslaender.url_rki_tasks') }}"> + href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_tasks') }}"> RKI Bundeslaender </a> </li> diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py index c50e7ac179fdf3ec71a0bcbcb602d93b7229e477..0059740e6e08a2fd7610cdc45320d1c841d3ac2c 100644 --- a/src/covid19/blueprints/owid/owid_views.py +++ b/src/covid19/blueprints/owid/owid_views.py @@ -53,9 +53,9 @@ def url_owid_tasks(): def url_owid_test(page=1): page_info = ApplicationPage('OWID', "Test") try: - page_data = OwidImport.get_continents() + page_data = OwidImport.get_continents(page) except OperationalError: - flash("No data in the database.") + flash(message="No data in the database.", category="error") page_data = None return render_template( 'owid/owid_test.html', diff --git a/src/covid19/static/vendor/fontawesome-free/package.json b/src/covid19/static/vendor/fontawesome-free/package.json index 08412d7aaf7f93c3d727bba57c53b5cc0f34f5c2..fef048f00a03be0f1f20279b1684a4c0dea2f50a 100644 --- a/src/covid19/static/vendor/fontawesome-free/package.json +++ b/src/covid19/static/vendor/fontawesome-free/package.json @@ -2,7 +2,7 @@ "_args": [ [ "@fortawesome/fontawesome-free@5.15.2", - "/home/tw/github/covid19python/src/covid19" + "D:\\github\\covid19python\\src\\covid19" ] ], "_from": "@fortawesome/fontawesome-free@5.15.2", @@ -27,7 +27,7 @@ ], "_resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz", "_spec": "5.15.2", - "_where": "/home/tw/github/covid19python/src/covid19", + "_where": "D:\\github\\covid19python\\src\\covid19", "author": { "name": "Dave Gandy", "email": "dave@fontawesome.com",