Merge branch 'enhancement/project-cleanup' into 'dev'

Minor fixes

See merge request !53

src/components/ModalComponent.vue

@@ -9,8 +9,11 @@
 
             <slot />
 
-            <div class="buttons flex flex-col justify-center items-center gap-3 mt-3 w-full">
+            <div class="buttons flex flex-row justify-center items-center gap-3 mt-3 w-full">
                 <slot name="buttons"></slot>
+                <button v-if="closeButton" class="button primary" @click="$emit('close')">
+                    Lukk
+                </button>
             </div>
         </div>
     </div>
@@ -26,6 +29,11 @@ defineProps({
         type: Boolean,
         default: true,
         required: false
+    },
+    closeButton: {
+        type: Boolean,
+        default: false,
+        required: false
     }
 })
 

src/types/profile.ts

@@ -5,6 +5,7 @@ export interface Profile {
     email: string
     username: string
     password?: string
+    savedAmount?: number
     spendingAccount: {
         accNumber?: number
         accountType?: string

src/views/ManageChallengeView.vue

@@ -242,12 +242,8 @@ const confirmCancel = () => {
                 :isModalOpen="errorModalOpen"
                 @close="errorModalOpen = false"
             >
-                <template v-slot:input>
-                    <div class="flex justify-center items-center">
-                        <div class="flex flex-col gap-5">
-                            <button class="primary" @click="errorModalOpen = false">Lukk</button>
-                        </div>
-                    </div>
+                <template v-slot:buttons>
+                    <button class="primary" @click="errorModalOpen = false">Lukk</button>
                 </template>
             </ModalComponent>
 
@@ -257,15 +253,9 @@ const confirmCancel = () => {
                 :isModalOpen="confirmModalOpen"
                 @close="confirmModalOpen = false"
             >
-                <template v-slot:input>
-                    <div class="flex justify-center items-center">
-                        <div class="flex flex-col gap-5">
-                            <button class="primary" @click="confirmCancel">Bekreft</button>
-                            <button class="primary danger" @click="confirmModalOpen = false">
-                                Avbryt
-                            </button>
-                        </div>
-                    </div>
+                <template v-slot:buttons>
+                    <button class="primary" @click="confirmCancel">Bekreft</button>
+                    <button class="primary danger" @click="confirmModalOpen = false">Avbryt</button>
                 </template>
             </ModalComponent>
         </div>

src/views/ManageGoalView.vue

@@ -244,12 +244,8 @@ const confirmCancel = () => {
                 :isModalOpen="errorModalOpen"
                 @close="errorModalOpen = false"
             >
-                <template v-slot:input>
-                    <div class="flex justify-center items-center">
-                        <div class="flex flex-col gap-5">
-                            <button class="primary" @click="errorModalOpen = false">Lukk</button>
-                        </div>
-                    </div>
+                <template v-slot:buttons>
+                    <button class="primary" @click="errorModalOpen = false">Lukk</button>
                 </template>
             </ModalComponent>
 
@@ -259,15 +255,9 @@ const confirmCancel = () => {
                 :isModalOpen="confirmModalOpen"
                 @close="confirmModalOpen = false"
             >
-                <template v-slot:input>
-                    <div class="flex justify-center items-center">
-                        <div class="flex flex-col gap-5">
-                            <button class="primary" @click="confirmCancel">Bekreft</button>
-                            <button class="primary danger" @click="confirmModalOpen = false">
-                                Avbryt
-                            </button>
-                        </div>
-                    </div>
+                <template v-slot:buttons>
+                    <button class="primary" @click="confirmCancel">Bekreft</button>
+                    <button class="primary danger" @click="confirmModalOpen = false">Avbryt</button>
                 </template>
             </ModalComponent>
         </div>

src/views/ViewProfileView.vue

@@ -77,7 +77,10 @@ const openSpare = () => {
                     </div>
                 </div>
 
-                <h3 class="font-bold" v-text="'Du har spart ' + '< totalSaved >' + 'kr'" />
+                <h3
+                    class="font-bold"
+                    v-text="'Du har totalt spart ' + profile?.savedAmount + 'kr'"
+                />
 
                 <CardTemplate>
                     <div class="bg-red-100">