Merge branch 'main' of...

Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/idatt2106-2024-07/frontend into feat/profile-and-settings-improvements

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()"

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);
 

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();
 

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'

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>,
   }),