From 464283fccb2b87759983a6798a3ad7a9b4ffa1dc Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Tue, 20 Apr 2021 11:53:13 +0200
Subject: [PATCH 1/2] menu right remove

---
 .../src/components/SidebarPlugin/SideBar.vue  | 42 ++--------
 frontend/src/routes/routes.js                 |  1 +
 frontend/src/views/Layout/DashboardNavbar.vue | 79 ++++---------------
 3 files changed, 24 insertions(+), 98 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 054381df8..065dd8f64 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -14,43 +14,13 @@
       </b-row>
       <slot name="mobile-right">
         <ul class="nav align-items-center d-md-none">
-          <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
-            <a slot="title-container" class="nav-link" href="#" role="button">
-              <div class="media align-items-center">
-                <span class="avatar avatar-sm">
-                  <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
-                </span>
-              </div>
-            </a>
-            xx
-            <router-link to="/overview" class="dropdown-item text-lg text-muted">
-              <i class="ni ni-single-02"></i>
-              <span>{{ $t('site.overview.account_overview') }}</span>
-            </router-link>
-            <router-link to="/profile" class="dropdown-item text-lg text-muted">
-              <i class="ni ni-single-02"></i>
-              <span>{{ $t('site.navbar.my-profil') }}</span>
-            </router-link>
-            <router-link to="/profileedit" class="dropdown-item text-lg text-muted">
-              <i class="ni ni-settings-gear-65"></i>
-              <span>{{ $t('site.navbar.settings') }}</span>
-            </router-link>
-            <router-link to="/transactions" class="dropdown-item text-lg text-muted">
-              <i class="ni ni-calendar-grid-58"></i>
-              <span>Transactions</span>
-            </router-link>
-            <!--
-                <router-link to="/activity" class="dropdown-item  text-lg text-muted">
-                    <i class="ni ni-calendar-grid-58"></i>
-                    <span>{{ $t('site.navbar.activity') }}</span>
-                </router-link>
-            -->
-            <div class="dropdown-divider"></div>
-            <div @click="logout" class="dropdown-item text-lg text-muted">
-              <i class="ni ni-support-16"></i>
-              {{ $t('logout') }}
+          <a slot="title-container" class="nav-link" href="#" role="button">
+            <div class="media align-items-center">
+              <span class="avatar avatar-sm">
+                <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+              </span>
             </div>
-          </base-dropdown>
+          </a>
         </ul>
       </slot>
       <slot></slot>
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index b50f2a7b1..ff09ee1ac 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -10,6 +10,7 @@ const routes = [
   },
   {
     path: '/profile',
+    name: 'Profile',
     component: () => import('../views/Pages/UserProfileCard.vue'),
   },
   {
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index ff1fb8ebf..bbd04f041 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -4,83 +4,33 @@
     class="navbar-top navbar-expand"
     :class="{ 'navbar-dark': type === 'default' }"
   >
-    <a
-      href="#"
-      aria-current="page"
-      class="h4 mb-0 text-uppercase d-none d-lg-inline-block active router-link-active"
-    >
-      {{ $route.name }}
-    </a>
     <!-- Navbar links -->
     <b-navbar-nav class="align-items-center ml-md-auto">
       <!-- This item dont have <b-nav-item> because item have data-action/data-target on tag <a>, wich we cant add -->
-      <li class="nav-item d-sm-none">
-        <a class="nav-link" href="#" data-action="search-show" data-target="#navbar-search-main">
-          <i class="ni ni-zoom-split-in"></i>
-        </a>
-      </li>
+      <li class="nav-item d-sm-none"></li>
     </b-navbar-nav>
     <b-navbar-nav class="align-items-center ml-auto ml-md-0">
-      <base-dropdown
-        menu-on-right
-        class="nav-item"
-        tag="li"
-        title-tag="a"
-        title-classes="nav-link pr-0"
-      >
-        <a href="#" class="pr-1" @click.prevent slot="title-container">
-          <b-media no-body class="align-items-center">
-            <span class="pb-2 text-lg font-weight-bold">
-              {{ $store.state.email }}
+      <a href="profile" class="pr-1" slot="title-container">
+        <b-media no-body class="align-items-center">
+          <span class="pb-2 text-lg font-weight-bold">
+            {{ $store.state.email }}
+          </span>
+          <b-media-body class="ml-2 d-none d-lg-block">
+            <span class="avatar">
+              <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
             </span>
-            <b-media-body class="ml-2 d-none d-lg-block">
-              <span class="avatar">
-                <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
-              </span>
-            </b-media-body>
-          </b-media>
-        </a>
-
-        <template>
-          <b-dropdown-header class="noti-title">
-            <h6 class="text-overflow m-0">{{ $t('welcome') }}</h6>
-          </b-dropdown-header>
-          <b-dropdown-item href="#!" to="/overview">
-            <i class="ni ni-single-02"></i>
-            <span>{{ $t('site.overview.account_overview') }}</span>
-          </b-dropdown-item>
-          <b-dropdown-item href="#!" to="/profile">
-            <i class="ni ni-single-02"></i>
-            <span>{{ $t('site.navbar.my-profil') }}</span>
-          </b-dropdown-item>
-          <b-dropdown-item href="#!" to="/profileedit">
-            <i class="ni ni-settings-gear-65"></i>
-            <span>{{ $t('site.navbar.settings') }}</span>
-          </b-dropdown-item>
-          <!--
-          <b-dropdown-item href="#!">
-            <i class="ni ni-calendar-grid-58"></i>
-            <span>{{ $t('site.navbar.activity') }}</span>
-          </b-dropdown-item>
-          -->
-          <div class="dropdown-divider"></div>
-          <b-dropdown-item href="#!" @click="logout">
-            <i class="ni ni-user-run"></i>
-            <span>{{ $t('logout') }}</span>
-          </b-dropdown-item>
-        </template>
-      </base-dropdown>
+          </b-media-body>
+        </b-media>
+      </a>
     </b-navbar-nav>
   </base-nav>
 </template>
 <script>
-import { CollapseTransition } from 'vue2-transitions'
 import { BaseNav } from '@/components'
 import VueQrcode from 'vue-qrcode'
 
 export default {
   components: {
-    //CollapseTransition,
     BaseNav,
     VueQrcode,
   },
@@ -120,5 +70,10 @@ export default {
       this.$store.dispatch('logout')
     },
   },
+  beforeDestroy() {
+    if (this.$sidebar.showSidebar) {
+      this.$sidebar.showSidebar = false
+    }
+  },
 }
 </script>

From 3c84382e45847556856861a07ab20523b93186ed Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 21 Apr 2021 15:52:09 +0200
Subject: [PATCH 2/2] remove beforeDestroy as noone can say what is it for

---
 frontend/src/views/Layout/DashboardNavbar.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 751e947b4..7b0964f2c 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -70,10 +70,5 @@ export default {
       this.$router.push('/login')
     },
   },
-  beforeDestroy() {
-    if (this.$sidebar.showSidebar) {
-      this.$sidebar.showSidebar = false
-    }
-  },
 }
 </script>