Merge branch 'main' into 'feat/redesign-roadmap'

# Conflicts:
#   src/api/services/GoalService.ts
#   src/api/services/UserService.ts

src/components/Budget/ExpenseBox.vue

@@ -50,11 +50,11 @@ const emitEditEvent = () => {
     <p>{{amount}} kr</p>
     <button class="btn btn-success" data-bs-toggle="collapse" :data-bs-target="'#' + index" aria-expanded="false" aria-controls="editBudgetCollapse">
       <img src="../../assets/icons/edit-button.svg" alt="Edit" height="18" width="18">
-      Edit
+      Endre
     </button>
     <button class="btn btn-danger" @click="emitDeleteEvent">
       <img src="../../assets/icons/trash-can.svg" alt="Edit" height="18" width="18">
-      Delete
+      Slett
     </button>
   </div>
 
@@ -62,10 +62,10 @@ const emitEditEvent = () => {
     <div class="container collapse-container">
       <form @submit.prevent="emitEditEvent">
         <div class="input-group">
-          <span class="input-group-text">Edit expense {{ index+1 }} </span>
-          <input type="text" class="form-control" placeholder="Expense description" required v-model="editDescription">
+          <span class="input-group-text">Endre utgift {{ index+1 }} </span>
+          <input type="text" class="form-control" placeholder="Utgift beskrivelse" required v-model="editDescription">
           <input type="number" min="0" class="form-control" placeholder="Amount (kr)" required v-model="editAmount">
-          <button type="submit" class="btn btn-primary" data-bs-toggle="collapse" :data-bs-target="'#' + index">Confirm</button>
+          <button type="submit" class="btn btn-primary" data-bs-toggle="collapse" :data-bs-target="'#' + index">Bekreft</button>
         </div>
       </form>
     </div>

src/components/Budget/Modal/ConfirmDeleteModal.vue

 <script setup lang="ts">
-import { UserService } from '@/api'
+import { BudgetService } from '@/api'
 
 const emit = defineEmits(['errorEvent', 'deletedEvent'])
 const props = defineProps({
@@ -22,7 +22,7 @@ const props = defineProps({
  */
 const deleteBudget = async () => {
   try {
-    await UserService.deleteBudget({budgetId: props.budgetId})
+    await BudgetService.deleteBudget({budgetId: props.budgetId})
     emit('deletedEvent')
   } catch (error) {
     emit('errorEvent', error)
@@ -36,12 +36,12 @@ const deleteBudget = async () => {
     <div class="modal-dialog modal-dialog-centered">
       <div class="modal-content">
         <div class="modal-header">
-          <h3>Are you sure you want to delete this budget <i>{{ budgetTitle }}?</i></h3>
+          <h3>Er du sikker på at du vil slette dette budgettet <i>{{ budgetTitle }}?</i></h3>
           <button class="btn btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
-          <button class="btn btn-primary" data-bs-dismiss="modal" @click="deleteBudget">Yes</button>
-          <button class="btn btn-primary" data-bs-dismiss="modal">No</button>
+          <button class="btn btn-primary" data-bs-dismiss="modal" @click="deleteBudget">Ja</button>
+          <button class="btn btn-primary" data-bs-dismiss="modal">Nei</button>
         </div>
       </div>
     </div>

src/components/Configuration/Configuration.vue

@@ -7,7 +7,7 @@ import { useRoute } from 'vue-router'
 const router = useRouter()
 
 // The configuration steps with path and order value.
-const configurationSteps = {'/commitment': 1, '/experience': 2, '/suitable-challenges': 3}
+const configurationSteps = {'/commitment': 1, '/experience': 2, '/suitable-challenges': 3, '/first-saving-goal': 4, '/finished-configuration': 5}
 const length = Object.keys(configurationSteps).length
 let percentage = ref(1/length);