Merge branch 'dev' into 'feature/UI-vuetify'

# Conflicts:
#   pages/login.vue
#   plugins/axios.js

components/Navbar.vue

@@ -81,22 +81,26 @@
 <script>
 export default {
   methods: {
-    logout () {
-      fetch('http://127.0.0.1:8000/api/logout', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          accept: 'application/json'
-        },
-        body: JSON.stringify({
+    async logout () {
+      try {
+        const resp = await this.$axios.post('/logout', {
           token: this.$auth.$storage.getUniversal('token')
         })
+        if (resp.status == '200') {
+          this.$toast.success('Logout!', {
+            duration: 2000
           })
+          this.$router.push('/login')
           localStorage.setItem('token', '')
           this.$auth.$storage.setUniversal('loggedIn', 'false')
           this.$auth.$storage.setUniversal('token', '')
           this.$auth.$storage.setUniversal('userName', '')
-      this.$router.push('/login')
+        }
+      } catch (e) {
+        this.$toast.error('ERR !', {
+          duration: 2000
+        })
+      }
     }
   }
 }

pages/login.vue

@@ -109,15 +109,10 @@ export default {
       this.password = ''
       this.checkbox = false
     },
-    async login () {
+    async login() {
       try {
-        const resp = await fetch('http://127.0.0.1:8000/api/login', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            Accept: 'application/json'
-          },
-          body: JSON.stringify({
+        const resp = await this.$axios.post('/login',
+          {
             email: this.email,
             password: this.password,
             status: this.status
@@ -137,14 +132,14 @@ export default {
           this.$router.push('home')
         }
       } catch (e) {
-        this.$toast.error('Username or Password not valid', {
-          duration: 2000
-        })
-        this.$router.push('/login')
-      }
+        this.$toast.error("Username or Password not valid", {
+          duration: 2000,
+        });
+        this.$router.push("/login");
       }
     }
 }
+}
 </script>
 <style scoped>
 .body {

plugins/axios.js

-export default function ({ $axios }, inject, redirect ) {
+export default function ({ $axios }, inject, redirect) {
   $axios.onError((error) => {
     if (error.response.status === 500) {
       redirect('/500')
@@ -15,7 +15,8 @@ export default function ({ $axios }, inject, redirect ) {
   const api = $axios.create({
     headers: {
       common: {
-        Accept: 'application/json, text/plain, */*'
+        Accept: 'application/json, text/plain, */*',
+        'Content-Type': 'application/json, text/plain, */*'
       }
     }
   })