From 30bf4f5747f4e23d10a3d51feb57f248cdbcce08 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 22 Nov 2020 13:13:19 +0100
Subject: [PATCH] core: migrate shell to core, remove navbar

---
 passbook/admin/urls.py                        |  2 -
 passbook/admin/views/shell.py                 |  8 ----
 passbook/core/templates/base/page.html        | 48 +------------------
 .../templates}/shell.html                     |  9 ++--
 passbook/core/urls.py                         |  5 +-
 passbook/core/views/shell.py                  |  8 ++++
 6 files changed, 15 insertions(+), 65 deletions(-)
 delete mode 100644 passbook/admin/views/shell.py
 rename passbook/{admin/templates/administration => core/templates}/shell.html (64%)
 create mode 100644 passbook/core/views/shell.py

diff --git a/passbook/admin/urls.py b/passbook/admin/urls.py
index 798dbe3f7..5c556d304 100644
--- a/passbook/admin/urls.py
+++ b/passbook/admin/urls.py
@@ -13,7 +13,6 @@ from passbook.admin.views import (
     policies_bindings,
     property_mappings,
     providers,
-    shell,
     sources,
     stages,
     stages_bindings,
@@ -25,7 +24,6 @@ from passbook.admin.views import (
 )
 
 urlpatterns = [
-    path("", shell.ShellView.as_view(), name="shell"),
     path(
         "overview/cache/flow/",
         overview.FlowCacheClearView.as_view(),
diff --git a/passbook/admin/views/shell.py b/passbook/admin/views/shell.py
deleted file mode 100644
index 19499452a..000000000
--- a/passbook/admin/views/shell.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""admin shell view"""
-from django.views.generic.base import TemplateView
-
-
-class ShellView(TemplateView):
-    """admin shell view"""
-
-    template_name = "administration/shell.html"
diff --git a/passbook/core/templates/base/page.html b/passbook/core/templates/base/page.html
index a9ff863fe..0b5950c95 100644
--- a/passbook/core/templates/base/page.html
+++ b/passbook/core/templates/base/page.html
@@ -8,54 +8,8 @@
 
 {% block body %}
 <pb-messages url="{% url 'passbook_api:messages-list' %}"></pb-messages>
-<div class="pf-c-page" id="page-default-nav-example">
+<div class="pf-c-page">
     <a class="pf-c-skip-to-content pf-c-button pf-m-primary" href="#main-content">{% trans 'Skip to content' %}</a>
-    <header role="banner" class="pf-c-page__header ws-page-header">
-        <div class="pf-c-page__header-brand">
-            <div class="pf-c-page__header-brand-toggle">
-                <button class="pf-c-button pf-m-plain" type="button" id="page-default-nav-example-nav-toggle"
-                    aria-label="Global navigation" aria-expanded="true"
-                    aria-controls="page-default-nav-example-primary-nav">
-                    <i class="fas fa-bars" aria-hidden="true"></i>
-                </button>
-            </div>
-            <a href="{% url 'passbook_core:overview' %}" class="pf-c-page__header-brand-link">
-                <div class="pf-c-brand pb-brand">
-                    <img src="{{ config.passbook.branding.logo }}" style="width: 100px;" alt="passbook icon">
-                    {% if config.passbook.branding.title_show %}
-                    <small><small>{{ config.passbook.branding.title }}</small></small>
-                    {% endif %}
-                </div>
-            </a>
-        </div>
-        <div class="pf-c-page__header-nav">
-            <nav class="pf-c-nav pf-m-horizontal" aria-label="Nav">
-                <ul class="pf-c-nav__list ws-top-nav">
-                    <li class="pf-c-nav__item"><a class="pf-c-nav__link {% is_active_url 'passbook_core:overview' %}"
-                            href="{% url 'passbook_core:overview' %}">{% trans 'Access' %}</a></li>
-                    {% if user.is_superuser %}
-                    <li class="pf-c-nav__item"><a class="pf-c-nav__link {% is_active_app 'passbook_admin' %}"
-                            href="{% url 'passbook_admin:shell' %}">{% trans 'Administrate' %}</a></li>
-                    <li class="pf-c-nav__item"><a class="pf-c-nav__link {% is_active_url 'passbook_audit:log' %}"
-                            href="{% url 'passbook_audit:log' %}">{% trans 'Monitor' %}</a></li>
-                    {% endif %}
-                </ul>
-            </nav>
-        </div>
-        <div class="pf-c-page__header-tools">
-            <div class="pf-c-page__header-tools-group pf-m-icons">
-                <a href="{% url 'passbook_flows:default-invalidation' %}" class="pf-c-button pf-m-plain" type="button" id="logout">
-                    <i class="fas fa-sign-out-alt" aria-hidden="true"></i>
-                </a>
-            </div>
-            <div class="pf-c-page__header-tools-group">
-                <a href="{% url 'passbook_core:user-settings' %}" id="user-settings" class="pf-c-button">
-                    {{ user.username }}
-                </a>
-            </div>
-            <img class="pf-c-avatar" src="{% avatar user %}" alt="">
-        </div>
-    </header>
     {% block page_content %}
     {% endblock %}
 </div>
diff --git a/passbook/admin/templates/administration/shell.html b/passbook/core/templates/shell.html
similarity index 64%
rename from passbook/admin/templates/administration/shell.html
rename to passbook/core/templates/shell.html
index 277df62db..adabb7263 100644
--- a/passbook/admin/templates/administration/shell.html
+++ b/passbook/core/templates/shell.html
@@ -13,11 +13,8 @@
 {% endblock %}
 
 {% block page_content %}
-<pb-admin-sidebar class="pf-c-page__sidebar">
-</pb-admin-sidebar>
-<pb-router-outlet role="main" class="pf-c-page__main" tabindex="-1" id="main-content">
+<pb-sidebar class="pf-c-page__sidebar" brandLogo="{{ config.passbook.branding.logo }}" {% if config.passbook.branding.title_show %} brandTitle="{{ config.passbook.branding.title }}" {% endif %}>
+</pb-sidebar>
+<pb-router-outlet role="main" class="pf-c-page__main" tabindex="-1" id="main-content" defaultUrl="-/overview/">
 </pb-router-outlet>
-<!-- <pb-admin-shell url="{% url 'passbook_admin:overview' %}" >
-    <div slot="body"></div>
-</pb-admin-shell> -->
 {% endblock %}
diff --git a/passbook/core/urls.py b/passbook/core/urls.py
index 04732c66c..c46027c91 100644
--- a/passbook/core/urls.py
+++ b/passbook/core/urls.py
@@ -1,7 +1,7 @@
 """passbook URL Configuration"""
 from django.urls import path
 
-from passbook.core.views import impersonate, overview, user
+from passbook.core.views import impersonate, overview, user, shell
 
 urlpatterns = [
     # User views
@@ -23,7 +23,8 @@ urlpatterns = [
         name="user-tokens-delete",
     ),
     # Overview
-    path("", overview.OverviewView.as_view(), name="overview"),
+    path("", shell.ShellView.as_view(), name="shell"),
+    path("-/overview/", overview.OverviewView.as_view(), name="overview"),
     # Impersonation
     path(
         "-/impersonation/<int:user_id>/",
diff --git a/passbook/core/views/shell.py b/passbook/core/views/shell.py
new file mode 100644
index 000000000..d401f3c66
--- /dev/null
+++ b/passbook/core/views/shell.py
@@ -0,0 +1,8 @@
+"""core shell view"""
+from django.views.generic.base import TemplateView
+
+
+class ShellView(TemplateView):
+    """core shell view"""
+
+    template_name = "shell.html"