From bb63eaeab49e0a69bca446d7799d6c3ac19157a6 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 09:30:20 +0200
Subject: [PATCH 01/11] css mobil style, language in extra componente

---
 frontend/src/App.vue                          | 24 +------------------
 frontend/src/components/LanguageSwitch.vue    | 22 +++++++++++++++++
 .../views/Layout/DashboardLayout_gdd.spec.js  |  2 +-
 .../src/views/Layout/DashboardLayout_gdd.vue  | 10 +++++---
 frontend/src/views/Layout/DashboardNavbar.vue |  7 ++++--
 frontend/src/views/Pages/AccountOverview.vue  |  4 ++--
 .../Pages/AccountOverview/GddStatus.spec.js   |  2 +-
 .../views/Pages/AccountOverview/GddStatus.vue | 21 +++++-----------
 .../views/Pages/AccountOverview/GddTable.vue  |  8 +++----
 .../Pages/UserProfileTransactionList.vue      |  2 +-
 10 files changed, 49 insertions(+), 53 deletions(-)
 create mode 100644 frontend/src/components/LanguageSwitch.vue

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index b47b9caf0..7cc476759 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,20 +1,6 @@
 <template>
   <div id="app" class="font-sans text-gray-800">
-    <header>
-      <b-col class="text-center">
-        <b-dropdown
-          size="sm"
-          split
-          variant="secondary"
-          :text="$t('language') + ' - ' + $i18n.locale"
-          class="m-md-2"
-        >
-          <b-dropdown-divider></b-dropdown-divider>
-          <b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
-          <b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
-        </b-dropdown>
-      </b-col>
-    </header>
+    <header></header>
     <div class="">
       <particles-bg type="custom" :config="config" :bg="true" />
       <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayoutGDD'" />
@@ -25,7 +11,6 @@
 <script>
 import { ParticlesBg } from 'particles-bg-vue'
 import icon from './icon.js'
-import { localeChanged } from 'vee-validate'
 import DashboardLayout from '@/views/Layout/DashboardLayout_gdd.vue'
 import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue'
 
@@ -54,13 +39,6 @@ export default {
       },
     }
   },
-  methods: {
-    setLocale(locale) {
-      this.$i18n.locale = locale
-      this.$store.commit('language', this.$i18n.locale)
-      localeChanged(locale)
-    },
-  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
new file mode 100644
index 000000000..35dc63abf
--- /dev/null
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <b-dropdown size="sm" :text="$t('language') + ' - ' + $i18n.locale">
+      <b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
+      <b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
+    </b-dropdown>
+  </div>
+</template>
+<script>
+import { localeChanged } from 'vee-validate'
+
+export default {
+  name: 'language-switch',
+  methods: {
+    setLocale(locale) {
+      this.$i18n.locale = locale
+      this.$store.commit('language', this.$i18n.locale)
+      localeChanged(locale)
+    },
+  },
+}
+</script>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index ee9bab18b..34766b63c 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -79,7 +79,7 @@ describe('DashboardLayoutGdd', () => {
       })
 
       it('has five items in the navbar', () => {
-        expect(navbar.findAll('ul > li')).toHaveLength(2)
+        expect(navbar.findAll('ul > li')).toHaveLength(5)
       })
 
       it('has first item "send" in navbar', () => {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 291c8762b..9fba0a3ae 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -3,12 +3,15 @@
     <notifications></notifications>
     <side-bar @logout="logout" :balance="balance">
       <template slot="links">
-        <b-nav-item href="#!" to="/overview">
+        <b-nav-item to="/overview">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('send') }}</b-nav-text>
         </b-nav-item>
-        <b-nav-item href="#!" to="/transactions">
+        <b-nav-item to="/transactions">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('transactions') }}</b-nav-text>
         </b-nav-item>
+        <b-nav-item class="d-lg-none">
+          <b-nav-text class="pt-3"><language-switch /></b-nav-text>
+        </b-nav-item>
         <!--
         <b-nav-item href="#!" to="/profile">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.my-profil') }}</b-nav-text>
@@ -24,7 +27,6 @@
     </side-bar>
     <div class="main-content">
       <dashboard-navbar :type="$route.meta.navbarType"></dashboard-navbar>
-
       <div @click="$sidebar.displaySidebar(false)">
         <fade-transition :duration="200" origin="center top" mode="out-in">
           <!-- your content here -->
@@ -52,6 +54,7 @@ import ContentFooter from './ContentFooter.vue'
 // import DashboardContent from './Content.vue';
 import { FadeTransition } from 'vue2-transitions'
 import communityAPI from '../../apis/communityAPI'
+import LanguageSwitch from '@/components/LanguageSwitch.vue'
 
 function hasElement(className) {
   return document.getElementsByClassName(className).length > 0
@@ -75,6 +78,7 @@ export default {
     ContentFooter,
     // DashboardContent,
     FadeTransition,
+    LanguageSwitch,
   },
   data() {
     return {
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 2195db8dd..75fe5be30 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -9,8 +9,9 @@
       <!-- 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"></li>
     </b-navbar-nav>
+    <language-switch class="mr-3" />
     <b-navbar-nav class="align-items-center ml-auto ml-md-0">
-      <a class="pr-1 nav-link" slot="title-container pointer">
+      <div 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 }}
@@ -21,18 +22,20 @@
             </span>
           </b-media-body>
         </b-media>
-      </a>
+      </div>
     </b-navbar-nav>
   </base-nav>
 </template>
 <script>
 import { BaseNav } from '@/components'
+import LanguageSwitch from '@/components/LanguageSwitch.vue'
 import VueQrcode from 'vue-qrcode'
 
 export default {
   components: {
     BaseNav,
     VueQrcode,
+    LanguageSwitch,
   },
   props: {
     type: {
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 41dcc7848..c9d839a3d 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <base-header class="pb-4 pt-2 bg-transparent"></base-header>
-    <b-container fluid class="p-2 mt-5">
+    <base-header class="pb-lg-4 pt-lg-2 bg-transparent"></base-header>
+    <b-container fluid class="p-lg-2 mt-lg-5">
       <gdd-status v-if="showTransactionList" :balance="balance" :gdt-balance="GdtBalance" />
       <br />
       <gdd-send
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
index 9adc3b4ca..e169dca93 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
@@ -25,7 +25,7 @@ describe('GddStatus', () => {
     })
 
     it('it displays the ammount of GDD', () => {
-      expect(wrapper.findAll('div.card-body').at(0).text()).toEqual('1234 GDD')
+      expect(wrapper.findAll('div.card-body b').at(0).text()).toEqual('1234')
     })
 
     it('it displays the ammount of GDT', () => {
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index 8698d1fdc..c88f157f3 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -2,24 +2,15 @@
   <div>
     <b-row>
       <b-col>
-        <stats-card
-          type="gradient-red"
-          sub-title="balance_gdd"
-          class="mb-4 h1"
-          style="background-color: #ebebeba3 !important"
-        >
-          {{ $n(balance) }} GDD
-        </stats-card>
+        <b-card style="background-color: #ebebeba3 !important">
+          <b>{{ $n(balance) }}</b>
+          GDD
+        </b-card>
       </b-col>
       <b-col>
-        <stats-card
-          type="gradient-orange"
-          sub-title="balance_gdt"
-          class="mb-4 h1"
-          style="background-color: #ebebeba3 !important"
-        >
+        <b-card class="lg-h2 text-right" style="background-color: #ebebeba3 !important">
           {{ $n(GdtBalance) }} GDT
-        </stats-card>
+        </b-card>
       </b-col>
     </b-row>
   </div>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index 194315b31..88b336a21 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -88,11 +88,9 @@
           </b-card>
         </b-collapse>
       </b-list-group-item>
-      <b-list-group-item>
-        <b-alert v-if="transactions.length === 0" show variant="secondary">
-          <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
-        </b-alert>
-      </b-list-group-item>
+      <div v-if="transactions.length === 0" class="mt-lg-4 text-center">
+        <span>{{ $t('transaction.nullTransactions') }}</span>
+      </div>
     </b-list-group>
   </div>
 </template>
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index e7c35a731..6b1a32d48 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header"
+      class="header pb-8 pt-lg-4 d-flex align-items-center profile-header"
       style="max-height: 200px"
     ></div>
     <b-container fluid class="mt--6">

From 58faba9709eabd8559498772d878d3ee5756e045 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 09:37:12 +0200
Subject: [PATCH 02/11] language switch component in authlayout_gdd

---
 frontend/src/views/Layout/AuthLayout_gdd.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 9aef55915..3ef8cb36f 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -1,16 +1,19 @@
 <template>
   <div class="wrapper">
-    <div class="main-content">
+    <div class="main-content mt-4">
       <router-view></router-view>
+      <language-switch class="text-center mb-5 mt-5" />
       <content-footer v-if="!$route.meta.hideFooter"></content-footer>
     </div>
   </div>
 </template>
 <script>
 import ContentFooter from './ContentFooter.vue'
+import LanguageSwitch from '@/components/LanguageSwitch.vue'
 export default {
   components: {
     ContentFooter,
+    LanguageSwitch,
   },
 }
 </script>

From f892a90e6c86d5a5ea11c1c835c68704c6817e52 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 11:29:00 +0200
Subject: [PATCH 03/11] switch language in sidebar

---
 frontend/src/locales/en.json                      | 1 -
 frontend/src/views/Layout/DashboardLayout_gdd.vue | 2 +-
 frontend/src/views/Layout/DashboardNavbar.vue     | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index fc2e15cc7..d9a3d278b 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -57,7 +57,6 @@
   },
   "transaction":{
     "show_all":"View all <strong>{count}</strong> transactions.",
-    "show_part": "The last <strong>{count}</strong> transactions.",
     "nullTransactions":"You don't have any transactions on your account yet.",
     "more": "more"
   },
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 9fba0a3ae..35b449854 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -9,7 +9,7 @@
         <b-nav-item to="/transactions">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('transactions') }}</b-nav-text>
         </b-nav-item>
-        <b-nav-item class="d-lg-none">
+        <b-nav-item>
           <b-nav-text class="pt-3"><language-switch /></b-nav-text>
         </b-nav-item>
         <!--
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 75fe5be30..7c83bef1b 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -9,7 +9,6 @@
       <!-- 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"></li>
     </b-navbar-nav>
-    <language-switch class="mr-3" />
     <b-navbar-nav class="align-items-center ml-auto ml-md-0">
       <div class="pr-1" slot="title-container ">
         <b-media no-body class="align-items-center">
@@ -28,14 +27,12 @@
 </template>
 <script>
 import { BaseNav } from '@/components'
-import LanguageSwitch from '@/components/LanguageSwitch.vue'
 import VueQrcode from 'vue-qrcode'
 
 export default {
   components: {
     BaseNav,
     VueQrcode,
-    LanguageSwitch,
   },
   props: {
     type: {

From 97bd3a6482f35d2eae1e5fea4bd82529bec0c3a5 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 12:01:13 +0200
Subject: [PATCH 04/11] mobil menu close by click of send and transactions

---
 .../src/components/SidebarPlugin/SideBar.vue  | 10 ++++-----
 .../views/Layout/DashboardLayout_gdd.spec.js  | 16 ++++++++------
 .../src/views/Layout/DashboardLayout_gdd.vue  | 21 +++++++++++++------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 9e0885d3f..375d9801a 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -44,22 +44,22 @@
         <ul class="navbar-nav">
           <slot name="links"></slot>
         </ul>
-        <hr class="my-3" />
-        <ul class="navbar-nav mb-md-3">
+        <hr class="my-2" />
+        <ul class="navbar-nav">
           <li class="nav-item">
             <a
               :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
-              class="nav-link text-lg"
+              class="nav-link"
               target="_blank"
             >
               {{ $t('members_area') }}
             </a>
           </li>
         </ul>
-        <hr class="my-3" />
+        <hr class="my-2" />
         <ul class="navbar-nav mb-md-3">
           <li class="nav-item">
-            <a class="nav-link text-lg pointer" @click="logout">
+            <a class="nav-link pointer" @click="logout">
               {{ $t('logout') }}
             </a>
           </li>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 34766b63c..7ef2ba7b6 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -79,31 +79,35 @@ describe('DashboardLayoutGdd', () => {
       })
 
       it('has five items in the navbar', () => {
-        expect(navbar.findAll('ul > li')).toHaveLength(5)
-      })
+        expect(navbar.findAll('ul > a')).toHaveLength(2)
+      })      
 
       it('has first item "send" in navbar', () => {
-        expect(navbar.findAll('ul > li').at(0).text()).toEqual('send')
+        expect(navbar.findAll('ul > a').at(0).text()).toEqual('send')
       })
 
       it('has first item "send" linked to overview in navbar', () => {
-        navbar.findAll('ul > li').at(0).trigger('click')
+        navbar.findAll('ul > a').at(0).trigger('click')
         expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/overview')
       })
 
       it('has second item "transactions" in navbar', () => {
-        expect(navbar.findAll('ul > li').at(1).text()).toEqual('transactions')
+        expect(navbar.findAll('ul > a').at(1).text()).toEqual('transactions')
       })
 
       // to do: get this working!
       it.skip('has second item "transactions" linked to transactions in navbar', async () => {
-        navbar.findAll('ul > li > a').at(1).trigger('click')
+        navbar.findAll('ul > a').at(1).trigger('click')
         await flushPromises()
         await jest.runAllTimers()
         await flushPromises()
         expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/transactions')
       })
 
+      it('has tree items in the navbar', () => {
+        expect(navbar.findAll('ul > li')).toHaveLength(3)
+      })
+
       // it('has third item "My profile" in navbar', () => {
       //  expect(navbar.findAll('ul > li').at(2).text()).toEqual('site.navbar.my-profil')
       // })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 35b449854..9546afda0 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -3,12 +3,21 @@
     <notifications></notifications>
     <side-bar @logout="logout" :balance="balance">
       <template slot="links">
-        <b-nav-item to="/overview">
-          <b-nav-text class="p-0 text-lg text-muted">{{ $t('send') }}</b-nav-text>
-        </b-nav-item>
-        <b-nav-item to="/transactions">
-          <b-nav-text class="p-0 text-lg text-muted">{{ $t('transactions') }}</b-nav-text>
-        </b-nav-item>
+        <sidebar-item
+          :link="{
+            name: $t('send'),
+            icon: false,
+            path: '/overview',
+          }"
+        ></sidebar-item>
+        <sidebar-item
+          :link="{
+            name: $t('transactions'),
+            icon: '',
+            path: '/transactions',
+          }"
+        ></sidebar-item>
+
         <b-nav-item>
           <b-nav-text class="pt-3"><language-switch /></b-nav-text>
         </b-nav-item>

From 3a2fc28dbc1b13172271c7b7d1610cf812e40be8 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 13:13:38 +0200
Subject: [PATCH 05/11] language end on menu

---
 frontend/src/components/SidebarPlugin/SideBar.vue     | 11 ++++++++---
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 10 +++++-----
 frontend/src/views/Layout/DashboardLayout_gdd.vue     |  7 -------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 375d9801a..5a960b39b 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -45,7 +45,7 @@
           <slot name="links"></slot>
         </ul>
         <hr class="my-2" />
-        <ul class="navbar-nav">
+        <ul class="navbar-nav ml-2">
           <li class="nav-item">
             <a
               :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
@@ -56,14 +56,17 @@
             </a>
           </li>
         </ul>
-        <hr class="my-2" />
-        <ul class="navbar-nav mb-md-3">
+
+        <ul class="navbar-nav ml-2">
           <li class="nav-item">
             <a class="nav-link pointer" @click="logout">
               {{ $t('logout') }}
             </a>
           </li>
         </ul>
+        <div class="mt-5 ml-4">
+          <language-switch />
+        </div>
       </div>
     </div>
   </nav>
@@ -71,12 +74,14 @@
 <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: {
     logo: {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 7ef2ba7b6..537d94f29 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -80,7 +80,7 @@ describe('DashboardLayoutGdd', () => {
 
       it('has five items in the navbar', () => {
         expect(navbar.findAll('ul > a')).toHaveLength(2)
-      })      
+      })
 
       it('has first item "send" in navbar', () => {
         expect(navbar.findAll('ul > a').at(0).text()).toEqual('send')
@@ -104,10 +104,10 @@ describe('DashboardLayoutGdd', () => {
         expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/transactions')
       })
 
-      it('has tree items in the navbar', () => {
-        expect(navbar.findAll('ul > li')).toHaveLength(3)
-      })
-
+      //it('has tree items in the navbar', () => {
+      //  expect(navbar.findAll('ul > li')).toHaveLength(3)
+      //})
+//
       // it('has third item "My profile" in navbar', () => {
       //  expect(navbar.findAll('ul > li').at(2).text()).toEqual('site.navbar.my-profil')
       // })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 9546afda0..4dd8948ff 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -6,21 +6,16 @@
         <sidebar-item
           :link="{
             name: $t('send'),
-            icon: false,
             path: '/overview',
           }"
         ></sidebar-item>
         <sidebar-item
           :link="{
             name: $t('transactions'),
-            icon: '',
             path: '/transactions',
           }"
         ></sidebar-item>
 
-        <b-nav-item>
-          <b-nav-text class="pt-3"><language-switch /></b-nav-text>
-        </b-nav-item>
         <!--
         <b-nav-item href="#!" to="/profile">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.my-profil') }}</b-nav-text>
@@ -63,7 +58,6 @@ import ContentFooter from './ContentFooter.vue'
 // import DashboardContent from './Content.vue';
 import { FadeTransition } from 'vue2-transitions'
 import communityAPI from '../../apis/communityAPI'
-import LanguageSwitch from '@/components/LanguageSwitch.vue'
 
 function hasElement(className) {
   return document.getElementsByClassName(className).length > 0
@@ -87,7 +81,6 @@ export default {
     ContentFooter,
     // DashboardContent,
     FadeTransition,
-    LanguageSwitch,
   },
   data() {
     return {

From 1cb538ba9ac2747dd60c555aedd68fe5cf245767 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 13:19:30 +0200
Subject: [PATCH 06/11] language end on menu margin text

---
 frontend/src/components/SidebarPlugin/SideBar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 5a960b39b..d6ea041c1 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -45,7 +45,7 @@
           <slot name="links"></slot>
         </ul>
         <hr class="my-2" />
-        <ul class="navbar-nav ml-2">
+        <ul class="navbar-nav ml-3">
           <li class="nav-item">
             <a
               :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
@@ -57,7 +57,7 @@
           </li>
         </ul>
 
-        <ul class="navbar-nav ml-2">
+        <ul class="navbar-nav ml-3">
           <li class="nav-item">
             <a class="nav-link pointer" @click="logout">
               {{ $t('logout') }}

From 693a6aee6706e5e56a1d7981673b4d9cfb8e699c Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 13:55:19 +0200
Subject: [PATCH 07/11] logo background color gray remove

---
 frontend/src/components/SidebarPlugin/SideBar.vue     | 4 +---
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index d6ea041c1..63ab8897c 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -32,9 +32,7 @@
         <div class="navbar-collapse-header d-md-none">
           <div class="row">
             <div class="col-6 collapse-brand">
-              <router-link to="/overview">
-                <img :src="logo" />
-              </router-link>
+              <img :src="logo" />
             </div>
             <div class="col-6 collapse-close">
               <navbar-toggle-button @click.native="closeSidebar"></navbar-toggle-button>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 537d94f29..79e85b49f 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -104,10 +104,10 @@ describe('DashboardLayoutGdd', () => {
         expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/transactions')
       })
 
-      //it('has tree items in the navbar', () => {
+      // it('has tree items in the navbar', () => {
       //  expect(navbar.findAll('ul > li')).toHaveLength(3)
-      //})
-//
+      // })
+      //
       // it('has third item "My profile" in navbar', () => {
       //  expect(navbar.findAll('ul > li').at(2).text()).toEqual('site.navbar.my-profil')
       // })

From 4885fb2f898e8a9d3fe616ed2c84179347104704 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 14:43:04 +0200
Subject: [PATCH 08/11] header remove from app.vue

---
 frontend/src/App.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 7cc476759..d44d64ab3 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,5 @@
 <template>
   <div id="app" class="font-sans text-gray-800">
-    <header></header>
     <div class="">
       <particles-bg type="custom" :config="config" :bg="true" />
       <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayoutGDD'" />

From 3592393609908b83556503d15973208951d683e6 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 15:10:00 +0200
Subject: [PATCH 09/11] merge master, languange-switch test

---
 frontend/src/components/LanguageSwitch.vue            | 2 +-
 frontend/src/components/SidebarPlugin/SideBar.spec.js | 6 ++++++
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 4 ----
 frontend/src/views/Layout/DashboardLayout_gdd.vue     | 1 -
 frontend/src/views/Pages/AccountOverview.vue          | 8 +++++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 35dc63abf..0fad036a6 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="language-switch">
     <b-dropdown size="sm" :text="$t('language') + ' - ' + $i18n.locale">
       <b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
       <b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index cc56b00f1..36230849f 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -112,6 +112,12 @@ describe('SideBar', () => {
           expect(wrapper.emitted('logout')).toEqual([[]])
         })
       })
+
+      describe('language-switch', () => {
+        it('has a language-switch button', () => {
+          expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
+        })
+      })
     })
   })
 })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 79e85b49f..8c1e604c0 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -59,10 +59,6 @@ describe('DashboardLayoutGdd', () => {
       expect(wrapper.find('nav#sidenav-main').exists()).toBeTruthy()
     })
 
-    it('has a notifications component', () => {
-      expect(wrapper.find('div.notifications').exists()).toBeTruthy()
-    })
-
     it('has a main content div', () => {
       expect(wrapper.find('div.main-content').exists()).toBeTruthy()
     })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 72ddb9b57..575f8a861 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="wrapper">
-    <notifications></notifications>
     <side-bar @logout="logout" :balance="balance" :pending="pending">
       <template slot="links">
         <sidebar-item
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 97845818b..3a8789ac3 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -2,13 +2,15 @@
   <div>
     <base-header class="pb-lg-4 pt-lg-2 bg-transparent"></base-header>
     <b-container fluid class="p-lg-2 mt-lg-5">
-      <gdd-status v-if="showTransactionList" :balance="balance" :gdt-balance="GdtBalance" />
-      <br />
-      <gdd-send
+      <gdd-status
+        v-if="showContext"
+        :pending="pending"
         :balance="balance"
         :gdt-balance="GdtBalance"
       />
       <br />
+      <gdd-send :balance="balance" :gdt-balance="GdtBalance" />
+      <br />
       <gdd-send :currentTransactionStep="currentTransactionStep">
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>

From e8e828baf193a50231bf02391de2ce036472cee7 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 15:21:42 +0200
Subject: [PATCH 10/11] status add pending, sorry mogge

---
 frontend/src/views/Pages/AccountOverview/GddStatus.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index 8281ca81a..e75247eb8 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -3,13 +3,13 @@
     <b-row>
       <b-col>
         <b-card style="background-color: #ebebeba3 !important">
-          <b>{{ $n(balance) }}</b>
+          <b>{{ pending ? '—' : $n(balance) }}</b>
           GDD
         </b-card>
       </b-col>
       <b-col>
         <b-card class="lg-h2 text-right" style="background-color: #ebebeba3 !important">
-          {{ $n(GdtBalance) }} GDT
+          {{ pending ? '—' : $n(GdtBalance) }} GDT
         </b-card>
       </b-col>
     </b-row>

From 77d72cf472965e19a7e31bb15ed5e48eacf993e5 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 12 May 2021 15:42:09 +0200
Subject: [PATCH 11/11] specs status

---
 frontend/src/views/Pages/AccountOverview.vue         |  2 --
 .../views/Pages/AccountOverview/GddStatus.spec.js    | 12 +++++++++---
 .../src/views/Pages/AccountOverview/GddStatus.vue    |  3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 3a8789ac3..0a59732b1 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -9,8 +9,6 @@
         :gdt-balance="GdtBalance"
       />
       <br />
-      <gdd-send :balance="balance" :gdt-balance="GdtBalance" />
-      <br />
       <gdd-send :currentTransactionStep="currentTransactionStep">
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
index b9c06cc11..b414f4e93 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
@@ -24,8 +24,14 @@ describe('GddStatus', () => {
       wrapper = Wrapper()
     })
 
-    it('it displays the ammount of GDD', () => {
-      expect(wrapper.findAll('div.card-body b').at(0).text()).toEqual('1234')
+    describe('balance is loading', () => {
+      it('it displays em-dash as the ammount of GDD', () => {
+        expect(wrapper.findAll('div.card-body').at(0).text()).toEqual('— GDD')
+      })
+
+      it('it displays em-dash as the ammount of GDT', () => {
+        expect(wrapper.findAll('div.card-body').at(1).text()).toEqual('— GDT')
+      })
     })
 
     describe('balance is loaded', () => {
@@ -36,7 +42,7 @@ describe('GddStatus', () => {
       })
 
       it('it displays the ammount of GDD', () => {
-        expect(wrapper.findAll('div.card-body b').at(0).text()).toEqual('1234')
+        expect(wrapper.findAll('div.card-body').at(0).text()).toEqual('1234 GDD')
       })
 
       it('it displays the ammount of GDT', () => {
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index e75247eb8..32fccce28 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -3,8 +3,7 @@
     <b-row>
       <b-col>
         <b-card style="background-color: #ebebeba3 !important">
-          <b>{{ pending ? '—' : $n(balance) }}</b>
-          GDD
+          {{ pending ? '—' : $n(balance) }} GDD
         </b-card>
       </b-col>
       <b-col>