* refactoring and fixes by login

feature: #4

package-lock.json

@@ -21,7 +21,8 @@
         "vue": "^3.2.45",
         "vue-i18n": "^9.2.2",
         "vue-router": "^4.1.6",
-        "vuex": "^4.0.2"
+        "vuex": "^4.0.2",
+        "vuex-persistedstate": "^4.1.0"
       },
       "devDependencies": {
         "@rushstack/eslint-patch": "^1.1.4",
@@ -3108,7 +3109,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6913,6 +6913,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/shvl": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.3.tgz",
+      "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==",
+      "deprecated": "older versions vulnerable to prototype pollution"
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -7434,6 +7440,19 @@
         "vue": "^3.0.2"
       }
     },
+    "node_modules/vuex-persistedstate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz",
+      "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "dependencies": {
+        "deepmerge": "^4.2.2",
+        "shvl": "^2.0.3"
+      },
+      "peerDependencies": {
+        "vuex": "^3.0 || ^4.0.0-rc"
+      }
+    },
     "node_modules/walker": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",

package.json

@@ -22,7 +22,8 @@
     "vue": "^3.2.45",
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.1.6",
-    "vuex": "^4.0.2"
+    "vuex": "^4.0.2",
+    "vuex-persistedstate": "^4.1.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.1.4",

src/authentication/AuthHelper.js

@@ -3,13 +3,13 @@ import store from '../store'
 
 let keycloak = null
 
-export function keycloakSetup() {
+export async function keycloakSetup() {
   keycloak = new Keycloak({
     url: 'https://auth.denysoft.eu/',
     realm: 'FST',
     clientId: 'frontend'
   })
-  return keycloak
+  await keycloak
     .init({
       onLoad: 'login-required',
       checkLoginIframe: false
@@ -32,23 +32,10 @@ export function keycloakSetup() {
     .catch(function () {
       alert('failed to initialize')
     })
-}
+  store.commit('initKeycloak', keycloak)
-export function login() {
+  store.commit('isAnonym', false)
-  keycloak.login()
 }
 
 export function getKeycloak() {
   return keycloak
 }
-
-export function isVerwaltung() {
-  return keycloak.hasRealmRole('verwaltung')
-}
-
-export function isEmployee() {
-  return keycloak.hasRealmRole('employee')
-}
-
-export function isAdmin() {
-  return keycloak.hasRealmRole('admin')
-}

src/components/Navbar.vue

@@ -7,19 +7,29 @@
     </div>
     <div class="flex justify-around basis-1/3 max-md:hidden">
       <div v-if="!isAnonym">
+        <RouterLink to="/contracts">
           <p class="py-2">Aufträge</p>
+        </RouterLink>
       </div>
       <div v-if="!isAnonym" class="nav-item">
+        <RouterLink to="/support">
           <p class="py-2">Support</p>
+        </RouterLink>
       </div>
       <div v-if="isVerwaltung" class="nav-item">
+        <RouterLink to="/administration">
           <p class="py-2">Administration</p>
+        </RouterLink>
       </div>
       <div v-if="isAnonym" class="nav-item">
+        <RouterLink to="/arbeiten">
           <p class="py-2">Arbeiten</p>
+        </RouterLink>
       </div>
       <div v-if="isAnonym" class="nav-item">
+        <RouterLink to="/contact">
           <p class="py-2">Kontakt</p>
+        </RouterLink>
       </div>
       <div v-if="isAnonym" class="nav-item">
         <RouterLink to="/about">
@@ -27,8 +37,12 @@
         </RouterLink>
       </div>
     </div>
-    <div v-if="isAnonym" class="nav-item basis-1/6 max-md:justify-end max-md:pr-5 max-md:flex max-md:basis-3/6">
+    <div
-      <button class="bg-blue-600 hover:bg-blue-500 duration-300 text-white px-3 py-1 my-2 rounded" @click="login">
+      v-if="isAnonym"
+      class="nav-item basis-1/6 max-md:justify-end max-md:pr-5 max-md:flex max-md:basis-3/6">
+      <button
+        class="bg-blue-600 hover:bg-blue-500 duration-300 text-white px-3 py-1 my-2 rounded"
+        @click="login">
         Login
       </button>
     </div>
@@ -61,7 +75,9 @@
         <RouterLink to="/about">Über uns</RouterLink>
       </li>
       <li v-if="isAnonym" class="block py-2 flex justify-center">
-        <button class="bg-blue-600 hover:bg-blue-500 duration-300 text-white px-3 py-1 my-2 rounded" @click="login">
+        <button
+          class="bg-blue-600 hover:bg-blue-500 duration-300 text-white px-3 py-1 my-2 rounded"
+          @click="login">
           Login
         </button>
       </li>
@@ -69,44 +85,33 @@
   </div>
 </template>
 <script>
-import {keycloakSetup} from "../authentication/AuthHelper";
+import { getKeycloak, keycloakSetup } from '../authentication/AuthHelper'
 
 export default {
   data() {
     return {
       keycloak: this.$store.state.keycloak.keycloak,
-      isAnonym: false,
       isNavbarClosed: true
     }
   },
   computed: {
     isVerwaltung() {
-      if (this.$store.state.keycloak.keycloak === null){
+      if (getKeycloak() === null) {
-        this.isAnonym = true;
         return false
       }
       return this.$store.state.keycloak.keycloak.realmAccess.roles.includes('verwaltung')
     },
-    isAdmin() {
+    isAnonym() {
-      if (this.$store.state.keycloak.keycloak === null){
+      return this.$store.state.keycloak.isAnonym
-        this.isAnonym = true;
-        return false
-      }
-      return this.$store.state.keycloak.keycloak.realmAccess.roles.includes('admin')
-    },
-    isEmployee() {
-      if (this.$store.state.keycloak.keycloak === null){
-        this.isAnonym = true;
-        return false
-      }
-      return this.$store.state.keycloak.keycloak.realmAccess.roles.includes('employeee')
     }
   },
   methods: {
-    login() {
+    async login() {
-       keycloakSetup()
+      if (this.$store.state.keycloak.keycloak === null) {
+        await keycloakSetup()
+      }
     },
-    openNavbar(){
+    openNavbar() {
       this.isNavbarClosed = !this.isNavbarClosed
     }
   }

src/router/index.js

@@ -33,8 +33,8 @@ const router = createRouter({
       }
     },
     {
-      path: '/support',
+      path: '/administration',
-      name: 'support',
+      name: 'administration',
       // this page is lazy-loaded when the route is visited.
       component: () => import('../views/AdministrationView.vue'),
       meta: {
@@ -87,12 +87,17 @@ const router = createRouter({
     }
   ]
 })
-
 router.beforeEach(async (to, from, next) => {
+  //if user was logged in but reloaded page. So we have all data, need only restore it
+  if (store.state.keycloak.keycloak !== null && getKeycloak() === null) {
+    await keycloakSetup()
+  }
+
   if (to.meta.requiresAuth === true) {
     if (getKeycloak() === null) {
       await keycloakSetup()
       store.commit('initKeycloak', getKeycloak())
+      store.commit('isAnonym', false)
     }
     if (!getKeycloak().authenticated) {
       next('/forbidden')

src/store/index.js

@@ -2,11 +2,13 @@ import { createStore } from 'vuex'
 import moduleA from './moduleA.module'
 import moduleB from './moduleB.module'
 import keycloak from './keycloak.module'
+import createPersistedState from 'vuex-persistedstate'
 
 export default createStore({
   modules: {
     keycloak: keycloak,
     a: moduleA,
     b: moduleB
-  }
+  },
+  plugins: [createPersistedState()]
 })

src/store/keycloak.module.js

@@ -1,20 +1,22 @@
 export default {
   state: () => ({
-    keycloak: null
+    keycloak: null,
+    isAnonym: true
   }),
   mutations: {
     initKeycloak(state, data) {
       state.keycloak = data
+    },
+    isAnonym(state, data) {
+      state.isAnonym = data
     }
   },
   actions: {
-    initKeycloak({ commit }) {
+    initKeycloak({ commit }, data) {
-      commit('initKeycloak')
+      commit('initKeycloak', data)
-    }
     },
-  getters: {
+    isAnonym({ commit }, data) {
-    getKeycloak(state) {
+      commit('isAnonym', data)
-      return state.keycloak
     }
   }
 }

src/views/AboutView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is a About page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>

src/views/AdministrationView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rerendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is an Administration page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>

src/views/ArbeitenView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rerendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is an Arbeiten page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>

src/views/ContactView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rerendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is an Contact page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>

src/views/ContractsView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rerendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is an Contracts page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>

src/views/HomeView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rerendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is a Home page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>

src/views/SupportView.vue

@@ -1,17 +1,15 @@
 <script setup>
-import Navbar from "../components/Navbar.vue";
+import Navbar from '../components/Navbar.vue'
 </script>
 <script>
 export default {
-  mounted() {
+  mounted() {}
-  }
 }
 </script>
 <template>
-  <Navbar/><!-- Causes rerendering each time todo: possible use in App.vue-->
+  <Navbar /><!-- Causes rerendering each time todo: possible use in App.vue-->
   <div class="about">
     <h1>This is an Support page</h1>
   </div>
 </template>
-<style>
+<style></style>
-</style>