From 22211a883cce342cf8d0123cb1d674d4d7811caa Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 14 Jun 2021 13:27:52 +0200
Subject: [PATCH 1/3] add content header again

---
 .../components/SidebarPlugin/SideBar.spec.js  | 14 -------------
 .../src/components/SidebarPlugin/SideBar.vue  |  9 ---------
 .../src/views/Layout/DashboardLayout_gdd.vue  | 20 ++++++++++++++++++-
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 4612f6f9e..f9e0780d4 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -41,20 +41,6 @@ describe('SideBar', () => {
       expect(wrapper.find('#sidenav-main').exists()).toBeTruthy()
     })
 
-    describe('balance', () => {
-      it('shows em-dash as balance while loading', () => {
-        expect(wrapper.find('.gddBalance').text()).toBe('— GDD')
-      })
-
-      it('shows the when loaded', async () => {
-        wrapper.setProps({
-          pending: false,
-        })
-        await wrapper.vm.$nextTick()
-        expect(wrapper.find('.gddBalance').text()).toBe('1234.56 GDD')
-      })
-    })
-
     describe('navbar button', () => {
       it('has a navbar button', () => {
         expect(wrapper.find('button.navbar-toggler').exists()).toBeTruthy()
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 138c802e9..d2373e1de 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -9,13 +9,6 @@
           <img :src="logo" class="navbar-brand-img" alt="Gradido Logo" />
         </div>
       </div>
-      <div class="gddBalance text-center">{{ pending ? '—' : $n(balance, 'decimal') }} GDD</div>
-
-      <div class="text-center">
-        <div class="avatar">
-          <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
-        </div>
-      </div>
 
       <slot name="mobile-right">
         <ul class="nav align-items-center d-md-none">
@@ -74,14 +67,12 @@
 </template>
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
-import VueQrcode from 'vue-qrcode'
 import LanguageSwitch from '@/components/LanguageSwitch.vue'
 
 export default {
   name: 'sidebar',
   components: {
     NavbarToggleButton,
-    VueQrcode,
     LanguageSwitch,
   },
   props: {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 68f3db88e..b1bf052fa 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -23,6 +23,23 @@
       </template>
     </side-bar>
     <div class="main-content">
+      <b-navbar>
+        <b-navbar-nav class="ml-auto">
+          <b-nav-item right>
+            <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">
+                <span class="avatar">
+                  <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+                </span>
+              </b-media-body>
+            </b-media>
+          </b-nav-item>
+        </b-navbar-nav>
+      </b-navbar>
+
       <div @click="$sidebar.displaySidebar(false)">
         <fade-transition :duration="200" origin="center top" mode="out-in">
           <!-- your content here -->
@@ -51,6 +68,7 @@ import ContentFooter from './ContentFooter.vue'
 // import DashboardContent from './Content.vue';
 import { FadeTransition } from 'vue2-transitions'
 import communityAPI from '../../apis/communityAPI'
+import VueQrcode from 'vue-qrcode'
 
 function hasElement(className) {
   return document.getElementsByClassName(className).length > 0
@@ -71,7 +89,7 @@ function initScrollbar(className) {
 export default {
   components: {
     ContentFooter,
-    // DashboardContent,
+    VueQrcode,
     FadeTransition,
   },
   data() {

From d8aa42cbbd022a635541b5374e2ab81b224a24b2 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 14 Jun 2021 15:27:39 +0200
Subject: [PATCH 2/3] content header line is fix

---
 .../src/components/SidebarPlugin/SideBar.vue  | 24 +++++++-----
 .../src/views/Layout/DashboardLayout_gdd.vue  | 39 +++++++++++--------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index d2373e1de..756e72d2a 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -4,19 +4,21 @@
     id="sidenav-main"
   >
     <div class="container-fluid">
-      <div class="text-center">
-        <div class="mb-2">
-          <img :src="logo" class="navbar-brand-img" alt="Gradido Logo" />
-        </div>
+      <!--Toggler-->
+      <navbar-toggle-button @click.native="showSidebar"></navbar-toggle-button>
+      <div class="navbar-brand">
+        <img :src="logo" class="navbar-brand-img" alt="..." />
       </div>
-
+      <b-row class="text-center">
+        <b-col>{{ pending ? '—' : $n(balance, 'decimal') }} GDD</b-col>
+      </b-row>
       <slot name="mobile-right">
         <ul class="nav align-items-center d-md-none">
-          <a slot="title-container" class="nav-link" role="button">
-            <div class="media align-items-center">
-              <navbar-toggle-button @click.native="showSidebar"></navbar-toggle-button>
-            </div>
-          </a>
+          <div class="media align-items-center">
+            <span class="avatar avatar-sm">
+              <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+            </span>
+          </div>
         </ul>
       </slot>
       <slot></slot>
@@ -68,12 +70,14 @@
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
 import LanguageSwitch from '@/components/LanguageSwitch.vue'
+import VueQrcode from 'vue-qrcode'
 
 export default {
   name: 'sidebar',
   components: {
     NavbarToggleButton,
     LanguageSwitch,
+    VueQrcode,
   },
   props: {
     logo: {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index b1bf052fa..7a6dffe03 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -23,22 +23,24 @@
       </template>
     </side-bar>
     <div class="main-content">
-      <b-navbar>
-        <b-navbar-nav class="ml-auto">
-          <b-nav-item right>
-            <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">
-                <span class="avatar">
-                  <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+      <div class="d-none d-md-block">
+        <b-navbar>
+          <b-navbar-nav class="ml-auto">
+            <b-nav-item>
+              <b-media no-body class="align-items-center">
+                <span class="pb-2 text-lg font-weight-bold">
+                  {{ $store.state.email }}
                 </span>
-              </b-media-body>
-            </b-media>
-          </b-nav-item>
-        </b-navbar-nav>
-      </b-navbar>
+                <b-media-body class="ml-2">
+                  <span class="avatar">
+                    <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+                  </span>
+                </b-media-body>
+              </b-media>
+            </b-nav-item>
+          </b-navbar-nav>
+        </b-navbar>
+      </div>
 
       <div @click="$sidebar.displaySidebar(false)">
         <fade-transition :duration="200" origin="center top" mode="out-in">
@@ -152,4 +154,9 @@ export default {
   },
 }
 </script>
-<style lang="scss"></style>
+<style lang="scss">
+.xxx {
+  position: relative;
+  right: 0px;
+}
+</style>

From ecf2b0d8f7ee531d1c54f50c2c6f69aef2683f90 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 14 Jun 2021 16:04:57 +0200
Subject: [PATCH 3/3] fix text balnace on sidebar.vue

---
 .../src/components/SidebarPlugin/SideBar.spec.js   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index f9e0780d4..58405f38f 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -54,6 +54,20 @@ describe('SideBar', () => {
       })
     })
 
+    describe('balance', () => {
+      it('shows em-dash as balance while loading', () => {
+        expect(wrapper.find('div.row.text-center').text()).toBe('— GDD')
+      })
+
+      it('shows the when loaded', async () => {
+        wrapper.setProps({
+          pending: false,
+        })
+        await wrapper.vm.$nextTick()
+        expect(wrapper.find('div.row.text-center').text()).toBe('1234.56 GDD')
+      })
+    })
+
     describe('close siedbar', () => {
       it('calls closeSidebar when clicked', async () => {
         const spy = jest.spyOn(wrapper.vm.$sidebar, 'displaySidebar')