Structure resp/formateur, prtection routes

canapGEST/Site/src/layouts/MainDrawer.vue

@@ -21,7 +21,7 @@
         </template>
         <span>Postulations</span>
       </v-tooltip>
-      <v-tooltip right>
+      <v-tooltip right v-if="isReponsible">
         <template v-slot:activator="{ on }">
           <v-list-tile @click="navigateTo('/openjobs')" v-on="on">
             <v-list-tile-action>
@@ -32,7 +32,7 @@
         <span>Places disponibles</span>
       </v-tooltip>
       <v-tooltip right>
-        <template v-slot:activator="{ on }">
+        <template v-slot:activator="{ on }" v-if="!isReponsible">
           <v-list-tile @click="navigateTo('/favourites')" v-on="on">
             <v-list-tile-action>
               <v-icon>star</v-icon>
@@ -48,6 +48,9 @@
 <script>
 export default {
   name: 'main-drawer',
+  computed: {
+    isReponsible () { return this.$store.state.moduleUser.userData.role === 'responsable'}
+  },
   methods: {
     navigateTo(link) {
       this.$router.push(link)

canapGEST/Site/src/layouts/MainNavbar.vue

@@ -11,10 +11,18 @@
       </v-btn>
     </v-toolbar-items>
     <v-toolbar-items class="hidden-sm-and-down" v-else>
-      <v-btn flat class="white--text">Nicolas Crausaz</v-btn>
-      <v-btn icon class="white--text">
-        <v-icon @click="logout">logout</v-icon>
-      </v-btn>
+      <v-btn
+        flat
+        class="white--text"
+      >{{$store.state.moduleUser.userData.tequila.firstname}} {{$store.state.moduleUser.userData.tequila.name}}</v-btn>
+      <v-tooltip bottom>
+        <template v-slot:activator="{ on }">
+          <v-btn icon class="white--text" v-on="on">
+            <v-icon @click="logout">logout</v-icon>
+          </v-btn>
+        </template>
+        <span>Déconnexion</span>
+      </v-tooltip>
     </v-toolbar-items>
   </v-toolbar>
 </template>

canapGEST/Site/src/router/index.js

 import Vue from 'vue'
 import Router from 'vue-router'
 import routes from './routes.js'
+import store from '../store/store.js'
 
 Vue.use(Router)
 
-export default new Router({routes})
+const router = new Router({ routes })
+
+router.beforeEach((to, from, next) => {
+  // TODO: check if token, and if expired
+  if (store.getters['moduleUser/userIsLogedIn']) {
+    //
+  }
+
+  // get & set user data
+  store.dispatch('moduleUser/getUserData').then(() => {
+    // Valide l'accès à la route selon le rôle
+
+    let routeLimitation = to.meta.requiresRole
+    let userRole = store.state.moduleUser.userData.role
+
+    if (routeLimitation == 'responsable' && userRole == 'formateur') {
+      // Routes limitées aux responsables
+      let deniedRoutes = ['/openjobs']
+      if (deniedRoutes.includes(to.fullPath)) {
+        next('/error');
+      }
+    }
+
+    if (routeLimitation == 'formateur' && userRole == 'responsable') {
+      // Routes limitées aux formateurs
+      let deniedRoutes = ['/favourites']
+      if (deniedRoutes.includes(to.fullPath)) {
+        next('/error');
+      }
+    }
+    next();
+  })
+});
+
+export default router

canapGEST/Site/src/router/routes.js

@@ -14,16 +14,23 @@ const routes = [
     name: 'application',
     component: () => import('@/views/ApplicationView.vue')
   },
+  {
+    path: '/openjobs',
+    name: 'openjobs',
+    component: () => import('@/views/OpenJobsView.vue'),
+    meta: { requiresRole: 'responsible' }
+  },
+  {
+    path: '/favourites',
+    name: 'favourites',
+    component: () => import('@/views/FavouritesView.vue'),
+    meta: { requiresRole: 'formateur' }
+  },
   {
     path: '*',
     name: 'error',
-    component: () => import('@/views/ErrorView.vue')
+    component: () => import('@/views/ErrorView.vue'),
   },
-  {
-    path: '/openjobs',
-    name: 'openjobs',
-    component: () => import('@/views/OpenJobsView.vue')
-  }
   // favorites
   // erreurs
 ]

canapGEST/Site/src/store/modules/user/actions.js

@@ -10,19 +10,25 @@ export function login() {
         window.location = 'http://localhost:8000/api/auth/login'
       } else {
         localStorage.setItem('stored_token', response.data.token);
-        console.log('setting token:' + response.data.token)
+        localStorage.setItem('last_login', Date.now());
       }
     })
 }
 
 export function getUserData(context) {
-  axios({
-    method: 'get',
-    url: '/user'
-  })
-    .then(response => {
-      context.commit('setUserData', response.data)
+  return new Promise((resolve, reject) => {
+    axios({
+      method: 'get',
+      url: '/user'
     })
+      .then(response => {
+        context.commit('setUserData', response.data)
+        resolve(response.data)
+      })
+      .catch(err => {
+        reject(err)
+      })
+  })
 }
 
 export function logout() {

canapGEST/Site/src/store/modules/user/getters.js

 export function userIsLogedIn () {
-  // return localStorage.getItem('stored_token') != null
-  return localStorage.getItem('stored_token')
+  return localStorage.getItem('stored_token') != null
 }
\ No newline at end of file

canapGEST/Site/src/store/modules/user/mutations.js

 export function setUserData (state, data) {
-  console.log(data)
   state.userData = data
 }
\ No newline at end of file

canapGEST/Site/src/views/FavouritesView.vue

+<template>
+    <div id="favourites-view">
+    <h1>Vos favoris</h1>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'favourites-view'
+}
+</script>
+
+<style>
+
+</style>

canapGEST/Site/src/views/HomeView.vue

 <template>
   <div id="home-view">
-    <h1>Accueil</h1>Accueil: statistiques
-    Il y a : 4 nouvelles postulations pour le métier : test depuis votre dernière connexion
-    <br>
-    <button @click="$store.dispatch('moduleUser/getUserData')">get data</button>
+    <h1>Accueil</h1>
+    Accueil: statistiques
+    Dernière connexion le: {{lastLogin}}
   </div>
 </template>
 
 <script>
 export default {
-  name: 'home-view'
+  name: 'home-view',
+  computed: {
+    lastLogin() { return localStorage.getItem('last_login') }
+  }
 }
 </script>