From 12bf269908f3a7923b129be4f779a32390bb3f7a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 19 Apr 2021 23:02:50 +0200
Subject: [PATCH 1/7] use vuex-persistedstate instead of cookies.

---
 frontend/package.json                         |  3 +-
 frontend/src/App.vue                          | 24 +---------
 frontend/src/main.js                          |  8 ++++
 frontend/src/routes/router.js                 |  9 ++--
 frontend/src/routes/routes.js                 | 23 +++++++--
 frontend/src/store/store.js                   | 47 ++++++-------------
 frontend/src/views/Layout/DashboardNavbar.vue |  2 +-
 frontend/src/views/Pages/Login.vue            | 21 ++++++---
 frontend/yarn.lock                            | 13 +++++
 9 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 80450b49b..49f2173d5 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -75,7 +75,8 @@
     "vue-qrcode-reader": "^2.3.16",
     "vue-router": "^3.0.6",
     "vue2-transitions": "^0.2.3",
-    "vuex": "^3.6.0"
+    "vuex": "^3.6.0",
+    "vuex-persistedstate": "^4.0.0-beta.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.7.0",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index fafd46b32..f0b7e513c 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -17,7 +17,7 @@
     </header>
     <div class="">
       <particles-bg type="custom" :config="config" :bg="true" />
-      <component :is="$store.state.session_id ? 'DashboardLayout' : 'AuthLayoutGDD'" />
+      <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayoutGDD'" />
     </div>
   </div>
 </template>
@@ -38,31 +38,9 @@ export default {
   },
   data() {
     return {
-      session_id: null,
-      email: '',
       language: 'en',
     }
   },
-  created() {
-    //console.log('xx', $cookies.get('gdd_lang'))
-    //console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green')
-    if ($cookies.isKey('gdd_session_id') == true) {
-      //console.log('%cHey %c' + $cookies.get('gdd_u') + '', 'font-weight:bold', 'color: orange')
-      this.$store.commit('session_id', $cookies.get('gdd_session_id'))
-      this.$store.commit('email', $cookies.get('gdd_u'))
-      if ($cookies.get('gdd_lang') != 'de' || $cookies.get('gdd_lang') != 'de') {
-        this.$store.commit('language', 'de')
-      } else {
-        this.$store.commit('language', $cookies.get('gdd_lang'))
-      }
-
-      this.$i18n.locale = $cookies.get('gdd_lang')
-      this.$router.push('overview')
-    } else {
-      //console.log('app.vue to Logout')
-      this.$store.dispatch('logout')
-    }
-  },
   data() {
     return {
       config: {
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 9b5ff9cba..03c522655 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -16,6 +16,14 @@ Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
 Vue.use(VueCookies)
 
+router.beforeEach((to, from, next) => {
+  if (to.meta.requiresAuth && !store.state.session_id) {
+    next({ path: '/login' })
+  } else {
+    next()
+  }
+})
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index cd3646fe0..93892801d 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import routes from './routes'
+import { store } from '../store/store'
 
 Vue.use(VueRouter)
 
@@ -21,11 +22,11 @@ const router = new VueRouter({
 })
 
 router.beforeEach((to, from, next) => {
-  let language = to.params.lang
-  if (!language) {
-    language = 'de'
+  if (to.meta.requiresAuth && !store.state.session_id) {
+    next({ path: '/login' })
+  } else {
+    next()
   }
-  next()
 })
 
 export default router
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index b50f2a7b1..dc30e5754 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -1,6 +1,12 @@
 import NotFound from '@/views/NotFoundPage.vue'
 
 const routes = [
+  {
+    path: '/',
+    redirect: (to) => {
+      return { path: '/login' }
+    },
+  },
   {
     path: '/overview',
     component: () => import('../views/KontoOverview.vue'),
@@ -11,18 +17,30 @@ const routes = [
   {
     path: '/profile',
     component: () => import('../views/Pages/UserProfileCard.vue'),
+    meta: {
+      requiresAuth: true,
+    },
   },
   {
     path: '/profileedit',
     component: () => import('../views/Pages/UserProfileEdit.vue'),
+    meta: {
+      requiresAuth: true,
+    },
   },
   {
     path: '/activity',
     component: () => import('../views/Pages/UserProfileActivity.vue'),
+    meta: {
+      requiresAuth: true,
+    },
   },
   {
     path: '/transactions',
     component: () => import('../views/Pages/UserProfileTransactionList.vue'),
+    meta: {
+      requiresAuth: true,
+    },
   },
   {
     path: '/login',
@@ -40,11 +58,6 @@ const routes = [
     path: '/password',
     component: () => import('../views/Pages/Password.vue'),
   },
-  {
-    path: '/explorer',
-    name: 'Explorer',
-    component: () => import('../views/Pages/Explorer.vue'),
-  },
   { path: '*', component: NotFound },
 ]
 
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 96b2c4be8..d9128cfc6 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -1,11 +1,17 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+//import router from '../routes/router.js'
 Vue.use(Vuex)
-import router from '../routes/router.js'
 import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
+import createPersistedState from 'vuex-persistedstate'
 
 export const store = new Vuex.Store({
+  plugins: [
+    createPersistedState({
+      storage: window.sessionStorage,
+    }),
+  ],
   state: {
     session_id: null,
     email: '',
@@ -31,7 +37,6 @@ export const store = new Vuex.Store({
   // Syncronous mutation of the state
   mutations: {
     language: (state, language) => {
-      //console.log('mutation: language', language)
       state.language = language
       $cookies.set('gdd_lang', language)
       if (state.language == 'de') {
@@ -43,52 +48,34 @@ export const store = new Vuex.Store({
       }
     },
     loginfail: (state, loginfail) => {
-      //console.log('mutation: email')
       state.loginfail = loginfail
     },
     email: (state, email) => {
-      //console.log('mutation: email')
       state.email = email
     },
     session_id: (state, session_id) => {
-      //console.log('mutation: session_id')
       state.session_id = session_id
     },
     user_balance: (state, balance) => {
-      //console.log('mutation: user_balance')
       state.user.balance = balance / 10000
     },
     user_balance_gdt: (state, balance) => {
-      //console.log('mutation: user_balance_gdt')
       state.user.balance_gdt = balance / 10000
     },
   },
   // Asyncronous actions - used for api calls
   actions: {
     login: async ({ dispatch, commit }, data) => {
-      const result = await loginAPI.login(data.email, data.password)
-      if (result.success) {
-        commit('session_id', result.result.data.session_id)
-        commit('email', data.email)
-        $cookies.set('gdd_session_id', result.result.data.session_id)
-        $cookies.set('gdd_u', data.email)
-        router.push('/overview')
-      } else {
-        // Register failed, we perform a logout
-        //alert('>>>>> FAIl LOGIN')
-        commit('loginfail', true)
-
-        //dispatch('logout')
-      }
-    },
-    passwordReset: async (data) => {
-      //console.log('<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>', data.email)
+      commit('session_id', data.session_id)
+      commit('email', data.email)
+      //      $cookies.set('gdd_session_id', result.result.data.session_id)
+      //      $cookies.set('gdd_u', data.email)
     },
+    passwordReset: async (data) => {},
     schoepfen: async (data) => {
       // http://localhost/transaction-creations/ajaxCreate
     },
     createUser: async ({ commit, dispatch }, data) => {
-      // console.log('action: createUser')
       const result = await loginAPI.create(
         data.email,
         data.first_name,
@@ -100,26 +87,20 @@ export const store = new Vuex.Store({
         commit('email', data.email)
         $cookies.set('gdd_session_id', result.result.data.session_id)
         $cookies.set('gdd_u', data.email)
-        router.push('/overview')
+        //router.push('/overview')
       } else {
         // Register failed, we perform a logout
-        // console.log('action createUser to  logout start')
         dispatch('logout')
       }
     },
     logout: async ({ commit, state }) => {
-      //console.log('action: logout')
       if (state.session_id) {
         const result = await loginAPI.logout(state.session_id)
         // The result can be error, but thats ok with us
       }
-
+      sessionStorage.clear()
       commit('session_id', null)
       commit('email', null)
-      $cookies.remove('gdd_session_id')
-      $cookies.remove('gdd_u')
-      $cookies.remove('gdd_lang')
-      router.push('/Login')
     },
     accountBalance: async ({ commit, dispatch, state }) => {
       const result = await communityAPI.balance($cookies.get('gdd_session_id'))
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index ff1fb8ebf..e17afe27e 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -116,8 +116,8 @@ export default {
       this.activeNotifications = false
     },
     logout() {
-      //console.log("DashboardNavbar.vue user logout() : ")
       this.$store.dispatch('logout')
+      this.$router.push('/login')
     },
   },
 }
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 52e117bbc..a1ab86401 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -95,6 +95,8 @@
   </div>
 </template>
 <script>
+import loginAPI from '../../apis/loginAPI'
+
 export default {
   name: 'login',
   data() {
@@ -104,17 +106,24 @@ export default {
         password: '',
         // rememberMe: false
       },
+      loginfail: false,
     }
   },
   methods: {
-    onSubmit() {
-      this.$store.dispatch('login', {
-        email: this.model.email,
-        password: this.model.password,
-      })
+    async onSubmit() {
+      const result = await loginAPI.login(this.model.email, this.model.password)
+      if (result.success) {
+        this.$store.dispatch('login', {
+          session_id: result.result.data.session_id,
+          email: this.model.email,
+        })
+        this.$router.push('/overview')
+      } else {
+        this.loginfail = true
+      }
     },
     closeAlert() {
-      this.$store.state.loginfail = false
+      this.loginfail = false
     },
   },
 }
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 65be5ba39..86b4d31fe 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -11879,6 +11879,11 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+shvl@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/shvl/-/shvl-2.0.3.tgz#eb4bd37644f5684bba1fc52c3010c96fb5e6afd1"
+  integrity sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==
+
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -13406,6 +13411,14 @@ vue@^2.2.6, vue@^2.5.17, vue@^2.6.11:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
   integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==
 
+vuex-persistedstate@^4.0.0-beta.3:
+  version "4.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-4.0.0-beta.3.tgz#89dd712de72d28e85cc95467d066002c1405f277"
+  integrity sha512-T4IRD27qoUWh+8qr6T6zVp15xO7x/nPgnU13OD0C2uUwA7U9PhGozrj6lvVmMYDyRgc36J0msMXn3GvwHjkIhA==
+  dependencies:
+    deepmerge "^4.2.2"
+    shvl "^2.0.2"
+
 vuex@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"

From c3c4b52807e7bc2f0e3f91c8c00f7d69d8eef903 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Apr 2021 00:23:00 +0200
Subject: [PATCH 2/7] removed all cookies

---
 frontend/package.json                         |  1 -
 frontend/src/components/BaseAlert.vue         |  1 -
 .../src/components/SidebarPlugin/SideBar.vue  |  9 +++--
 frontend/src/main.js                          |  2 -
 frontend/src/store/store.js                   | 29 ++-------------
 frontend/src/views/KontoOverview.spec.js      |  1 -
 frontend/src/views/KontoOverview.vue          |  2 +-
 frontend/src/views/Layout/DashboardNavbar.vue |  2 +-
 frontend/src/views/Pages/Login.vue            |  2 +-
 frontend/src/views/Pages/Register.vue         | 37 ++++++++++++-------
 frontend/yarn.lock                            |  5 ---
 11 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 49f2173d5..00e0ca45b 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -65,7 +65,6 @@
     "vue-cli-plugin-i18n": "^1.0.1",
     "vue-clickaway": "^2.2.2",
     "vue-clipboard2": "^0.3.0",
-    "vue-cookies": "^1.7.4",
     "vue-flatpickr-component": "^8.1.2",
     "vue-good-table": "^2.21.3",
     "vue-i18n": "^8.22.4",
diff --git a/frontend/src/components/BaseAlert.vue b/frontend/src/components/BaseAlert.vue
index c95da2a32..3349bde50 100644
--- a/frontend/src/components/BaseAlert.vue
+++ b/frontend/src/components/BaseAlert.vue
@@ -69,7 +69,6 @@ export default {
   methods: {
     dismissAlert() {
       this.visible = false
-      this.$store.state.loginfail = false
     },
   },
 }
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 054381df8..c1aca6b12 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -40,10 +40,10 @@
               <span>Transactions</span>
             </router-link>
             <!--
-                <router-link to="/activity" class="dropdown-item  text-lg text-muted">
-                    <i class="ni ni-calendar-grid-58"></i>
-                    <span>{{ $t('site.navbar.activity') }}</span>
-                </router-link>
+                 <router-link to="/activity" class="dropdown-item  text-lg text-muted">
+                 <i class="ni ni-calendar-grid-58"></i>
+                 <span>{{ $t('site.navbar.activity') }}</span>
+                 </router-link>
             -->
             <div class="dropdown-divider"></div>
             <div @click="logout" class="dropdown-item text-lg text-muted">
@@ -132,6 +132,7 @@ export default {
       this.$sidebar.displaySidebar(true)
     },
     logout() {
+      this.$router.push('/login')
       this.$store.dispatch('logout')
     },
   },
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 03c522655..f1b7ee0c2 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -3,7 +3,6 @@ import DashboardPlugin from './plugins/dashboard-plugin'
 import App from './App.vue'
 import i18n from './i18n.js'
 import VeeValidate from './vee-validate.js'
-import VueCookies from 'vue-cookies'
 
 // store
 import { store } from './store/store'
@@ -14,7 +13,6 @@ import router from './routes/router'
 // plugin setup
 Vue.use(DashboardPlugin)
 Vue.config.productionTip = false
-Vue.use(VueCookies)
 
 router.beforeEach((to, from, next) => {
   if (to.meta.requiresAuth && !store.state.session_id) {
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index d9128cfc6..8fb6fbb86 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -18,7 +18,6 @@ export const store = new Vuex.Store({
     language: 'en',
     sizeDE: 'normal',
     sizeGB: 'big',
-    loginfail: false,
     user: {
       name: '',
       balance: 0,
@@ -38,7 +37,6 @@ export const store = new Vuex.Store({
   mutations: {
     language: (state, language) => {
       state.language = language
-      $cookies.set('gdd_lang', language)
       if (state.language == 'de') {
         state.sizeDE = 'big'
         state.sizeGB = 'normal'
@@ -47,9 +45,6 @@ export const store = new Vuex.Store({
         state.sizeGB = 'big'
       }
     },
-    loginfail: (state, loginfail) => {
-      state.loginfail = loginfail
-    },
     email: (state, email) => {
       state.email = email
     },
@@ -68,42 +63,26 @@ export const store = new Vuex.Store({
     login: async ({ dispatch, commit }, data) => {
       commit('session_id', data.session_id)
       commit('email', data.email)
-      //      $cookies.set('gdd_session_id', result.result.data.session_id)
-      //      $cookies.set('gdd_u', data.email)
     },
     passwordReset: async (data) => {},
     schoepfen: async (data) => {
       // http://localhost/transaction-creations/ajaxCreate
     },
     createUser: async ({ commit, dispatch }, data) => {
-      const result = await loginAPI.create(
-        data.email,
-        data.first_name,
-        data.last_name,
-        data.password,
-      )
-      if (result.success) {
-        commit('session_id', result.result.data.session_id)
-        commit('email', data.email)
-        $cookies.set('gdd_session_id', result.result.data.session_id)
-        $cookies.set('gdd_u', data.email)
-        //router.push('/overview')
-      } else {
-        // Register failed, we perform a logout
-        dispatch('logout')
-      }
+      commit('session_id', data.session_id)
+      commit('email', data.email)
     },
     logout: async ({ commit, state }) => {
       if (state.session_id) {
         const result = await loginAPI.logout(state.session_id)
         // The result can be error, but thats ok with us
       }
-      sessionStorage.clear()
       commit('session_id', null)
       commit('email', null)
+      sessionStorage.clear()
     },
     accountBalance: async ({ commit, dispatch, state }) => {
-      const result = await communityAPI.balance($cookies.get('gdd_session_id'))
+      const result = await communityAPI.balance(state.session_id)
       if (result.success) {
         commit('user_balance', result.result.data.balance)
       } else {
diff --git a/frontend/src/views/KontoOverview.spec.js b/frontend/src/views/KontoOverview.spec.js
index 0e60de370..d2bb8403c 100644
--- a/frontend/src/views/KontoOverview.spec.js
+++ b/frontend/src/views/KontoOverview.spec.js
@@ -1,7 +1,6 @@
 import { shallowMount } from '@vue/test-utils'
 import KontoOverview from './KontoOverview'
 import Vuex from 'vuex'
-import VueCookies from 'vue-cookies'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index c4fd481ac..114e6cf11 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -40,7 +40,7 @@ export default {
     GddTable,
   },
   created() {
-    this.$store.dispatch('accountBalance', $cookies.get('gdd_session_id'))
+    this.$store.dispatch('accountBalance', this.$store.state.session_id)
   },
   methods: {
     setRows(rows) {
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index e17afe27e..8202e2aa0 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -116,8 +116,8 @@ export default {
       this.activeNotifications = false
     },
     logout() {
-      this.$store.dispatch('logout')
       this.$router.push('/login')
+      this.$store.dispatch('logout')
     },
   },
 }
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index a1ab86401..08f48d9dd 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -45,7 +45,7 @@
                     v-model="model.password"
                   ></base-input>
 
-                  <b-alert v-show="$store.state.loginfail" show variant="warning">
+                  <b-alert v-show="loginfail" show variant="warning">
                     <span class="alert-text bv-example-row">
                       <b-row>
                         <b-col class="col-9 text-left">
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index b651d8144..b3ab9ecf5 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -141,6 +141,8 @@
   </div>
 </template>
 <script>
+import loginAPI from '../../apis/loginAPI'
+
 export default {
   name: 'register',
   data() {
@@ -167,19 +169,28 @@ export default {
     togglePasswordVisibility() {
       this.passwordVisible = !this.passwordVisible
     },
-    onSubmit() {
-      this.$store.dispatch('createUser', {
-        email: this.model.email,
-        first_name: this.model.firstname,
-        last_name: this.model.lastname,
-        emailType: 2,
-        password: this.model.password,
-      })
-      this.model.email = ''
-      this.model.firstname = ''
-      this.model.lastname = ''
-      this.model.password = ''
-      this.$router.push('/thx')
+    async onSubmit() {
+      const result = await loginAPI.create(
+        this.model.email,
+        this.model.firstname,
+        this.model.lastname,
+        this.password,
+      )
+      if (result.success) {
+        this.$store.dispatch('createUser', {
+          session_id: result.result.data.session_id,
+          email: this.model.email,
+        })
+        this.model.email = ''
+        this.model.firstname = ''
+        this.model.lastname = ''
+        this.password = ''
+        this.$router.push('/thx')
+      } else {
+        // todo: Display a proper error message!
+        this.$router.push('/login')
+        this.$store.dispatch('logout')
+      }
     },
   },
   computed: {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 86b4d31fe..4d1b90966 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -13249,11 +13249,6 @@ vue-clipboard2@^0.3.0:
   dependencies:
     clipboard "^2.0.0"
 
-vue-cookies@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.4.tgz#d241d0a0431da0795837651d10b4d73e7c8d3e8d"
-  integrity sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA==
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"

From 688315a56412b49e0fa70849da06bcc7451c5a47 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Apr 2021 00:37:11 +0200
Subject: [PATCH 3/7] Remove uncommented import

---
 frontend/src/store/store.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 8fb6fbb86..217eeba07 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-//import router from '../routes/router.js'
 Vue.use(Vuex)
 import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'

From dd9b10a4cbf0d84c3bba86ab61d0258b9c2bd353 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Apr 2021 12:09:07 +0200
Subject: [PATCH 4/7] remove sizeDE, sizeGB from store. commit logout to store
 before redirect

---
 frontend/src/store/store.js                   | 9 ---------
 frontend/src/views/Layout/DashboardNavbar.vue | 2 +-
 frontend/src/views/Pages/Register.vue         | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 8fb6fbb86..a2f36a433 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -16,8 +16,6 @@ export const store = new Vuex.Store({
     session_id: null,
     email: '',
     language: 'en',
-    sizeDE: 'normal',
-    sizeGB: 'big',
     user: {
       name: '',
       balance: 0,
@@ -37,13 +35,6 @@ export const store = new Vuex.Store({
   mutations: {
     language: (state, language) => {
       state.language = language
-      if (state.language == 'de') {
-        state.sizeDE = 'big'
-        state.sizeGB = 'normal'
-      } else {
-        state.sizeDE = 'normal'
-        state.sizeGB = 'big'
-      }
     },
     email: (state, email) => {
       state.email = email
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 8202e2aa0..e17afe27e 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -116,8 +116,8 @@ export default {
       this.activeNotifications = false
     },
     logout() {
-      this.$router.push('/login')
       this.$store.dispatch('logout')
+      this.$router.push('/login')
     },
   },
 }
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index b3ab9ecf5..49e38e04b 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -188,8 +188,8 @@ export default {
         this.$router.push('/thx')
       } else {
         // todo: Display a proper error message!
-        this.$router.push('/login')
         this.$store.dispatch('logout')
+        this.$router.push('/login')
       }
     },
   },

From bc53844c7b9bab68b43c1fa270a0c2b706ba94e7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Apr 2021 12:12:38 +0200
Subject: [PATCH 5/7] commit lohout to store before redirect

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

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index c1aca6b12..7b0831382 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -132,8 +132,8 @@ export default {
       this.$sidebar.displaySidebar(true)
     },
     logout() {
-      this.$router.push('/login')
       this.$store.dispatch('logout')
+      this.$router.push('/login')
     },
   },
   beforeDestroy() {

From fca0c7627ec2789ecf64bf77d6f6179b8f8e2222 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Apr 2021 12:27:54 +0200
Subject: [PATCH 6/7] only one navigation guard in main.js

---
 frontend/src/routes/router.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index 93892801d..6671a8de9 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import routes from './routes'
-import { store } from '../store/store'
 
 Vue.use(VueRouter)
 
@@ -21,12 +20,4 @@ const router = new VueRouter({
   },
 })
 
-router.beforeEach((to, from, next) => {
-  if (to.meta.requiresAuth && !store.state.session_id) {
-    next({ path: '/login' })
-  } else {
-    next()
-  }
-})
-
 export default router

From 3820bd0bfa3100ec9a67b282c0090b175b96bc03 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Apr 2021 15:17:21 +0200
Subject: [PATCH 7/7] remove hrefs in router-links

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

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 7b0831382..9e3401c0e 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -15,7 +15,7 @@
       <slot name="mobile-right">
         <ul class="nav align-items-center d-md-none">
           <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
-            <a slot="title-container" class="nav-link" href="#" role="button">
+            <a slot="title-container" class="nav-link" role="button">
               <div class="media align-items-center">
                 <span class="avatar avatar-sm">
                   <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
@@ -88,7 +88,7 @@
         <hr class="my-3" />
         <ul class="navbar-nav mb-md-3">
           <li class="nav-item">
-            <a class="nav-link text-lg" href="#!" @click="logout">
+            <a class="nav-link text-lg" @click="logout">
               {{ $t('logout') }}
             </a>
           </li>
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index e17afe27e..33f133a76 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -45,15 +45,15 @@
           <b-dropdown-header class="noti-title">
             <h6 class="text-overflow m-0">{{ $t('welcome') }}</h6>
           </b-dropdown-header>
-          <b-dropdown-item href="#!" to="/overview">
+          <b-dropdown-item to="/overview">
             <i class="ni ni-single-02"></i>
             <span>{{ $t('site.overview.account_overview') }}</span>
           </b-dropdown-item>
-          <b-dropdown-item href="#!" to="/profile">
+          <b-dropdown-item to="/profile">
             <i class="ni ni-single-02"></i>
             <span>{{ $t('site.navbar.my-profil') }}</span>
           </b-dropdown-item>
-          <b-dropdown-item href="#!" to="/profileedit">
+          <b-dropdown-item to="/profileedit">
             <i class="ni ni-settings-gear-65"></i>
             <span>{{ $t('site.navbar.settings') }}</span>
           </b-dropdown-item>
@@ -64,7 +64,7 @@
           </b-dropdown-item>
           -->
           <div class="dropdown-divider"></div>
-          <b-dropdown-item href="#!" @click="logout">
+          <b-dropdown-item @click="logout">
             <i class="ni ni-user-run"></i>
             <span>{{ $t('logout') }}</span>
           </b-dropdown-item>