diff --git a/src/vite-frontend/src/components/TheHeader.vue b/src/vite-frontend/src/components/TheHeader.vue index 419ab09..4c1d306 100644 --- a/src/vite-frontend/src/components/TheHeader.vue +++ b/src/vite-frontend/src/components/TheHeader.vue @@ -19,16 +19,16 @@ Home - - - - @@ -39,8 +39,31 @@ diff --git a/src/vite-frontend/src/store/index.ts b/src/vite-frontend/src/store/index.ts index 29062b9..ff2bbe2 100644 --- a/src/vite-frontend/src/store/index.ts +++ b/src/vite-frontend/src/store/index.ts @@ -12,9 +12,6 @@ export default createStore({ }, setToken(state, token){ state.token = token; - }, - getToken(state){ - return state.token } }, actions: { @@ -24,6 +21,12 @@ export default createStore({ localStorage.setItem("username", user.username); localStorage.setItem("token", user.token); }, + LOGOUT({commit}){ + commit("setUsername",""); + commit("setToken",""); + localStorage.removeItem("username"); + localStorage.removeItem("token"); + }, }, } ) diff --git a/src/vite-frontend/src/views/TheLogin.vue b/src/vite-frontend/src/views/TheLogin.vue index 72e4f86..334ed00 100644 --- a/src/vite-frontend/src/views/TheLogin.vue +++ b/src/vite-frontend/src/views/TheLogin.vue @@ -58,7 +58,7 @@ export default { }) .then(response => { store.dispatch("LOGIN",response.data.user); - router.push("/"); + router.push({name:"Home"}); }) .catch(error =>{ const code = error.response.data.errors.code; diff --git a/src/vite-frontend/src/views/TheRegister.vue b/src/vite-frontend/src/views/TheRegister.vue index 4dab020..bb4b464 100644 --- a/src/vite-frontend/src/views/TheRegister.vue +++ b/src/vite-frontend/src/views/TheRegister.vue @@ -84,9 +84,11 @@ export default { user }) .then(response => { - store.dispatch("LOGIN",response.data.user); - allHideError(); - router.push("/"); + store.dispatch("LOGIN",response.data.user) + .then(()=>{ + allHideError(); + router.push({name: "Home"}); + }); }) .catch(error =>{ const code = error.response.data.errors.code; diff --git a/src/vite-frontend/src/views/TheSetting.vue b/src/vite-frontend/src/views/TheSetting.vue index a685d9c..6e950d5 100644 --- a/src/vite-frontend/src/views/TheSetting.vue +++ b/src/vite-frontend/src/views/TheSetting.vue @@ -30,6 +30,10 @@ +
+ @@ -84,6 +88,12 @@ export default { }) } + const logout = () =>{ + store.dispatch("LOGOUT").then(()=>{ + router.push({name: "Home"}); + }) + } + onMounted(() => { axios.get(url+'/api/user',{ @@ -100,7 +110,7 @@ export default { //TODO 예외처리 }) }) - return {user, password, url, token, getUser, updateUser}; + return {user, password, url, token, getUser, updateUser, logout}; } }