diff --git a/resources/js/app.js b/resources/js/app.js
index 653cedc0..751a189a 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -31,10 +31,6 @@ const router = new VueRouter({
name: 'login',
component: Login,
},
- {
- path: '/logout',
- name: 'logout',
- },
{
path: '/register',
name: 'register',
diff --git a/resources/js/views/App.vue b/resources/js/views/App.vue
index 99032de6..d319dfc7 100644
--- a/resources/js/views/App.vue
+++ b/resources/js/views/App.vue
@@ -18,9 +18,9 @@
-
+
Sign out
-
+
@@ -51,6 +51,26 @@
mounted(){
this.isLoggedIn = localStorage.getItem('jwt')
this.username = localStorage.getItem('user')
+ },
+
+ methods: {
+ logout(evt) {
+ if(confirm("Are you sure you want to log out?")) {
+ axios.post('api/logout').then(response => {
+
+ localStorage.removeItem('jwt');
+ delete axios.defaults.headers.common['Authorization'];
+
+ this.$router.go('/login');
+ })
+ .catch(error => {
+ localStorage.removeItem('jwt');
+ delete axios.defaults.headers.common['Authorization'];
+
+ this.$router.go('/login');
+ });
+ }
+ }
}
}
\ No newline at end of file
diff --git a/resources/js/views/Login.vue b/resources/js/views/Login.vue
index 0e13e9f0..a0fb6d96 100644
--- a/resources/js/views/Login.vue
+++ b/resources/js/views/Login.vue
@@ -62,7 +62,7 @@
localStorage.setItem('jwt',response.data.success.token)
if (localStorage.getItem('jwt') != null){
- this.$router.push({name: 'accounts'});
+ this.$router.go('/');
}
})
.catch(e => {
@@ -80,7 +80,7 @@
},
beforeRouteEnter (to, from, next) {
if (localStorage.getItem('jwt')) {
- return next('accounts');
+ return next('/');
}
next();
diff --git a/resources/js/views/Register.vue b/resources/js/views/Register.vue
index 19812d71..3b266901 100644
--- a/resources/js/views/Register.vue
+++ b/resources/js/views/Register.vue
@@ -88,7 +88,7 @@
localStorage.setItem('jwt',response.data.success.token)
if (localStorage.getItem('jwt') != null){
- this.$router.push({name: 'accounts'});
+ this.$router.go('/');
}
})
.catch(error => {
@@ -103,7 +103,7 @@
},
beforeRouteEnter (to, from, next) {
if (localStorage.getItem('jwt')) {
- return next('accounts');
+ return next('/');
}
next();