From fb48e7c9d2ba4a3566244234174230dde4411304 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Dec 2021 13:09:45 +0100
Subject: [PATCH 01/71] catch error Client certificate revoked and pass
 error.session-expired. Graph QL error: always passed from backend

---
 frontend/src/locales/de.json                      | 2 +-
 frontend/src/locales/en.json                      | 2 +-
 frontend/src/main.js                              | 2 +-
 frontend/src/views/Layout/DashboardLayout_gdd.vue | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1e8bfb621..120bf6cbd 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -48,7 +48,7 @@
     "error": "Fehler",
     "no-account": "Leider konnten wir keinen Account finden mit diesen Daten!",
     "no-email-verify": "Die Email wurde noch nicht bestätigt, bitte überprüfe deine Emails und klicke auf den Aktivierungslink!",
-    "session-expired": "Sitzung abgelaufen!"
+    "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet."
   },
   "form": {
     "amount": "Betrag",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f473ff798..bbb68b0b9 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -48,7 +48,7 @@
     "error": "Error",
     "no-account": "Unfortunately we could not find an account to the given data!",
     "no-email-verify": "Your email is not activated yet, please check your emails and click the activation link!",
-    "session-expired": "The session expired"
+    "session-expired": "The session was closed for security reasons."
   },
   "form": {
     "amount": "Amount",
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 1aa945608..8194bb4a8 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -24,7 +24,7 @@ const authLink = new ApolloLink((operation, forward) => {
   })
   return forward(operation).map((response) => {
     if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
-      response.errors[0].message = i18n.t('error.session-expired')
+      // response.errors[0].message = i18n.t('error.session-expired')
       store.dispatch('logout', null)
       if (router.currentRoute.path !== '/login') router.push('/login')
       return response
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 8273685bd..9487eadf7 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -133,7 +133,9 @@ export default {
         })
         .catch((error) => {
           this.pending = true
-          this.$toasted.error(error.message)
+          if (error.message === 'GraphQL error: 403.13 - Client certificate revoked') {
+            this.$toasted.error(this.$t('error.session-expired'))
+          }
           // what to do when loading balance fails?
         })
     },

From 73006ede996604a09e7642b3b0c1a9e3756fa5b3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 7 Dec 2021 10:34:24 +0100
Subject: [PATCH 02/71] insert b-navbar from bootstrap

---
 .../src/views/Layout/DashboardLayout_gdd.vue  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 8273685bd..16847f39f 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,5 +1,46 @@
 <template>
   <div>
+    <b-navbar toggleable="lg" type="dark" variant="info">
+      <div class="navbar-brand">
+        <img :src="logo" class="navbar-brand-img" alt="..." />
+      </div>
+      <b-nav-text>{{ balance }} GDD</b-nav-text>
+      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
+
+      <b-collapse id="nav-collapse" is-nav>
+        <b-navbar-nav>
+          <b-nav-item href="/overview">{{ $t('overview') }}</b-nav-item>
+          <b-nav-item href="/send">{{ $t('send') }}</b-nav-item>
+          <b-nav-item href="/transactions">{{ $t('transactions') }}</b-nav-item>
+          <b-nav-item href="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
+        </b-navbar-nav>
+
+        <!-- Right aligned nav items -->
+        <b-navbar-nav class="ml-auto">
+          <b-nav-form>
+            <b-form-input size="sm" class="mr-sm-2" placeholder="Search"></b-form-input>
+            <b-button size="sm" class="my-2 my-sm-0" type="submit">Search</b-button>
+          </b-nav-form>
+
+          <b-nav-item-dropdown text="Lang" right>
+            <b-dropdown-item href="#">EN</b-dropdown-item>
+            <b-dropdown-item href="#">ES</b-dropdown-item>
+            <b-dropdown-item href="#">RU</b-dropdown-item>
+            <b-dropdown-item href="#">FA</b-dropdown-item>
+          </b-nav-item-dropdown>
+
+          <b-nav-item-dropdown right>
+            <!-- Using 'button-content' slot -->
+            <template #button-content>
+              <em>User</em>
+            </template>
+            <b-dropdown-item href="#">Profile</b-dropdown-item>
+            <b-dropdown-item href="#">Sign Out</b-dropdown-item>
+          </b-nav-item-dropdown>
+        </b-navbar-nav>
+      </b-collapse>
+    </b-navbar>
+
     <side-bar @logout="logout" :balance="balance" :pending="pending">
       <template slot="links">
         <sidebar-item
@@ -28,6 +69,7 @@
         ></sidebar-item>
       </template>
     </side-bar>
+
     <div class="main-content" style="max-width: 1000px">
       <div class="d-none d-md-block">
         <b-navbar>
@@ -84,6 +126,7 @@ export default {
   },
   data() {
     return {
+      logo: 'img/brand/green.png',
       balance: 0,
       GdtBalance: 0,
       transactions: [],
@@ -143,3 +186,9 @@ export default {
   },
 }
 </script>
+<style>
+.navbar-brand-img {
+  height: 2rem;
+  padding-left: 10px;
+}
+</style>

From b257575a9592b2d3421d076279fca1f153c490e3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 7 Dec 2021 11:03:01 +0100
Subject: [PATCH 03/71] all function from old menu to new navbar menu

---
 .../src/views/Layout/DashboardLayout_gdd.vue  | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 16847f39f..e1704fe56 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -4,23 +4,22 @@
       <div class="navbar-brand">
         <img :src="logo" class="navbar-brand-img" alt="..." />
       </div>
-      <b-nav-text>{{ balance }} GDD</b-nav-text>
+      <b-nav-text center>{{ balance }} GDD</b-nav-text>
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
       <b-collapse id="nav-collapse" is-nav>
         <b-navbar-nav>
-          <b-nav-item href="/overview">{{ $t('overview') }}</b-nav-item>
-          <b-nav-item href="/send">{{ $t('send') }}</b-nav-item>
-          <b-nav-item href="/transactions">{{ $t('transactions') }}</b-nav-item>
-          <b-nav-item href="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
+          <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
+          <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
+          <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
         </b-navbar-nav>
 
         <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto">
-          <b-nav-form>
+          <!--<b-nav-form>
             <b-form-input size="sm" class="mr-sm-2" placeholder="Search"></b-form-input>
             <b-button size="sm" class="my-2 my-sm-0" type="submit">Search</b-button>
-          </b-nav-form>
+          </b-nav-form> 
 
           <b-nav-item-dropdown text="Lang" right>
             <b-dropdown-item href="#">EN</b-dropdown-item>
@@ -28,47 +27,35 @@
             <b-dropdown-item href="#">RU</b-dropdown-item>
             <b-dropdown-item href="#">FA</b-dropdown-item>
           </b-nav-item-dropdown>
+          -->
 
           <b-nav-item-dropdown right>
             <!-- Using 'button-content' slot -->
             <template #button-content>
-              <em>User</em>
+              <em> {{ $store.state.email }} 
+             
+                  <span class="avatar">
+                    <vue-qrcode
+                      v-if="$store.state.email"
+                      :value="$store.state.email"
+                      type="image/png"
+                    ></vue-qrcode>
+                  </span>
+               
+              </em>
             </template>
-            <b-dropdown-item href="#">Profile</b-dropdown-item>
-            <b-dropdown-item href="#">Sign Out</b-dropdown-item>
+            <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
+            <b-dropdown-item  @click="getElopageLink" target="_blank">
+              {{ $t('members_area') }}
+            </b-dropdown-item>
+            <b-dropdown-item   target="_blank" @click="admin">{{ $t('admin_area') }}</b-dropdown-item>
+            <b-dropdown-item href="/#" @click="logout">{{ $t('logout') }}</b-dropdown-item>
           </b-nav-item-dropdown>
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
 
-    <side-bar @logout="logout" :balance="balance" :pending="pending">
-      <template slot="links">
-        <sidebar-item
-          :link="{
-            name: $t('overview'),
-            path: '/overview',
-          }"
-        ></sidebar-item>
-        <sidebar-item
-          :link="{
-            name: $t('send'),
-            path: '/send',
-          }"
-        ></sidebar-item>
-        <sidebar-item
-          :link="{
-            name: $t('transactions'),
-            path: '/transactions',
-          }"
-        ></sidebar-item>
-        <sidebar-item
-          :link="{
-            name: $t('site.navbar.my-profil'),
-            path: '/profile',
-          }"
-        ></sidebar-item>
-      </template>
-    </side-bar>
+   
 
     <div class="main-content" style="max-width: 1000px">
       <div class="d-none d-md-block">
@@ -117,6 +104,7 @@ import { logout, transactionsQuery } from '../../graphql/queries'
 import ContentFooter from './ContentFooter.vue'
 import { FadeTransition } from 'vue2-transitions'
 import VueQrcode from 'vue-qrcode'
+import CONFIG from '../../config'
 
 export default {
   components: {
@@ -183,6 +171,20 @@ export default {
     updateBalance(ammount) {
       this.balance -= ammount
     },
+    admin() {
+      window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token))
+      this.$store.dispatch('logout') // logout without redirect
+    },
+    getElopageLink() {
+      const pId = this.$store.state.publisherId
+        ? this.$store.state.publisherId
+        : CONFIG.DEFAULT_PUBLISHER_ID
+      return encodeURI(
+        this.$store.state.hasElopage
+          ? `https://elopage.com/s/gradido/sign_in?locale=${this.$i18n.locale}`
+          : `https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${pId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email}`,
+      )
+    },
   },
 }
 </script>

From 93136e5a75ffa8b2dfc4cdb82986716b9a1bddff Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 7 Dec 2021 11:06:16 +0100
Subject: [PATCH 04/71] =?UTF-8?q?remove=20old=20sidebar=20and=20navbar=20m?=
 =?UTF-8?q?en=C3=BC=20from=20DashboardLayout=5Fgdd.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/Layout/DashboardLayout_gdd.vue  | 49 +++++--------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index e1704fe56..cddb576a5 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -32,55 +32,30 @@
           <b-nav-item-dropdown right>
             <!-- Using 'button-content' slot -->
             <template #button-content>
-              <em> {{ $store.state.email }} 
-             
-                  <span class="avatar">
-                    <vue-qrcode
-                      v-if="$store.state.email"
-                      :value="$store.state.email"
-                      type="image/png"
-                    ></vue-qrcode>
-                  </span>
-               
+              <em>
+                {{ $store.state.email }}
+
+                <span class="avatar">
+                  <vue-qrcode
+                    v-if="$store.state.email"
+                    :value="$store.state.email"
+                    type="image/png"
+                  ></vue-qrcode>
+                </span>
               </em>
             </template>
             <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
-            <b-dropdown-item  @click="getElopageLink" target="_blank">
+            <b-dropdown-item @click="getElopageLink" target="_blank">
               {{ $t('members_area') }}
             </b-dropdown-item>
-            <b-dropdown-item   target="_blank" @click="admin">{{ $t('admin_area') }}</b-dropdown-item>
+            <b-dropdown-item target="_blank" @click="admin">{{ $t('admin_area') }}</b-dropdown-item>
             <b-dropdown-item href="/#" @click="logout">{{ $t('logout') }}</b-dropdown-item>
           </b-nav-item-dropdown>
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
 
-   
-
     <div class="main-content" style="max-width: 1000px">
-      <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 class="ml-2">
-                  <span class="avatar">
-                    <vue-qrcode
-                      v-if="$store.state.email"
-                      :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">
           <router-view

From 11069ee5e79fcf0208d165e63ec5699c00275c4e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 7 Dec 2021 11:14:31 +0100
Subject: [PATCH 05/71] add class container an main-content in
 DashboardLayout_gdd.vue

---
 frontend/src/views/Layout/DashboardLayout_gdd.vue | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index cddb576a5..bff92ecd7 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -16,19 +16,6 @@
 
         <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto">
-          <!--<b-nav-form>
-            <b-form-input size="sm" class="mr-sm-2" placeholder="Search"></b-form-input>
-            <b-button size="sm" class="my-2 my-sm-0" type="submit">Search</b-button>
-          </b-nav-form> 
-
-          <b-nav-item-dropdown text="Lang" right>
-            <b-dropdown-item href="#">EN</b-dropdown-item>
-            <b-dropdown-item href="#">ES</b-dropdown-item>
-            <b-dropdown-item href="#">RU</b-dropdown-item>
-            <b-dropdown-item href="#">FA</b-dropdown-item>
-          </b-nav-item-dropdown>
-          -->
-
           <b-nav-item-dropdown right>
             <!-- Using 'button-content' slot -->
             <template #button-content>
@@ -55,7 +42,7 @@
       </b-collapse>
     </b-navbar>
 
-    <div class="main-content" style="max-width: 1000px">
+    <div class="container main-content" style="max-width: 1000px">
       <div @click="$sidebar.displaySidebar(false)">
         <fade-transition :duration="200" origin="center top" mode="out-in">
           <router-view

From 165ed1801ba1aba862d0b0006d8c17e322c4b7ff Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 18:00:59 +0100
Subject: [PATCH 06/71] update jest, install transform-require-context

---
 frontend/babel.config.js                    |   1 +
 frontend/jest.config.js                     |   1 +
 frontend/package.json                       |   4 +-
 frontend/src/main.js                        |  35 +-
 frontend/src/plugins/apolloProvider.js      |  37 +
 frontend/src/plugins/apolloProvider.test.js | 116 +++
 frontend/yarn.lock                          | 889 ++++++++++++++++----
 7 files changed, 864 insertions(+), 219 deletions(-)
 create mode 100644 frontend/src/plugins/apolloProvider.js
 create mode 100644 frontend/src/plugins/apolloProvider.test.js

diff --git a/frontend/babel.config.js b/frontend/babel.config.js
index 5907ab074..7acdca661 100644
--- a/frontend/babel.config.js
+++ b/frontend/babel.config.js
@@ -1,6 +1,7 @@
 module.exports = {
   presets: ['@babel/preset-env'],
   plugins: [
+    'transform-require-context',
     [
       'component',
       {
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
index 774aa6bf9..5caae815c 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -22,4 +22,5 @@ module.exports = {
   testMatch: ['**/?(*.)+(spec|test).js?(x)'],
   // snapshotSerializers: ['jest-serializer-vue'],
   transformIgnorePatterns: ['<rootDir>/node_modules/(?!vee-validate/dist/rules)'],
+  testEnvironment: 'jest-environment-jsdom-sixteen',
 }
diff --git a/frontend/package.json b/frontend/package.json
index e50c5fe89..86b127676 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,8 +22,9 @@
     "apollo-boost": "^0.4.9",
     "axios": "^0.21.1",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27.3.1",
     "babel-plugin-require-context-hook": "^1.0.0",
+    "babel-plugin-transform-require-context": "^0.1.1",
     "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.5.0",
@@ -51,6 +52,7 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^26.6.3",
     "jest-canvas-mock": "^2.3.1",
+    "jest-environment-jsdom-sixteen": "^2.0.0",
     "nouislider": "^12.1.0",
     "particles-bg-vue": "1.2.3",
     "perfect-scrollbar": "^1.3.0",
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 1aa945608..75dfdcedb 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -3,9 +3,6 @@ import DashboardPlugin from './plugins/dashboard-plugin'
 import App from './App.vue'
 import i18n from './i18n.js'
 import { loadAllRules } from './validation-rules'
-import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
-import VueApollo from 'vue-apollo'
-import CONFIG from './config'
 
 import addNavigationGuards from './routes/guards'
 
@@ -13,37 +10,7 @@ import { store } from './store/store'
 
 import router from './routes/router'
 
-const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
-
-const authLink = new ApolloLink((operation, forward) => {
-  const token = store.state.token
-  operation.setContext({
-    headers: {
-      Authorization: token && token.length > 0 ? `Bearer ${token}` : '',
-    },
-  })
-  return forward(operation).map((response) => {
-    if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
-      response.errors[0].message = i18n.t('error.session-expired')
-      store.dispatch('logout', null)
-      if (router.currentRoute.path !== '/login') router.push('/login')
-      return response
-    }
-    const newToken = operation.getContext().response.headers.get('token')
-    if (newToken) store.commit('token', newToken)
-    return response
-  })
-})
-
-const apolloClient = new ApolloClient({
-  link: authLink.concat(httpLink),
-  cache: new InMemoryCache(),
-  uri: CONFIG.GRAPHQL_URI,
-})
-
-const apolloProvider = new VueApollo({
-  defaultClient: apolloClient,
-})
+import { apolloProvider } from './plugins/apolloProvider'
 
 // plugin setup
 Vue.use(DashboardPlugin)
diff --git a/frontend/src/plugins/apolloProvider.js b/frontend/src/plugins/apolloProvider.js
new file mode 100644
index 000000000..73452e5ba
--- /dev/null
+++ b/frontend/src/plugins/apolloProvider.js
@@ -0,0 +1,37 @@
+import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
+import VueApollo from 'vue-apollo'
+import CONFIG from '../config'
+import { store } from '../store/store'
+import router from '../routes/router'
+import i18n from '../i18n'
+
+const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
+
+const authLink = new ApolloLink((operation, forward) => {
+  const token = store.state.token
+  operation.setContext({
+    headers: {
+      Authorization: token && token.length > 0 ? `Bearer ${token}` : '',
+    },
+  })
+  return forward(operation).map((response) => {
+    if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
+      response.errors[0].message = i18n.t('error.session-expired')
+      store.dispatch('logout', null)
+      if (router.currentRoute.path !== '/login') router.push('/login')
+      return response
+    }
+    const newToken = operation.getContext().response.headers.get('token')
+    if (newToken) store.commit('token', newToken)
+    return response
+  })
+})
+
+const apolloClient = new ApolloClient({
+  link: authLink.concat(httpLink),
+  cache: new InMemoryCache(),
+})
+
+export const apolloProvider = new VueApollo({
+  defaultClient: apolloClient,
+})
diff --git a/frontend/src/plugins/apolloProvider.test.js b/frontend/src/plugins/apolloProvider.test.js
new file mode 100644
index 000000000..75a7045ea
--- /dev/null
+++ b/frontend/src/plugins/apolloProvider.test.js
@@ -0,0 +1,116 @@
+import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
+import './apolloProvider'
+import CONFIG from '../config'
+
+import VueApollo from 'vue-apollo'
+import { store } from '../store/store.js'
+import router from '../routes/router'
+import i18n from '../i18n'
+
+jest.mock('vue-apollo')
+jest.mock('../store/store')
+jest.mock('../routes/router')
+jest.mock('../i18n')
+
+jest.mock('apollo-boost', () => {
+  return {
+    __esModule: true,
+    ApolloClient: jest.fn(),
+    ApolloLink: jest.fn(() => {
+      return { concat: jest.fn() }
+    }),
+    InMemoryCache: jest.fn(),
+    HttpLink: jest.fn(),
+  }
+})
+
+describe('apolloProvider', () => {
+  it('calls the HttpLink', () => {
+    expect(HttpLink).toBeCalledWith({ uri: CONFIG.GRAPHQL_URI })
+  })
+
+  it('calls the ApolloLink', () => {
+    expect(ApolloLink).toBeCalled()
+  })
+
+  it('calls the ApolloClient', () => {
+    expect(ApolloClient).toBeCalled()
+  })
+
+  it('calls the VueApollo', () => {
+    expect(VueApollo).toBeCalled()
+  })
+
+  describe('ApolloLink', () => {
+    // mock store
+    const storeDispatchMock = jest.fn()
+    store.state = {
+      token: 'some-token',
+    }
+    store.dispatch = storeDispatchMock
+
+    // mock i18n.t
+    i18n.t = jest.fn((t) => t)
+
+    // mock apllo response
+    const responseMock = {
+      errors: [{ message: '403.13 - Client certificate revoked' }],
+    }
+
+    // mock router
+    const routerPushMock = jest.fn()
+    router.push = routerPushMock
+    router.currentRoute = {
+      path: '/overview',
+    }
+
+    // mock context
+    const setContextMock = jest.fn()
+    const getContextMock = jest.fn(() => {
+      return {
+        response: {
+          headers: {
+            get: jest.fn(),
+          },
+        },
+      }
+    })
+
+    // mock apollo link function params
+    const operationMock = {
+      setContext: setContextMock,
+      getContext: getContextMock,
+    }
+
+    const forwardMock = jest.fn(() => {
+      return [responseMock]
+    })
+
+    // get apollo link callback
+    const middleware = ApolloLink.mock.calls[0][0]
+
+    beforeEach(() => {
+      jest.clearAllMocks()
+      // run the callback with mocked params
+      middleware(operationMock, forwardMock)
+    })
+
+    it('sets authorization header', () => {
+      expect(setContextMock).toBeCalledWith({
+        headers: {
+          Authorization: 'Bearer some-token',
+        },
+      })
+    })
+
+    describe('apollo response is 403.13', () => {
+      it.skip('dispatches logout', () => {
+        expect(storeDispatchMock).toBeCalledWith('logout', null)
+      })
+
+      it.skip('redirects to logout', () => {
+        expect(routerPushMock).toBeCalledWith('/logout')
+      })
+    })
+  })
+})
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index c9f427f7a..ec95b138a 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -9,13 +9,20 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
+"@babel/code-frame@^7.0.0":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
   integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
   dependencies:
     "@babel/highlight" "^7.12.13"
 
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
+  integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
+  dependencies:
+    "@babel/highlight" "^7.16.0"
+
 "@babel/compat-data@^7.13.0":
   version "7.13.6"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.6.tgz#11972d07db4c2317afdbf41d6feb3a730301ef4e"
@@ -26,10 +33,10 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
   integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
 
-"@babel/compat-data@^7.13.8":
-  version "7.13.11"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.11.tgz#9c8fe523c206979c9a81b1e12fe50c1254f1aa35"
-  integrity sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==
+"@babel/compat-data@^7.13.8", "@babel/compat-data@^7.16.0":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
+  integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
 
 "@babel/core@^7.0.0":
   version "7.13.1"
@@ -53,25 +60,24 @@
     semver "7.0.0"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559"
-  integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==
+"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4"
+  integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==
   dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.10"
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.10"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.0"
+    "@babel/helper-compilation-targets" "^7.16.0"
+    "@babel/helper-module-transforms" "^7.16.0"
+    "@babel/helpers" "^7.16.0"
+    "@babel/parser" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.19"
     semver "^6.3.0"
     source-map "^0.5.0"
 
@@ -97,16 +103,16 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.0.tgz#bd00d4394ca22f220390c56a0b5b85568ec1ec0c"
-  integrity sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==
+"@babel/generator@^7.13.0", "@babel/generator@^7.13.9", "@babel/generator@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2"
+  integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.16.0"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.9", "@babel/generator@^7.4.0":
+"@babel/generator@^7.4.0":
   version "7.13.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
   integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
@@ -140,14 +146,14 @@
     browserslist "^4.14.5"
     semver "7.0.0"
 
-"@babel/helper-compilation-targets@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
-  integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
+"@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.16.0":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"
+  integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
+    "@babel/compat-data" "^7.16.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.17.5"
     semver "^6.3.0"
 
 "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.8":
@@ -200,21 +206,21 @@
   dependencies:
     "@babel/types" "^7.13.0"
 
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
+  integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
+    "@babel/helper-get-function-arity" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/types" "^7.16.0"
 
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+"@babel/helper-get-function-arity@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
+  integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.16.0"
 
 "@babel/helper-hoist-variables@^7.12.13", "@babel/helper-hoist-variables@^7.13.0":
   version "7.13.0"
@@ -224,12 +230,19 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/helper-member-expression-to-functions@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
-  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
+"@babel/helper-hoist-variables@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
+  integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4"
+  integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==
+  dependencies:
+    "@babel/types" "^7.16.0"
 
 "@babel/helper-member-expression-to-functions@^7.13.12":
   version "7.13.12"
@@ -246,13 +259,20 @@
     "@babel/types" "7.0.0-beta.35"
     lodash "^4.2.0"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13":
+"@babel/helper-module-imports@^7.0.0":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
   integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
+  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-module-imports@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
@@ -260,7 +280,7 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
-"@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.13.0":
+"@babel/helper-module-transforms@^7.12.13":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
   integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
@@ -275,6 +295,20 @@
     "@babel/types" "^7.13.0"
     lodash "^4.17.19"
 
+"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5"
+  integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-replace-supers" "^7.16.0"
+    "@babel/helper-simple-access" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-module-transforms@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz#600e58350490828d82282631a1422268e982ba96"
@@ -289,14 +323,19 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.12"
 
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+"@babel/helper-optimise-call-expression@^7.12.13", "@babel/helper-optimise-call-expression@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
+  integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.16.0"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
   integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
@@ -310,7 +349,7 @@
     "@babel/helper-wrap-function" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0":
+"@babel/helper-replace-supers@^7.12.13":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
   integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
@@ -320,6 +359,16 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
+"@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17"
+  integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.16.0"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/traverse" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-replace-supers@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
@@ -330,12 +379,12 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.12"
 
-"@babel/helper-simple-access@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
-  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
+"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
+  integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.16.0"
 
 "@babel/helper-simple-access@^7.13.12":
   version "7.13.12"
@@ -351,27 +400,27 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
+  integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.16.0"
 
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.15.7":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
 "@babel/helper-validator-identifier@^7.14.0":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
   integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
 
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+"@babel/helper-validator-option@^7.12.17", "@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
 
 "@babel/helper-wrap-function@^7.13.0":
   version "7.13.0"
@@ -392,14 +441,14 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+"@babel/helpers@^7.13.10", "@babel/helpers@^7.16.0":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c"
+  integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==
   dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.3"
+    "@babel/types" "^7.16.0"
 
 "@babel/highlight@^7.10.4":
   version "7.14.0"
@@ -410,12 +459,12 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
-  integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
+"@babel/highlight@^7.12.13", "@babel/highlight@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
+  integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.15.7"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
@@ -431,21 +480,21 @@
     regenerator-runtime "^0.13.4"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.13.10":
-  version "7.13.11"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88"
-  integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==
-
-"@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.7.0":
-  version "7.13.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab"
-  integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e"
+  integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==
 
 "@babel/parser@^7.13.13", "@babel/parser@^7.4.3":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
   integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
 
+"@babel/parser@^7.7.0":
+  version "7.13.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab"
+  integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
@@ -712,13 +761,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-top-level-await@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
   integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-arrow-functions@^7.13.0", "@babel/plugin-transform-arrow-functions@^7.2.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
@@ -1161,7 +1217,16 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.13", "@babel/template@^7.3.3", "@babel/template@^7.4.0":
+"@babel/template@7", "@babel/template@^7.12.13", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
+  integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/parser" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/template@^7.4.0":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
   integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
@@ -1170,7 +1235,7 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.7.0":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
   integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
@@ -1185,6 +1250,21 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787"
+  integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.0"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-hoist-variables" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/parser" "^7.16.3"
+    "@babel/types" "^7.16.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.13.13", "@babel/traverse@^7.4.3":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
@@ -1208,7 +1288,15 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0":
+"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
+  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.15.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.12.1", "@babel/types@^7.7.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
   integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
@@ -1429,6 +1517,17 @@
     jest-message-util "^24.9.0"
     jest-mock "^24.9.0"
 
+"@jest/fake-timers@^25.1.0":
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz#46352e00533c024c90c2bc2ad9f2959f7f114185"
+  integrity sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==
+  dependencies:
+    "@jest/types" "^25.5.0"
+    jest-message-util "^25.5.0"
+    jest-mock "^25.5.0"
+    jest-util "^25.5.0"
+    lolex "^5.0.0"
+
 "@jest/fake-timers@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
@@ -1610,6 +1709,27 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
+"@jest/transform@^27.4.2":
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.4.2.tgz#459885e96de2e21fc68b8b371e90aa653966dd0d"
+  integrity sha512-RTKcPZllfcmLfnlxBya7aypofhdz05+E6QITe55Ex0rxyerkgjmmpMlvVn11V0cP719Ps6WcDYCnDzxnnJUwKg==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^27.4.2"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^4.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^27.4.2"
+    jest-regex-util "^27.4.0"
+    jest-util "^27.4.2"
+    micromatch "^4.0.4"
+    pirates "^4.0.1"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
 "@jest/types@^24.3.0", "@jest/types@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
@@ -1619,6 +1739,16 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
+"@jest/types@^25.5.0":
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
+  integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
 "@jest/types@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
@@ -1630,6 +1760,17 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@jest/types@^27.4.2":
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.4.2.tgz#96536ebd34da6392c2b7c7737d693885b5dd44a5"
+  integrity sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1702,7 +1843,23 @@
     string-width "^2.0.0"
     strip-ansi "^5"
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.7":
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
+  version "7.1.17"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.17.tgz#f50ac9d20d64153b510578d84f9643f9a3afbe64"
+  integrity sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__core@^7.1.0":
   version "7.1.14"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
   integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
@@ -1714,21 +1871,28 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
-  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
+  integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
-  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
+"@types/babel__traverse@^7.0.4":
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639"
   integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==
@@ -1776,9 +1940,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
-  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
@@ -1815,9 +1979,9 @@
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
-  version "14.14.31"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055"
-  integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==
+  version "16.11.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10"
+  integrity sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==
 
 "@types/node@>=6":
   version "16.4.12"
@@ -1860,9 +2024,9 @@
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
 "@types/yargs-parser@*":
-  version "20.2.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
-  integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
+  version "20.2.1"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
+  integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
 
 "@types/yargs@^13.0.0":
   version "13.0.11"
@@ -1872,9 +2036,16 @@
     "@types/yargs-parser" "*"
 
 "@types/yargs@^15.0.0":
-  version "15.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
-  integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
+  version "15.0.14"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
+  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@types/yargs@^16.0.0":
+  version "16.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
+  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2483,11 +2654,23 @@ acorn@^8.0.5:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
   integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
 
+acorn@^8.2.4:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
+  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+
 address@^1.0.3:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -2622,7 +2805,15 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.1:
+anymatch@^3.0.3:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
   integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
@@ -2992,6 +3183,20 @@ babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
+babel-jest@^27.3.1:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.2.tgz#6edf80971045cfd44f3f10b6eda6007d95f62742"
+  integrity sha512-MADrjb3KBO2eyZCAc6QaJg6RT5u+6oEdDyHO5HEalnpwQ6LrhTsQF2Kj1Wnz2t6UPXIXPk18dSXXOT0wF5yTxA==
+  dependencies:
+    "@jest/transform" "^27.4.2"
+    "@jest/types" "^27.4.2"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^27.4.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    slash "^3.0.0"
+
 babel-loader@^8.0.5:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
@@ -3034,14 +3239,14 @@ babel-plugin-istanbul@^5.1.0:
     test-exclude "^5.2.3"
 
 babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
 babel-plugin-jest-hoist@^24.9.0:
@@ -3061,6 +3266,16 @@ babel-plugin-jest-hoist@^26.6.2:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
+babel-plugin-jest-hoist@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz#d7831fc0f93573788d80dee7e682482da4c730d6"
+  integrity sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.0.0"
+    "@types/babel__traverse" "^7.0.6"
+
 babel-plugin-jsx-event-modifiers@^2.0.2:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-jsx-event-modifiers/-/babel-plugin-jsx-event-modifiers-2.0.5.tgz#93e6ebb5d7553bb08f9fedbf7a0bee3af09a0472"
@@ -3130,6 +3345,13 @@ babel-plugin-transform-es2015-modules-commonjs@^6.26.0, babel-plugin-transform-e
     babel-template "^6.26.0"
     babel-types "^6.26.0"
 
+babel-plugin-transform-require-context@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-require-context/-/babel-plugin-transform-require-context-0.1.1.tgz#319b545ca83080b5062776b46cc9b8b346fea9a6"
+  integrity sha512-4ceqYOtzgmq4/QsB8dP7pUrUOCjY/jrRYdt7YkIOWHxtGDQbcf6YZDyLCiPQf6KsEIcIbSQiTRXOsbLiuJfgNQ==
+  dependencies:
+    "@babel/template" "7"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
@@ -3179,6 +3401,14 @@ babel-preset-jest@^26.6.2:
     babel-plugin-jest-hoist "^26.6.2"
     babel-preset-current-node-syntax "^1.0.0"
 
+babel-preset-jest@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz#70d0e676a282ccb200fbabd7f415db5fdf393bca"
+  integrity sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==
+  dependencies:
+    babel-plugin-jest-hoist "^27.4.0"
+    babel-preset-current-node-syntax "^1.0.0"
+
 babel-preset-vue@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-2.0.2.tgz#cfadf1bd736125397481b5f8525ced0049a0c71f"
@@ -3240,9 +3470,9 @@ babylon@^6.18.0:
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
@@ -3499,7 +3729,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.3.4, browserslist@^4.5.4:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.3, browserslist@^4.3.4, browserslist@^4.5.4:
   version "4.16.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
   integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
@@ -3510,6 +3740,17 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4
     escalade "^3.1.1"
     node-releases "^1.1.70"
 
+browserslist@^4.14.5, browserslist@^4.17.5:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
+  integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
+  dependencies:
+    caniuse-lite "^1.0.30001280"
+    electron-to-chromium "^1.3.896"
+    escalade "^3.1.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
+
 bs-logger@0.x:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -3756,11 +3997,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109:
   version "1.0.30001251"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"
   integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==
 
+caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001280:
+  version "1.0.30001285"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001285.tgz#fe1e52229187e11d6670590790d669b9e03315b7"
+  integrity sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -3798,7 +4044,23 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -3882,6 +4144,11 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
+ci-info@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
+  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -4084,16 +4351,16 @@ color@^3.0.0:
     color-string "^1.5.4"
 
 colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
 colors@^1.1.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4236,7 +4503,14 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+convert-source-map@^1.5.1, convert-source-map@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -4953,6 +5227,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@4, debug@^4.1.0:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -4960,7 +5241,7 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
@@ -5382,10 +5663,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.649:
-  version "1.3.673"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.673.tgz#b4f81c930b388f962b7eba20d0483299aaa40913"
-  integrity sha512-ms+QR2ckfrrpEAjXweLx6kNCbpAl66DcW//3BZD4BV5KhUgr0RZRce1ON/9J3QyA3JO28nzgb5Xv8DnPr05ILg==
+electron-to-chromium@^1.3.649, electron-to-chromium@^1.3.896:
+  version "1.4.12"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.12.tgz#5f73d1278c6205fc41d7a0ebd75563046b77c5d8"
+  integrity sha512-zjfhG9Us/hIy8AlQ5OzfbR/C4aBv1Dg/ak4GX35CELYlJ4tDAtoEcQivXvyBdqdNQ+R6PhlgQqV8UNPJmhkJog==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -6052,9 +6333,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     safe-buffer "^5.1.1"
 
 exec-sh@^0.3.2:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.5.tgz#1b46bd6bcbf54fdc1e926a4f3d90126d42cec3df"
-  integrity sha512-0hzpaUazv4mEccxdn3TXC+HWNeVXNKMCJRK6E7Xyg+LwGAYI3yFag6jTkd4injV+kChYDQS1ftqDhnDVWNhU8A==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
 execa@^0.8.0:
   version "0.8.0"
@@ -6570,6 +6851,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -6652,7 +6942,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@~2.3.1:
+fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -6785,7 +7075,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -6797,6 +7087,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.4:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.0.1, globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6891,12 +7193,12 @@ google-maps@^3.2.1:
   resolved "https://registry.yarnpkg.com/google-maps/-/google-maps-3.3.0.tgz#4432b4715406bc15268ad35b1dd1b04d974956a6"
   integrity sha512-pj4En0cWKG+lcBvC7qrzu5ItiMsYNTgjG2capsPzAbAM/O8ftugGpUUftTTwdGL8KlNvB4CEZ6IBWwpWYzUEpw==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
-graceful-fs@^4.2.3:
+graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
@@ -7240,6 +7542,15 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
   integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -7273,6 +7584,14 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -7758,6 +8077,11 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
 is-regex@^1.0.4, is-regex@^1.1.1, is-regex@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
@@ -7869,10 +8193,10 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
   integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
 istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
   version "3.3.0"
@@ -7887,7 +8211,7 @@ istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
     istanbul-lib-coverage "^2.0.5"
     semver "^6.0.0"
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
+istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
   integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
@@ -7897,6 +8221,17 @@ istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^5.0.4:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
+  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^2.0.4:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
@@ -8134,6 +8469,16 @@ jest-environment-jsdom-fifteen@^1.0.2:
     jest-util "^24.0.0"
     jsdom "^15.2.1"
 
+jest-environment-jsdom-sixteen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-2.0.0.tgz#0f8c12663ccd9836d248574decffc575bfb091e1"
+  integrity sha512-BF+8P67aEJcd78TQzwSb9P4a73cArOWb5KgqI8eU6cHRWDIJdDRE8XTeZAmOuDSDhKpuEXjKkXwWB3GOJvqHJQ==
+  dependencies:
+    "@jest/fake-timers" "^25.1.0"
+    jest-mock "^25.1.0"
+    jest-util "^25.1.0"
+    jsdom "^16.2.1"
+
 jest-environment-jsdom@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b"
@@ -8232,6 +8577,26 @@ jest-haste-map@^26.6.2:
   optionalDependencies:
     fsevents "^2.1.2"
 
+jest-haste-map@^27.4.2:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.4.2.tgz#7fc7d5e568cca704284f4850885b74a0b8b87587"
+  integrity sha512-foiyAEePORUN2eeJnOtcM1y8qW0ShEd9kTjWVL4sVaMcuCJM6gtHegvYPBRT0mpI/bs4ueThM90+Eoj2ncoNsA==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-regex-util "^27.4.0"
+    jest-serializer "^27.4.0"
+    jest-util "^27.4.2"
+    jest-worker "^27.4.2"
+    micromatch "^4.0.4"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
 jest-jasmine2@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
@@ -8328,6 +8693,20 @@ jest-message-util@^24.9.0:
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
+jest-message-util@^25.5.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz#ea11d93204cc7ae97456e1d8716251185b8880ea"
+  integrity sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/types" "^25.5.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^3.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.2"
+    slash "^3.0.0"
+    stack-utils "^1.0.1"
+
 jest-message-util@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
@@ -8350,6 +8729,13 @@ jest-mock@^24.0.0, jest-mock@^24.9.0:
   dependencies:
     "@jest/types" "^24.9.0"
 
+jest-mock@^25.1.0, jest-mock@^25.5.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz#a91a54dabd14e37ecd61665d6b6e06360a55387a"
+  integrity sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==
+  dependencies:
+    "@jest/types" "^25.5.0"
+
 jest-mock@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
@@ -8373,6 +8759,11 @@ jest-regex-util@^26.0.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
+jest-regex-util@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.4.0.tgz#e4c45b52653128843d07ad94aec34393ea14fbca"
+  integrity sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==
+
 jest-resolve-dependencies@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
@@ -8549,6 +8940,14 @@ jest-serializer@^26.6.2:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
+jest-serializer@^27.4.0:
+  version "27.4.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.4.0.tgz#34866586e1cae2388b7d12ffa2c7819edef5958a"
+  integrity sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==
+  dependencies:
+    "@types/node" "*"
+    graceful-fs "^4.2.4"
+
 jest-snapshot@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
@@ -8613,6 +9012,17 @@ jest-util@^24.0.0, jest-util@^24.9.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
+jest-util@^25.1.0, jest-util@^25.5.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz#31c63b5d6e901274d264a4fec849230aa3fa35b0"
+  integrity sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==
+  dependencies:
+    "@jest/types" "^25.5.0"
+    chalk "^3.0.0"
+    graceful-fs "^4.2.4"
+    is-ci "^2.0.0"
+    make-dir "^3.0.0"
+
 jest-util@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
@@ -8625,6 +9035,18 @@ jest-util@^26.6.2:
     is-ci "^2.0.0"
     micromatch "^4.0.2"
 
+jest-util@^27.4.2:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.4.2.tgz#ed95b05b1adfd761e2cda47e0144c6a58e05a621"
+  integrity sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==
+  dependencies:
+    "@jest/types" "^27.4.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.4"
+    picomatch "^2.2.3"
+
 jest-validate@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
@@ -8705,6 +9127,15 @@ jest-worker@^26.6.2:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^27.4.2:
+  version "27.4.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.2.tgz#0fb123d50955af1a450267787f340a1bf7e12bc4"
+  integrity sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
@@ -8842,6 +9273,39 @@ jsdom@^15.2.1:
     ws "^7.0.0"
     xml-name-validator "^3.0.0"
 
+jsdom@^16.2.1:
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
+  dependencies:
+    abab "^2.0.5"
+    acorn "^8.2.4"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.3.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.1"
+    domexception "^2.0.1"
+    escodegen "^2.0.0"
+    form-data "^3.0.0"
+    html-encoding-sniffer "^2.0.1"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.0"
+    parse5 "6.0.1"
+    saxes "^5.0.1"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.0.0"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.1.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.5.0"
+    ws "^7.4.6"
+    xml-name-validator "^3.0.0"
+
 jsdom@^16.4.0:
   version "16.5.1"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz#4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"
@@ -9204,7 +9668,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.10:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -9221,6 +9685,13 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
+lolex@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
+  integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
 loose-envify@^1.0.0, loose-envify@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -9289,12 +9760,12 @@ make-error@1.x:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
-    tmpl "1.0.x"
+    tmpl "1.0.5"
 
 map-cache@^0.2.2:
   version "0.2.2"
@@ -9429,13 +9900,13 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -9834,9 +10305,14 @@ node-notifier@^8.0.0:
     which "^2.0.2"
 
 node-releases@^1.1.70:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+  version "1.1.77"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
+  integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
+
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
 node-sass@^6.0.1:
   version "6.0.1"
@@ -10494,7 +10970,17 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+
+picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -10526,13 +11012,20 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.0, pirates@^4.0.1:
+pirates@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   dependencies:
     node-modules-regexp "^1.0.0"
 
+pirates@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.3.tgz#41a4acbc9bc78decd7f205ee828f34929b9d5749"
+  integrity sha512-e30YDq2NWgpyIpaKWgols6m/YfgyIyLEmVvrLH5mGrwUs6R6N2h5+DKluT502tex/BK+DO9DIRZ0qqm1/M3FrQ==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -11478,9 +11971,9 @@ renderkid@^2.0.4:
     strip-ansi "^3.0.0"
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
@@ -12043,9 +12536,9 @@ sigmund@^1.0.1:
   integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -12630,6 +13123,13 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-hyperlinks@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
@@ -12854,10 +13354,10 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+tmpl@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
@@ -12973,6 +13473,13 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
+tr46@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+  dependencies:
+    punycode "^2.1.1"
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -13678,11 +14185,11 @@ w3c-xmlserializer@^2.0.0:
     xml-name-validator "^3.0.0"
 
 walker@^1.0.7, walker@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
-    makeerror "1.0.x"
+    makeerror "1.0.12"
 
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"
@@ -13936,6 +14443,15 @@ whatwg-url@^8.0.0:
     tr46 "^2.0.2"
     webidl-conversions "^6.1.0"
 
+whatwg-url@^8.5.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+  dependencies:
+    lodash "^4.7.0"
+    tr46 "^2.1.0"
+    webidl-conversions "^6.1.0"
+
 which-boxed-primitive@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -14072,6 +14588,11 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
   integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
+ws@^7.4.6:
+  version "7.5.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
+  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

From a0f8c6664d1b1fe84497d043265ddfb7ebaa9434 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 18:04:10 +0100
Subject: [PATCH 07/71] fix window assign mock

---
 frontend/src/components/SidebarPlugin/SideBar.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 7b12b6473..3f1a29034 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -167,7 +167,10 @@ describe('SideBar', () => {
           beforeEach(async () => {
             mocks.$store.state.isAdmin = true
             mocks.$store.state.token = 'valid-token'
-            window.location.assign = assignLocationSpy
+            delete window.location
+            window.location = {
+              assign: assignLocationSpy,
+            }
             wrapper = Wrapper()
           })
 

From c55c1f26cf31e27f41c143c793f81dd93941ce83 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 18:41:49 +0100
Subject: [PATCH 08/71] test complete apollo provider

---
 frontend/src/plugins/apolloProvider.test.js | 90 +++++++++++++++++----
 1 file changed, 76 insertions(+), 14 deletions(-)

diff --git a/frontend/src/plugins/apolloProvider.test.js b/frontend/src/plugins/apolloProvider.test.js
index 75a7045ea..aeb02243c 100644
--- a/frontend/src/plugins/apolloProvider.test.js
+++ b/frontend/src/plugins/apolloProvider.test.js
@@ -1,4 +1,4 @@
-import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
+import { ApolloClient, ApolloLink, HttpLink } from 'apollo-boost'
 import './apolloProvider'
 import CONFIG from '../config'
 
@@ -44,10 +44,12 @@ describe('apolloProvider', () => {
   describe('ApolloLink', () => {
     // mock store
     const storeDispatchMock = jest.fn()
+    const storeCommitMock = jest.fn()
     store.state = {
       token: 'some-token',
     }
     store.dispatch = storeDispatchMock
+    store.commit = storeCommitMock
 
     // mock i18n.t
     i18n.t = jest.fn((t) => t)
@@ -70,7 +72,7 @@ describe('apolloProvider', () => {
       return {
         response: {
           headers: {
-            get: jest.fn(),
+            get: jest.fn(() => 'another-token'),
           },
         },
       }
@@ -89,27 +91,87 @@ describe('apolloProvider', () => {
     // get apollo link callback
     const middleware = ApolloLink.mock.calls[0][0]
 
-    beforeEach(() => {
-      jest.clearAllMocks()
-      // run the callback with mocked params
-      middleware(operationMock, forwardMock)
+    describe('with token in store', () => {
+      it('sets authorization header with token', () => {
+        // run the apollo link callback with mocked params
+        middleware(operationMock, forwardMock)
+        expect(setContextMock).toBeCalledWith({
+          headers: {
+            Authorization: 'Bearer some-token',
+          },
+        })
+      })
     })
 
-    it('sets authorization header', () => {
-      expect(setContextMock).toBeCalledWith({
-        headers: {
-          Authorization: 'Bearer some-token',
-        },
+    describe('without token in store', () => {
+      beforeEach(() => {
+        store.state.token = null
+      })
+
+      it('sets authorization header empty', () => {
+        middleware(operationMock, forwardMock)
+        expect(setContextMock).toBeCalledWith({
+          headers: {
+            Authorization: '',
+          },
+        })
       })
     })
 
     describe('apollo response is 403.13', () => {
-      it.skip('dispatches logout', () => {
+      beforeEach(() => {
+        // run the apollo link callback with mocked params
+        middleware(operationMock, forwardMock)
+      })
+
+      it('dispatches logout', () => {
         expect(storeDispatchMock).toBeCalledWith('logout', null)
       })
 
-      it.skip('redirects to logout', () => {
-        expect(routerPushMock).toBeCalledWith('/logout')
+      describe('current route is not login', () => {
+        it('redirects to logout', () => {
+          expect(routerPushMock).toBeCalledWith('/login')
+        })
+      })
+
+      describe('current route is login', () => {
+        beforeEach(() => {
+          jest.clearAllMocks()
+          router.currentRoute.path = '/login'
+        })
+
+        it('does not redirect to login', () => {
+          expect(routerPushMock).not.toBeCalled()
+        })
+      })
+    })
+
+    describe('apollo response is with new token', () => {
+      beforeEach(() => {
+        delete responseMock.errors
+        middleware(operationMock, forwardMock)
+      })
+
+      it('commits new token to store', () => {
+        expect(storeCommitMock).toBeCalledWith('token', 'another-token')
+      })
+    })
+
+    describe('apollo response is without new token', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+        getContextMock.mockReturnValue({
+          response: {
+            headers: {
+              get: jest.fn(() => null),
+            },
+          },
+        })
+        middleware(operationMock, forwardMock)
+      })
+
+      it('does not commit token to store', () => {
+        expect(storeCommitMock).not.toBeCalled()
       })
     })
   })

From 994253747281580b2887831118cd816fcf1cf839 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 18:43:13 +0100
Subject: [PATCH 09/71] test coverage frontend to 90%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d5b02cc76..e2488d050 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -399,7 +399,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 86
+          min_coverage: 90
           token: ${{ github.token }}
   
   ##############################################################################

From ee248ec86a36887401864ebe516d2b803a09fadb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 19:11:31 +0100
Subject: [PATCH 10/71] test apollo provider, apollo provider as plugin

---
 admin/src/main.js                        |  35 +----
 admin/src/main.test.js                   |  73 ----------
 admin/src/plugins/apolloProvider.js      |  37 +++++
 admin/src/plugins/apolloProvider.test.js | 178 +++++++++++++++++++++++
 4 files changed, 216 insertions(+), 107 deletions(-)
 create mode 100644 admin/src/plugins/apolloProvider.js
 create mode 100644 admin/src/plugins/apolloProvider.test.js

diff --git a/admin/src/main.js b/admin/src/main.js
index 6a59f1cc7..2743e0f9a 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -11,11 +11,8 @@ import addNavigationGuards from './router/guards'
 
 import i18n from './i18n'
 
-import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
 import VueApollo from 'vue-apollo'
 
-import CONFIG from './config'
-
 import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 import 'bootstrap/dist/css/bootstrap.css'
 import 'bootstrap-vue/dist/bootstrap-vue.css'
@@ -23,37 +20,7 @@ import 'bootstrap-vue/dist/bootstrap-vue.css'
 import moment from 'vue-moment'
 import Toasted from 'vue-toasted'
 
-const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
-
-const authLink = new ApolloLink((operation, forward) => {
-  const token = store.state.token
-
-  operation.setContext({
-    headers: {
-      Authorization: token && token.length > 0 ? `Bearer ${token}` : '',
-    },
-  })
-  return forward(operation).map((response) => {
-    if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
-      response.errors[0].message = i18n.t('error.session-expired')
-      store.dispatch('logout', null)
-      if (router.currentRoute.path !== '/logout') router.push('/logout')
-      return response
-    }
-    const newToken = operation.getContext().response.headers.get('token')
-    if (newToken) store.commit('token', newToken)
-    return response
-  })
-})
-
-const apolloClient = new ApolloClient({
-  link: authLink.concat(httpLink),
-  cache: new InMemoryCache(),
-})
-
-const apolloProvider = new VueApollo({
-  defaultClient: apolloClient,
-})
+import { apolloProvider } from './plugins/apolloProvider'
 
 Vue.use(BootstrapVue)
 
diff --git a/admin/src/main.test.js b/admin/src/main.test.js
index 747ef5d2a..06efa8b65 100644
--- a/admin/src/main.test.js
+++ b/admin/src/main.test.js
@@ -101,77 +101,4 @@ describe('main', () => {
       }),
     )
   })
-
-  describe('ApolloLink', () => {
-    // mock store
-    const storeDispatchMock = jest.fn()
-    store.state = {
-      token: 'some-token',
-    }
-    store.dispatch = storeDispatchMock
-
-    // mock i18n.t
-    i18n.t = jest.fn((t) => t)
-
-    // mock apllo response
-    const responseMock = {
-      errors: [{ message: '403.13 - Client certificate revoked' }],
-    }
-
-    // mock router
-    const routerPushMock = jest.fn()
-    router.push = routerPushMock
-    router.currentRoute = {
-      path: '/overview',
-    }
-
-    // mock context
-    const setContextMock = jest.fn()
-    const getContextMock = jest.fn(() => {
-      return {
-        response: {
-          headers: {
-            get: jest.fn(),
-          },
-        },
-      }
-    })
-
-    // mock apollo link function params
-    const operationMock = {
-      setContext: setContextMock,
-      getContext: getContextMock,
-    }
-
-    const forwardMock = jest.fn(() => {
-      return [responseMock]
-    })
-
-    // get apollo link callback
-    const middleware = ApolloLink.mock.calls[0][0]
-
-    beforeEach(() => {
-      jest.clearAllMocks()
-      // run the callback with mocked params
-      middleware(operationMock, forwardMock)
-    })
-
-    it('sets authorization header', () => {
-      expect(setContextMock).toBeCalledWith({
-        headers: {
-          Authorization: 'Bearer some-token',
-        },
-      })
-    })
-
-    describe('apollo response is 403.13', () => {
-      it.skip('dispatches logout', () => {
-        expect(storeDispatchMock).toBeCalledWith('logout', null)
-      })
-
-      it.skip('redirects to logout', () => {
-        expect(routerPushMock).toBeCalledWith('/logout')
-      })
-    })
-  })
 })
diff --git a/admin/src/plugins/apolloProvider.js b/admin/src/plugins/apolloProvider.js
new file mode 100644
index 000000000..ec7df38f1
--- /dev/null
+++ b/admin/src/plugins/apolloProvider.js
@@ -0,0 +1,37 @@
+import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
+import VueApollo from 'vue-apollo'
+import CONFIG from '../config'
+import store from '../store/store'
+import router from '../router/router'
+import i18n from '../i18n'
+
+const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
+
+const authLink = new ApolloLink((operation, forward) => {
+  const token = store.state.token
+  operation.setContext({
+    headers: {
+      Authorization: token && token.length > 0 ? `Bearer ${token}` : '',
+    },
+  })
+  return forward(operation).map((response) => {
+    if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
+      response.errors[0].message = i18n.t('error.session-expired')
+      store.dispatch('logout', null)
+      if (router.currentRoute.path !== '/login') router.push('/login')
+      return response
+    }
+    const newToken = operation.getContext().response.headers.get('token')
+    if (newToken) store.commit('token', newToken)
+    return response
+  })
+})
+
+const apolloClient = new ApolloClient({
+  link: authLink.concat(httpLink),
+  cache: new InMemoryCache(),
+})
+
+export const apolloProvider = new VueApollo({
+  defaultClient: apolloClient,
+})
diff --git a/admin/src/plugins/apolloProvider.test.js b/admin/src/plugins/apolloProvider.test.js
new file mode 100644
index 000000000..3610b5dae
--- /dev/null
+++ b/admin/src/plugins/apolloProvider.test.js
@@ -0,0 +1,178 @@
+import { ApolloClient, ApolloLink, HttpLink } from 'apollo-boost'
+import './apolloProvider'
+import CONFIG from '../config'
+
+import VueApollo from 'vue-apollo'
+import store from '../store/store'
+import router from '../router/router'
+import i18n from '../i18n'
+
+jest.mock('vue-apollo')
+jest.mock('../store/store')
+jest.mock('../router/router')
+jest.mock('../i18n')
+
+jest.mock('apollo-boost', () => {
+  return {
+    __esModule: true,
+    ApolloClient: jest.fn(),
+    ApolloLink: jest.fn(() => {
+      return { concat: jest.fn() }
+    }),
+    InMemoryCache: jest.fn(),
+    HttpLink: jest.fn(),
+  }
+})
+
+describe('apolloProvider', () => {
+  it('calls the HttpLink', () => {
+    expect(HttpLink).toBeCalledWith({ uri: CONFIG.GRAPHQL_URI })
+  })
+
+  it('calls the ApolloLink', () => {
+    expect(ApolloLink).toBeCalled()
+  })
+
+  it('calls the ApolloClient', () => {
+    expect(ApolloClient).toBeCalled()
+  })
+
+  it('calls the VueApollo', () => {
+    expect(VueApollo).toBeCalled()
+  })
+
+  describe('ApolloLink', () => {
+    // mock store
+    const storeDispatchMock = jest.fn()
+    const storeCommitMock = jest.fn()
+    store.state = {
+      token: 'some-token',
+    }
+    store.dispatch = storeDispatchMock
+    store.commit = storeCommitMock
+
+    // mock i18n.t
+    i18n.t = jest.fn((t) => t)
+
+    // mock apllo response
+    const responseMock = {
+      errors: [{ message: '403.13 - Client certificate revoked' }],
+    }
+
+    // mock router
+    const routerPushMock = jest.fn()
+    router.push = routerPushMock
+    router.currentRoute = {
+      path: '/overview',
+    }
+
+    // mock context
+    const setContextMock = jest.fn()
+    const getContextMock = jest.fn(() => {
+      return {
+        response: {
+          headers: {
+            get: jest.fn(() => 'another-token'),
+          },
+        },
+      }
+    })
+
+    // mock apollo link function params
+    const operationMock = {
+      setContext: setContextMock,
+      getContext: getContextMock,
+    }
+
+    const forwardMock = jest.fn(() => {
+      return [responseMock]
+    })
+
+    // get apollo link callback
+    const middleware = ApolloLink.mock.calls[0][0]
+
+    describe('with token in store', () => {
+      it('sets authorization header with token', () => {
+        // run the apollo link callback with mocked params
+        middleware(operationMock, forwardMock)
+        expect(setContextMock).toBeCalledWith({
+          headers: {
+            Authorization: 'Bearer some-token',
+          },
+        })
+      })
+    })
+
+    describe('without token in store', () => {
+      beforeEach(() => {
+        store.state.token = null
+      })
+
+      it('sets authorization header empty', () => {
+        middleware(operationMock, forwardMock)
+        expect(setContextMock).toBeCalledWith({
+          headers: {
+            Authorization: '',
+          },
+        })
+      })
+    })
+
+    describe('apollo response is 403.13', () => {
+      beforeEach(() => {
+        // run the apollo link callback with mocked params
+        middleware(operationMock, forwardMock)
+      })
+
+      it('dispatches logout', () => {
+        expect(storeDispatchMock).toBeCalledWith('logout', null)
+      })
+
+      describe('current route is not login', () => {
+        it('redirects to logout', () => {
+          expect(routerPushMock).toBeCalledWith('/login')
+        })
+      })
+
+      describe('current route is login', () => {
+        beforeEach(() => {
+          jest.clearAllMocks()
+          router.currentRoute.path = '/login'
+        })
+
+        it('does not redirect to login', () => {
+          expect(routerPushMock).not.toBeCalled()
+        })
+      })
+    })
+
+    describe('apollo response is with new token', () => {
+      beforeEach(() => {
+        delete responseMock.errors
+        middleware(operationMock, forwardMock)
+      })
+
+      it('commits new token to store', () => {
+        expect(storeCommitMock).toBeCalledWith('token', 'another-token')
+      })
+    })
+
+    describe('apollo response is without new token', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+        getContextMock.mockReturnValue({
+          response: {
+            headers: {
+              get: jest.fn(() => null),
+            },
+          },
+        })
+        middleware(operationMock, forwardMock)
+      })
+
+      it('does not commit token to store', () => {
+        expect(storeCommitMock).not.toBeCalled()
+      })
+    })
+  })
+})

From 3fff3cce67deb23fbeaf396c8446a265549d894d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 19:12:01 +0100
Subject: [PATCH 11/71] unit test coverage to 69% in Admin Interface

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e2488d050..0435d0c76 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -441,7 +441,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 60
+          min_coverage: 69
           token: ${{ github.token }}
 
   ##############################################################################

From 811c24067941c598e45ef2e76196dc67a1a9d00e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Dec 2021 19:14:54 +0100
Subject: [PATCH 12/71] redirect to logout

---
 admin/src/plugins/apolloProvider.js      |  2 +-
 admin/src/plugins/apolloProvider.test.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/src/plugins/apolloProvider.js b/admin/src/plugins/apolloProvider.js
index ec7df38f1..0e342b8fc 100644
--- a/admin/src/plugins/apolloProvider.js
+++ b/admin/src/plugins/apolloProvider.js
@@ -18,7 +18,7 @@ const authLink = new ApolloLink((operation, forward) => {
     if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
       response.errors[0].message = i18n.t('error.session-expired')
       store.dispatch('logout', null)
-      if (router.currentRoute.path !== '/login') router.push('/login')
+      if (router.currentRoute.path !== '/logout') router.push('/logout')
       return response
     }
     const newToken = operation.getContext().response.headers.get('token')
diff --git a/admin/src/plugins/apolloProvider.test.js b/admin/src/plugins/apolloProvider.test.js
index 3610b5dae..e5f394e96 100644
--- a/admin/src/plugins/apolloProvider.test.js
+++ b/admin/src/plugins/apolloProvider.test.js
@@ -128,19 +128,19 @@ describe('apolloProvider', () => {
         expect(storeDispatchMock).toBeCalledWith('logout', null)
       })
 
-      describe('current route is not login', () => {
+      describe('current route is not logout', () => {
         it('redirects to logout', () => {
-          expect(routerPushMock).toBeCalledWith('/login')
+          expect(routerPushMock).toBeCalledWith('/logout')
         })
       })
 
-      describe('current route is login', () => {
+      describe('current route is logout', () => {
         beforeEach(() => {
           jest.clearAllMocks()
-          router.currentRoute.path = '/login'
+          router.currentRoute.path = '/logout'
         })
 
-        it('does not redirect to login', () => {
+        it('does not redirect to logout', () => {
           expect(routerPushMock).not.toBeCalled()
         })
       })

From 274fd6e21e8c6f669dbce8a7c536eafed2362402 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Dec 2021 10:30:56 +0100
Subject: [PATCH 13/71] grid system, display sidebar if large

---
 frontend/src/App.vue                          |  2 +-
 .../src/views/Layout/DashboardLayout_gdd.vue  | 67 +++++++++++--------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 981917c54..25b0eadc5 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app" class="font-sans text-gray-800">
-    <div class="">
+    <div>
       <particles-bg v-if="$store.state.coinanimation" type="custom" :config="config" :bg="true" />
       <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayoutGDD'" />
     </div>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index bff92ecd7..5280b13cd 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -8,7 +8,7 @@
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
       <b-collapse id="nav-collapse" is-nav>
-        <b-navbar-nav>
+        <b-navbar-nav class="d-none d-md-flex d-sm-flex">
           <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
           <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
@@ -21,14 +21,6 @@
             <template #button-content>
               <em>
                 {{ $store.state.email }}
-
-                <span class="avatar">
-                  <vue-qrcode
-                    v-if="$store.state.email"
-                    :value="$store.state.email"
-                    type="image/png"
-                  ></vue-qrcode>
-                </span>
               </em>
             </template>
             <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
@@ -41,37 +33,56 @@
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
+<div >
+     <div   class="d-none d-lg-flex shadow-lg" style="width: 300px; float:left" >
+          <b-sidebar id="sidebar-1" visible no-header-close  bg-variant="white"  >
+            <div class="px-3 py-2">
+              <p>
+                Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac
+                facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac,
+                vestibulum at eros.
+              </p>
+              <b-img src="https://picsum.photos/500/500/?image=54" fluid thumbnail></b-img>
+            </div>
+           
+          </b-sidebar>
+        </div>
+        <div>
+          
+           <div>
+            <div @click="$sidebar.displaySidebar(false)">
+              <fade-transition :duration="200" origin="center top" mode="out-in">
+                <router-view
+                  ref="router-view"
+                  :balance="balance"
+                  :gdt-balance="GdtBalance"
+                  :transactions="transactions"
+                  :transactionCount="transactionCount"
+                  :pending="pending"
+                  @update-balance="updateBalance"
+                  @update-transactions="updateTransactions"
+                ></router-view>
+              </fade-transition>
+            </div>
+            <content-footer v-if="!$route.meta.hideFooter"></content-footer>
+          </div>
 
-    <div class="container main-content" style="max-width: 1000px">
-      <div @click="$sidebar.displaySidebar(false)">
-        <fade-transition :duration="200" origin="center top" mode="out-in">
-          <router-view
-            ref="router-view"
-            :balance="balance"
-            :gdt-balance="GdtBalance"
-            :transactions="transactions"
-            :transactionCount="transactionCount"
-            :pending="pending"
-            @update-balance="updateBalance"
-            @update-transactions="updateTransactions"
-          ></router-view>
-        </fade-transition>
-      </div>
-      <content-footer v-if="!$route.meta.hideFooter"></content-footer>
-    </div>
+
+        </div>
+</div>
+
+     
   </div>
 </template>
 <script>
 import { logout, transactionsQuery } from '../../graphql/queries'
 import ContentFooter from './ContentFooter.vue'
 import { FadeTransition } from 'vue2-transitions'
-import VueQrcode from 'vue-qrcode'
 import CONFIG from '../../config'
 
 export default {
   components: {
     ContentFooter,
-    VueQrcode,
     FadeTransition,
   },
   data() {

From cbda7f81f3489976f725a286d3b3462d10e2c14a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Dec 2021 10:38:56 +0100
Subject: [PATCH 14/71] delete creative tim src/components/Navbar and
 Sidebarplugin

---
 .../components/Navbar/NavbarToggleButton.vue  |  21 --
 .../src/components/NavbarToggleButton.vue     |  32 ---
 .../components/SidebarPlugin/SideBar.spec.js  | 197 ------------------
 .../src/components/SidebarPlugin/SideBar.vue  | 145 -------------
 .../components/SidebarPlugin/SidebarItem.vue  | 189 -----------------
 .../src/components/SidebarPlugin/index.js     |  41 ----
 frontend/src/components/index.js              |   5 -
 frontend/src/plugins/dashboard-plugin.js      |   2 -
 frontend/test/testSetup.js                    |   2 -
 9 files changed, 634 deletions(-)
 delete mode 100644 frontend/src/components/Navbar/NavbarToggleButton.vue
 delete mode 100755 frontend/src/components/NavbarToggleButton.vue
 delete mode 100644 frontend/src/components/SidebarPlugin/SideBar.spec.js
 delete mode 100755 frontend/src/components/SidebarPlugin/SideBar.vue
 delete mode 100755 frontend/src/components/SidebarPlugin/SidebarItem.vue
 delete mode 100755 frontend/src/components/SidebarPlugin/index.js
 delete mode 100755 frontend/src/components/index.js

diff --git a/frontend/src/components/Navbar/NavbarToggleButton.vue b/frontend/src/components/Navbar/NavbarToggleButton.vue
deleted file mode 100644
index 5e6ab56b3..000000000
--- a/frontend/src/components/Navbar/NavbarToggleButton.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <button
-    type="button"
-    class="navbar-toggler collapsed"
-    data-toggle="collapse"
-    data-target="#navbar"
-    aria-controls="navbarSupportedContent"
-    aria-expanded="false"
-    aria-label="Toggle navigation"
-  >
-    <span class="navbar-toggler-bar bar1"></span>
-    <span class="navbar-toggler-bar bar2"></span>
-    <span class="navbar-toggler-bar bar3"></span>
-  </button>
-</template>
-<script>
-export default {
-  name: 'navbar-toggle-button',
-}
-</script>
-<style></style>
diff --git a/frontend/src/components/NavbarToggleButton.vue b/frontend/src/components/NavbarToggleButton.vue
deleted file mode 100755
index 0f539df38..000000000
--- a/frontend/src/components/NavbarToggleButton.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <button
-    class="navbar-toggler"
-    type="button"
-    data-toggle="collapse"
-    :data-target="target"
-    :aria-controls="target"
-    :aria-expanded="toggled"
-    aria-label="Toggle navigation"
-  >
-    <span class="navbar-toggler-icon"></span>
-    <slot>
-      <span></span>
-    </slot>
-  </button>
-</template>
-<script>
-export default {
-  props: {
-    target: {
-      type: [String, Number],
-      description: 'Button target element',
-    },
-    toggled: {
-      type: Boolean,
-      default: false,
-      description: 'Whether button is toggled',
-    },
-  },
-}
-</script>
-<style></style>
diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
deleted file mode 100644
index 7b12b6473..000000000
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import { mount, RouterLinkStub } from '@vue/test-utils'
-import SideBar from './SideBar'
-
-const localVue = global.localVue
-
-const storeDispatchMock = jest.fn()
-
-describe('SideBar', () => {
-  let wrapper
-
-  const stubs = {
-    RouterLink: RouterLinkStub,
-  }
-
-  const propsData = {
-    balance: 1234.56,
-  }
-
-  const mocks = {
-    $store: {
-      state: {
-        email: 'test@example.org',
-        publisherId: 123,
-        firstName: 'test',
-        lastName: 'example',
-        hasElopage: false,
-      },
-      dispatch: storeDispatchMock,
-    },
-    $i18n: {
-      locale: 'en',
-    },
-    $t: jest.fn((t) => t),
-    $n: jest.fn((n) => n),
-  }
-
-  const Wrapper = () => {
-    return mount(SideBar, { localVue, mocks, stubs, propsData })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('renders the component', () => {
-      expect(wrapper.find('#sidenav-main').exists()).toBeTruthy()
-    })
-
-    describe('navbar button', () => {
-      it('has a navbar button', () => {
-        expect(wrapper.find('button.navbar-toggler').exists()).toBeTruthy()
-      })
-
-      it('calls showSidebar when clicked', async () => {
-        const spy = jest.spyOn(wrapper.vm.$sidebar, 'displaySidebar')
-        wrapper.find('button.navbar-toggler').trigger('click')
-        await wrapper.vm.$nextTick()
-        expect(spy).toHaveBeenCalledWith(true)
-      })
-    })
-
-    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')
-        wrapper.find('#sidenav-collapse-main').find('button.navbar-toggler').trigger('click')
-        await wrapper.vm.$nextTick()
-        expect(spy).toHaveBeenCalledWith(false)
-      })
-    })
-
-    describe('static menu items', () => {
-      describe("member's area without publisher ID", () => {
-        it('has a link to the elopage', () => {
-          expect(wrapper.findAll('li').at(0).text()).toContain('members_area')
-        })
-
-        it('has a badge', () => {
-          expect(wrapper.findAll('li').at(0).text()).toContain('!')
-        })
-
-        it('links to the elopage registration', () => {
-          expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-            'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=123&firstName=test&lastName=example&email=test@example.org',
-          )
-        })
-
-        describe('with locale="de"', () => {
-          beforeEach(() => {
-            mocks.$i18n.locale = 'de'
-          })
-
-          it('links to the German elopage registration when locale is set to de', () => {
-            expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-              'https://elopage.com/s/gradido/basic-de/payment?locale=de&prid=111&pid=123&firstName=test&lastName=example&email=test@example.org',
-            )
-          })
-        })
-
-        describe("member's area with publisher ID", () => {
-          beforeEach(() => {
-            mocks.$store.state.hasElopage = true
-          })
-
-          it('links to the elopage member area', () => {
-            expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-              'https://elopage.com/s/gradido/sign_in?locale=de',
-            )
-          })
-
-          it('has no badge', () => {
-            expect(wrapper.findAll('li').at(0).text()).not.toContain('!')
-          })
-        })
-
-        describe("member's area with default publisher ID  and no elopage", () => {
-          beforeEach(() => {
-            mocks.$store.state.publisherId = null
-            mocks.$store.state.hasElopage = false
-          })
-
-          it('links to the elopage member area with default publisher ID', () => {
-            expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-              'https://elopage.com/s/gradido/basic-de/payment?locale=de&prid=111&pid=2896&firstName=test&lastName=example&email=test@example.org',
-            )
-          })
-
-          it('has a badge', () => {
-            expect(wrapper.findAll('li').at(0).text()).toContain('!')
-          })
-        })
-      })
-
-      describe('logout', () => {
-        it('has a logout button', () => {
-          expect(wrapper.findAll('li').at(1).text()).toBe('logout')
-        })
-
-        it('emits logout when logout is clicked', async () => {
-          wrapper.findAll('li').at(1).find('a').trigger('click')
-          await wrapper.vm.$nextTick()
-          expect(wrapper.emitted('logout')).toEqual([[]])
-        })
-      })
-
-      describe('admin-area', () => {
-        it('is not visible when not an admin', () => {
-          expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area')
-        })
-
-        describe('logged in as admin', () => {
-          const assignLocationSpy = jest.fn()
-          beforeEach(async () => {
-            mocks.$store.state.isAdmin = true
-            mocks.$store.state.token = 'valid-token'
-            window.location.assign = assignLocationSpy
-            wrapper = Wrapper()
-          })
-
-          it('is visible', () => {
-            expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
-          })
-
-          describe('click on admin area', () => {
-            beforeEach(async () => {
-              await wrapper.findAll('li').at(1).find('a').trigger('click')
-            })
-
-            it('opens a new window when clicked', () => {
-              expect(assignLocationSpy).toHaveBeenCalledWith(
-                'http://localhost/admin/authenticate?token=valid-token',
-              )
-            })
-
-            it('dispatches logout to store', () => {
-              expect(storeDispatchMock).toHaveBeenCalledWith('logout')
-            })
-          })
-        })
-      })
-    })
-  })
-})
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
deleted file mode 100755
index 96882e816..000000000
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <nav
-    class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent"
-    id="sidenav-main"
-  >
-    <div class="container-fluid">
-      <!--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">
-          <div class="media align-items-center">
-            <span class="avatar avatar-sm">
-              <vue-qrcode
-                v-if="$store.state.email"
-                :value="$store.state.email"
-                type="image/png"
-              ></vue-qrcode>
-            </span>
-          </div>
-        </ul>
-      </slot>
-      <slot></slot>
-      <div
-        v-show="$sidebar.showSidebar"
-        class="navbar-collapse collapse show"
-        id="sidenav-collapse-main"
-      >
-        <div class="navbar-collapse-header d-md-none">
-          <div class="row">
-            <div class="col-6 collapse-brand">
-              <img :src="logo" />
-            </div>
-            <div class="col-6 collapse-close">
-              <navbar-toggle-button @click.native="closeSidebar"></navbar-toggle-button>
-            </div>
-          </div>
-        </div>
-        <ul class="navbar-nav">
-          <slot name="links"></slot>
-        </ul>
-        <hr class="my-2" />
-
-        <ul class="navbar-nav ml-3">
-          <li class="nav-item">
-            <a :href="getElopageLink()" class="nav-link" target="_blank">
-              {{ $t('members_area') }}&nbsp;
-              <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
-            </a>
-          </li>
-        </ul>
-
-        <ul class="navbar-nav ml-3" v-if="$store.state.isAdmin">
-          <li class="nav-item">
-            <a class="nav-link pointer" @click="admin">
-              {{ $t('admin_area') }}
-            </a>
-          </li>
-        </ul>
-
-        <ul class="navbar-nav ml-3">
-          <li class="nav-item">
-            <a class="nav-link pointer" @click="logout">
-              {{ $t('logout') }}
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </nav>
-</template>
-<script>
-import NavbarToggleButton from '@/components/NavbarToggleButton'
-import VueQrcode from 'vue-qrcode'
-import CONFIG from '../../config'
-
-export default {
-  name: 'sidebar',
-  components: {
-    NavbarToggleButton,
-    VueQrcode,
-  },
-  props: {
-    logo: {
-      type: String,
-      default: 'img/brand/green.png',
-      description: 'Gradido Sidebar app logo',
-    },
-    value: { type: String },
-    autoClose: {
-      type: Boolean,
-      default: true,
-      description: 'Whether sidebar should autoclose on mobile when clicking an item',
-    },
-    balance: {
-      type: Number,
-      default: 0,
-    },
-    pending: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  provide() {
-    return {
-      autoClose: this.autoClose,
-    }
-  },
-  methods: {
-    closeSidebar() {
-      this.$sidebar.displaySidebar(false)
-    },
-    showSidebar() {
-      this.$sidebar.displaySidebar(true)
-    },
-    logout() {
-      this.$emit('logout')
-    },
-    admin() {
-      window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token))
-      this.$store.dispatch('logout') // logout without redirect
-    },
-    getElopageLink() {
-      const pId = this.$store.state.publisherId
-        ? this.$store.state.publisherId
-        : CONFIG.DEFAULT_PUBLISHER_ID
-      return encodeURI(
-        this.$store.state.hasElopage
-          ? `https://elopage.com/s/gradido/sign_in?locale=${this.$i18n.locale}`
-          : `https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${pId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email}`,
-      )
-    },
-  },
-}
-</script>
-<style>
-.pointer {
-  cursor: pointer;
-}
-</style>
diff --git a/frontend/src/components/SidebarPlugin/SidebarItem.vue b/frontend/src/components/SidebarPlugin/SidebarItem.vue
deleted file mode 100755
index 309af33b0..000000000
--- a/frontend/src/components/SidebarPlugin/SidebarItem.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-  <b-nav-item
-    :is="baseComponent"
-    :to="link.path ? link.path : '/'"
-    class="nav-item"
-    :class="{ active: isActive }"
-  >
-    <a
-      v-if="isMenu"
-      class="sidebar-menu-item nav-link"
-      :class="{ active: isActive }"
-      :aria-expanded="!collapsed"
-      data-toggle="collapse"
-      @click.prevent="collapseMenu"
-    >
-      <template v-if="addLink">
-        <span class="nav-link-text">
-          {{ link.name }}
-          <b class="caret"></b>
-        </span>
-      </template>
-      <template v-else>
-        <i :class="link.icon"></i>
-        <span class="nav-link-text">
-          {{ link.name }}
-          <b class="caret"></b>
-        </span>
-      </template>
-    </a>
-
-    <collapse-transition>
-      <div v-if="$slots.default || this.isMenu" v-show="!collapsed" class="collapse show">
-        <ul class="nav nav-sm flex-column">
-          <slot></slot>
-        </ul>
-      </div>
-    </collapse-transition>
-
-    <slot name="title" v-if="children.length === 0 && !$slots.default && link.path">
-      <component
-        :to="link.path"
-        @click.native="linkClick"
-        :is="elementType(link, false)"
-        class="nav-link"
-        :class="{ active: link.active }"
-        :target="link.target"
-        :href="link.path"
-      >
-        <template v-if="addLink">
-          <span class="nav-link-text">{{ link.name }}</span>
-        </template>
-        <template v-else>
-          <i :class="link.icon"></i>
-          <span class="nav-link-text">{{ link.name }}</span>
-        </template>
-      </component>
-    </slot>
-  </b-nav-item>
-</template>
-<script>
-import { CollapseTransition } from 'vue2-transitions'
-
-export default {
-  name: 'sidebar-item',
-  components: {
-    CollapseTransition,
-  },
-  props: {
-    menu: {
-      type: Boolean,
-      default: false,
-      description:
-        "Whether the item is a menu. Most of the item it's not used and should be used only if you want to override the default behavior.",
-    },
-    link: {
-      type: Object,
-      default: () => {
-        return {
-          name: '',
-          path: '',
-          children: [],
-        }
-      },
-      description:
-        'Sidebar link. Can contain name, path, icon and other attributes. See examples for more info',
-    },
-  },
-  provide() {
-    return {
-      addLink: this.addChild,
-      removeLink: this.removeChild,
-    }
-  },
-  inject: {
-    addLink: { default: null },
-    removeLink: { default: null },
-    autoClose: {
-      default: true,
-    },
-  },
-  data() {
-    return {
-      children: [],
-      collapsed: true,
-    }
-  },
-  computed: {
-    baseComponent() {
-      return this.isMenu || this.link.isRoute ? 'li' : 'router-link'
-    },
-    linkPrefix() {
-      if (this.link.name) {
-        const words = this.link.name.split(' ')
-        return words.map((word) => word.substring(0, 1)).join('')
-      }
-      return ''
-    },
-    isMenu() {
-      return this.children.length > 0 || this.menu === true
-    },
-    isActive() {
-      if (this.$route && this.$route.path) {
-        const matchingRoute = this.children.find((c) => this.$route.path.startsWith(c.link.path))
-        if (matchingRoute !== undefined) {
-          return true
-        }
-      }
-      return false
-    },
-  },
-  methods: {
-    addChild(item) {
-      const index = this.$slots.default.indexOf(item.$vnode)
-      this.children.splice(index, 0, item)
-    },
-    removeChild(item) {
-      const tabs = this.children
-      const index = tabs.indexOf(item)
-      tabs.splice(index, 1)
-    },
-    elementType(link, isParent = true) {
-      if (link.isRoute === false) {
-        return isParent ? 'li' : 'a'
-      } else {
-        return 'router-link'
-      }
-    },
-    linkAbbreviation(name) {
-      const matches = name.match(/\b(\w)/g)
-      return matches.join('')
-    },
-    linkClick() {
-      if (this.autoClose && this.$sidebar && this.$sidebar.showSidebar === true) {
-        this.$sidebar.displaySidebar(false)
-      }
-    },
-    collapseMenu() {
-      this.collapsed = !this.collapsed
-    },
-    collapseSubMenu(link) {
-      link.collapsed = !link.collapsed
-    },
-  },
-  mounted() {
-    if (this.addLink) {
-      this.addLink(this)
-    }
-    if (this.link.collapsed !== undefined) {
-      this.collapsed = this.link.collapsed
-    }
-    if (this.isActive && this.isMenu) {
-      this.collapsed = false
-    }
-  },
-  destroyed() {
-    if (this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el)
-    }
-    if (this.removeLink) {
-      this.removeLink(this)
-    }
-  },
-}
-</script>
-<style>
-.sidebar-menu-item {
-  cursor: pointer;
-}
-</style>
diff --git a/frontend/src/components/SidebarPlugin/index.js b/frontend/src/components/SidebarPlugin/index.js
deleted file mode 100755
index 4723f9952..000000000
--- a/frontend/src/components/SidebarPlugin/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import Sidebar from './SideBar.vue'
-import SidebarItem from './SidebarItem.vue'
-
-const SidebarStore = {
-  showSidebar: false,
-  sidebarLinks: [],
-  isMinimized: false,
-  displaySidebar(value) {
-    this.showSidebar = value
-  },
-  toggleMinimize() {
-    document.body.classList.toggle('sidebar-mini')
-    const simulateWindowResize = setInterval(() => {
-      window.dispatchEvent(new Event('resize'))
-    }, 180)
-
-    setTimeout(() => {
-      clearInterval(simulateWindowResize)
-    }, 1000)
-
-    this.isMinimized = !this.isMinimized
-  },
-}
-
-const SidebarPlugin = {
-  install(Vue, options) {
-    if (options && options.sidebarLinks) {
-      SidebarStore.sidebarLinks = options.sidebarLinks
-    }
-    const app = new Vue({
-      data: {
-        sidebarStore: SidebarStore,
-      },
-    })
-    Vue.prototype.$sidebar = app.sidebarStore
-    Vue.component('side-bar', Sidebar)
-    Vue.component('sidebar-item', SidebarItem)
-  },
-}
-
-export default SidebarPlugin
diff --git a/frontend/src/components/index.js b/frontend/src/components/index.js
deleted file mode 100755
index 656f05d91..000000000
--- a/frontend/src/components/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import NavbarToggleButton from './Navbar/NavbarToggleButton'
-
-import SidebarPlugin from './SidebarPlugin'
-
-export { SidebarPlugin, NavbarToggleButton }
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 892a2d93c..d0113b631 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -1,6 +1,5 @@
 import GlobalComponents from './globalComponents'
 import GlobalDirectives from './globalDirectives'
-import SideBar from '@/components/SidebarPlugin'
 
 import Toasted from 'vue-toasted'
 
@@ -28,7 +27,6 @@ export default {
   install(Vue) {
     Vue.use(GlobalComponents)
     Vue.use(GlobalDirectives)
-    Vue.use(SideBar)
     Vue.use(BootstrapVue)
     Vue.use(IconsPlugin)
     Vue.use(VueMoment)
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 9ae5777ec..cb50ccdb6 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -8,7 +8,6 @@ import * as rules from 'vee-validate/dist/rules'
 import { messages } from 'vee-validate/dist/locale/en.json'
 
 import RegeneratorRuntime from 'regenerator-runtime'
-import SideBar from '@/components/SidebarPlugin'
 import VueQrcode from 'vue-qrcode'
 
 import VueMoment from 'vue-moment'
@@ -41,7 +40,6 @@ global.localVue.use(BootstrapVue)
 global.localVue.use(Vuex)
 global.localVue.use(IconsPlugin)
 global.localVue.use(RegeneratorRuntime)
-global.localVue.use(SideBar)
 global.localVue.use(VueQrcode)
 global.localVue.use(VueMoment)
 global.localVue.component('validation-provider', ValidationProvider)

From 54016ee5e289e37dc4b3243994462d2a8acbe066 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Dec 2021 11:07:11 +0100
Subject: [PATCH 15/71] set sidbar an content in display: inline-flex

---
 .../src/views/Layout/DashboardLayout_gdd.vue  | 80 ++++++++++---------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 5280b13cd..858c3a260 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,8 +1,10 @@
 <template>
   <div>
     <b-navbar toggleable="lg" type="dark" variant="info">
-      <div class="navbar-brand">
+      <div class="navbar-brand" >
+        <router-link to="/overview" >
         <img :src="logo" class="navbar-brand-img" alt="..." />
+        </router-link>
       </div>
       <b-nav-text center>{{ balance }} GDD</b-nav-text>
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
@@ -33,45 +35,49 @@
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
-<div >
-     <div   class="d-none d-lg-flex shadow-lg" style="width: 300px; float:left" >
-          <b-sidebar id="sidebar-1" visible no-header-close  bg-variant="white"  >
-            <div class="px-3 py-2">
-              <p>
-                Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac
-                facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac,
-                vestibulum at eros.
-              </p>
-              <b-img src="https://picsum.photos/500/500/?image=54" fluid thumbnail></b-img>
+  <div style="display: inline-flex">
+      <div class="d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
+        <b-sidebar id="sidebar-1" visible no-header-close bg-variant="false">
+          <div class="px-3 py-2">
+            <p></p>
+            <div class="mb-6">
+              <b-nav vertical class="w-200">
+                <b-nav-item to="/overview" class="mb-3" active>Overview</b-nav-item>
+                <b-nav-item to="/send" class="mb-3">Link</b-nav-item>
+                <b-nav-item to="/transactions" class="mb-3">Another Link</b-nav-item>
+                <b-nav-item to="/profile" class="mb-3" disabled>Disabled</b-nav-item>
+              </b-nav>
+              <hr />
+              <b-nav vertical class="w-100">
+                <b-nav-item class="mb-3" active>Active</b-nav-item>
+                <b-nav-item class="mb-3">Link</b-nav-item>
+                <b-nav-item class="mb-3">Another Link</b-nav-item>
+                <b-nav-item class="mb-3" disabled>Disabled</b-nav-item>
+              </b-nav>
             </div>
-           
-          </b-sidebar>
-        </div>
-        <div>
-          
-           <div>
-            <div @click="$sidebar.displaySidebar(false)">
-              <fade-transition :duration="200" origin="center top" mode="out-in">
-                <router-view
-                  ref="router-view"
-                  :balance="balance"
-                  :gdt-balance="GdtBalance"
-                  :transactions="transactions"
-                  :transactionCount="transactionCount"
-                  :pending="pending"
-                  @update-balance="updateBalance"
-                  @update-transactions="updateTransactions"
-                ></router-view>
-              </fade-transition>
-            </div>
-            <content-footer v-if="!$route.meta.hideFooter"></content-footer>
           </div>
-
-
-        </div>
-</div>
-
+        </b-sidebar>
+      </div>
      
+        <div>
+          <div>
+            <fade-transition :duration="200" origin="center top" mode="out-in">
+              <router-view
+                ref="router-view"
+                :balance="balance"
+                :gdt-balance="GdtBalance"
+                :transactions="transactions"
+                :transactionCount="transactionCount"
+                :pending="pending"
+                @update-balance="updateBalance"
+                @update-transactions="updateTransactions"
+              ></router-view>
+            </fade-transition>
+          </div>
+          <content-footer v-if="!$route.meta.hideFooter"></content-footer>
+        </div>
+  </div>
+    
   </div>
 </template>
 <script>

From 8122f218a9cf34bbb38816b5c64c9a43e1464555 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Dec 2021 11:14:34 +0100
Subject: [PATCH 16/71] render error message as it is

---
 frontend/src/views/Layout/DashboardLayout_gdd.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 9487eadf7..8273685bd 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -133,9 +133,7 @@ export default {
         })
         .catch((error) => {
           this.pending = true
-          if (error.message === 'GraphQL error: 403.13 - Client certificate revoked') {
-            this.$toasted.error(this.$t('error.session-expired'))
-          }
+          this.$toasted.error(error.message)
           // what to do when loading balance fails?
         })
     },

From 88002a52097dcec2f60a24eb7d7451fdbc0e8128 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Dec 2021 13:21:03 +0100
Subject: [PATCH 17/71] define custom error toast, use this custom toast for
 all error toasts

---
 frontend/src/main.js                          | 10 ++++++++++
 frontend/src/mixins/getCommunityInfo.js       |  2 +-
 frontend/src/plugins/dashboard-plugin.test.js | 20 +++++++++++++++++++
 frontend/src/routes/router.test.js            |  7 +++++++
 .../views/Layout/DashboardLayout_gdd.spec.js  |  6 ++++--
 .../src/views/Layout/DashboardLayout_gdd.vue  |  2 +-
 .../GdtTransactionList.spec.js                |  4 +++-
 .../AccountOverview/GdtTransactionList.vue    |  2 +-
 frontend/src/views/Pages/Login.spec.js        |  4 +++-
 frontend/src/views/Pages/Login.vue            |  2 +-
 frontend/src/views/Pages/Register.spec.js     |  4 +++-
 .../src/views/Pages/RegisterCommunity.spec.js |  4 +++-
 .../Pages/RegisterSelectCommunity.spec.js     |  4 +++-
 .../views/Pages/RegisterSelectCommunity.vue   |  2 +-
 .../src/views/Pages/ResetPassword.spec.js     |  4 +++-
 frontend/src/views/Pages/ResetPassword.vue    |  4 ++--
 .../UserCard_CoinAnimation.spec.js            |  4 +++-
 .../UserProfile/UserCard_CoinAnimation.vue    |  2 +-
 .../UserProfile/UserCard_FormUserData.spec.js |  4 +++-
 .../UserProfile/UserCard_FormUserData.vue     |  2 +-
 .../UserCard_FormUserPasswort.spec.js         |  4 +++-
 .../UserProfile/UserCard_FormUserPasswort.vue |  2 +-
 .../UserProfile/UserCard_FormUsername.spec.js |  4 +++-
 .../UserProfile/UserCard_FormUsername.vue     |  2 +-
 .../UserProfile/UserCard_Language.spec.js     |  4 +++-
 .../Pages/UserProfile/UserCard_Language.vue   |  2 +-
 .../UserProfile/UserCard_Newsletter.spec.js   |  4 +++-
 .../Pages/UserProfile/UserCard_Newsletter.vue |  2 +-
 28 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/frontend/src/main.js b/frontend/src/main.js
index 75dfdcedb..cbd7383aa 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -16,6 +16,16 @@ import { apolloProvider } from './plugins/apolloProvider'
 Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
 
+Vue.toasted.register(
+  'error',
+  (payload) => {
+    return payload.replace(/^GraphQL error: /, '')
+  },
+  {
+    type: 'error',
+  },
+)
+
 loadAllRules(i18n)
 
 addNavigationGuards(router, store, apolloProvider.defaultClient)
diff --git a/frontend/src/mixins/getCommunityInfo.js b/frontend/src/mixins/getCommunityInfo.js
index f8fda6e45..3ca1c74cc 100644
--- a/frontend/src/mixins/getCommunityInfo.js
+++ b/frontend/src/mixins/getCommunityInfo.js
@@ -13,7 +13,7 @@ export const getCommunityInfoMixin = {
             return result.data.getCommunityInfo
           })
           .catch((error) => {
-            this.$toasted.error(error.message)
+            this.$toasted.global.error(error.message)
           })
       }
     },
diff --git a/frontend/src/plugins/dashboard-plugin.test.js b/frontend/src/plugins/dashboard-plugin.test.js
index 3792ad2c4..25083c399 100644
--- a/frontend/src/plugins/dashboard-plugin.test.js
+++ b/frontend/src/plugins/dashboard-plugin.test.js
@@ -4,8 +4,11 @@ import Vue from 'vue'
 import GlobalComponents from './globalComponents'
 import GlobalDirectives from './globalDirectives'
 
+import Toasted from 'vue-toasted'
+
 jest.mock('./globalComponents')
 jest.mock('./globalDirectives')
+jest.mock('vue-toasted')
 
 jest.mock('vue')
 
@@ -22,4 +25,21 @@ describe('dashboard plugin', () => {
   it('installs the global directives', () => {
     expect(vueUseMock).toBeCalledWith(GlobalDirectives)
   })
+
+  describe('vue toasted', () => {
+    const toastedAction = vueUseMock.mock.calls[11][1].action.onClick
+    const goAwayMock = jest.fn()
+    const toastObject = {
+      goAway: goAwayMock,
+    }
+
+    it('installs vue toasted', () => {
+      expect(vueUseMock).toBeCalledWith(Toasted, expect.anything())
+    })
+
+    it('onClick calls goAway(0)', () => {
+      toastedAction({}, toastObject)
+      expect(goAwayMock).toBeCalledWith(0)
+    })
+  })
 })
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index a85c7a291..bc2f3d340 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -143,6 +143,13 @@ describe('router', () => {
         })
       })
 
+      describe('password with param comingFrom', () => {
+        it('loads the "Password" component', async () => {
+          const component = await routes.find((r) => r.path === '/password/:comingFrom').component()
+          expect(component.default.name).toBe('password')
+        })
+      })
+
       describe('register-community', () => {
         it('loads the "registerCommunity" component', async () => {
           const component = await routes.find((r) => r.path === '/register-community').component()
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index b25640e5c..231e36dcd 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -39,7 +39,9 @@ describe('DashboardLayoutGdd', () => {
       },
     },
     $toasted: {
-      error: toasterMock,
+      global: {
+        error: toasterMock,
+      },
     },
     $apollo: {
       query: apolloMock,
@@ -266,7 +268,7 @@ describe('DashboardLayoutGdd', () => {
           expect(wrapper.vm.pending).toBeTruthy()
         })
 
-        it('calls $toasted.error method', () => {
+        it('calls $toasted.global.error method', () => {
           expect(toasterMock).toBeCalledWith('Ouch!')
         })
       })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 8273685bd..a9859145b 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -133,7 +133,7 @@ export default {
         })
         .catch((error) => {
           this.pending = true
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
           // what to do when loading balance fails?
         })
     },
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
index 77507cb69..a03122527 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js
@@ -37,7 +37,9 @@ describe('GdtTransactionList ', () => {
     $n: jest.fn((n) => n),
     $d: jest.fn((d) => d),
     $toasted: {
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       query: apolloMock,
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 378aa3ece..9c8b51f5e 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -71,7 +71,7 @@ export default {
           window.scrollTo(0, 0)
         })
         .catch((error) => {
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
     },
   },
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index a16a8ad54..34175d8b3 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -52,7 +52,9 @@ describe('Login', () => {
       push: mockRouterPush,
     },
     $toasted: {
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       query: apolloQueryMock,
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 0ce209551..d5d3e25a4 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -106,7 +106,7 @@ export default {
         })
         .catch((error) => {
           if (error.message.includes('No user with this credentials')) {
-            this.$toasted.error(this.$t('error.no-account'))
+            this.$toasted.global.error(this.$t('error.no-account'))
           } else {
             // : this.$t('error.no-email-verify')
             this.$router.push('/reset/login')
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index b75c881c6..820229a4a 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -49,7 +49,9 @@ describe('Register', () => {
       },
     },
     $toasted: {
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
   }
 
diff --git a/frontend/src/views/Pages/RegisterCommunity.spec.js b/frontend/src/views/Pages/RegisterCommunity.spec.js
index 63fd63276..477e5e08e 100644
--- a/frontend/src/views/Pages/RegisterCommunity.spec.js
+++ b/frontend/src/views/Pages/RegisterCommunity.spec.js
@@ -37,7 +37,9 @@ describe('RegisterCommunity', () => {
       },
     },
     $toasted: {
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
   }
 
diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js
index eba23cea4..ad80c7e38 100644
--- a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js
+++ b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js
@@ -79,7 +79,9 @@ describe('RegisterSelectCommunity', () => {
       show: spinnerMock,
     },
     $toasted: {
-      error: toasterMock,
+      global: {
+        error: toasterMock,
+      },
     },
   }
 
diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.vue b/frontend/src/views/Pages/RegisterSelectCommunity.vue
index f6914f1f2..ab46da03f 100644
--- a/frontend/src/views/Pages/RegisterSelectCommunity.vue
+++ b/frontend/src/views/Pages/RegisterSelectCommunity.vue
@@ -76,7 +76,7 @@ export default {
           )
         })
         .catch((error) => {
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
       loader.hide()
       this.pending = false
diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js
index 36a2f169c..f3bbc7334 100644
--- a/frontend/src/views/Pages/ResetPassword.spec.js
+++ b/frontend/src/views/Pages/ResetPassword.spec.js
@@ -30,7 +30,9 @@ const createMockObject = (comingFrom) => {
         },
       },
       $toasted: {
-        error: toasterMock,
+        global: {
+          error: toasterMock,
+        },
       },
       $router: {
         push: routerPushMock,
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index 478a8db8c..3e6aef339 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -96,10 +96,10 @@ export default {
         })
         .catch((error) => {
           if (error.message.includes('Code is older than 10 minutes')) {
-            this.$toasted.error(error.message)
+            this.$toasted.global.error(error.message)
             this.$router.push('/password/reset')
           } else {
-            this.$toasted.error(error.message)
+            this.$toasted.global.error(error.message)
           }
         })
     },
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.spec.js
index 59d1f72e5..64455a3e8 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.spec.js
@@ -24,7 +24,9 @@ describe('UserCard_CoinAnimation', () => {
     },
     $toasted: {
       success: toastSuccessMock,
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       mutate: mockAPIcall,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.vue b/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.vue
index 21192af93..99d46ae9b 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_CoinAnimation.vue
@@ -58,7 +58,7 @@ export default {
         })
         .catch((error) => {
           this.CoinAnimationStatus = this.$store.state.coinanimation
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
     },
   },
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
index b4cdc0fb7..23c9e2840 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js
@@ -25,7 +25,9 @@ describe('UserCard_FormUserData', () => {
     },
     $toasted: {
       success: toastSuccessMock,
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       mutate: mockAPIcall,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
index f22a48ccd..9f23c864d 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
@@ -124,7 +124,7 @@ export default {
           this.$toasted.success(this.$t('settings.name.change-success'))
         })
         .catch((error) => {
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
     },
   },
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
index 3997bb71e..1057f71f1 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js
@@ -17,7 +17,9 @@ describe('UserCard_FormUserPasswort', () => {
     $t: jest.fn((t) => t),
     $toasted: {
       success: toastSuccessMock,
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       mutate: changePasswordProfileMock,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 5235c4554..54ad39431 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -85,7 +85,7 @@ export default {
           this.cancelEdit()
         })
         .catch((error) => {
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
     },
   },
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
index be3abbbee..5a3ee8cd6 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
@@ -31,7 +31,9 @@ describe('UserCard_FormUsername', () => {
     },
     $toasted: {
       success: toastSuccessMock,
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       mutate: mockAPIcall,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
index 90ac23884..6bae1abb4 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
@@ -100,7 +100,7 @@ export default {
           this.$toasted.success(this.$t('settings.name.change-success'))
         })
         .catch((error) => {
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
           this.showUsername = true
           this.username = this.$store.state.username
           this.form.username = this.$store.state.username
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js
index f2acacd5b..e13d4a1d1 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js
@@ -28,7 +28,9 @@ describe('UserCard_Language', () => {
     },
     $toasted: {
       success: toastSuccessMock,
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       mutate: mockAPIcall,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index 9315c747e..b53d08189 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -101,7 +101,7 @@ export default {
         })
         .catch((error) => {
           this.language = this.$store.state.language
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
     },
     buildTagFromLanguageString() {
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
index facde1f36..766e13ce5 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js
@@ -25,7 +25,9 @@ describe('UserCard_Newsletter', () => {
     },
     $toasted: {
       success: toastSuccessMock,
-      error: toastErrorMock,
+      global: {
+        error: toastErrorMock,
+      },
     },
     $apollo: {
       mutate: mockAPIcall,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
index 31fd745b2..2499671cf 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
@@ -56,7 +56,7 @@ export default {
         })
         .catch((error) => {
           this.newsletterState = this.$store.state.newsletterState
-          this.$toasted.error(error.message)
+          this.$toasted.global.error(error.message)
         })
     },
   },

From 139e537e944afd3f7ad085313dd50d6f62b7aee8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Dec 2021 17:27:19 +0100
Subject: [PATCH 18/71] add components Navbar, Sidebar

---
 frontend/src/components/Menu/Navbar.vue       | 58 +++++++++++
 frontend/src/components/Menu/Sidebar.vue      | 30 ++++++
 .../src/views/Layout/DashboardLayout_gdd.vue  | 98 +++++--------------
 3 files changed, 112 insertions(+), 74 deletions(-)
 create mode 100644 frontend/src/components/Menu/Navbar.vue
 create mode 100644 frontend/src/components/Menu/Sidebar.vue

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
new file mode 100644
index 000000000..b91d4763c
--- /dev/null
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <b-navbar toggleable="lg" type="dark" variant="info">
+      <div class="navbar-brand">
+        <router-link to="/overview">
+          <img :src="logo" class="navbar-brand-img" alt="..." />
+        </router-link>
+      </div>
+      <b-nav-text center>{{ balance }} GDD</b-nav-text>
+      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
+
+      <b-collapse id="nav-collapse" is-nav>
+        <b-navbar-nav class="d-none d-md-flex d-sm-flex">
+          <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
+          <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
+          <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
+          <hr />
+          <b-nav-item to="/overview" class="mb-3" active>Overview</b-nav-item>
+          <b-nav-item to="/send" class="mb-3">Link</b-nav-item>
+          <b-nav-item to="/transactions" class="mb-3">Another Link</b-nav-item>
+          <b-nav-item to="/profile" class="mb-3" disabled>Disabled</b-nav-item>
+        </b-navbar-nav>
+
+        <!-- Right aligned nav items -->
+        <b-navbar-nav class="ml-auto">
+          <b-nav-item-dropdown right>
+            <!-- Using 'button-content' slot -->
+            <template #button-content>
+              <em>
+                {{ $store.state.email }}
+              </em>
+            </template>
+            <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
+            <b-dropdown-item @click="this.$emit('get-elopage-link')" target="_blank">
+              {{ $t('members_area') }}
+            </b-dropdown-item>
+            <b-dropdown-item @click="this.$emit('admin')" target="_blank">
+              {{ $t('admin_area') }}
+            </b-dropdown-item>
+            <b-dropdown-item href="/#" @click="this.$emit('logout')">
+              {{ $t('logout') }}
+            </b-dropdown-item>
+          </b-nav-item-dropdown>
+        </b-navbar-nav>
+      </b-collapse>
+    </b-navbar>
+  </div>
+</template>
+<script>
+export default {
+  name: 'navbar',
+  data() {
+    return {
+      logo: 'img/brand/green.png',
+    }
+  },
+}
+</script>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
new file mode 100644
index 000000000..c7472218c
--- /dev/null
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -0,0 +1,30 @@
+<template>
+  <div>
+      
+   
+      <div class="px-3 py-2">
+        <p></p>
+        <div class="mb-6">
+          <b-nav vertical class="w-200">
+            <b-nav-item to="/overview" class="mb-3" active>Overview</b-nav-item>
+            <b-nav-item to="/send" class="mb-3">Link</b-nav-item>
+            <b-nav-item to="/transactions" class="mb-3">Another Link</b-nav-item>
+            <b-nav-item to="/profile" class="mb-3" disabled>Disabled</b-nav-item>
+          </b-nav>
+          <hr />
+          <b-nav vertical class="w-100">
+            <b-nav-item class="mb-3" active>Active</b-nav-item>
+            <b-nav-item class="mb-3">Link</b-nav-item>
+            <b-nav-item class="mb-3">Another Link</b-nav-item>
+            <b-nav-item class="mb-3" disabled>Disabled</b-nav-item>
+          </b-nav>
+        </div>
+      </div>
+ 
+  </div>
+</template>
+<script>
+export default {
+  name: 'sidebar',
+}
+</script>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 858c3a260..6340fc2b5 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,86 +1,34 @@
 <template>
   <div>
-    <b-navbar toggleable="lg" type="dark" variant="info">
-      <div class="navbar-brand" >
-        <router-link to="/overview" >
-        <img :src="logo" class="navbar-brand-img" alt="..." />
-        </router-link>
+    <navbar @get-elopage-link="getElopageLink" @admin="admin" />
+    <div style="display: inline-flex">
+      <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
+        <sidebar @get-elopage-link="getElopageLink" @admin="admin" />
       </div>
-      <b-nav-text center>{{ balance }} GDD</b-nav-text>
-      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
-      <b-collapse id="nav-collapse" is-nav>
-        <b-navbar-nav class="d-none d-md-flex d-sm-flex">
-          <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
-          <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
-          <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
-        </b-navbar-nav>
-
-        <!-- Right aligned nav items -->
-        <b-navbar-nav class="ml-auto">
-          <b-nav-item-dropdown right>
-            <!-- Using 'button-content' slot -->
-            <template #button-content>
-              <em>
-                {{ $store.state.email }}
-              </em>
-            </template>
-            <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
-            <b-dropdown-item @click="getElopageLink" target="_blank">
-              {{ $t('members_area') }}
-            </b-dropdown-item>
-            <b-dropdown-item target="_blank" @click="admin">{{ $t('admin_area') }}</b-dropdown-item>
-            <b-dropdown-item href="/#" @click="logout">{{ $t('logout') }}</b-dropdown-item>
-          </b-nav-item-dropdown>
-        </b-navbar-nav>
-      </b-collapse>
-    </b-navbar>
-  <div style="display: inline-flex">
-      <div class="d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
-        <b-sidebar id="sidebar-1" visible no-header-close bg-variant="false">
-          <div class="px-3 py-2">
-            <p></p>
-            <div class="mb-6">
-              <b-nav vertical class="w-200">
-                <b-nav-item to="/overview" class="mb-3" active>Overview</b-nav-item>
-                <b-nav-item to="/send" class="mb-3">Link</b-nav-item>
-                <b-nav-item to="/transactions" class="mb-3">Another Link</b-nav-item>
-                <b-nav-item to="/profile" class="mb-3" disabled>Disabled</b-nav-item>
-              </b-nav>
-              <hr />
-              <b-nav vertical class="w-100">
-                <b-nav-item class="mb-3" active>Active</b-nav-item>
-                <b-nav-item class="mb-3">Link</b-nav-item>
-                <b-nav-item class="mb-3">Another Link</b-nav-item>
-                <b-nav-item class="mb-3" disabled>Disabled</b-nav-item>
-              </b-nav>
-            </div>
-          </div>
-        </b-sidebar>
-      </div>
-     
+      <div>
         <div>
-          <div>
-            <fade-transition :duration="200" origin="center top" mode="out-in">
-              <router-view
-                ref="router-view"
-                :balance="balance"
-                :gdt-balance="GdtBalance"
-                :transactions="transactions"
-                :transactionCount="transactionCount"
-                :pending="pending"
-                @update-balance="updateBalance"
-                @update-transactions="updateTransactions"
-              ></router-view>
-            </fade-transition>
-          </div>
-          <content-footer v-if="!$route.meta.hideFooter"></content-footer>
+          <fade-transition :duration="200" origin="center top" mode="out-in">
+            <router-view
+              ref="router-view"
+              :balance="balance"
+              :gdt-balance="GdtBalance"
+              :transactions="transactions"
+              :transactionCount="transactionCount"
+              :pending="pending"
+              @update-balance="updateBalance"
+              @update-transactions="updateTransactions"
+            ></router-view>
+          </fade-transition>
         </div>
-  </div>
-    
+        <content-footer v-if="!$route.meta.hideFooter"></content-footer>
+      </div>
+    </div>
   </div>
 </template>
 <script>
+import Navbar from '../../components/Menu/Navbar.vue'
+import Sidebar from '../../components/Menu/Sidebar.vue'
 import { logout, transactionsQuery } from '../../graphql/queries'
 import ContentFooter from './ContentFooter.vue'
 import { FadeTransition } from 'vue2-transitions'
@@ -88,6 +36,8 @@ import CONFIG from '../../config'
 
 export default {
   components: {
+    Navbar,
+    Sidebar,
     ContentFooter,
     FadeTransition,
   },

From adadbf27200f5f3c9b575eaa0c879ffe86fdcf73 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Dec 2021 17:44:16 +0100
Subject: [PATCH 19/71] add links in components Navbar

---
 frontend/src/components/Menu/Navbar.vue       | 35 +++++++++++++++----
 frontend/src/components/Menu/Sidebar.vue      |  8 ++---
 .../src/views/Layout/DashboardLayout_gdd.vue  |  4 +--
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index b91d4763c..7e7e15e93 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -7,18 +7,30 @@
         </router-link>
       </div>
       <b-nav-text center>{{ balance }} GDD</b-nav-text>
-      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
-
-      <b-collapse id="nav-collapse" is-nav>
+      
+      <b-collapse id="nav-collapse">
         <b-navbar-nav class="d-none d-md-flex d-sm-flex">
           <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
           <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
+          <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
           <hr />
-          <b-nav-item to="/overview" class="mb-3" active>Overview</b-nav-item>
-          <b-nav-item to="/send" class="mb-3">Link</b-nav-item>
-          <b-nav-item to="/transactions" class="mb-3">Another Link</b-nav-item>
-          <b-nav-item to="/profile" class="mb-3" disabled>Disabled</b-nav-item>
+          <b-nav-item to="/#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
+            {{ $t('members_area') }}
+            <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
+          </b-nav-item>
+          <b-nav-item
+            v-if="$store.state.isAdmin"
+            to="/#"
+            class="mb-3"
+            @click="this.$emit('admin')"
+            target="_blank"
+          >
+            {{ $t('admin_area') }}
+          </b-nav-item>
+          <b-nav-item to="/#" class="mb-3" @click="this.$emit('logout')">
+            {{ $t('logout') }}
+          </b-nav-item>
         </b-navbar-nav>
 
         <!-- Right aligned nav items -->
@@ -43,12 +55,21 @@
           </b-nav-item-dropdown>
         </b-navbar-nav>
       </b-collapse>
+
+      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
+
     </b-navbar>
   </div>
 </template>
 <script>
 export default {
   name: 'navbar',
+  props: {
+    balance: {
+      type: Number,
+      required: true,
+    },
+  },
   data() {
     return {
       logo: 'img/brand/green.png',
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index c7472218c..a91d31177 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -6,10 +6,10 @@
         <p></p>
         <div class="mb-6">
           <b-nav vertical class="w-200">
-            <b-nav-item to="/overview" class="mb-3" active>Overview</b-nav-item>
-            <b-nav-item to="/send" class="mb-3">Link</b-nav-item>
-            <b-nav-item to="/transactions" class="mb-3">Another Link</b-nav-item>
-            <b-nav-item to="/profile" class="mb-3" disabled>Disabled</b-nav-item>
+            <b-nav-item to="/overview" class="mb-3" active>{{ $t('overview') }}</b-nav-item>
+            <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
+            <b-nav-item to="/transactions" class="mb-3">{{ $t('transactions') }}</b-nav-item>
+            <b-nav-item to="/profile" class="mb-3" disabled>{{ $t('profile') }}</b-nav-item>
           </b-nav>
           <hr />
           <b-nav vertical class="w-100">
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 6340fc2b5..aa343b60b 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <navbar @get-elopage-link="getElopageLink" @admin="admin" />
+    <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout"/>
     <div style="display: inline-flex">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
-        <sidebar @get-elopage-link="getElopageLink" @admin="admin" />
+        <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
       </div>
 
       <div>

From d9f8387d7e468ceca5ab523229edd64e8a34ef88 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Dec 2021 18:58:15 +0100
Subject: [PATCH 20/71] feat: Test Creation in Admin Interface

---
 .github/workflows/test.yml       |   2 +-
 admin/src/pages/Creation.spec.js | 174 ++++++++++++++++++++++++++++++-
 admin/src/pages/Creation.vue     |  15 +--
 3 files changed, 174 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0435d0c76..88a6ba8e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -441,7 +441,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 69
+          min_coverage: 76
           token: ${{ github.token }}
 
   ##############################################################################
diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js
index 02c2ed4ce..f0186099e 100644
--- a/admin/src/pages/Creation.spec.js
+++ b/admin/src/pages/Creation.spec.js
@@ -1,5 +1,6 @@
-import { mount } from '@vue/test-utils'
+import { shallowMount } from '@vue/test-utils'
 import Creation from './Creation.vue'
+import Vue from 'vue'
 
 const localVue = global.localVue
 
@@ -7,11 +8,19 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
     searchUsers: [
       {
+        id: 1,
         firstName: 'Bibi',
         lastName: 'Bloxberg',
         email: 'bibi@bloxberg.de',
         creation: [200, 400, 600],
       },
+      {
+        id: 2,
+        firstName: 'Benjamin',
+        lastName: 'Blümchen',
+        email: 'benjamin@bluemchen.de',
+        creation: [800, 600, 400],
+      },
     ],
   },
 })
@@ -31,10 +40,10 @@ describe('Creation', () => {
   let wrapper
 
   const Wrapper = () => {
-    return mount(Creation, { localVue, mocks })
+    return shallowMount(Creation, { localVue, mocks })
   }
 
-  describe('mount', () => {
+  describe('shallowMount', () => {
     beforeEach(() => {
       wrapper = Wrapper()
     })
@@ -43,6 +52,165 @@ describe('Creation', () => {
       expect(wrapper.find('div.creation').exists()).toBeTruthy()
     })
 
+    describe('apollo returns user array', () => {
+      it('calls the searchUser query', () => {
+        expect(apolloQueryMock).toBeCalled()
+      })
+
+      it('sets the data of itemsList', () => {
+        expect(wrapper.vm.itemsList).toEqual([
+          {
+            id: 1,
+            firstName: 'Bibi',
+            lastName: 'Bloxberg',
+            email: 'bibi@bloxberg.de',
+            creation: [200, 400, 600],
+            showDetails: false,
+          },
+          {
+            id: 2,
+            firstName: 'Benjamin',
+            lastName: 'Blümchen',
+            email: 'benjamin@bluemchen.de',
+            creation: [800, 600, 400],
+            showDetails: false,
+          },
+        ])
+      })
+    })
+
+    describe('update iten', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+      })
+
+      describe('push', () => {
+        beforeEach(() => {
+          wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
+            'update-item',
+            {
+              id: 2,
+              firstName: 'Benjamin',
+              lastName: 'Blümchen',
+              email: 'benjamin@bluemchen.de',
+              creation: [800, 600, 400],
+              showDetails: false,
+            },
+            'push',
+          )
+        })
+
+        it('removes the pushed item from itemsList', () => {
+          expect(wrapper.vm.itemsList).toEqual([
+            {
+              id: 1,
+              firstName: 'Bibi',
+              lastName: 'Bloxberg',
+              email: 'bibi@bloxberg.de',
+              creation: [200, 400, 600],
+              showDetails: false,
+            },
+          ])
+        })
+
+        it('adds the pushed item to itemsMassCreation', () => {
+          expect(wrapper.vm.itemsMassCreation).toEqual([
+            {
+              id: 2,
+              firstName: 'Benjamin',
+              lastName: 'Blümchen',
+              email: 'benjamin@bluemchen.de',
+              creation: [800, 600, 400],
+              showDetails: false,
+            },
+          ])
+        })
+
+        describe('remove', () => {
+          beforeEach(() => {
+            wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
+              'update-item',
+              {
+                id: 2,
+                firstName: 'Benjamin',
+                lastName: 'Blümchen',
+                email: 'benjamin@bluemchen.de',
+                creation: [800, 600, 400],
+                showDetails: false,
+              },
+              'remove',
+            )
+          })
+
+          it('removes the item from itemsMassCreation', () => {
+            expect(wrapper.vm.itemsMassCreation).toEqual([])
+          })
+
+          it('adds the item to itemsList', () => {
+            expect(wrapper.vm.itemsList).toEqual([
+              {
+                id: 1,
+                firstName: 'Bibi',
+                lastName: 'Bloxberg',
+                email: 'bibi@bloxberg.de',
+                creation: [200, 400, 600],
+                showDetails: false,
+              },
+              {
+                id: 2,
+                firstName: 'Benjamin',
+                lastName: 'Blümchen',
+                email: 'benjamin@bluemchen.de',
+                creation: [800, 600, 400],
+                showDetails: false,
+              },
+            ])
+          })
+        })
+      })
+
+      describe('error', () => {
+        const consoleErrorMock = jest.fn()
+
+        beforeEach(() => {
+          Vue.config.warnHandler = (w) => {}
+          // eslint-disable-next-line no-console
+          console.error = consoleErrorMock
+          wrapper.findComponent({ name: 'UserTable' }).vm.$emit('update-item', {}, 'no-rule')
+        })
+
+        it('throws an error', () => {
+          expect(consoleErrorMock).toBeCalledWith(expect.objectContaining({ message: 'no-rule' }))
+        })
+      })
+    })
+
+    describe('remove all bookmarks', () => {
+      beforeEach(async () => {
+        await wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
+          'update-item',
+          {
+            id: 2,
+            firstName: 'Benjamin',
+            lastName: 'Blümchen',
+            email: 'benjamin@bluemchen.de',
+            creation: [800, 600, 400],
+            showDetails: false,
+          },
+          'push',
+        )
+        wrapper.findComponent({ name: 'CreationFormular' }).vm.$emit('remove-all-bookmark')
+      })
+
+      it('removes all items from itemsMassCreation', () => {
+        expect(wrapper.vm.itemsMassCreation).toEqual([])
+      })
+
+      it('adds all items to itemsList', () => {
+        expect(wrapper.vm.itemsList).toHaveLength(2)
+      })
+    })
+
     describe('apollo returns error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({
diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
index 21d4aa11a..820f6382e 100644
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@@ -125,20 +125,9 @@ export default {
           throw new Error(event)
       }
     },
-
-    // updateRadioSelected(obj) {
-    //  this.radioSelectedMass = obj[0]
-    // },
-
     removeAllBookmark() {
-      alert('remove all bookmarks')
-      const index = 0
-      let i = 0
-
-      for (i; i < this.itemsMassCreation.length; i++) {
-        this.itemsList.push(this.itemsMassCreation[i])
-      }
-      this.itemsMassCreation.splice(index, this.itemsMassCreation.length)
+      this.itemsMassCreation.forEach((item) => this.itemsList.push(item))
+      this.itemsMassCreation = []
     },
   },
 }

From b063bdfab3abf6736dfb6215018f2a364f42a9d0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Dec 2021 19:08:02 +0100
Subject: [PATCH 21/71] reset warnHandler after testing thrown errors

---
 admin/src/pages/Creation.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js
index f0186099e..b97386722 100644
--- a/admin/src/pages/Creation.spec.js
+++ b/admin/src/pages/Creation.spec.js
@@ -171,6 +171,7 @@ describe('Creation', () => {
 
       describe('error', () => {
         const consoleErrorMock = jest.fn()
+        const warnHandler = Vue.config.warnHandler
 
         beforeEach(() => {
           Vue.config.warnHandler = (w) => {}
@@ -179,6 +180,10 @@ describe('Creation', () => {
           wrapper.findComponent({ name: 'UserTable' }).vm.$emit('update-item', {}, 'no-rule')
         })
 
+        afterEach(() => {
+          Vue.config.warnHandler = warnHandler
+        })
+
         it('throws an error', () => {
           expect(consoleErrorMock).toBeCalledWith(expect.objectContaining({ message: 'no-rule' }))
         })

From bcc66691efaaf23ee34ced2b48fb22ecdbad5374 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 09:02:50 +0100
Subject: [PATCH 22/71] add emit for logout on Navbar and Sidebar

---
 frontend/src/components/Menu/Navbar.vue        | 18 ++++++++----------
 frontend/src/components/Menu/Sidebar.vue       |  2 +-
 .../src/views/Layout/DashboardLayout_gdd.vue   |  4 +---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 7e7e15e93..50651209c 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -7,28 +7,29 @@
         </router-link>
       </div>
       <b-nav-text center>{{ balance }} GDD</b-nav-text>
-      
-      <b-collapse id="nav-collapse">
-        <b-navbar-nav class="d-none d-md-flex d-sm-flex">
+      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
+
+      <b-collapse id="nav-collapse" is-nav>
+        <b-navbar-nav >
           <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
           <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
           <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
           <hr />
-          <b-nav-item to="/#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
+          <b-nav-item to="#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
             {{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
           <b-nav-item
             v-if="$store.state.isAdmin"
-            to="/#"
+            to="#"
             class="mb-3"
             @click="this.$emit('admin')"
             target="_blank"
           >
             {{ $t('admin_area') }}
           </b-nav-item>
-          <b-nav-item to="/#" class="mb-3" @click="this.$emit('logout')">
+          <b-nav-item class="mb-3" @click="$emit('logout')">
             {{ $t('logout') }}
           </b-nav-item>
         </b-navbar-nav>
@@ -49,15 +50,12 @@
             <b-dropdown-item @click="this.$emit('admin')" target="_blank">
               {{ $t('admin_area') }}
             </b-dropdown-item>
-            <b-dropdown-item href="/#" @click="this.$emit('logout')">
+            <b-dropdown-item @click="$emit('logout')">
               {{ $t('logout') }}
             </b-dropdown-item>
           </b-nav-item-dropdown>
         </b-navbar-nav>
       </b-collapse>
-
-      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
-
     </b-navbar>
   </div>
 </template>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index a91d31177..40c02c2fd 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -16,7 +16,7 @@
             <b-nav-item class="mb-3" active>Active</b-nav-item>
             <b-nav-item class="mb-3">Link</b-nav-item>
             <b-nav-item class="mb-3">Another Link</b-nav-item>
-            <b-nav-item class="mb-3" disabled>Disabled</b-nav-item>
+            <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
           </b-nav>
         </div>
       </div>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index aa343b60b..80a58432b 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout"/>
+    <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
     <div style="display: inline-flex">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
         <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
@@ -59,12 +59,10 @@ export default {
           query: logout,
         })
         .then(() => {
-          this.$sidebar.displaySidebar(false)
           this.$store.dispatch('logout')
           this.$router.push('/login')
         })
         .catch(() => {
-          this.$sidebar.displaySidebar(false)
           this.$store.dispatch('logout')
           if (this.$router.currentRoute.path !== '/login') this.$router.push('/login')
         })

From 9cfb6716b2c98b5e6b02c293136397699594f5b0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 09:08:05 +0100
Subject: [PATCH 23/71] add emit for adminarea  on Navbar and Sidebar

---
 frontend/src/components/Menu/Navbar.vue  | 31 +++---------------------
 frontend/src/components/Menu/Sidebar.vue |  2 +-
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 50651209c..d7e26f593 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -10,23 +10,17 @@
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
       <b-collapse id="nav-collapse" is-nav>
-        <b-navbar-nav >
+        <b-navbar-nav>
           <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
           <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
           <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
           <hr />
-          <b-nav-item to="#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
+          <b-nav-item to="#" class="mb-3" @click="$emit('get-elopage-link')">
             {{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
-          <b-nav-item
-            v-if="$store.state.isAdmin"
-            to="#"
-            class="mb-3"
-            @click="this.$emit('admin')"
-            target="_blank"
-          >
+          <b-nav-item v-if="$store.state.isAdmin" to="#" class="mb-3" @click="$emit('admin')">
             {{ $t('admin_area') }}
           </b-nav-item>
           <b-nav-item class="mb-3" @click="$emit('logout')">
@@ -36,24 +30,7 @@
 
         <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto">
-          <b-nav-item-dropdown right>
-            <!-- Using 'button-content' slot -->
-            <template #button-content>
-              <em>
-                {{ $store.state.email }}
-              </em>
-            </template>
-            <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
-            <b-dropdown-item @click="this.$emit('get-elopage-link')" target="_blank">
-              {{ $t('members_area') }}
-            </b-dropdown-item>
-            <b-dropdown-item @click="this.$emit('admin')" target="_blank">
-              {{ $t('admin_area') }}
-            </b-dropdown-item>
-            <b-dropdown-item @click="$emit('logout')">
-              {{ $t('logout') }}
-            </b-dropdown-item>
-          </b-nav-item-dropdown>
+          <b-nav-item to="/profile" right>{{ $store.state.email }}</b-nav-item>
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 40c02c2fd..d1409a681 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -15,7 +15,7 @@
           <b-nav vertical class="w-100">
             <b-nav-item class="mb-3" active>Active</b-nav-item>
             <b-nav-item class="mb-3">Link</b-nav-item>
-            <b-nav-item class="mb-3">Another Link</b-nav-item>
+            <b-nav-item class="mb-3" @click="$emit('admin')">{{ $t('admin_area') }}</b-nav-item>
             <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
           </b-nav>
         </div>

From 1010997d3a194cbc1cabcdec00db713c3e42d1e9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 09:56:21 +0100
Subject: [PATCH 24/71] sidebar and content fixed size, navbar variant
 tranparent

---
 frontend/src/components/Menu/Navbar.vue       | 57 +++++++++----------
 frontend/src/components/Menu/Sidebar.vue      | 43 +++++++-------
 .../src/views/Layout/DashboardLayout_gdd.vue  |  4 +-
 3 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index d7e26f593..10e5ec858 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -1,38 +1,37 @@
 <template>
   <div>
-    <b-navbar toggleable="lg" type="dark" variant="info">
+    <b-navbar toggleable="lg" type="light" variant="trans">
       <div class="navbar-brand">
-        <router-link to="/overview">
-          <img :src="logo" class="navbar-brand-img" alt="..." />
-        </router-link>
+        <b-navbar-nav>
+          <b-nav-item to="/overview">
+            <img :src="logo" class="navbar-brand-img" alt="..." />
+          </b-nav-item>
+        </b-navbar-nav>
       </div>
       <b-nav-text center>{{ balance }} GDD</b-nav-text>
+
+      <div class="d-flex d-xl-none d-lg-none d-md-flex">
+        <b-collapse id="nav-collapse" is-nav>
+          <b-navbar-nav>
+            <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
+            <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
+            <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
+            <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
+            <hr />
+            <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
+              {{ $t('members_area') }}
+              <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
+            </b-nav-item>
+            <b-nav-item v-if="$store.state.isAdmin" class="mb-3" @click="$emit('admin')">
+              {{ $t('admin_area') }}
+            </b-nav-item>
+            <b-nav-item class="mb-3" @click="$emit('logout')">
+              {{ $t('logout') }}
+            </b-nav-item>
+          </b-navbar-nav>
+        </b-collapse>
+      </div>
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
-
-      <b-collapse id="nav-collapse" is-nav>
-        <b-navbar-nav>
-          <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
-          <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
-          <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
-          <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
-          <hr />
-          <b-nav-item to="#" class="mb-3" @click="$emit('get-elopage-link')">
-            {{ $t('members_area') }}
-            <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
-          </b-nav-item>
-          <b-nav-item v-if="$store.state.isAdmin" to="#" class="mb-3" @click="$emit('admin')">
-            {{ $t('admin_area') }}
-          </b-nav-item>
-          <b-nav-item class="mb-3" @click="$emit('logout')">
-            {{ $t('logout') }}
-          </b-nav-item>
-        </b-navbar-nav>
-
-        <!-- Right aligned nav items -->
-        <b-navbar-nav class="ml-auto">
-          <b-nav-item to="/profile" right>{{ $store.state.email }}</b-nav-item>
-        </b-navbar-nav>
-      </b-collapse>
     </b-navbar>
   </div>
 </template>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index d1409a681..1072c6709 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -1,26 +1,29 @@
 <template>
   <div>
-      
-   
-      <div class="px-3 py-2">
-        <p></p>
-        <div class="mb-6">
-          <b-nav vertical class="w-200">
-            <b-nav-item to="/overview" class="mb-3" active>{{ $t('overview') }}</b-nav-item>
-            <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
-            <b-nav-item to="/transactions" class="mb-3">{{ $t('transactions') }}</b-nav-item>
-            <b-nav-item to="/profile" class="mb-3" disabled>{{ $t('profile') }}</b-nav-item>
-          </b-nav>
-          <hr />
-          <b-nav vertical class="w-100">
-            <b-nav-item class="mb-3" active>Active</b-nav-item>
-            <b-nav-item class="mb-3">Link</b-nav-item>
-            <b-nav-item class="mb-3" @click="$emit('admin')">{{ $t('admin_area') }}</b-nav-item>
-            <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
-          </b-nav>
-        </div>
+    <div class="px-3 py-2">
+      <p></p>
+      <div class="mb-6">
+        <b-nav vertical class="w-200">
+          <b-nav-item to="/overview" class="mb-3" active>{{ $t('overview') }}</b-nav-item>
+          <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
+          <b-nav-item to="/transactions" class="mb-3">{{ $t('transactions') }}</b-nav-item>
+          <b-nav-item to="/profile" class="mb-3">
+            {{ $t('site.navbar.my-profil') }}
+          </b-nav-item>
+        </b-nav>
+        <hr />
+        <b-nav vertical class="w-100">
+          <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
+            {{ $t('members_area') }}
+            <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
+          </b-nav-item>
+          <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
+            {{ $t('admin_area') }}
+          </b-nav-item>
+          <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
+        </b-nav>
       </div>
- 
+    </div>
   </div>
 </template>
 <script>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 80a58432b..d9ec8de24 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
-    <div style="display: inline-flex">
+    <div style="display: inline-flex; width: 100%">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
         <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
       </div>
 
-      <div>
+      <div class="ml-2 mr-2" style="width: 100%">
         <div>
           <fade-transition :duration="200" origin="center top" mode="out-in">
             <router-view

From 1813b7b434515f68830e749b2cb2754ebabc2379 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 11:27:29 +0100
Subject: [PATCH 25/71] tests for Navbar and Sidebar

---
 frontend/src/components/Menu/Navbar.spec.js  | 57 ++++++++++++++++++++
 frontend/src/components/Menu/Navbar.vue      | 10 ++--
 frontend/src/components/Menu/Sidebar.spec.js | 34 ++++++++++++
 frontend/src/components/Menu/Sidebar.vue     |  2 +-
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/components/Menu/Navbar.spec.js
 create mode 100644 frontend/src/components/Menu/Sidebar.spec.js

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
new file mode 100644
index 000000000..fba63d65a
--- /dev/null
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -0,0 +1,57 @@
+import { mount } from '@vue/test-utils'
+import Navbar from './Navbar'
+
+const localVue = global.localVue
+
+const propsData = {
+  balance: 1234,
+}
+
+const mocks = {
+  $i18n: {
+    locale: 'en',
+  },
+  $t: jest.fn((t) => t),
+  $store: {
+    state: {
+      hasElopage: true,
+      isAdmin: true,
+    },
+  },
+}
+
+describe('Navbar', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(Navbar, { localVue, propsData, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.component-navbar').exists()).toBeTruthy()
+    })
+  })
+  // describe('find link admin and evented click', () => {
+  //   beforeEach(async () => {
+  //     await wrapper.find('.test-admin').trigger('click')
+  //   })
+
+  //   it('find link admin and click', () => {
+  //     expect(wrapper.emitted('admin')).toBeTruthy()
+  //     expect(wrapper.emitted('admin')).toEqual([
+  //       [
+  //         {
+  //           email: 'someone@watches.tv',
+  //           amount: 87.23,
+  //           memo: 'Long enough',
+  //         },
+  //       ],
+  //     ])
+  //   })
+  // })
+})
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 10e5ec858..3a48aa8b7 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="component-navbar">
     <b-navbar toggleable="lg" type="light" variant="trans">
       <div class="navbar-brand">
         <b-navbar-nav>
@@ -13,7 +13,7 @@
       <div class="d-flex d-xl-none d-lg-none d-md-flex">
         <b-collapse id="nav-collapse" is-nav>
           <b-navbar-nav>
-            <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
+            <b-nav-item to="/overview" class="test-overview">{{ $t('overview') }}</b-nav-item>
             <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
             <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
             <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
@@ -22,7 +22,11 @@
               {{ $t('members_area') }}
               <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
             </b-nav-item>
-            <b-nav-item v-if="$store.state.isAdmin" class="mb-3" @click="$emit('admin')">
+            <b-nav-item
+              v-if="$store.state.isAdmin"
+              class="test-overview mb-3"
+              @click="$emit('admin')"
+            >
               {{ $t('admin_area') }}
             </b-nav-item>
             <b-nav-item class="mb-3" @click="$emit('logout')">
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
new file mode 100644
index 000000000..4a5b8f930
--- /dev/null
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -0,0 +1,34 @@
+import { mount } from '@vue/test-utils'
+import Sidebar from './Sidebar.vue'
+
+const localVue = global.localVue
+
+describe('Sidebar', () => {
+  let wrapper
+
+  const mocks = {
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+    $store: {
+      state: {
+        hasElopage: true,
+        isAdmin: true,
+      },
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(Sidebar, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+    it('renders the component', () => {
+      expect(wrapper.find('div#component-sidebar').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 1072c6709..c9f1356a6 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div id="component-sidebar">
     <div class="px-3 py-2">
       <p></p>
       <div class="mb-6">

From 82b0a77f3be653e0d8daf2cc69a72754a089ae9a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 14:59:39 +0100
Subject: [PATCH 26/71] Navbar remove is-nav menu, add collaps components

---
 frontend/src/components/Menu/Navbar.vue       | 31 ++++++++++++++++++-
 .../src/views/Layout/DashboardLayout_gdd.vue  |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 3a48aa8b7..88a5f5af5 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -35,8 +35,36 @@
           </b-navbar-nav>
         </b-collapse>
       </div>
-      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
+      <b-navbar-toggle @click="visible = !visible"></b-navbar-toggle>
     </b-navbar>
+    <b-collapse
+      id="collapse-4"
+      v-model="visible"
+      class="p-3"
+      style="position: absolute; z-index: 100000; background-color: #dfe0e3f5; width: 100%;     box-shadow: cadetblue 0px 13px 22px;"
+    >
+      <b-nav vertical @click="visible = false">
+        <b-nav-item to="/overview" class="mb-3">
+          {{ $t('overview') }}
+        </b-nav-item>
+        <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
+        <b-nav-item to="/transactions" class="mb-3">
+          {{ $t('transactions') }}
+        </b-nav-item>
+        <b-nav-item to="/profile" class="mb-3">
+          {{ $t('site.navbar.my-profil') }}
+        </b-nav-item>
+        <br />
+        <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
+          {{ $t('members_area') }}
+          <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
+        </b-nav-item>
+        <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
+          {{ $t('admin_area') }}
+        </b-nav-item>
+        <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
+      </b-nav>
+    </b-collapse>
   </div>
 </template>
 <script>
@@ -50,6 +78,7 @@ export default {
   },
   data() {
     return {
+      visible: false,
       logo: 'img/brand/green.png',
     }
   },
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index d9ec8de24..f432dcdf2 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
-    <div style="display: inline-flex; width: 100%">
+    <div style="display: inline-flex; width: 100%; height: 91%; position: absolute">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
         <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
       </div>

From 86c67e2a26b171a9606d90c3cf5e1ed159e68669 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 15:01:20 +0100
Subject: [PATCH 27/71] yarn fix lint

---
 frontend/src/components/Menu/Navbar.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 88a5f5af5..68b3105a1 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -41,7 +41,13 @@
       id="collapse-4"
       v-model="visible"
       class="p-3"
-      style="position: absolute; z-index: 100000; background-color: #dfe0e3f5; width: 100%;     box-shadow: cadetblue 0px 13px 22px;"
+      style="
+        position: absolute;
+        z-index: 100000;
+        background-color: #dfe0e3f5;
+        width: 100%;
+        box-shadow: cadetblue 0px 13px 22px;
+      "
     >
       <b-nav vertical @click="visible = false">
         <b-nav-item to="/overview" class="mb-3">

From d43783c51267ee1016bf2dfa6f55fe9d46c41d69 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 9 Dec 2021 15:15:19 +0100
Subject: [PATCH 28/71] css style remove from element to style area

---
 frontend/src/components/Menu/Navbar.vue       | 22 +++++++++----------
 .../src/views/Layout/DashboardLayout_gdd.vue  |  8 ++++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 68b3105a1..71ba2f4af 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -37,18 +37,7 @@
       </div>
       <b-navbar-toggle @click="visible = !visible"></b-navbar-toggle>
     </b-navbar>
-    <b-collapse
-      id="collapse-4"
-      v-model="visible"
-      class="p-3"
-      style="
-        position: absolute;
-        z-index: 100000;
-        background-color: #dfe0e3f5;
-        width: 100%;
-        box-shadow: cadetblue 0px 13px 22px;
-      "
-    >
+    <b-collapse id="collapse-4" v-model="visible" class="p-3 b-collaps-gradido">
       <b-nav vertical @click="visible = false">
         <b-nav-item to="/overview" class="mb-3">
           {{ $t('overview') }}
@@ -90,3 +79,12 @@ export default {
   },
 }
 </script>
+<style>
+.b-collaps-gradido {
+  position: absolute;
+  z-index: 100000;
+  background-color: #dfe0e3f5;
+  width: 100%;
+  box-shadow: cadetblue 0px 13px 22px;
+}
+</style>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index f432dcdf2..872392a72 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
-    <div style="display: inline-flex; width: 100%; height: 91%; position: absolute">
+    <div class="content-gradido">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
         <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
       </div>
@@ -116,6 +116,12 @@ export default {
 }
 </script>
 <style>
+.content-gradido {
+  display: inline-flex;
+  width: 100%;
+  height: 91%;
+  position: absolute;
+}
 .navbar-brand-img {
   height: 2rem;
   padding-left: 10px;

From d583b728840dd313ebc47e32d66d568272dbb195 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 9 Dec 2021 22:57:57 +0100
Subject: [PATCH 29/71] database requires external-net to fetch packages

---
 docker-compose.override.yml | 3 ---
 docker-compose.yml          | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 83f38a95f..cdaf46a7a 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -68,9 +68,6 @@ services:
     image: gradido/database:test_up
     build:
       target: test_up
-    #networks:
-    #  - external-net
-    #  - internal-net
     environment:
       - NODE_ENV="development"
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9352fd162..ae72f3137 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,12 +116,10 @@ services:
       - mariadb
     networks:
       - internal-net
-    #ports:
-    #  - 4000:4000
+      - external-net # this is required to fetch the packages
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
-      # - PORT=4000
       - BUILD_DATE
       - BUILD_VERSION
       - BUILD_COMMIT

From 04d2ae1b82663dcbde3cddfc580367944e2cc541 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 9 Dec 2021 22:58:15 +0100
Subject: [PATCH 30/71] cleaned docker file and update node version from 12 to
 17

---
 database/Dockerfile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/database/Dockerfile b/database/Dockerfile
index f2048284b..ec0537ddf 100644
--- a/database/Dockerfile
+++ b/database/Dockerfile
@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE ###########################################################################
 ##################################################################################
-FROM node:12.19.0-alpine3.10 as base
+FROM node:17-alpine as base
 
 # ENVs (available in production aswell, can be overwritten by commandline or env file)
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
@@ -14,8 +14,6 @@ ENV BUILD_VERSION="0.0.0.0"
 ENV BUILD_COMMIT="0000000"
 ## SET NODE_ENV
 ENV NODE_ENV="production"
-## App relevant Envs
-#ENV PORT="4000"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
@@ -34,10 +32,6 @@ LABEL maintainer="support@gradido.net"
 ## install: git
 #RUN apk --no-cache add git
 
-# Settings
-## Expose Container Port
-# EXPOSE ${PORT}
-
 ## Workdir
 RUN mkdir -p ${DOCKER_WORKDIR}
 WORKDIR ${DOCKER_WORKDIR}
@@ -99,7 +93,7 @@ FROM base as production
 # Copy "binary"-files from build image
 COPY --from=build ${DOCKER_WORKDIR}/build ./build
 # We also copy the node_modules express and serve-static for the run script
- COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
 # Copy static files
 # COPY --from=build ${DOCKER_WORKDIR}/public ./public
 # Copy package.json for script definitions (lock file should not be needed)

From 5eb955c52b686454beef173fb976ce6842400a20 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 00:34:19 +0100
Subject: [PATCH 31/71] fix corrupted balance error when calculating decay
 (this is not to be multiplied with 10000

---
 .../src/graphql/resolver/TransactionResolver.ts    |  2 +-
 frontend/src/views/Pages/Login.vue                 | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 58eb695ea..b2f4b4db5 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -428,7 +428,7 @@ async function addUserTransaction(
   if (lastUserTransaction) {
     newBalance += Number(
       await calculateDecay(
-        Number(lastUserTransaction.balance * 10000),
+        Number(lastUserTransaction.balance),
         lastUserTransaction.balanceDate,
         transaction.received,
       ).catch(() => {
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index d5d3e25a4..cd5f9fd88 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -104,13 +104,13 @@ export default {
           this.$router.push('/overview')
           loader.hide()
         })
-        .catch((error) => {
-          if (error.message.includes('No user with this credentials')) {
-            this.$toasted.global.error(this.$t('error.no-account'))
-          } else {
-            // : this.$t('error.no-email-verify')
-            this.$router.push('/reset/login')
-          }
+        .catch((/* error */) => {
+          // if (error.message.includes('No user with this credentials')) {
+          this.$toasted.global.error(this.$t('error.no-account'))
+          // } else {
+          // this.$t('error.no-email-verify')
+          // this.$router.push('/reset/login')
+          // }
           loader.hide()
         })
     },

From eef7403f0ff5fe3571182188dacd34566fc75f71 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 00:35:04 +0100
Subject: [PATCH 32/71] Revert "Auxiliary commit to revert individual files
 from 5eb955c52b686454beef173fb976ce6842400a20"

This reverts commit f1d9e9096abe110698c3e9d756c377a991a15b3c.
---
 frontend/src/views/Pages/Login.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index cd5f9fd88..d5d3e25a4 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -104,13 +104,13 @@ export default {
           this.$router.push('/overview')
           loader.hide()
         })
-        .catch((/* error */) => {
-          // if (error.message.includes('No user with this credentials')) {
-          this.$toasted.global.error(this.$t('error.no-account'))
-          // } else {
-          // this.$t('error.no-email-verify')
-          // this.$router.push('/reset/login')
-          // }
+        .catch((error) => {
+          if (error.message.includes('No user with this credentials')) {
+            this.$toasted.global.error(this.$t('error.no-account'))
+          } else {
+            // : this.$t('error.no-email-verify')
+            this.$router.push('/reset/login')
+          }
           loader.hide()
         })
     },

From 2f8e1affa445e88bbd526954a3fa55c058950959 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 01:23:11 +0100
Subject: [PATCH 33/71] fix the i18n to load the keys again - witht he bable
 transform this no longer happend

---
 frontend/babel.config.js | 1 -
 frontend/package.json    | 1 -
 frontend/yarn.lock       | 9 +--------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/frontend/babel.config.js b/frontend/babel.config.js
index 7acdca661..5907ab074 100644
--- a/frontend/babel.config.js
+++ b/frontend/babel.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   presets: ['@babel/preset-env'],
   plugins: [
-    'transform-require-context',
     [
       'component',
       {
diff --git a/frontend/package.json b/frontend/package.json
index 86b127676..5fbdcb0d8 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,7 +24,6 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^27.3.1",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "babel-plugin-transform-require-context": "^0.1.1",
     "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.5.0",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index ec95b138a..d1d6eacd0 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1217,7 +1217,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@7", "@babel/template@^7.12.13", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
+"@babel/template@^7.12.13", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
   integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
@@ -3345,13 +3345,6 @@ babel-plugin-transform-es2015-modules-commonjs@^6.26.0, babel-plugin-transform-e
     babel-template "^6.26.0"
     babel-types "^6.26.0"
 
-babel-plugin-transform-require-context@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-require-context/-/babel-plugin-transform-require-context-0.1.1.tgz#319b545ca83080b5062776b46cc9b8b346fea9a6"
-  integrity sha512-4ceqYOtzgmq4/QsB8dP7pUrUOCjY/jrRYdt7YkIOWHxtGDQbcf6YZDyLCiPQf6KsEIcIbSQiTRXOsbLiuJfgNQ==
-  dependencies:
-    "@babel/template" "7"
-
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"

From 5ff262df9105b9113945b85ff15856033ae51aea Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 04:14:26 +0100
Subject: [PATCH 34/71] reinclude moriz's solution but only in test environment

---
 frontend/babel.config.js | 19 +++++++++++++++----
 frontend/package.json    |  2 +-
 frontend/yarn.lock       | 14 ++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/frontend/babel.config.js b/frontend/babel.config.js
index 5907ab074..fab7b82b8 100644
--- a/frontend/babel.config.js
+++ b/frontend/babel.config.js
@@ -1,11 +1,22 @@
-module.exports = {
-  presets: ['@babel/preset-env'],
-  plugins: [
+module.exports = function (api) {
+  api.cache(true)
+
+  const presets = ['@babel/preset-env']
+  const plugins = [
     [
       'component',
       {
         styleLibraryName: 'theme-chalk',
       },
     ],
-  ],
+  ]
+
+  if (process.env.NODE_ENV === 'test') {
+    plugins.push('transform-require-context')
+  }
+
+  return {
+    presets,
+    plugins,
+  }
 }
diff --git a/frontend/package.json b/frontend/package.json
index 5fbdcb0d8..cfa7be87c 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -23,7 +23,6 @@
     "axios": "^0.21.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^27.3.1",
-    "babel-plugin-require-context-hook": "^1.0.0",
     "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.5.0",
@@ -89,6 +88,7 @@
     "@vue/eslint-config-prettier": "^4.0.1",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.0",
+    "babel-plugin-transform-require-context": "^0.1.1",
     "dotenv-webpack": "^7.0.3",
     "node-sass": "^6.0.1",
     "sass-loader": "^10",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index d1d6eacd0..2bc1361be 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1217,7 +1217,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.13", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
+"@babel/template@7", "@babel/template@^7.12.13", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
   integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
@@ -3325,11 +3325,6 @@ babel-plugin-polyfill-regenerator@^0.1.2:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.1.2"
 
-babel-plugin-require-context-hook@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-require-context-hook/-/babel-plugin-require-context-hook-1.0.0.tgz#3f0e7cce87c338f53639b948632fd4e73834632d"
-  integrity sha512-EMZD1563QUqLhzrqcThk759RhuNVX/ZJdrtGK6drwzgvnR+ARjWyXIHPbu+tUNaMGtPz/gQeAM2M6VUw2UiUeA==
-
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
@@ -3345,6 +3340,13 @@ babel-plugin-transform-es2015-modules-commonjs@^6.26.0, babel-plugin-transform-e
     babel-template "^6.26.0"
     babel-types "^6.26.0"
 
+babel-plugin-transform-require-context@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-require-context/-/babel-plugin-transform-require-context-0.1.1.tgz#319b545ca83080b5062776b46cc9b8b346fea9a6"
+  integrity sha512-4ceqYOtzgmq4/QsB8dP7pUrUOCjY/jrRYdt7YkIOWHxtGDQbcf6YZDyLCiPQf6KsEIcIbSQiTRXOsbLiuJfgNQ==
+  dependencies:
+    "@babel/template" "7"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"

From fcd355e486e0d48b93cd2cf6865192797b342044 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 04:27:13 +0100
Subject: [PATCH 35/71] run frontend tests in test environment

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0435d0c76..42c83ff06 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -380,7 +380,7 @@ jobs:
       ##########################################################################
       - name: frontend | Unit tests
         run: |
-          docker run -v ~/coverage:/app/coverage --rm gradido/frontend:test yarn run test
+          docker run --env NODE_ENV=test -v ~/coverage:/app/coverage --rm gradido/frontend:test yarn run test
           cp -r ~/coverage ./coverage
       ##########################################################################
       # COVERAGE REPORT FRONTEND ###############################################

From a6e7a897c752fa3a02c7c80b4738ef812cc485d7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:07:54 +0100
Subject: [PATCH 36/71] emit visible navbar collaps out of navbar

---
 frontend/src/components/Menu/Navbar.vue       | 52 +++++++------------
 .../src/views/Layout/DashboardLayout_gdd.vue  | 19 +++++--
 2 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 71ba2f4af..a7a33aa52 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="component-navbar">
-    <b-navbar toggleable="lg" type="light" variant="trans">
+  <div class="component-navbar" style="background-color: #fff">
+    <b-navbar toggleable="lg" type="light" variant="faded">
       <div class="navbar-brand">
         <b-navbar-nav>
           <b-nav-item to="/overview">
@@ -9,36 +9,13 @@
         </b-navbar-nav>
       </div>
       <b-nav-text center>{{ balance }} GDD</b-nav-text>
-
-      <div class="d-flex d-xl-none d-lg-none d-md-flex">
-        <b-collapse id="nav-collapse" is-nav>
-          <b-navbar-nav>
-            <b-nav-item to="/overview" class="test-overview">{{ $t('overview') }}</b-nav-item>
-            <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
-            <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
-            <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
-            <hr />
-            <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
-              {{ $t('members_area') }}
-              <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
-            </b-nav-item>
-            <b-nav-item
-              v-if="$store.state.isAdmin"
-              class="test-overview mb-3"
-              @click="$emit('admin')"
-            >
-              {{ $t('admin_area') }}
-            </b-nav-item>
-            <b-nav-item class="mb-3" @click="$emit('logout')">
-              {{ $t('logout') }}
-            </b-nav-item>
-          </b-navbar-nav>
-        </b-collapse>
-      </div>
-      <b-navbar-toggle @click="visible = !visible"></b-navbar-toggle>
+      <b-navbar-toggle
+        target=""
+        @click="$emit('set-visible', (visibleCollapse = !visible))"
+      ></b-navbar-toggle>
     </b-navbar>
-    <b-collapse id="collapse-4" v-model="visible" class="p-3 b-collaps-gradido">
-      <b-nav vertical @click="visible = false">
+    <b-collapse id="collapse-4" v-model="visibleCollapse" class="p-3 b-collaps-gradido">
+      <b-nav vertical @click="$emit('setVisible', false)">
         <b-nav-item to="/overview" class="mb-3">
           {{ $t('overview') }}
         </b-nav-item>
@@ -50,7 +27,7 @@
           {{ $t('site.navbar.my-profil') }}
         </b-nav-item>
         <br />
-        <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
+        <b-nav-item class="mb-3" @click="$emit('getElopageLink')">
           {{ $t('members_area') }}
           <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
         </b-nav-item>
@@ -66,6 +43,10 @@
 export default {
   name: 'navbar',
   props: {
+    visible: {
+      type: Boolean,
+      required: true,
+    },
     balance: {
       type: Number,
       required: true,
@@ -73,10 +54,15 @@ export default {
   },
   data() {
     return {
-      visible: false,
       logo: 'img/brand/green.png',
+      visibleCollapse: this.visible,
     }
   },
+  watch: {
+    visible() {
+      this.visibleCollapse = this.visible
+    },
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 872392a72..b60535fa9 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,13 +1,20 @@
 <template>
   <div>
-    <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
+    <navbar
+      :balance="balance"
+      :visible="visible"
+      @set-visible="setVisible"
+      @get-elopage-link="getElopageLink"
+      @admin="admin"
+      @logout="logout"
+    />
     <div class="content-gradido">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
-        <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
+        <sidebar @getElopageLink="getElopageLink" @admin="admin" @logout="logout" />
       </div>
 
-      <div class="ml-2 mr-2" style="width: 100%">
-        <div>
+      <div class="ml-2 mr-2" style="width: 100%" @click="visible = false">
+        <div class="main-content">
           <fade-transition :duration="200" origin="center top" mode="out-in">
             <router-view
               ref="router-view"
@@ -50,6 +57,7 @@ export default {
       bookedBalance: 0,
       transactionCount: 0,
       pending: true,
+      visible: false,
     }
   },
   methods: {
@@ -112,6 +120,9 @@ export default {
           : `https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${pId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email}`,
       )
     },
+    setVisible(bool) {
+      this.visible = bool
+    },
   },
 }
 </script>

From fabc61f505732057d594e57a5b1f67993f7c6f55 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:12:49 +0100
Subject: [PATCH 37/71] cdd style content width 100%

---
 frontend/src/views/Pages/AccountOverview.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 5512a03d8..6ac4c2cc2 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <b-container fluid>
+    <div>
       <b-row>
         <b-col class="col-6">
           <b-row>
-            <b-col class="col-11 bg-gray text-white p-3">
+            <b-col class="col-11 bg-gray text-white ml-2 p-3">
               <status
                 class="gdd-status-gdd"
                 :pending="pending"
@@ -36,7 +36,7 @@
         @update-transactions="updateTransactions"
       />
       <gdd-transaction-list-footer :count="transactionCount" />
-    </b-container>
+    </div>
   </div>
 </template>
 <script>

From 2219474e492aa6f6f66cbfd9ca32d0ff28de2eea Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:16:15 +0100
Subject: [PATCH 38/71] change color for amount boxes GDD and GDT

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

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 6ac4c2cc2..98db2c5ad 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -4,7 +4,7 @@
       <b-row>
         <b-col class="col-6">
           <b-row>
-            <b-col class="col-11 bg-gray text-white ml-2 p-3">
+            <b-col class="col-11 ml-2 p-3" style="background-color: #f0f0f0">
               <status
                 class="gdd-status-gdd"
                 :pending="pending"
@@ -16,7 +16,7 @@
         </b-col>
         <b-col class="col-6 text-right">
           <b-row>
-            <b-col class="bg-white text-gray p-3">
+            <b-col class="p-3" style="background-color: #f0f0f0">
               <status
                 class="gdd-status-gdt"
                 :pending="pending"

From 874b51735310e6fc1470e00b7affcede43c2ef96 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:47:11 +0100
Subject: [PATCH 39/71] first and lastname in navbar and collaps nav, add area
 icons

---
 frontend/src/components/Menu/Navbar.vue | 34 ++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index a7a33aa52..1b0c2b251 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -8,14 +8,32 @@
           </b-nav-item>
         </b-navbar-nav>
       </div>
-      <b-nav-text center>{{ balance }} GDD</b-nav-text>
+
+      <b-navbar-nav class="ml-auto" is-nav>
+        <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
+          <small>{{ $store.state.firstName }} {{ $store.state.lastName }}, <b>{{ $store.state.email }}</b>
+          <b-icon class="ml-3" icon="gear-fill" aria-hidden="true"></b-icon> </small>
+        </b-nav-item>
+      </b-navbar-nav>
+
       <b-navbar-toggle
-        target=""
+        target="nav-collapse"
         @click="$emit('set-visible', (visibleCollapse = !visible))"
       ></b-navbar-toggle>
     </b-navbar>
+
     <b-collapse id="collapse-4" v-model="visibleCollapse" class="p-3 b-collaps-gradido">
-      <b-nav vertical @click="$emit('setVisible', false)">
+    
+      <b-nav vertical @click="$emit('set-visible', false)">
+          <div class="text-right">
+       <router-link to="/profile">
+        <small>
+          {{ $store.state.firstName }}
+          {{ $store.state.lastName }},
+          <b>{{ $store.state.email }}</b>
+        </small>
+        </router-link>
+      </div>
         <b-nav-item to="/overview" class="mb-3">
           {{ $t('overview') }}
         </b-nav-item>
@@ -24,17 +42,21 @@
           {{ $t('transactions') }}
         </b-nav-item>
         <b-nav-item to="/profile" class="mb-3">
+         <b-icon icon="gear-fill" aria-hidden="true"></b-icon>
           {{ $t('site.navbar.my-profil') }}
+         
         </b-nav-item>
         <br />
         <b-nav-item class="mb-3" @click="$emit('getElopageLink')">
-          {{ $t('members_area') }}
+            <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+            {{ $t('members_area') }}
           <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
         </b-nav-item>
         <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
-          {{ $t('admin_area') }}
+           <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+           {{ $t('admin_area') }}
         </b-nav-item>
-        <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
+        <b-nav-item class="mb-3" @click="$emit('logout')"> <b-icon icon="power" aria-hidden="true"></b-icon>  {{ $t('logout') }}</b-nav-item>
       </b-nav>
     </b-collapse>
   </div>

From 8582d554f0061d47533a055b68fd6cee677d0bcb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:48:13 +0100
Subject: [PATCH 40/71] add area icons in sidebar

---
 frontend/src/components/Menu/Navbar.vue  | 42 +++++++++++++-----------
 frontend/src/components/Menu/Sidebar.vue |  6 ++--
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 1b0c2b251..af723ce93 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -11,8 +11,11 @@
 
       <b-navbar-nav class="ml-auto" is-nav>
         <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
-          <small>{{ $store.state.firstName }} {{ $store.state.lastName }}, <b>{{ $store.state.email }}</b>
-          <b-icon class="ml-3" icon="gear-fill" aria-hidden="true"></b-icon> </small>
+          <small>
+            {{ $store.state.firstName }} {{ $store.state.lastName }},
+            <b>{{ $store.state.email }}</b>
+            <b-icon class="ml-3" icon="gear-fill" aria-hidden="true"></b-icon>
+          </small>
         </b-nav-item>
       </b-navbar-nav>
 
@@ -23,17 +26,16 @@
     </b-navbar>
 
     <b-collapse id="collapse-4" v-model="visibleCollapse" class="p-3 b-collaps-gradido">
-    
       <b-nav vertical @click="$emit('set-visible', false)">
-          <div class="text-right">
-       <router-link to="/profile">
-        <small>
-          {{ $store.state.firstName }}
-          {{ $store.state.lastName }},
-          <b>{{ $store.state.email }}</b>
-        </small>
-        </router-link>
-      </div>
+        <div class="text-right">
+          <router-link to="/profile">
+            <small>
+              {{ $store.state.firstName }}
+              {{ $store.state.lastName }},
+              <b>{{ $store.state.email }}</b>
+            </small>
+          </router-link>
+        </div>
         <b-nav-item to="/overview" class="mb-3">
           {{ $t('overview') }}
         </b-nav-item>
@@ -42,21 +44,23 @@
           {{ $t('transactions') }}
         </b-nav-item>
         <b-nav-item to="/profile" class="mb-3">
-         <b-icon icon="gear-fill" aria-hidden="true"></b-icon>
+          <b-icon icon="gear-fill" aria-hidden="true"></b-icon>
           {{ $t('site.navbar.my-profil') }}
-         
         </b-nav-item>
         <br />
         <b-nav-item class="mb-3" @click="$emit('getElopageLink')">
-            <b-icon icon="link45deg" aria-hidden="true"></b-icon>
-            {{ $t('members_area') }}
+          <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+          {{ $t('members_area') }}
           <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
         </b-nav-item>
         <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
-           <b-icon icon="link45deg" aria-hidden="true"></b-icon>
-           {{ $t('admin_area') }}
+          <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+          {{ $t('admin_area') }}
+        </b-nav-item>
+        <b-nav-item class="mb-3" @click="$emit('logout')">
+          <b-icon icon="power" aria-hidden="true"></b-icon>
+          {{ $t('logout') }}
         </b-nav-item>
-        <b-nav-item class="mb-3" @click="$emit('logout')"> <b-icon icon="power" aria-hidden="true"></b-icon>  {{ $t('logout') }}</b-nav-item>
       </b-nav>
     </b-collapse>
   </div>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index c9f1356a6..da322208a 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -14,13 +14,13 @@
         <hr />
         <b-nav vertical class="w-100">
           <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
-            {{ $t('members_area') }}
+            <b-icon icon="link45deg" aria-hidden="true"></b-icon>{{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
           <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
-            {{ $t('admin_area') }}
+            <b-icon icon="link45deg" aria-hidden="true"></b-icon>{{ $t('admin_area') }}
           </b-nav-item>
-          <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
+          <b-nav-item class="mb-3" @click="$emit('logout')"><b-icon icon="power" aria-hidden="true"></b-icon> {{ $t('logout') }}</b-nav-item>
         </b-nav>
       </div>
     </div>

From 2c7ab38f3988b2a7a9d9b4b881bef09fda230940 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:49:49 +0100
Subject: [PATCH 41/71] add area icons in sidebar edit profil

---
 frontend/src/components/Menu/Sidebar.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index da322208a..1d7f7ac67 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -8,19 +8,25 @@
           <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions" class="mb-3">{{ $t('transactions') }}</b-nav-item>
           <b-nav-item to="/profile" class="mb-3">
+            <b-icon icon="gear-fill" aria-hidden="true"></b-icon>
             {{ $t('site.navbar.my-profil') }}
           </b-nav-item>
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">
           <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
-            <b-icon icon="link45deg" aria-hidden="true"></b-icon>{{ $t('members_area') }}
+            <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+            {{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
           <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
-            <b-icon icon="link45deg" aria-hidden="true"></b-icon>{{ $t('admin_area') }}
+            <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+            {{ $t('admin_area') }}
+          </b-nav-item>
+          <b-nav-item class="mb-3" @click="$emit('logout')">
+            <b-icon icon="power" aria-hidden="true"></b-icon>
+            {{ $t('logout') }}
           </b-nav-item>
-          <b-nav-item class="mb-3" @click="$emit('logout')"><b-icon icon="power" aria-hidden="true"></b-icon> {{ $t('logout') }}</b-nav-item>
         </b-nav>
       </div>
     </div>

From 4b05e55d72f1cbfc6fb966b8556cb301f09af9c4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 07:51:59 +0100
Subject: [PATCH 42/71] navbar collaps box-shadow to grey

---
 frontend/src/components/Menu/Navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index af723ce93..1ede4d5bb 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -97,6 +97,6 @@ export default {
   z-index: 100000;
   background-color: #dfe0e3f5;
   width: 100%;
-  box-shadow: cadetblue 0px 13px 22px;
+  box-shadow: #b4b4b4 0px 13px 22px;
 }
 </style>

From 96f03ebf343c76965cab81d40efdd4500b4713e8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 08:01:04 +0100
Subject: [PATCH 43/71] navbar color and size by :hover

---
 frontend/src/components/Menu/Navbar.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 1ede4d5bb..f18820ab7 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -98,5 +98,12 @@ export default {
   background-color: #dfe0e3f5;
   width: 100%;
   box-shadow: #b4b4b4 0px 13px 22px;
+  font-size: large;
+}
+.b-collaps-gradido li :hover{
+   
+  background-color: #e9e7e7f5;
+  font-size: larger;
+
 }
 </style>

From 5e2bb9bf25f4ec23508de6e0fb527b184911a389 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 08:16:54 +0100
Subject: [PATCH 44/71] amount in send formular

---
 frontend/src/views/Pages/SendOverview.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/views/Pages/SendOverview.vue
index ee8537833..5961310fb 100644
--- a/frontend/src/views/Pages/SendOverview.vue
+++ b/frontend/src/views/Pages/SendOverview.vue
@@ -1,20 +1,17 @@
 <template>
   <div>
     <b-container fluid>
-      <b-row>
-        <b-col class="bg-gray text-white text-center p-3">
-          <status
+      
+         <status
             class="gdd-status-gdd"
             v-if="showContext"
             :pending="pending"
             :balance="balance"
             status-text="GDD"
+            style="position: absolute; right: 28px;z-index: 1;"
           />
-        </b-col>
-      </b-row>
-
-      <br />
       <gdd-send :currentTransactionStep="currentTransactionStep">
+        
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
         </template>

From 9425f7ad993ad2112530587681a959be2e50b11d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 08:17:25 +0100
Subject: [PATCH 45/71] remove componente status from sendformular

---
 frontend/src/components/Menu/Navbar.vue   |  3 +++
 frontend/src/views/Pages/SendOverview.vue | 15 +--------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index f18820ab7..92aaf879c 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -6,10 +6,13 @@
           <b-nav-item to="/overview">
             <img :src="logo" class="navbar-brand-img" alt="..." />
           </b-nav-item>
+        
         </b-navbar-nav>
+        
       </div>
 
       <b-navbar-nav class="ml-auto" is-nav>
+          <b-nav-item>  {{balance}} GDD</b-nav-item>
         <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
           <small>
             {{ $store.state.firstName }} {{ $store.state.lastName }},
diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/views/Pages/SendOverview.vue
index 5961310fb..fc0dc5692 100644
--- a/frontend/src/views/Pages/SendOverview.vue
+++ b/frontend/src/views/Pages/SendOverview.vue
@@ -1,17 +1,7 @@
 <template>
   <div>
-    <b-container fluid>
-      
-         <status
-            class="gdd-status-gdd"
-            v-if="showContext"
-            :pending="pending"
-            :balance="balance"
-            status-text="GDD"
-            style="position: absolute; right: 28px;z-index: 1;"
-          />
+    <b-container>
       <gdd-send :currentTransactionStep="currentTransactionStep">
-        
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
         </template>
@@ -38,9 +28,7 @@
   </div>
 </template>
 <script>
-import Status from '../../components/Status.vue'
 import GddSend from './SendOverview/GddSend.vue'
-
 import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
 import TransactionConfirmation from './SendOverview/GddSend/TransactionConfirmation.vue'
 import TransactionResult from './SendOverview/GddSend/TransactionResult.vue'
@@ -55,7 +43,6 @@ const EMPTY_TRANSACTION_DATA = {
 export default {
   name: 'SendOverview',
   components: {
-    Status,
     GddSend,
 
     TransactionForm,

From 14c6e11d8b1a651b57dbd5ebbe1282257f263178 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 08:20:19 +0100
Subject: [PATCH 46/71] yarn lint --fix

---
 frontend/src/components/Menu/Navbar.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 92aaf879c..79bfad136 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -6,13 +6,11 @@
           <b-nav-item to="/overview">
             <img :src="logo" class="navbar-brand-img" alt="..." />
           </b-nav-item>
-        
         </b-navbar-nav>
-        
       </div>
 
       <b-navbar-nav class="ml-auto" is-nav>
-          <b-nav-item>  {{balance}} GDD</b-nav-item>
+        <b-nav-item>{{ balance }} GDD</b-nav-item>
         <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
           <small>
             {{ $store.state.firstName }} {{ $store.state.lastName }},
@@ -103,10 +101,8 @@ export default {
   box-shadow: #b4b4b4 0px 13px 22px;
   font-size: large;
 }
-.b-collaps-gradido li :hover{
-   
+.b-collaps-gradido li :hover {
   background-color: #e9e7e7f5;
   font-size: larger;
-
 }
 </style>

From 63ce5c4b93615d99f905e5a12122e13287e27d72 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 08:33:31 +0100
Subject: [PATCH 47/71] yarn test DashboardLayout_gdd.spec.js

---
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 10 ++++++++--
 frontend/src/views/Layout/DashboardLayout_gdd.vue     |  5 +++--
 frontend/src/views/Pages/SendOverview.spec.js         |  4 ----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index b25640e5c..db12acdfe 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -70,8 +70,12 @@ describe('DashboardLayoutGdd', () => {
       wrapper = Wrapper()
     })
 
+    it('has a navbar', () => {
+      expect(wrapper.find('.main-navbar').exists()).toBeTruthy()
+    })
+
     it('has a sidebar', () => {
-      expect(wrapper.find('nav#sidenav-main').exists()).toBeTruthy()
+      expect(wrapper.find('.main-sidebar').exists()).toBeTruthy()
     })
 
     it('has a main content div', () => {
@@ -79,9 +83,10 @@ describe('DashboardLayoutGdd', () => {
     })
 
     it('has a footer inside the main content', () => {
-      expect(wrapper.find('div.main-content').find('footer.footer').exists()).toBeTruthy()
+      expect(wrapper.find('div.main-page').find('footer.footer').exists()).toBeTruthy()
     })
 
+    /*
     describe('navigation bar', () => {
       let navbar
 
@@ -271,5 +276,6 @@ describe('DashboardLayoutGdd', () => {
         })
       })
     })
+    */
   })
 })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index b60535fa9..89ca43d1a 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <navbar
+      class="main-navbar"
       :balance="balance"
       :visible="visible"
       @set-visible="setVisible"
@@ -10,10 +11,10 @@
     />
     <div class="content-gradido">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
-        <sidebar @getElopageLink="getElopageLink" @admin="admin" @logout="logout" />
+        <sidebar class="main-sidebar" @getElopageLink="getElopageLink" @admin="admin" @logout="logout" />
       </div>
 
-      <div class="ml-2 mr-2" style="width: 100%" @click="visible = false">
+      <div class="main-page ml-2 mr-2" style="width: 100%" @click="visible = false">
         <div class="main-content">
           <fade-transition :duration="200" origin="center top" mode="out-in">
             <router-view
diff --git a/frontend/src/views/Pages/SendOverview.spec.js b/frontend/src/views/Pages/SendOverview.spec.js
index f28ec6126..16bb6b8d5 100644
--- a/frontend/src/views/Pages/SendOverview.spec.js
+++ b/frontend/src/views/Pages/SendOverview.spec.js
@@ -38,10 +38,6 @@ describe('SendOverview', () => {
       wrapper = Wrapper()
     })
 
-    it('has a status GDD line gdd-status-gdd', () => {
-      expect(wrapper.find('div.gdd-status-gdd').exists()).toBeTruthy()
-    })
-
     it('has a send field', () => {
       expect(wrapper.find('div.gdd-send').exists()).toBeTruthy()
     })

From 7f926213612f1916537052721d47341cd16c9b04 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 09:04:54 +0100
Subject: [PATCH 48/71] router-link remove to b-link in navbar

---
 frontend/src/components/Menu/Navbar.spec.js           | 1 +
 frontend/src/components/Menu/Navbar.vue               | 4 ++--
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 2 +-
 frontend/src/views/Layout/DashboardLayout_gdd.vue     | 7 ++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index fba63d65a..497f78001 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -5,6 +5,7 @@ const localVue = global.localVue
 
 const propsData = {
   balance: 1234,
+  visible: false,
 }
 
 const mocks = {
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 79bfad136..899618a9d 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -29,13 +29,13 @@
     <b-collapse id="collapse-4" v-model="visibleCollapse" class="p-3 b-collaps-gradido">
       <b-nav vertical @click="$emit('set-visible', false)">
         <div class="text-right">
-          <router-link to="/profile">
+          <b-link to="/profile">
             <small>
               {{ $store.state.firstName }}
               {{ $store.state.lastName }},
               <b>{{ $store.state.email }}</b>
             </small>
-          </router-link>
+          </b-link>
         </div>
         <b-nav-item to="/overview" class="mb-3">
           {{ $t('overview') }}
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index db12acdfe..383c89c17 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -1,5 +1,5 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-import flushPromises from 'flush-promises'
+// import flushPromises from 'flush-promises'
 import DashboardLayoutGdd from './DashboardLayout_gdd'
 
 jest.useFakeTimers()
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 89ca43d1a..bb31136f4 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -11,7 +11,12 @@
     />
     <div class="content-gradido">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
-        <sidebar class="main-sidebar" @getElopageLink="getElopageLink" @admin="admin" @logout="logout" />
+        <sidebar
+          class="main-sidebar"
+          @getElopageLink="getElopageLink"
+          @admin="admin"
+          @logout="logout"
+        />
       </div>
 
       <div class="main-page ml-2 mr-2" style="width: 100%" @click="visible = false">

From 9eb4e8603a7adc81ea7a5a3afa00608b7f8bce43 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Dec 2021 09:08:54 +0100
Subject: [PATCH 49/71] Withdrew * 10000 and / 10000 since we need to store the
 full value.

---
 backend/src/graphql/resolver/AdminResolver.ts       | 4 ++--
 backend/src/graphql/resolver/TransactionResolver.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 3c03227d5..5be947cde 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -176,7 +176,7 @@ export class AdminResolver {
     } else {
       newBalance = lastUserTransaction.balance
     }
-    newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()) / 10000)
+    newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()))
 
     const newUserTransaction = new UserTransaction()
     newUserTransaction.userId = pendingCreation.userId
@@ -194,7 +194,7 @@ export class AdminResolver {
 
     if (!userBalance) userBalance = balanceRepository.create()
     userBalance.userId = pendingCreation.userId
-    userBalance.amount = Number(newBalance * 10000)
+    userBalance.amount = Number(newBalance)
     userBalance.modified = new Date()
     userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
     await balanceRepository.save(userBalance)
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 58eb695ea..b2f4b4db5 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -428,7 +428,7 @@ async function addUserTransaction(
   if (lastUserTransaction) {
     newBalance += Number(
       await calculateDecay(
-        Number(lastUserTransaction.balance * 10000),
+        Number(lastUserTransaction.balance),
         lastUserTransaction.balanceDate,
         transaction.received,
       ).catch(() => {

From 152d0db54269f6474c1008e113e3ebbbcff7eff2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 09:09:42 +0100
Subject: [PATCH 50/71] navbar brand add click  visible = false

---
 frontend/src/components/Menu/Navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 899618a9d..c7a21af8a 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -2,7 +2,7 @@
   <div class="component-navbar" style="background-color: #fff">
     <b-navbar toggleable="lg" type="light" variant="faded">
       <div class="navbar-brand">
-        <b-navbar-nav>
+        <b-navbar-nav @click="$emit('set-visible', false)">
           <b-nav-item to="/overview">
             <img :src="logo" class="navbar-brand-img" alt="..." />
           </b-nav-item>

From 56dd218ee28daecbb10d51179a51ff737feeb2ce Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Dec 2021 09:14:22 +0100
Subject: [PATCH 51/71] Fix updatePendingCreation amount that is send back.

---
 backend/src/graphql/resolver/AdminResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 5be947cde..749f2f591 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -83,7 +83,7 @@ export class AdminResolver {
 
     await pendingCreationRepository.save(updatedCreation)
     const result = new UpdatePendingCreation()
-    result.amount = parseInt(updatedCreation.amount.toString())
+    result.amount = parseInt(amount.toString())
     result.memo = updatedCreation.memo
     result.date = updatedCreation.date
     result.moderator = updatedCreation.moderator

From 057debeee86ad520b09e49b3091df07493da6cdd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 09:33:44 +0100
Subject: [PATCH 52/71] navbar test all navbar-items

---
 frontend/src/components/Menu/Navbar.spec.js | 54 ++++++++++++++-------
 frontend/src/components/Menu/Navbar.vue     |  4 +-
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 497f78001..d53367a66 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -37,22 +37,42 @@ describe('Navbar', () => {
       expect(wrapper.find('div.component-navbar').exists()).toBeTruthy()
     })
   })
-  // describe('find link admin and evented click', () => {
-  //   beforeEach(async () => {
-  //     await wrapper.find('.test-admin').trigger('click')
-  //   })
 
-  //   it('find link admin and click', () => {
-  //     expect(wrapper.emitted('admin')).toBeTruthy()
-  //     expect(wrapper.emitted('admin')).toEqual([
-  //       [
-  //         {
-  //           email: 'someone@watches.tv',
-  //           amount: 87.23,
-  //           memo: 'Long enough',
-  //         },
-  //       ],
-  //     ])
-  //   })
-  // })
+  describe('navigation Navbar', () => {
+    it('has .navbar-brand in the navbar', () => {
+      expect(wrapper.find('.navbar-brand').exists()).toBeTruthy()
+    })
+    it('has b-navbar-toggle in the navbar', () => {
+      expect(wrapper.find('.navbar-toggler').exists()).toBeTruthy()
+    })
+    it('has ten b-nav-item in the navbar', () => {
+      expect(wrapper.findAll('.nav-item')).toHaveLength(10)
+    })
+
+    it('has first nav-item "amount GDD" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('1234 GDD')
+    })
+
+    it('has first nav-item "overview" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('overview')
+    })
+    it('has first nav-item "send" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('send')
+    })
+    it('has first nav-item "transactions" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('transactions')
+    })
+    it('has first nav-item "my-profil" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('site.navbar.my-profil')
+    })
+    it('has first nav-item "members_area" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('members_area')
+    })
+    it('has first nav-item "admin_area" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area')
+    })
+    it('has first nav-item "logout" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('logout')
+    })
+  })
 })
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index c7a21af8a..55380d316 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -21,12 +21,12 @@
       </b-navbar-nav>
 
       <b-navbar-toggle
-        target="nav-collapse"
+        target="collapse-nav"
         @click="$emit('set-visible', (visibleCollapse = !visible))"
       ></b-navbar-toggle>
     </b-navbar>
 
-    <b-collapse id="collapse-4" v-model="visibleCollapse" class="p-3 b-collaps-gradido">
+    <b-collapse id="collapse-nav" v-model="visibleCollapse" class="p-3 b-collaps-gradido">
       <b-nav vertical @click="$emit('set-visible', false)">
         <div class="text-right">
           <b-link to="/profile">

From b9b28a37a3ac5b4501f3fb473d2a96eb811ea5d3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 09:36:48 +0100
Subject: [PATCH 53/71] sidebar  test all navbar-items

---
 frontend/src/components/Menu/Sidebar.spec.js | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index 4a5b8f930..ed0973642 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -31,4 +31,37 @@ describe('Sidebar', () => {
       expect(wrapper.find('div#component-sidebar').exists()).toBeTruthy()
     })
   })
+
+  describe('navigation Navbar', () => {
+      
+    it('has seven b-nav-item in the navbar', () => {
+      expect(wrapper.findAll('.nav-item')).toHaveLength(7)
+    })
+
+    it('has first nav-item "overview" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('overview')
+    })
+
+    it('has first nav-item "send" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('send')
+    })
+
+    it('has first nav-item "transactions" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('transactions')
+    })
+    it('has first nav-item "my-profil" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('site.navbar.my-profil')
+    })
+    it('has first nav-item "members_area" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('members_area')
+    })
+    it('has first nav-item "admin_area" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('admin_area')
+    })
+    it('has first nav-item "logout" in navbar', () => {
+      expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('logout')
+    })
+
+
+  })
 })

From 0fff9798e1e1b779e41deb74fb06a9f0813a9141 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 09:37:17 +0100
Subject: [PATCH 54/71] yarn lint --fix

---
 frontend/src/components/Menu/Sidebar.spec.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index ed0973642..416767786 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -33,7 +33,6 @@ describe('Sidebar', () => {
   })
 
   describe('navigation Navbar', () => {
-      
     it('has seven b-nav-item in the navbar', () => {
       expect(wrapper.findAll('.nav-item')).toHaveLength(7)
     })
@@ -61,7 +60,5 @@ describe('Sidebar', () => {
     it('has first nav-item "logout" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('logout')
     })
-
-
   })
 })

From d6b32b6ba5da46e98bb36ce39ff27e2dff54cadf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 09:40:56 +0100
Subject: [PATCH 55/71] remove target text from b-navbar-toggle, yarn lint
 --fix

---
 frontend/src/components/Menu/Navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 55380d316..574313e4e 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -21,7 +21,7 @@
       </b-navbar-nav>
 
       <b-navbar-toggle
-        target="collapse-nav"
+        target="false"
         @click="$emit('set-visible', (visibleCollapse = !visible))"
       ></b-navbar-toggle>
     </b-navbar>

From b874abb4f835e671d0b7546ce25df23dbb082971 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 10:03:53 +0100
Subject: [PATCH 56/71] getElopageLink to data and props elopageUri

---
 frontend/src/components/Menu/Navbar.spec.js           |  9 +++++++++
 frontend/src/components/Menu/Navbar.vue               |  6 +++++-
 frontend/src/components/Menu/Sidebar.vue              |  8 +++++++-
 frontend/src/views/Layout/DashboardLayout_gdd.spec.js |  4 +---
 frontend/src/views/Layout/DashboardLayout_gdd.vue     | 10 +++-------
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index d53367a66..382615144 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -68,6 +68,15 @@ describe('Navbar', () => {
     it('has first nav-item "members_area" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('members_area')
     })
+
+    it('has a link to the members area', () => {
+      expect(wrapper.findAll('.nav-item').at(7).text()).toContain('members_area')
+      expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe(
+        'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=123&firstName=User&lastName=Example&email=user@example.org',
+      )
+    })
+
+
     it('has first nav-item "admin_area" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area')
     })
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 574313e4e..97533f9d0 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -49,7 +49,7 @@
           {{ $t('site.navbar.my-profil') }}
         </b-nav-item>
         <br />
-        <b-nav-item class="mb-3" @click="$emit('getElopageLink')">
+        <b-nav-item :href="elopageUri" class="mb-3" target="_blank">
           <b-icon icon="link45deg" aria-hidden="true"></b-icon>
           {{ $t('members_area') }}
           <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
@@ -78,6 +78,10 @@ export default {
       type: Number,
       required: true,
     },
+    elopageUri: {
+      type: String,
+      required: false,
+    },
   },
   data() {
     return {
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 1d7f7ac67..ec3df2015 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -14,7 +14,7 @@
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">
-          <b-nav-item class="mb-3" @click="$emit('get-elopage-link')">
+          <b-nav-item class="mb-3" :href="elopageUri" target="_blank">
             <b-icon icon="link45deg" aria-hidden="true"></b-icon>
             {{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
@@ -35,5 +35,11 @@
 <script>
 export default {
   name: 'sidebar',
+  props: {
+    elopageUri: {
+      type: String,
+      required: false,
+    },
+  },
 }
 </script>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 383c89c17..fd4fffbee 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -138,9 +138,7 @@ describe('DashboardLayoutGdd', () => {
         )
       })
 
-      it('has a logout button', () => {
-        expect(wrapper.findAll('ul').at(3).text()).toBe('logout')
-      })
+     
 
       describe('logout', () => {
         beforeEach(async () => {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index bb31136f4..e56629275 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -4,19 +4,14 @@
       class="main-navbar"
       :balance="balance"
       :visible="visible"
+      :elopageUri="elopageUri"
       @set-visible="setVisible"
-      @get-elopage-link="getElopageLink"
       @admin="admin"
       @logout="logout"
     />
     <div class="content-gradido">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
-        <sidebar
-          class="main-sidebar"
-          @getElopageLink="getElopageLink"
-          @admin="admin"
-          @logout="logout"
-        />
+        <sidebar class="main-sidebar" :elopageUri="elopageUri" @admin="admin" @logout="logout" />
       </div>
 
       <div class="main-page ml-2 mr-2" style="width: 100%" @click="visible = false">
@@ -64,6 +59,7 @@ export default {
       transactionCount: 0,
       pending: true,
       visible: false,
+      elopageUri: this.getElopageLink(),
     }
   },
   methods: {

From 7cbafbdee3e92de972b71a043f6687b9ace2ef25 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 10:08:06 +0100
Subject: [PATCH 57/71] test props elopageUri

---
 frontend/src/components/Menu/Navbar.spec.js  | 8 +-------
 frontend/src/components/Menu/Sidebar.spec.js | 5 +++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 382615144..5884b7192 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -65,18 +65,12 @@ describe('Navbar', () => {
     it('has first nav-item "my-profil" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('site.navbar.my-profil')
     })
-    it('has first nav-item "members_area" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('members_area')
-    })
 
     it('has a link to the members area', () => {
       expect(wrapper.findAll('.nav-item').at(7).text()).toContain('members_area')
-      expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe(
-        'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=123&firstName=User&lastName=Example&email=user@example.org',
-      )
+      expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe('#')
     })
 
-
     it('has first nav-item "admin_area" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area')
     })
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index 416767786..2ecd45933 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -51,8 +51,9 @@ describe('Sidebar', () => {
     it('has first nav-item "my-profil" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('site.navbar.my-profil')
     })
-    it('has first nav-item "members_area" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('members_area')
+    it('has a link to the members area', () => {
+      expect(wrapper.findAll('.nav-item').at(4).text()).toContain('members_area')
+      expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe('#')
     })
     it('has first nav-item "admin_area" in navbar', () => {
       expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('admin_area')

From 118dd886b87e0a1ba49f29a0f80e62fbb2e13d62 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 10:26:24 +0100
Subject: [PATCH 58/71] test for reactivitat DashboardLayout_gdd.spec.js

---
 .../views/Layout/DashboardLayout_gdd.spec.js  | 56 +------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index fd4fffbee..c17c66647 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -1,5 +1,5 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
-// import flushPromises from 'flush-promises'
+import flushPromises from 'flush-promises'
 import DashboardLayoutGdd from './DashboardLayout_gdd'
 
 jest.useFakeTimers()
@@ -86,60 +86,7 @@ describe('DashboardLayoutGdd', () => {
       expect(wrapper.find('div.main-page').find('footer.footer').exists()).toBeTruthy()
     })
 
-    /*
     describe('navigation bar', () => {
-      let navbar
-
-      beforeEach(() => {
-        navbar = wrapper.findAll('ul.navbar-nav').at(0)
-      })
-
-      it('has four items in the navbar', () => {
-        expect(navbar.findAll('ul > a')).toHaveLength(4)
-      })
-
-      it('has first item "overview" in navbar', () => {
-        expect(navbar.findAll('ul > a').at(0).text()).toEqual('overview')
-      })
-
-      it('has first item "overview" linked to overview in navbar', () => {
-        expect(navbar.findAll('ul > a > a').at(0).attributes('href')).toBe('/overview')
-      })
-
-      it('has second item "send" in navbar', () => {
-        expect(navbar.findAll('ul > a').at(1).text()).toEqual('send')
-      })
-
-      it('has second item "send" linked to /send in navbar', () => {
-        expect(wrapper.findAll('ul > a > a').at(1).attributes('href')).toBe('/send')
-      })
-
-      it('has third item "transactions" in navbar', () => {
-        expect(navbar.findAll('ul > a').at(2).text()).toEqual('transactions')
-      })
-
-      it('has third item "transactions" linked to transactions in navbar', async () => {
-        expect(wrapper.findAll('ul > a > a').at(2).attributes('href')).toBe('/transactions')
-      })
-
-      it('has fourth item "My profile" in navbar', () => {
-        expect(navbar.findAll('ul > a').at(3).text()).toEqual('site.navbar.my-profil')
-      })
-
-      it('has fourth item "My profile" linked to profile in navbar', async () => {
-        expect(wrapper.findAll('ul > a > a').at(3).attributes('href')).toBe('/profile')
-      })
-
-      it('has a link to the members area', () => {
-        expect(wrapper.findAll('ul').at(2).text()).toContain('members_area')
-        expect(wrapper.findAll('ul').at(2).text()).toContain('!')
-        expect(wrapper.findAll('ul').at(2).find('a').attributes('href')).toBe(
-          'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=123&firstName=User&lastName=Example&email=user@example.org',
-        )
-      })
-
-     
-
       describe('logout', () => {
         beforeEach(async () => {
           await apolloMock.mockResolvedValue({
@@ -274,6 +221,5 @@ describe('DashboardLayoutGdd', () => {
         })
       })
     })
-    */
   })
 })

From 0a3db57b7fe8f977375f4db5c919e02829fe2ad7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Dec 2021 12:51:22 +0100
Subject: [PATCH 59/71] Remove SideBar test, side bar remove changed the
 dashboard-plugin

---
 .../components/SidebarPlugin/SideBar.spec.js  | 200 ------------------
 frontend/src/plugins/dashboard-plugin.test.js |   2 +-
 2 files changed, 1 insertion(+), 201 deletions(-)
 delete mode 100644 frontend/src/components/SidebarPlugin/SideBar.spec.js

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
deleted file mode 100644
index 3f1a29034..000000000
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ /dev/null
@@ -1,200 +0,0 @@
-import { mount, RouterLinkStub } from '@vue/test-utils'
-import SideBar from './SideBar'
-
-const localVue = global.localVue
-
-const storeDispatchMock = jest.fn()
-
-describe('SideBar', () => {
-  let wrapper
-
-  const stubs = {
-    RouterLink: RouterLinkStub,
-  }
-
-  const propsData = {
-    balance: 1234.56,
-  }
-
-  const mocks = {
-    $store: {
-      state: {
-        email: 'test@example.org',
-        publisherId: 123,
-        firstName: 'test',
-        lastName: 'example',
-        hasElopage: false,
-      },
-      dispatch: storeDispatchMock,
-    },
-    $i18n: {
-      locale: 'en',
-    },
-    $t: jest.fn((t) => t),
-    $n: jest.fn((n) => n),
-  }
-
-  const Wrapper = () => {
-    return mount(SideBar, { localVue, mocks, stubs, propsData })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('renders the component', () => {
-      expect(wrapper.find('#sidenav-main').exists()).toBeTruthy()
-    })
-
-    describe('navbar button', () => {
-      it('has a navbar button', () => {
-        expect(wrapper.find('button.navbar-toggler').exists()).toBeTruthy()
-      })
-
-      it('calls showSidebar when clicked', async () => {
-        const spy = jest.spyOn(wrapper.vm.$sidebar, 'displaySidebar')
-        wrapper.find('button.navbar-toggler').trigger('click')
-        await wrapper.vm.$nextTick()
-        expect(spy).toHaveBeenCalledWith(true)
-      })
-    })
-
-    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')
-        wrapper.find('#sidenav-collapse-main').find('button.navbar-toggler').trigger('click')
-        await wrapper.vm.$nextTick()
-        expect(spy).toHaveBeenCalledWith(false)
-      })
-    })
-
-    describe('static menu items', () => {
-      describe("member's area without publisher ID", () => {
-        it('has a link to the elopage', () => {
-          expect(wrapper.findAll('li').at(0).text()).toContain('members_area')
-        })
-
-        it('has a badge', () => {
-          expect(wrapper.findAll('li').at(0).text()).toContain('!')
-        })
-
-        it('links to the elopage registration', () => {
-          expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-            'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=123&firstName=test&lastName=example&email=test@example.org',
-          )
-        })
-
-        describe('with locale="de"', () => {
-          beforeEach(() => {
-            mocks.$i18n.locale = 'de'
-          })
-
-          it('links to the German elopage registration when locale is set to de', () => {
-            expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-              'https://elopage.com/s/gradido/basic-de/payment?locale=de&prid=111&pid=123&firstName=test&lastName=example&email=test@example.org',
-            )
-          })
-        })
-
-        describe("member's area with publisher ID", () => {
-          beforeEach(() => {
-            mocks.$store.state.hasElopage = true
-          })
-
-          it('links to the elopage member area', () => {
-            expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-              'https://elopage.com/s/gradido/sign_in?locale=de',
-            )
-          })
-
-          it('has no badge', () => {
-            expect(wrapper.findAll('li').at(0).text()).not.toContain('!')
-          })
-        })
-
-        describe("member's area with default publisher ID  and no elopage", () => {
-          beforeEach(() => {
-            mocks.$store.state.publisherId = null
-            mocks.$store.state.hasElopage = false
-          })
-
-          it('links to the elopage member area with default publisher ID', () => {
-            expect(wrapper.findAll('li').at(0).find('a').attributes('href')).toBe(
-              'https://elopage.com/s/gradido/basic-de/payment?locale=de&prid=111&pid=2896&firstName=test&lastName=example&email=test@example.org',
-            )
-          })
-
-          it('has a badge', () => {
-            expect(wrapper.findAll('li').at(0).text()).toContain('!')
-          })
-        })
-      })
-
-      describe('logout', () => {
-        it('has a logout button', () => {
-          expect(wrapper.findAll('li').at(1).text()).toBe('logout')
-        })
-
-        it('emits logout when logout is clicked', async () => {
-          wrapper.findAll('li').at(1).find('a').trigger('click')
-          await wrapper.vm.$nextTick()
-          expect(wrapper.emitted('logout')).toEqual([[]])
-        })
-      })
-
-      describe('admin-area', () => {
-        it('is not visible when not an admin', () => {
-          expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area')
-        })
-
-        describe('logged in as admin', () => {
-          const assignLocationSpy = jest.fn()
-          beforeEach(async () => {
-            mocks.$store.state.isAdmin = true
-            mocks.$store.state.token = 'valid-token'
-            delete window.location
-            window.location = {
-              assign: assignLocationSpy,
-            }
-            wrapper = Wrapper()
-          })
-
-          it('is visible', () => {
-            expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
-          })
-
-          describe('click on admin area', () => {
-            beforeEach(async () => {
-              await wrapper.findAll('li').at(1).find('a').trigger('click')
-            })
-
-            it('opens a new window when clicked', () => {
-              expect(assignLocationSpy).toHaveBeenCalledWith(
-                'http://localhost/admin/authenticate?token=valid-token',
-              )
-            })
-
-            it('dispatches logout to store', () => {
-              expect(storeDispatchMock).toHaveBeenCalledWith('logout')
-            })
-          })
-        })
-      })
-    })
-  })
-})
diff --git a/frontend/src/plugins/dashboard-plugin.test.js b/frontend/src/plugins/dashboard-plugin.test.js
index 25083c399..613bb184f 100644
--- a/frontend/src/plugins/dashboard-plugin.test.js
+++ b/frontend/src/plugins/dashboard-plugin.test.js
@@ -27,7 +27,7 @@ describe('dashboard plugin', () => {
   })
 
   describe('vue toasted', () => {
-    const toastedAction = vueUseMock.mock.calls[11][1].action.onClick
+    const toastedAction = vueUseMock.mock.calls[10][1].action.onClick
     const goAwayMock = jest.fn()
     const toastObject = {
       goAway: goAwayMock,

From 11fc0c16e923808c206372bc1ad533a5027a7ae3 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 10 Dec 2021 12:54:38 +0100
Subject: [PATCH 60/71] Update frontend/src/components/Menu/Navbar.spec.js

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/components/Menu/Navbar.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 5884b7192..d757d49e0 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -36,7 +36,6 @@ describe('Navbar', () => {
     it('renders the component', () => {
       expect(wrapper.find('div.component-navbar').exists()).toBeTruthy()
     })
-  })
 
   describe('navigation Navbar', () => {
     it('has .navbar-brand in the navbar', () => {

From 0aa2154abdd8036a6e23c5846305e930f2d67b3a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 10 Dec 2021 12:55:03 +0100
Subject: [PATCH 61/71] Update frontend/src/components/Menu/Navbar.spec.js

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/components/Menu/Navbar.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index d757d49e0..b225b43c4 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -77,4 +77,5 @@ describe('Navbar', () => {
       expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('logout')
     })
   })
+  })
 })

From 49c192ebbf106e537ab2231ad00f523934d8dfef Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 10 Dec 2021 12:55:19 +0100
Subject: [PATCH 62/71] Update frontend/src/components/Menu/Sidebar.spec.js

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/components/Menu/Sidebar.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index 2ecd45933..ae03067b3 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -30,7 +30,6 @@ describe('Sidebar', () => {
     it('renders the component', () => {
       expect(wrapper.find('div#component-sidebar').exists()).toBeTruthy()
     })
-  })
 
   describe('navigation Navbar', () => {
     it('has seven b-nav-item in the navbar', () => {

From 04819a1156d37d1d6beff1028605fab2a72c76da Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 10 Dec 2021 12:55:32 +0100
Subject: [PATCH 63/71] Update frontend/src/components/Menu/Sidebar.spec.js

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/components/Menu/Sidebar.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index ae03067b3..ea1f28259 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -61,4 +61,5 @@ describe('Sidebar', () => {
       expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('logout')
     })
   })
+  })
 })

From fba757228c50a28b2bb3b36a514c7dac8c87735a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 17:03:34 +0100
Subject: [PATCH 64/71] renamed pendingCreations into loginPendingTasksAdmin as
 to our naming conventions

---
 backend/src/graphql/resolver/AdminResolver.ts | 38 +++++++++----------
 ...gCreation.ts => LoginPendingTasksAdmin.ts} |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename backend/src/typeorm/repository/{PendingCreation.ts => LoginPendingTasksAdmin.ts} (64%)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 749f2f591..127e5f26c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -6,7 +6,7 @@ import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
 import { RIGHTS } from '../../auth/RIGHTS'
 import { TransactionRepository } from '../../typeorm/repository/Transaction'
 import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation'
-import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation'
+import { LoginPendingTasksAdminRepository } from '../../typeorm/repository/LoginPendingTasksAdmin'
 import { UserRepository } from '../../typeorm/repository/User'
 import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
@@ -48,8 +48,8 @@ export class AdminResolver {
     const creations = await getUserCreations(user.id)
     const creationDateObj = new Date(creationDate)
     if (isCreationValid(creations, amount, creationDateObj)) {
-      const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-      const loginPendingTaskAdmin = pendingCreationRepository.create()
+      const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
+      const loginPendingTaskAdmin = loginPendingTasksAdminRepository.create()
       loginPendingTaskAdmin.userId = user.id
       loginPendingTaskAdmin.amount = BigInt(amount * 10000)
       loginPendingTaskAdmin.created = new Date()
@@ -57,7 +57,7 @@ export class AdminResolver {
       loginPendingTaskAdmin.memo = memo
       loginPendingTaskAdmin.moderator = moderator
 
-      pendingCreationRepository.save(loginPendingTaskAdmin)
+      loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
     }
     return await getUserCreations(user.id)
   }
@@ -70,8 +70,8 @@ export class AdminResolver {
     const userRepository = getCustomRepository(UserRepository)
     const user = await userRepository.findByEmail(email)
 
-    const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-    const updatedCreation = await pendingCreationRepository.findOneOrFail({ id })
+    const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
+    const updatedCreation = await loginPendingTasksAdminRepository.findOneOrFail({ id })
 
     if (updatedCreation.userId !== user.id)
       throw new Error('user of the pending creation and send user does not correspond')
@@ -81,7 +81,7 @@ export class AdminResolver {
     updatedCreation.date = new Date(creationDate)
     updatedCreation.moderator = moderator
 
-    await pendingCreationRepository.save(updatedCreation)
+    await loginPendingTasksAdminRepository.save(updatedCreation)
     const result = new UpdatePendingCreation()
     result.amount = parseInt(amount.toString())
     result.memo = updatedCreation.memo
@@ -110,8 +110,8 @@ export class AdminResolver {
 
   @Query(() => [PendingCreation])
   async getPendingCreations(): Promise<PendingCreation[]> {
-    const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-    const pendingCreations = await pendingCreationRepository.find()
+    const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
+    const pendingCreations = await loginPendingTasksAdminRepository.find()
 
     const pendingCreationsPromise = await Promise.all(
       pendingCreations.map(async (pendingCreation) => {
@@ -137,16 +137,16 @@ export class AdminResolver {
 
   @Mutation(() => Boolean)
   async deletePendingCreation(@Arg('id') id: number): Promise<boolean> {
-    const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-    const entity = await pendingCreationRepository.findOneOrFail(id)
-    const res = await pendingCreationRepository.delete(entity)
+    const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
+    const entity = await loginPendingTasksAdminRepository.findOneOrFail(id)
+    const res = await loginPendingTasksAdminRepository.delete(entity)
     return !!res
   }
 
   @Mutation(() => Boolean)
   async confirmPendingCreation(@Arg('id') id: number): Promise<boolean> {
-    const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-    const pendingCreation = await pendingCreationRepository.findOneOrFail(id)
+    const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
+    const pendingCreation = await loginPendingTasksAdminRepository.findOneOrFail(id)
 
     const transactionRepository = getCustomRepository(TransactionRepository)
     let transaction = new Transaction()
@@ -198,7 +198,7 @@ export class AdminResolver {
     userBalance.modified = new Date()
     userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
     await balanceRepository.save(userBalance)
-    await pendingCreationRepository.delete(pendingCreation)
+    await loginPendingTasksAdminRepository.delete(pendingCreation)
 
     return true
   }
@@ -247,8 +247,8 @@ async function getUserCreations(id: number): Promise<number[]> {
     })
     .getRawOne()
 
-  const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-  const pendingAmountMounth = await pendingCreationRepository
+  const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
+  const pendingAmountMounth = await loginPendingTasksAdminRepository
     .createQueryBuilder('login_pending_tasks_admin')
     .select('SUM(login_pending_tasks_admin.amount)', 'sum')
     .where('login_pending_tasks_admin.userId = :id', { id })
@@ -260,7 +260,7 @@ async function getUserCreations(id: number): Promise<number[]> {
     })
     .getRawOne()
 
-  const pendingAmountLastMounth = await pendingCreationRepository
+  const pendingAmountLastMounth = await loginPendingTasksAdminRepository
     .createQueryBuilder('login_pending_tasks_admin')
     .select('SUM(login_pending_tasks_admin.amount)', 'sum')
     .where('login_pending_tasks_admin.userId = :id', { id })
@@ -272,7 +272,7 @@ async function getUserCreations(id: number): Promise<number[]> {
     })
     .getRawOne()
 
-  const pendingAmountBeforeLastMounth = await pendingCreationRepository
+  const pendingAmountBeforeLastMounth = await loginPendingTasksAdminRepository
     .createQueryBuilder('login_pending_tasks_admin')
     .select('SUM(login_pending_tasks_admin.amount)', 'sum')
     .where('login_pending_tasks_admin.userId = :id', { id })
diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/LoginPendingTasksAdmin.ts
similarity index 64%
rename from backend/src/typeorm/repository/PendingCreation.ts
rename to backend/src/typeorm/repository/LoginPendingTasksAdmin.ts
index 8b49e7ecc..b5c55fcd2 100644
--- a/backend/src/typeorm/repository/PendingCreation.ts
+++ b/backend/src/typeorm/repository/LoginPendingTasksAdmin.ts
@@ -2,4 +2,4 @@ import { EntityRepository, Repository } from 'typeorm'
 import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin'
 
 @EntityRepository(LoginPendingTasksAdmin)
-export class PendingCreationRepository extends Repository<LoginPendingTasksAdmin> {}
+export class LoginPendingTasksAdminRepository extends Repository<LoginPendingTasksAdmin> {}

From ea1352d57175761552beb164ea3166fe521148a1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 10 Dec 2021 19:16:53 +0100
Subject: [PATCH 65/71] more tests for Navbar.vue, yarn lint --fix

---
 frontend/src/components/Menu/Navbar.spec.js   | 75 ++++++++++---------
 frontend/src/components/Menu/Navbar.vue       |  1 -
 frontend/src/components/Menu/Sidebar.spec.js  | 52 ++++++-------
 .../src/views/Layout/DashboardLayout_gdd.vue  | 11 +--
 4 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index b225b43c4..78b78b822 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -6,6 +6,7 @@ const localVue = global.localVue
 const propsData = {
   balance: 1234,
   visible: false,
+  elopageUri: 'https://elopage.com',
 }
 
 const mocks = {
@@ -15,7 +16,7 @@ const mocks = {
   $t: jest.fn((t) => t),
   $store: {
     state: {
-      hasElopage: true,
+      hasElopage: false,
       isAdmin: true,
     },
   },
@@ -37,45 +38,47 @@ describe('Navbar', () => {
       expect(wrapper.find('div.component-navbar').exists()).toBeTruthy()
     })
 
-  describe('navigation Navbar', () => {
-    it('has .navbar-brand in the navbar', () => {
-      expect(wrapper.find('.navbar-brand').exists()).toBeTruthy()
-    })
-    it('has b-navbar-toggle in the navbar', () => {
-      expect(wrapper.find('.navbar-toggler').exists()).toBeTruthy()
-    })
-    it('has ten b-nav-item in the navbar', () => {
-      expect(wrapper.findAll('.nav-item')).toHaveLength(10)
-    })
+    describe('navigation Navbar', () => {
+      it('has .navbar-brand in the navbar', () => {
+        expect(wrapper.find('.navbar-brand').exists()).toBeTruthy()
+      })
+      it('has b-navbar-toggle in the navbar', () => {
+        expect(wrapper.find('.navbar-toggler').exists()).toBeTruthy()
+      })
+      it('has ten b-nav-item in the navbar', () => {
+        expect(wrapper.findAll('.nav-item')).toHaveLength(10)
+      })
 
-    it('has first nav-item "amount GDD" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('1234 GDD')
-    })
+      it('has first nav-item "amount GDD" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('1234 GDD')
+      })
 
-    it('has first nav-item "overview" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('overview')
-    })
-    it('has first nav-item "send" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('send')
-    })
-    it('has first nav-item "transactions" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('transactions')
-    })
-    it('has first nav-item "my-profil" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('site.navbar.my-profil')
-    })
+      it('has first nav-item "overview" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('overview')
+      })
+      it('has first nav-item "send" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('send')
+      })
+      it('has first nav-item "transactions" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('transactions')
+      })
+      it('has first nav-item "my-profil" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('site.navbar.my-profil')
+      })
 
-    it('has a link to the members area', () => {
-      expect(wrapper.findAll('.nav-item').at(7).text()).toContain('members_area')
-      expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe('#')
-    })
+      it('has a link to the members area', () => {
+        expect(wrapper.findAll('.nav-item').at(7).text()).toContain('members_area')
+        expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe(
+          'https://elopage.com',
+        )
+      })
 
-    it('has first nav-item "admin_area" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area')
+      it('has first nav-item "admin_area" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area')
+      })
+      it('has first nav-item "logout" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('logout')
+      })
     })
-    it('has first nav-item "logout" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('logout')
-    })
-  })
   })
 })
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 97533f9d0..0b8154293 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -107,6 +107,5 @@ export default {
 }
 .b-collaps-gradido li :hover {
   background-color: #e9e7e7f5;
-  font-size: larger;
 }
 </style>
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index ea1f28259..884269b9b 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -31,35 +31,35 @@ describe('Sidebar', () => {
       expect(wrapper.find('div#component-sidebar').exists()).toBeTruthy()
     })
 
-  describe('navigation Navbar', () => {
-    it('has seven b-nav-item in the navbar', () => {
-      expect(wrapper.findAll('.nav-item')).toHaveLength(7)
-    })
+    describe('navigation Navbar', () => {
+      it('has seven b-nav-item in the navbar', () => {
+        expect(wrapper.findAll('.nav-item')).toHaveLength(7)
+      })
 
-    it('has first nav-item "overview" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('overview')
-    })
+      it('has first nav-item "overview" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('overview')
+      })
 
-    it('has first nav-item "send" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('send')
-    })
+      it('has first nav-item "send" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('send')
+      })
 
-    it('has first nav-item "transactions" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('transactions')
+      it('has first nav-item "transactions" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('transactions')
+      })
+      it('has first nav-item "my-profil" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('site.navbar.my-profil')
+      })
+      it('has a link to the members area', () => {
+        expect(wrapper.findAll('.nav-item').at(4).text()).toContain('members_area')
+        expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe('#')
+      })
+      it('has first nav-item "admin_area" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('admin_area')
+      })
+      it('has first nav-item "logout" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('logout')
+      })
     })
-    it('has first nav-item "my-profil" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('site.navbar.my-profil')
-    })
-    it('has a link to the members area', () => {
-      expect(wrapper.findAll('.nav-item').at(4).text()).toContain('members_area')
-      expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe('#')
-    })
-    it('has first nav-item "admin_area" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('admin_area')
-    })
-    it('has first nav-item "logout" in navbar', () => {
-      expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('logout')
-    })
-  })
   })
 })
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 1932711ef..2659dff04 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -59,7 +59,6 @@ export default {
       transactionCount: 0,
       pending: true,
       visible: false,
-      elopageUri: this.getElopageLink(),
     }
   },
   methods: {
@@ -112,7 +111,12 @@ export default {
       window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token))
       this.$store.dispatch('logout') // logout without redirect
     },
-    getElopageLink() {
+    setVisible(bool) {
+      this.visible = bool
+    },
+  },
+  computed: {
+    elopageUri() {
       const pId = this.$store.state.publisherId
         ? this.$store.state.publisherId
         : CONFIG.DEFAULT_PUBLISHER_ID
@@ -122,9 +126,6 @@ export default {
           : `https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${pId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email}`,
       )
     },
-    setVisible(bool) {
-      this.visible = bool
-    },
   },
 }
 </script>

From 1dff467b10968df82e62434da89434033b978f9d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 11 Dec 2021 09:38:32 +0100
Subject: [PATCH 66/71] Add style .bg-lightgrey in AccountOverview.vue

---
 frontend/src/views/Layout/DashboardLayout_gdd.vue | 3 +++
 frontend/src/views/Pages/AccountOverview.vue      | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 2659dff04..bd3bd8e4c 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -140,4 +140,7 @@ export default {
   height: 2rem;
   padding-left: 10px;
 }
+.bg-lightgrey {
+  background-color: #f0f0f0;
+}
 </style>
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 98db2c5ad..5cb04d9f0 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -4,7 +4,7 @@
       <b-row>
         <b-col class="col-6">
           <b-row>
-            <b-col class="col-11 ml-2 p-3" style="background-color: #f0f0f0">
+            <b-col class="col-11 ml-2 p-3 bg-lightgrey">
               <status
                 class="gdd-status-gdd"
                 :pending="pending"
@@ -14,9 +14,9 @@
             </b-col>
           </b-row>
         </b-col>
-        <b-col class="col-6 text-right">
+        <b-col class="col-6 text-right bg-lightgrey">
           <b-row>
-            <b-col class="p-3" style="background-color: #f0f0f0">
+            <b-col class="p-3">
               <status
                 class="gdd-status-gdt"
                 :pending="pending"

From b7a1b2da699ddd05ac945d7a38db9dc2e5d30bc9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 11 Dec 2021 09:42:39 +0100
Subject: [PATCH 67/71] sidebar change paddings for b-nav

---
 frontend/src/components/Menu/Sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index ec3df2015..70119c69e 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="component-sidebar">
-    <div class="px-3 py-2">
+    <div class="pl-3">
       <p></p>
       <div class="mb-6">
         <b-nav vertical class="w-200">

From 2cf7de2e4b147128f230fd057d85f319301adbfb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 11 Dec 2021 10:27:47 +0100
Subject: [PATCH 68/71] test watch function for visible

---
 frontend/src/components/Menu/Navbar.spec.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 78b78b822..f9e612cad 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -1,4 +1,4 @@
-import { mount } from '@vue/test-utils'
+import { mount, shallowMount } from '@vue/test-utils'
 import Navbar from './Navbar'
 
 const localVue = global.localVue
@@ -81,4 +81,23 @@ describe('Navbar', () => {
       })
     })
   })
+  describe('check watch visible true', () => {
+    beforeEach(async () => {
+      await wrapper.setProps({ visible: true })
+    })
+
+    it('has visibleCollapse == visible', async () => {
+      expect(wrapper.vm.visibleCollapse).toBe(true)
+    })
+  })
+
+  describe('check watch visible false', () => {
+    beforeEach(async () => {
+      await wrapper.setProps({ visible: false })
+    })
+
+    it('has visibleCollapse == visible', async () => {
+      expect(wrapper.vm.visibleCollapse).toBe(false)
+    })
+  })
 })

From 7bd952a14a64a2f8f40e5026577397b3b7ebebbb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 11 Dec 2021 10:31:10 +0100
Subject: [PATCH 69/71] remove shallowMount from Navbar.vue

---
 frontend/src/components/Menu/Navbar.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index f9e612cad..bb62df36a 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -1,4 +1,4 @@
-import { mount, shallowMount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import Navbar from './Navbar'
 
 const localVue = global.localVue

From 50effee00b0479b7e3a492dd10b6842bae76613a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 13 Dec 2021 08:02:18 +0100
Subject: [PATCH 70/71] no async

---
 frontend/src/components/Menu/Navbar.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index bb62df36a..2b929f422 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -86,7 +86,7 @@ describe('Navbar', () => {
       await wrapper.setProps({ visible: true })
     })
 
-    it('has visibleCollapse == visible', async () => {
+    it('has visibleCollapse == visible', () => {
       expect(wrapper.vm.visibleCollapse).toBe(true)
     })
   })
@@ -96,7 +96,7 @@ describe('Navbar', () => {
       await wrapper.setProps({ visible: false })
     })
 
-    it('has visibleCollapse == visible', async () => {
+    it('has visibleCollapse == visible', () => {
       expect(wrapper.vm.visibleCollapse).toBe(false)
     })
   })

From 4c3b10b893cc2aec39380f4972dcf53633a6b859 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 13 Dec 2021 09:55:05 +0100
Subject: [PATCH 71/71] Update admin/src/pages/Creation.spec.js

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 admin/src/pages/Creation.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js
index b97386722..65e56ca33 100644
--- a/admin/src/pages/Creation.spec.js
+++ b/admin/src/pages/Creation.spec.js
@@ -79,7 +79,7 @@ describe('Creation', () => {
       })
     })
 
-    describe('update iten', () => {
+    describe('update item', () => {
       beforeEach(() => {
         jest.clearAllMocks()
       })