From 05a486a6d390d81c57be8d018377680c713d74d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Mon, 27 Jul 2020 09:13:06 +0200
Subject: [PATCH] remove cookienotification

---
 src/App.vue                         |  4 +---
 src/router/index.js                 | 32 +++++++++++++++++++----------
 src/store/index.js                  |  2 +-
 src/store/modules/barUsers.js       |  4 +++-
 src/store/modules/jobkindManager.js |  2 --
 src/store/modules/login.js          |  8 +++-----
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5b49b13..10e70c6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -76,18 +76,16 @@
           </v-card-actions>
         </v-card>
       </v-dialog>
-      <CookieNotification />
     </v-footer>
   </v-app>
 </template>
 
 <script>
 import TitleBar from './components/TitleBar'
-import CookieNotification from './components/CookieNotification'
 import { mapGetters, mapActions } from 'vuex'
 export default {
   name: 'App',
-  components: { CookieNotification, TitleBar },
+  components: { TitleBar },
   data: () => ({
     render: 0,
     timer: null,
diff --git a/src/router/index.js b/src/router/index.js
index 108690d..8ebe80f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,7 +25,7 @@ import UserManager from '@/components/vorstand/UserManager'
 import WorkgroupManagement from '@/components/vorstand/WorkgroupManagement'
 import JobKindManager from '@/components/vorstand/JobKindManager'
 import JobsRequest from '@/components/user/JobsRequest'
-import ResetPassword from "@/components/ResetPassword";
+import ResetPassword from '@/components/ResetPassword'
 
 Vue.use(VueRouter)
 
@@ -176,35 +176,45 @@ const router = new VueRouter({
 router.beforeEach((to, from, next) => {
   store.dispatch('fetchAccessToken')
   if (to.name === 'main') {
-    if (to.name ==='finanzer' || to.name === 'overview' || to.name === 'activeUser') {
+    if (
+      to.name === 'finanzer' ||
+      to.name === 'overview' ||
+      to.name === 'activeUser'
+    ) {
       if (!store.state.login.user.group.includes('moneymaster')) {
-        next({name: 'login'})
+        next({ name: 'login' })
       }
     }
     if (to.name === 'bar' || to.name === 'geruecht') {
       if (!store.state.login.user.group.includes('bar')) {
-        next({name: 'login'})
+        next({ name: 'login' })
       }
     }
-    if (to.name === 'user' || to.name === 'userOverview' || to.name === 'userConfig' || to.name === 'userJobs' || to.name === 'jobRequests') {
+    if (
+      to.name === 'user' ||
+      to.name === 'userOverview' ||
+      to.name === 'userConfig' ||
+      to.name === 'userJobs' ||
+      to.name === 'jobRequests'
+    ) {
       if (!store.state.login.user.group.includes('user')) {
-        next({name: 'login'})
+        next({ name: 'login' })
       }
     }
     if (!store.state.login.user.accessToken) {
-      next({name: 'login'})
+      next({ name: 'login' })
     }
   }
   if (to.name === 'login') {
     if (store.state.login.user.accessToken) {
       if (store.state.login.user.group.includes('moneymaster')) {
-        next({name: 'overview'})
+        next({ name: 'overview' })
       } else if (store.state.login.user.group.includes('bar')) {
-        next({name: 'geruecht'})
+        next({ name: 'geruecht' })
       } else if (store.state.login.user.group.includes('user')) {
-        next({name: 'add'})
+        next({ name: 'add' })
       } else if (store.state.login.user.group.includes('extern')) {
-        next({name: 'main'})
+        next({ name: 'main' })
       }
     }
   }
diff --git a/src/store/index.js b/src/store/index.js
index 5c870b0..7c4eed4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -12,7 +12,7 @@ import wm from '@/store/modules/workgroupManagement'
 import jkm from '@/store/modules/jobkindManager'
 import jobInvites from '@/store/modules/jobInvites'
 import jobRequests from '@/store/modules/jobRequests'
-import connectionError from "@/store/modules/connectionError";
+import connectionError from '@/store/modules/connectionError'
 
 Vue.use(Vuex)
 
diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js
index 76f3be2..883a70e 100644
--- a/src/store/modules/barUsers.js
+++ b/src/store/modules/barUsers.js
@@ -45,7 +45,9 @@ const mutations = {
         existuser.type = users[user].type
         existuser.limit = users[user].limit
         existuser.last_seen = users[user].last_seen
-        existuser.autoLock = users[user].autoLock ? users[user].autoLock : existuser.autoLock
+        existuser.autoLock = users[user].autoLock
+          ? users[user].autoLock
+          : existuser.autoLock
       } else {
         state.users.push({
           username: users[user].username,
diff --git a/src/store/modules/jobkindManager.js b/src/store/modules/jobkindManager.js
index 2c829b4..4e03d07 100644
--- a/src/store/modules/jobkindManager.js
+++ b/src/store/modules/jobkindManager.js
@@ -73,8 +73,6 @@ const actions = {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
-
-
   },
   async updateJobKind({ commit, rootState, dispatch }, data) {
     try {
diff --git a/src/store/modules/login.js b/src/store/modules/login.js
index 494f8af..4c32df0 100644
--- a/src/store/modules/login.js
+++ b/src/store/modules/login.js
@@ -62,13 +62,13 @@ const actions = {
     commit('loginStart')
     try {
       const response = await axios.post(url.login, { ...loginData })
-      const cookieA = localStorage.getItem('cookie:accepted')
+      /*const cookieA = localStorage.getItem('cookie:accepted')
       if (!cookieA) {
         commit('loginStop', 'Sie müssen die Cookies akzeptieren!')
         commit('setCookieNotification', true)
         commit('setCookieAccepted', false)
         return
-      }
+      }*/
       localStorage.setItem(
         'user',
         JSON.stringify({
@@ -81,9 +81,7 @@ const actions = {
       )
       commit('loginStop', null)
       commit('updateAccessToken', response.data)
-      if (state.user.group.includes('moneymaster')) {
-        router.push('/main/finanzer/overview')
-      } else if (state.user.group.includes('bar')) {
+      if (state.user.group.includes('bar')) {
         router.push('/main/bar/geruecht')
       } else if (state.user.group.includes('user')) {
         router.push('/main/user/add')