- Fixed my revert hahaha :)

api/repositories/user-repository.js

@@ -116,7 +116,8 @@ class UserRepository {
                     .then(newUser => {
                         resolve({
                             "message": "Account successfully created !",
-                            "user": newUser,
+                            "code": 201,
+                            "token": newUser.uuid,
                         })
                     })
                     .catch(err => {
@@ -146,11 +147,13 @@ class UserRepository {
                 if (match) {
                     resolve({
                         "message": "User successfully logged in !",
-                        "user": fetchedUser,
+                        "code": 200,
+                        "token": fetchedUser.uuid,
                     })
                 } else {
                     reject({
-                        "message": "Les informations de connexion sont erronées.",
+                        "message": "Authentification attempt failed ; credentials are incorrect.",
+                        "code": 400,
                     })
                 }
             })
@@ -166,7 +169,7 @@ class UserRepository {
             this.getOneByEmail(mail, false)
             .then(() => {
                 reject({
-                    "message": "L'email est déjà utilisé par un autre utilisateur.",
+                    "message": "This email is already linked to an account.",
                     "code": 403
                 })
             })

client/src/components/global/navbar/navbar.vue

@@ -10,8 +10,8 @@
           <router-link :to="link.url" class="nav-link">{{ link.text }}</router-link>
         </li>
       </ul>
-            <div v-if="user" class="navbar-nav">
-                <router-link :to="'/profil'" class="nav-link">{{ user.name }}</router-link>
+      <div v-if="user_token" class="navbar-nav">
+        <router-link :to="'/profil'" class="nav-link">{{ user_token }}</router-link>
         <div @click="logoutUser()" class="nav-link">Deconnexion</div>
       </div>
       <div v-else class="navbar-nav">
@@ -22,7 +22,8 @@
 </template>
 
 <script>
-    export default {
+
+export default {
   name: 'navbar',
   data() {
     return {
@@ -43,18 +44,18 @@
     }
   },
   computed: {
-            user() {
-                return this.$store.state.user
+    user_token() {
+      return this.$store.getters.getUserToken
     }
   },
   methods: {
     logoutUser() {
-                this.$cookies.remove('U_')
-                this.$store.commit('logout')
-                this.$router.push('/')
-            }
+      this.$store.dispatch('user_logout');
+      this.$router.push('/');
     }
   }
+}
+
 </script>
 
 <style lang="scss"></style>

client/src/main.js

@@ -1,9 +1,10 @@
 // Core
 import Vue from 'vue'
-import Vuex from 'vuex'
 import VueRouter from 'vue-router'
 import App from './app.vue'
 
+import store from './store'
+
 import Globals from './global-components.js'
 Globals.forEach(component => {
     Vue.component(component.name, component)
@@ -55,38 +56,6 @@ Vue.filter('truncate', filter)
 import router from './routes'
 Vue.use(VueRouter)
 
-// Store
-Vue.use(Vuex)
-let user = Vue.$cookies.get('U_')
-
-const store = new Vuex.Store({
-    state: user ?
-        { status: { loggedIn: true }, user }
-        : { status: { loggedIn: false }, user: null },
-    mutations: {
-        loginSucceed (state, user) {
-            state.status.loggedIn = true
-            state.user = user
-        },
-        loginFail (state) {
-            state.status.loggedIn = false
-            state.user = null
-        },
-        logout(state) {
-            state.status.loggedIn = false;
-            state.user = null;
-        },
-        registerSucceed (state, user) {
-            state.status.loggedIn = true
-            state.user = user
-        },
-        registerFail (state) {
-            state.status.loggedIn = false
-            state.user = null
-        },
-    }
-})
-
 // Mount Vue
 const app = new Vue({
     render: h => h(App),

client/src/pages/user/login-page.vue

@@ -34,9 +34,6 @@
 </template>
 
 <script>
-// API
-import { RepositoryFactory } from "~/api/repositories"
-const Users = RepositoryFactory.get('users')
 
 export default {
     name: 'login-page',
@@ -52,27 +49,25 @@ export default {
     },
     methods: {
       async logUser(e) {
-            e.preventDefault()
 
-            Users.login({
+        let userInput = {
           "mail": this.email,
           "password": this.password
+        };
+
+        this.$store.dispatch('user_login', userInput)
+          .then(() => {
+            this.$router.push('/profil');
           })
-            .then(v => {
-                let user = v.data.user
-                this.$cookies.set("U_", user, 60 * 60 * 24 * 30)
-                this.$store.commit('loginSucceed', user)
-                this.$router.push('/profil')
-            })
-            .catch(() => {
-                this.$store.commit('loginFailed')
-            })
+
+        e.preventDefault();
       }
     }
 }
 </script>
 
 <style lang="scss" scoped>
+
 section {
   min-height: calc(100vh - 56px);
   main {
@@ -84,9 +79,15 @@ section {
     }
   }
 }
+
 @media only screen and (max-width: 600px) {
+  section {
+    main {
       .title {
         font-size: 3.5rem;
       }
+    }
+  }
 }
+
 </style>

client/src/pages/user/profile-page.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="container-fluid p-4" id="spell-container">
     <div class="display-3 font-display mb-3">
-            <span class="username">{{ user.name }}</span>
-            <span v-if="user.verified" class="verified"><i class="mad">check_circle</i></span>
+      <span class="username">{{ user_token }}</span>
+      <!-- <span v-if="user.verified" class="verified"><i class="mad">check_circle</i></span> -->
     </div>
   </div>
 </template>
@@ -11,14 +11,15 @@
 export default {
   name: 'profile-page',
   computed: {
-        user() {
-            return this.$store.state.user
+    user_token() {
+      return this.$store.getters.getUserToken
     }
   },
 }
 </script>
 
 <style lang="scss" scoped>
+
 .title {
     font-size: 5rem;
     font-weight: 700;
@@ -28,4 +29,5 @@ export default {
         font-size: 3.5rem;
     }
 }
+
 </style>

client/src/routes.js

@@ -1,5 +1,5 @@
-import Vue from 'vue'
 import VueRouter from 'vue-router'
+import store from './store'
 
 // Pages
 import Index from "~/pages/index-page"
@@ -30,14 +30,14 @@ const routes = [
     path: '/connexion',
     component: Login,
     meta: {
-            antiAuthGuard: true
+      loginFilter: true
     }
   },
   {
     path: '/inscription',
     component: Register,
     meta: {
-            antiAuthGuard: true
+      loginFilter: true
     }
   },
   {
@@ -67,7 +67,7 @@ const routes = [
     component: Profile,
     props: true,
     meta: {
-            authGuard: true,
+      logoutFilter: true,
     }
   },
 ]
@@ -80,18 +80,22 @@ const router = new VueRouter({
 })
 
 router.beforeEach((to, from, next) => {
-    if (to.matched.some(record => record.meta.authGuard)) {
-        if (Vue.$cookies.get('U_') == null) {
+  if (to.matched.some(record => record.meta.loginFilter)) {
+    if (store.getters.getUserToken) {
+      next({
+        path: '/',
+      });
+    }
+    next();
+  } else if (to.matched.some(record => record.meta.logoutFilter)) {
+    if (!store.getters.getUserToken) {
       next({
         path: '/connexion',
-                params: { nextUrl: to.fullPath },
-            })
-        } else {
-            next()
+      });
     }
-    } else {
-        next()
+    next();
   }
+  next();
 })
 
 export default router;