diff --git a/src/components/FormRegister.vue b/src/components/FormRegister.vue
index 9ec933ae7a7969273c9f06545ddc7de1ff5b4c83..5d8e75434066ff02c4e0db27d7fd308b722435cb 100644
--- a/src/components/FormRegister.vue
+++ b/src/components/FormRegister.vue
@@ -12,8 +12,7 @@ const confirm = ref<string>('')
const showPassword = ref<boolean>(false)
const errorMessage = ref<string>('')
-const passwordValidations = ref<string[]>([]);
-
+const passwordValidations = ref<string[]>([])
const userStore = useUserStore()
@@ -45,37 +44,37 @@ const toggleShowPassword = () => {
}
const validatePassword = () => {
- const messages = [];
- const lengthValid = password.value.length >= 8 && password.value.length <= 30;
- const numberValid = /[0-9]/.test(password.value);
- const lowercaseValid = /[a-zæøå]/.test(password.value);
- const uppercaseValid = /[ÆØÅA-Z]/.test(password.value);
- const specialCharacterValid = /[@#$%^&+=!]/.test(password.value);
- const noSpacesValid = !/\s/.test(password.value);
+ const messages = []
+ const lengthValid = password.value.length >= 8 && password.value.length <= 30
+ const numberValid = /[0-9]/.test(password.value)
+ const lowercaseValid = /[a-zæøå]/.test(password.value)
+ const uppercaseValid = /[ÆØÅA-Z]/.test(password.value)
+ const specialCharacterValid = /[@#$%^&+=!]/.test(password.value)
+ const noSpacesValid = !/\s/.test(password.value)
- if (!lengthValid) {
- messages.push('Må være mellom 8 og 30 karakterer. ');
- }
- if (!numberValid) {
- messages.push('MÃ¥ inneholde minst ett tall. ');
- }
- if (!lowercaseValid) {
- messages.push('Må inneholde minst én liten bokstav. ');
- }
- if (!uppercaseValid) {
- messages.push('Må inneholde minst én stor bokstav. ');
- }
- if (!specialCharacterValid) {
- messages.push('MÃ¥ inneholde minst ett spesialtegn (@#$%^&+=!). ');
- }
- if (!noSpacesValid) {
- messages.push('MÃ¥ ikke inneholde mellomrom. ');
- }
+ if (!lengthValid) {
+ messages.push('Må være mellom 8 og 30 karakterer. ')
+ }
+ if (!numberValid) {
+ messages.push('MÃ¥ inneholde minst ett tall. ')
+ }
+ if (!lowercaseValid) {
+ messages.push('Må inneholde minst én liten bokstav. ')
+ }
+ if (!uppercaseValid) {
+ messages.push('Må inneholde minst én stor bokstav. ')
+ }
+ if (!specialCharacterValid) {
+ messages.push('MÃ¥ inneholde minst ett spesialtegn (@#$%^&+=!). ')
+ }
+ if (!noSpacesValid) {
+ messages.push('MÃ¥ ikke inneholde mellomrom. ')
+ }
- passwordValidations.value = messages;
-};
+ passwordValidations.value = messages
+}
-watch(password, validatePassword);
+watch(password, validatePassword)
watch(
() => userStore.errorMessage,
@@ -180,11 +179,11 @@ watch(
placeholder="Bekreft passord"
type="password"
/>
- <div class="ml-4">
- <p class="text-sm">
- <span v-for="message in passwordValidations" :key="message">{{ message }}</span>
- </p>
- </div>
+ <div class="ml-4">
+ <p class="text-sm">
+ <span v-for="message in passwordValidations" :key="message">{{ message }}</span>
+ </p>
+ </div>
</div>
<div class="flex flex-row gap-5">
<button
diff --git a/src/components/__tests__/ButtonDisplayStreakTest.spec.ts b/src/components/__tests__/ButtonDisplayStreakTest.spec.ts
index 34083de7f865ef18a80a2e3a8a7b9f4b1abb57d7..e7e3122b70704441ffe13262b6ff945adf61c29c 100644
--- a/src/components/__tests__/ButtonDisplayStreakTest.spec.ts
+++ b/src/components/__tests__/ButtonDisplayStreakTest.spec.ts
@@ -1,20 +1,20 @@
-import { describe, expect, it, beforeEach } from 'vitest';
-import { mount } from '@vue/test-utils';
-import { createPinia, setActivePinia } from 'pinia';
-import ButtonComponent from '@/components/ButtonDisplayStreak.vue';
+import { describe, expect, it, beforeEach } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import ButtonComponent from '@/components/ButtonDisplayStreak.vue'
describe('ButtonComponent', () => {
beforeEach(() => {
- setActivePinia(createPinia());
- });
+ setActivePinia(createPinia())
+ })
it('renders correctly', () => {
const wrapper = mount(ButtonComponent, {
props: {
buttonText: 'Click me',
- type: 'goal',
- },
- });
- expect(wrapper.exists()).toBe(true);
- });
-});
+ type: 'goal'
+ }
+ })
+ expect(wrapper.exists()).toBe(true)
+ })
+})
diff --git a/src/views/ConfigAccountNumberView.vue b/src/views/ConfigAccountNumberView.vue
index 3102f5112df4b323097bb8ce7029abc5fbbe1994..a869677084d0673fa9c63044977a93682538cfe3 100644
--- a/src/views/ConfigAccountNumberView.vue
+++ b/src/views/ConfigAccountNumberView.vue
@@ -6,8 +6,8 @@
Legg til kontonummer for sparekonto og brukskonto
</h1>
<div class="absolute bottom-0 md:bottom-40 left-0 w-40 h-40 md:w-52 md:h-52 ml-4">
- <p class="text-sm font-bold mb-3 animate-bounce">Trykk pÃ¥ meg for hjelp â—ï¸</p>
- <SpareComponent
+ <p class="text-sm font-bold mb-3 animate-bounce">Trykk pÃ¥ meg for hjelp â—ï¸</p>
+ <SpareComponent
:speech="[
'Her skriver du inn kontonummer for sparekonto og brukskonto. 🪩',
'Sparekonto er kontoen du vil legge alle dine oppsparte penger på!',
@@ -49,8 +49,8 @@
/>
</div>
</div>
- <p class="mt-10">Husk at du kan endre dette senere!</p>
- <div class="absolute bottom-36 right-2">
+ <p class="mt-10">Husk at du kan endre dette senere!</p>
+ <div class="absolute bottom-36 right-2">
<ContinueButtonComponent
@click="onButtonClick"
:disabled="!isFormValid"
diff --git a/src/views/ConfigFamiliarWithSavingsView.vue b/src/views/ConfigFamiliarWithSavingsView.vue
index 817e51b2996f978bd950e7bed8f022cca96b33df..5153c3ac65cedf57806206624ed5a8abee92fa02 100644
--- a/src/views/ConfigFamiliarWithSavingsView.vue
+++ b/src/views/ConfigFamiliarWithSavingsView.vue
@@ -1,10 +1,14 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen px-4 text-center">
- <h1 class="mb-8 md:mb-16 mt-2 text-2xl font-bold sm:text-4xl">
+ <h1 class="mb-8 md:mb-16 mt-2 text-2xl font-bold sm:text-4xl">
Hvor kjent er du med sparing fra før?
</h1>
- <div class="absolute bottom-4 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4">
- <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">Trykk pÃ¥ meg for hjelp â—ï¸</p>
+ <div
+ class="absolute bottom-4 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4"
+ >
+ <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">
+ Trykk pÃ¥ meg for hjelp â—ï¸
+ </p>
<SpareComponent
:speech="[
'Her kan du fylle inn hvor kjent du er med sparing fra før, slik at vi kan hjelpe deg på best mulig måte! 💡',
@@ -15,7 +19,7 @@
:imageDirection="'right'"
></SpareComponent>
</div>
- <div class="grid grid-cols-1 gap-8 mb-2 sm:gap-10 sm:mb-12 md:grid-cols-3">
+ <div class="grid grid-cols-1 gap-8 mb-2 sm:gap-10 sm:mb-12 md:grid-cols-3">
<div
:class="{
'border-[var(--green)] border-4': selectedOption === 'litt',
@@ -50,7 +54,7 @@
<p class="mt-2 text-lg font-bold">Godt kjent</p>
</div>
</div>
- <p class="mb-4 md:mb-10">Husk at du kan endre dette senere!</p>
+ <p class="mb-4 md:mb-10">Husk at du kan endre dette senere!</p>
<ContinueButtonComponent
:disabled="selectedOption === null"
@click="onButtonClick"
diff --git a/src/views/ConfigHabitChangeView.vue b/src/views/ConfigHabitChangeView.vue
index d0a5bb6a36a13c6d41b5b5ad71f11b0968331082..937398bdc6f082b3b27344d241dc940545583432 100644
--- a/src/views/ConfigHabitChangeView.vue
+++ b/src/views/ConfigHabitChangeView.vue
@@ -1,10 +1,14 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen px-4 text-center">
- <h1 class="mb-8 md:mb-16 mt-2 text-2xl font-bold sm:text-4xl">
+ <h1 class="mb-8 md:mb-16 mt-2 text-2xl font-bold sm:text-4xl">
Hvor store vaneedringer er du villig til å gjøre?
</h1>
- <div class="absolute bottom-4 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4">
- <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">Trykk pÃ¥ meg for hjelp â—ï¸</p>
+ <div
+ class="absolute bottom-4 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4"
+ >
+ <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">
+ Trykk pÃ¥ meg for hjelp â—ï¸
+ </p>
<SpareComponent
:speech="[
'Her kan du velge hvor mye innsats du er villig til å legge inn for å endre vanene dine! 📚',
@@ -50,7 +54,7 @@
<p class="mt-2 text-md sm:text-lg font-bold">Store</p>
</div>
</div>
- <p class="mb-4 md:mb-10">Husk at du kan endre dette senere!</p>
+ <p class="mb-4 md:mb-10">Husk at du kan endre dette senere!</p>
<ContinueButtonComponent
:disabled="selectedOption === null"
@click="onButtonClick"
diff --git a/src/views/ConfigSpendingItemsAmountView.vue b/src/views/ConfigSpendingItemsAmountView.vue
index 15a28c589e8cf80cde8478fa41acb1e22736a0b2..0b1e3e4e9280b21e52fba9d066e51a46211d195d 100644
--- a/src/views/ConfigSpendingItemsAmountView.vue
+++ b/src/views/ConfigSpendingItemsAmountView.vue
@@ -1,11 +1,15 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen px-4 text-center relative">
- <h1 class="mb-2 text-2xl font-bold sm:text-4xl">
- Hvor mye bruker du per kjøp på ...
- </h1>
- <p class="text-sm mb-8 md:mb-10">Her kan du skrive inn hvor mye du bruker per kjøp på ulike kategorier</p>
- <div class="md:absolute fixed bottom-3 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4">
- <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">Trykk pÃ¥ meg for hjelp â—ï¸</p>
+ <h1 class="mb-2 text-2xl font-bold sm:text-4xl">Hvor mye bruker du per kjøp på ...</h1>
+ <p class="text-sm mb-8 md:mb-10">
+ Her kan du skrive inn hvor mye du bruker per kjøp på ulike kategorier
+ </p>
+ <div
+ class="md:absolute fixed bottom-3 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4"
+ >
+ <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">
+ Trykk pÃ¥ meg for hjelp â—ï¸
+ </p>
<SpareComponent
:speech="[
'Her kan du skrive inn hvor mye penger du bruker per kjøp pÃ¥ ulike ting. ðŸ”',
@@ -78,7 +82,7 @@
</div>
</div>
</div>
- <p class="mt-10">Husk at du kan endre dette senere!</p>
+ <p class="mt-10">Husk at du kan endre dette senere!</p>
<div class="w-full text-right">
<ContinueButtonComponent
@click="onButtonClick"
diff --git a/src/views/ConfigSpendingItemsTotalAmountView.vue b/src/views/ConfigSpendingItemsTotalAmountView.vue
index 16171fae13b9c1c4cce3aa459590a89fd4d1a3b2..d3f0c9ecacfab72ab96a755663a121f6ff4ce575 100644
--- a/src/views/ConfigSpendingItemsTotalAmountView.vue
+++ b/src/views/ConfigSpendingItemsTotalAmountView.vue
@@ -1,11 +1,11 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen px-4 text-center relative">
- <h1 class="mb-2 text-2xl font-bold sm:text-4xl">
- Hvor mye bruker du per uke på ...
- </h1>
- <p class="text-sm mb-8 md:mb-10">Her kan du skrive inn hvor mye du bruker per uke på ulike kategorier</p>
+ <h1 class="mb-2 text-2xl font-bold sm:text-4xl">Hvor mye bruker du per uke på ...</h1>
+ <p class="text-sm mb-8 md:mb-10">
+ Her kan du skrive inn hvor mye du bruker per uke på ulike kategorier
+ </p>
<div class="absolute bottom-0 md:bottom-40 left-0 w-40 h-40 md:w-52 md:h-52 ml-4">
- <p class="text-sm font-bold mb-3 animate-bounce">Trykk pÃ¥ meg for hjelp â—ï¸</p>
+ <p class="text-sm font-bold mb-3 animate-bounce">Trykk pÃ¥ meg for hjelp â—ï¸</p>
<SpareComponent
:speech="[
'Her skal du skrive inn hvor mye du bruker per uke pÃ¥ ulike kategorier. 🗓ï¸',
@@ -78,7 +78,7 @@
</div>
</div>
</div>
- <p class="mt-10">Husk at du kan endre dette senere!</p>
+ <p class="mt-10">Husk at du kan endre dette senere!</p>
<div class="w-full text-right">
<ContinueButtonComponent
@click="onButtonClick"
diff --git a/src/views/ConfigSpendingItemsView.vue b/src/views/ConfigSpendingItemsView.vue
index 10d6948009f20a5777f70e4db255ea5c80cfd04f..f95b2915ae3600577ceb4a48eeab3e6cf8c2769f 100644
--- a/src/views/ConfigSpendingItemsView.vue
+++ b/src/views/ConfigSpendingItemsView.vue
@@ -1,9 +1,18 @@
<template>
<div class="flex flex-col items-center justify-center min-h-screen text-center">
- <h1 class="mb-3 text-2xl font-bold sm:text-4xl mt-0 md:mt-7">Hva bruker du mye penger på?</h1>
- <p class="text-sm mb-8 md:mb-10">Hvis du ikke finner noe som passer, kan du skrive inn egne kategorier i "Annet ..." feltet</p>
- <div class="md:absolute fixed bottom-3 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4">
- <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">Trykk pÃ¥ meg for hjelp â—ï¸</p>
+ <h1 class="mb-3 text-2xl font-bold sm:text-4xl mt-0 md:mt-7">
+ Hva bruker du mye penger på?
+ </h1>
+ <p class="text-sm mb-8 md:mb-10">
+ Hvis du ikke finner noe som passer, kan du skrive inn egne kategorier i "Annet ..."
+ feltet
+ </p>
+ <div
+ class="md:absolute fixed bottom-3 md:bottom-40 left-2 w-28 h-28 md:w-40 md:h-40 lg:w-52 lg:h-52 ml-4"
+ >
+ <p class="md:text-sm text-xs font-bold mb-3 animate-bounce invisible sm:visible">
+ Trykk pÃ¥ meg for hjelp â—ï¸
+ </p>
<SpareComponent
:speech="[
'Her kan du velge hva du bruker mye penger på, slik at vi kan hjelpe deg med å spare penger! 💸',
@@ -68,7 +77,7 @@
</div>
</div>
</div>
- <p class="mb-1">Husk at du kan endre dette senere!</p>
+ <p class="mb-1">Husk at du kan endre dette senere!</p>
<div class="w-full text-right">
<ContinueButtonComponent
@click="onButtonClick"
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 9ed9f5db1efad7289ddd4a610a19d787e631be53..188e8fca5a7da2d9cd928c728834f8c42bfe805e 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -9,7 +9,9 @@
:imageDirection="'right'"
class="my-10 md:ml-5"
></SpareComponent>
- <div class="flex flex-col gap-2 items-center mx-auto mt-4 mb-20 md:gap-4 md:m-0 md:ml-4 w-full">
+ <div
+ class="flex flex-col gap-2 items-center mx-auto mt-4 mb-20 md:gap-4 md:m-0 md:ml-4 w-full"
+ >
<ButtonAddGoalOrChallenge :buttonText="'Legg til sparemål'" :type="'goal'" />
<ButtonAddGoalOrChallenge
:buttonText="'Legg til spareutfordring'"
diff --git a/src/views/ManageChallengeView.vue b/src/views/ManageChallengeView.vue
index 543cbd8fa03fc8cc5c382774626bce40a2e88012..5da2394990b9f3c8edb73bd6611e1a60c73012d4 100644
--- a/src/views/ManageChallengeView.vue
+++ b/src/views/ManageChallengeView.vue
@@ -315,9 +315,7 @@ const removeUploadedFile = () => {
>
<InteractiveSpare
:png-size="10"
- :speech="[
- `Trenger du hjelp? Trykk på ⓠnede i høyre hjørne!`
- ]"
+ :speech="[`Trenger du hjelp? Trykk på ⓠnede i høyre hjørne!`]"
direction="left"
/>
</div>
diff --git a/src/views/ManageGoalView.vue b/src/views/ManageGoalView.vue
index 2fbe057119d5d05989ffd3bbe4074edca6fd05bb..25e1af89597a9be1bd028ed5b2628abe5de1896d 100644
--- a/src/views/ManageGoalView.vue
+++ b/src/views/ManageGoalView.vue
@@ -337,9 +337,7 @@ onMounted(async () => {
>
<InteractiveSpare
:png-size="10"
- :speech="[
- `Trenger du hjelp? Trykk på ⓠnede i høyre hjørne!`
- ]"
+ :speech="[`Trenger du hjelp? Trykk på ⓠnede i høyre hjørne!`]"
direction="left"
/>
</div>