diff --git a/src/components/BaseComponents/NavBar.vue b/src/components/BaseComponents/NavBar.vue index ea5b6c44b863d4bf852566cd01305b02e271fa26..6bb477581683e7e6969e67df1db7651f65b494fb 100644 --- a/src/components/BaseComponents/NavBar.vue +++ b/src/components/BaseComponents/NavBar.vue @@ -36,7 +36,7 @@ :to="toBudget()" exact-active-class="active-nav" @click="toggleDropdown"> - <img src="@/assets/icons/budget.svg">Budjsett + <img src="@/assets/icons/budget.svg">Budsjett </router-link> </li> <li class="nav-item"> @@ -119,7 +119,7 @@ <img src="@/assets/icons/feedback.svg">Tilbakemelding </router-link> </li> - <li> + <li v-if="useUserInfoStore().role === 'ADMIN'"> <router-link data-cy="admin" class="dropdown-item dropdown-username-link" :to="toAdmin()" diff --git a/src/components/Configuration/ConfigurationParent.vue b/src/components/Configuration/ConfigurationParent.vue index 4d01b6193fb46d9e5d684a6de71d587f9c6d6895..0c3f338d6e919e169c33f6d8c0cf314b52efba95 100644 --- a/src/components/Configuration/ConfigurationParent.vue +++ b/src/components/Configuration/ConfigurationParent.vue @@ -7,7 +7,7 @@ import { useRoute } from 'vue-router' const router = useRouter() // The configuration steps with path and order value. -const configurationSteps = {'/bank-account': 1,'/commitment': 2, '/experience': 3, '/suitable-challenges': 4, '/first-saving-goal': 5, '/finished-configuration': 6} +const configurationSteps = {'/bank-account': 1,'/commitment': 2, '/suitable-challenges': 3, '/first-saving-goal': 4, '/finished-configuration': 5} const length = Object.keys(configurationSteps).length let percentage = ref(1/length); diff --git a/src/components/Configuration/ConfigurationSteps/BankAccount.vue b/src/components/Configuration/ConfigurationSteps/BankAccount.vue index 7c25f6068f7067ba91f3504d4d26aa8fbcb535f3..9ffde7b48fd03b8dca31c1e69b29f5decb9999ac 100644 --- a/src/components/Configuration/ConfigurationSteps/BankAccount.vue +++ b/src/components/Configuration/ConfigurationSteps/BankAccount.vue @@ -5,7 +5,6 @@ import { ref } from 'vue' import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue' import { useConfigurationStore } from '@/stores/ConfigurationStore' import { AccountControllerService } from '@/api' -import handleUnknownError from '@/components/Exceptions/unkownErrorHandler' const router = useRouter(); diff --git a/src/components/Configuration/ConfigurationSteps/ConfigurationCommitment.vue b/src/components/Configuration/ConfigurationSteps/ConfigurationCommitment.vue index 836ec18e28f118e65a09a76e803cdac2317d5700..82ed3be4fb17a7df3b1b9205d8f2abdf4e2fb453 100644 --- a/src/components/Configuration/ConfigurationSteps/ConfigurationCommitment.vue +++ b/src/components/Configuration/ConfigurationSteps/ConfigurationCommitment.vue @@ -31,7 +31,7 @@ const handleSubmit = () => { else if (mediumRef.value.checked) choice = 'SOME' else if (highRef.value.checked) choice = 'MUCH' useConfigurationStore().setCommitment(choice) - router.push('/experience') + router.push('/suitable-challenges') } else { errorMsg.value = 'Please select an option before continuing' diff --git a/src/stores/ConfigurationStore.ts b/src/stores/ConfigurationStore.ts index e0fd57fe25b56583f75c895407209fcf6dd0417d..38412c6715ce2042244aaf2d7f129d0a91999a98 100644 --- a/src/stores/ConfigurationStore.ts +++ b/src/stores/ConfigurationStore.ts @@ -12,7 +12,7 @@ export const useConfigurationStore = defineStore('ConfigurationStore', { /** The user's commitment. */ commitment: '', /** The user's experience. */ - experience: '', + experience: 'NONE', /** The challenges the user is facing. */ challenges: [] as Array<string>, }),