diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py index 1fcbdca0353d9620aaa3ffa7e8de034892517985..37aefd56d3aa1ebbc7069fa4adb9034965e67f6b 100644 --- a/src/covid19/blueprints/admin/admin_views.py +++ b/src/covid19/blueprints/admin/admin_views.py @@ -48,6 +48,14 @@ def task_admin_database_drop_create(self): return result +@app.route('/') +def url_admin_index(): + page_info = ApplicationPage('Admin', "Covid19 Admin") + return render_template( + 'admin/index.html', + page_info=page_info) + + @app_admin.route('/tasks') def url_admin_tasks(): page_info = ApplicationPage('Admin', "Tasks") diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html index adf2d7b8a182bc8266d562e343204075868a740c..f2092e1f4d9d6de360566013b149638344436f93 100644 --- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html +++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html @@ -13,19 +13,19 @@ <div class="col"> <div class="btn-group-vertical" role="group" aria-label="Views"> <a class="btn btn-secondary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_alive_message_start') }}" + href="{{ url_for( 'app_admin.url_alive_message_start') }}" role="button">Admin :: alive message</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_drop') }}" + href="{{ url_for( 'app_admin.url_admin_database_drop') }}" role="button">Admin :: database :: drop_create</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}" + href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}" role="button">Admin :: database :: drop_create :: only</a> <a class="btn btn-secondary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_import') }}" + href="{{ url_for( 'app_admin.url_admin_database_import') }}" role="button">Admin :: database :: import</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_dump') }}" + href="{{ url_for( 'app_admin.url_admin_database_dump') }}" role="button">Admin :: database :: dump</a> </div> </div> diff --git a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html index e3f2673a85a5538b73dfa82470beb46af9078eda..a062df93c2d22305f5d0ae47f109da6ee8a89170 100644 --- a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html +++ b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html @@ -4,31 +4,31 @@ Admin </a> <div class="dropdown-menu" aria-labelledby="navbarDropdown"> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_tasks') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}"> Admin </a> <div class="dropdown-divider"></div> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_tasks') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}"> admin tasks </a> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_info') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_info') }}"> admin info </a> <div class="dropdown-divider"></div> - <a class="dropdown-item" href="{{ url_for( 'admin.url_alive_message_start') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_alive_message_start') }}"> Task: Admin :: alive message </a> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_drop') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_drop') }}"> Task: Admin :: database :: drop_create and import </a> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"> Task: Admin :: database :: drop_create only </a> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_dump') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump') }}"> Task: Admin :: database :: dump </a> <div class="dropdown-divider"></div> - <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_import') }}"> + <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_import') }}"> Task: Admin :: database :: import (TBD) </a> </div> diff --git a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html index e519221a990de2db8d5ee2ca980d839ef6adce27..c5289732746c93f64add79bb2ee664f26f15286a 100644 --- a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html +++ b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html @@ -3,11 +3,11 @@ <ul class="nav nav-tabs"> <li class="nav-item"> <a class="nav-link" - href="{{ url_for( 'admin.url_admin_info') }}">admin Info</a> + href="{{ url_for( 'app_admin.url_admin_info') }}">admin Info</a> </li> <li class="nav-item"> <a class="nav-link" - href="{{ url_for( 'admin.url_admin_tasks') }}">admin tasks</a> + href="{{ url_for( 'app_admin.url_admin_tasks') }}">admin tasks</a> </li> </ul> </nav> \ No newline at end of file diff --git a/src/covid19/blueprints/admin/templates/admin/index.html b/src/covid19/blueprints/admin/templates/admin/index.html index f378bf30f89491740b4d405620d41d377a53a2ea..3ed5c8bc06cea4f5b2f7b96e4551d352d574b06e 100644 --- a/src/covid19/blueprints/admin/templates/admin/index.html +++ b/src/covid19/blueprints/admin/templates/admin/index.html @@ -8,19 +8,19 @@ <h3>Admin :: Tasks</h3> <div class="btn-group-vertical" role="group" aria-label="Views"> <a class="btn btn-secondary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_alive_message_start') }}" + href="{{ url_for( 'app_admin.url_alive_message_start') }}" role="button">Admin :: alive message</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_drop') }}" + href="{{ url_for( 'app_admin.url_admin_database_drop') }}" role="button">Admin :: database :: drop_create</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}" + href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}" role="button">Admin :: database :: drop_create :: only</a> <a class="btn btn-secondary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_import') }}" + href="{{ url_for( 'app_admin.url_admin_database_import') }}" role="button">Admin :: database :: import</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'admin.url_admin_database_dump') }}" + href="{{ url_for( 'app_admin.url_admin_database_dump') }}" role="button">Admin :: database :: dump</a> </div> </div> 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 30a919656655ff8c0cb5e3a779d4c2b40dbda01a..6f8f636cf23d0f07f21a4a290b099b6c10f5482a 100644 --- a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html +++ b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html @@ -38,7 +38,7 @@ </li> <li class="nav-item"> <a class="nav-link" - href="{{ url_for( 'admin.url_admin_tasks') }}"> + href="{{ url_for( 'app_admin.url_admin_tasks') }}"> Admin </a> </li> diff --git a/src/database.py b/src/database.py index 28bfd9be682df209c28cb4dba73232ccd1e530fa..39e2691f3aa6e42e03e4c7d614125f4959991e1c 100644 --- a/src/database.py +++ b/src/database.py @@ -18,7 +18,7 @@ app.config['SQLALCHEMY_DATABASE_URI'] = DB_URL app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False # silence the deprecation warning run_run_with_debug = app.config['APP_DEBUGGER_ACTIVE'] app.config['FLASK_ADMIN_SWATCH'] = 'cerulean' -admin = Admin(app, name='covid19', template_mode='bootstrap3') +admin = Admin(app, name='covid19admin', template_mode='bootstrap4') db = SQLAlchemy(app) db.create_all()