Skip to content
Snippets Groups Projects
Commit d7b2765b authored by Trygve Jørgensen's avatar Trygve Jørgensen
Browse files

feat(navbar): logout button works

parent 7832154c
No related branches found
No related tags found
3 merge requests!66Final merge,!24UI cleanup,!4Pipeline fix
......@@ -2,7 +2,6 @@
import { computed, ref, watch } from 'vue'
import { useUserStore } from '@/stores/userStore'
import ModalComponent from '@/components/ModalComponent.vue'
import { useRouter } from 'vue-router'
import axios from 'axios'
const username = ref<string>('')
......@@ -14,13 +13,11 @@ const resetEmail = ref<string>('')
const emailRegex = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/
const userStore = useUserStore()
const router = useRouter()
const isEmailValid = computed(() => emailRegex.test(resetEmail.value))
const submitForm = () => {
userStore.login(username.value, password.value)
router.push('/hjem')
}
const toggleShowPassword = () => {
......
......@@ -2,7 +2,6 @@
import { computed, ref, watch } from 'vue'
import { useUserStore } from '@/stores/userStore'
import ToolTip from '@/components/ToolTip.vue'
import { useRouter } from 'vue-router'
const firstname = ref<string>('')
const lastname = ref<string>('')
......@@ -15,7 +14,6 @@ const showPassword = ref<boolean>(false)
const errorMessage = ref<string>('')
const userStore = useUserStore()
const router = useRouter()
const nameRegex = /^[a-zA-Z ,.'-]+$/
const emailRegex = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/
......@@ -37,7 +35,6 @@ const isFormInvalid = computed(
const submitForm = () => {
userStore.register(firstname.value, lastname.value, email.value, username.value, password.value)
router.push('/konfigurasjonSteg1')
}
const toggleShowPassword = () => {
......
......@@ -43,18 +43,18 @@
</template>
<script setup lang="ts">
import { RouterLink, useRouter } from 'vue-router'
import { RouterLink } from 'vue-router'
import { onMounted, ref } from 'vue'
import { useUserStore } from '@/stores/userStore'
const router = useRouter()
const userStore = useUserStore()
const windowWidth = ref(window.innerWidth)
const hamburgerOpen = ref(false)
const isHamburger = ref(false)
const logout = () => {
router.push('/login')
hamburgerOpen.value = false
userStore.logout()
}
const toggleMenu = () => {
......
......@@ -38,7 +38,7 @@ export const useUserStore = defineStore('user', () => {
user.value.lastname = lastname
user.value.username = username
router.push('/')
router.push({ name: 'configurations1' })
})
.catch((error) => {
const axiosError = error as AxiosError
......@@ -60,7 +60,7 @@ export const useUserStore = defineStore('user', () => {
user.value.lastname = response.data.lastName
user.value.username = response.data.username
router.push('/')
router.push({ name: 'home' })
})
.catch((error) => {
const axiosError = error as AxiosError
......@@ -68,9 +68,18 @@ export const useUserStore = defineStore('user', () => {
})
}
const logout = () => {
console.log('Logging out')
sessionStorage.removeItem('accessToken')
localStorage.removeItem('refreshToken')
user.value = defaultUser
router.push({ name: 'login' })
}
return {
login,
register,
login,
logout,
errorMessage
}
})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment