From 7a5971c8083fd37bfd7a47002337cd24049386b3 Mon Sep 17 00:00:00 2001
From: Ina <inamar@stud.ntnu.no>
Date: Fri, 3 May 2024 16:45:03 +0200
Subject: [PATCH] chore: run format check
---
src/components/FormRegister.vue | 69 +++++++++----------
.../__tests__/ButtonDisplayStreakTest.spec.ts | 24 +++----
src/views/ConfigAccountNumberView.vue | 8 +--
src/views/ConfigFamiliarWithSavingsView.vue | 14 ++--
src/views/ConfigHabitChangeView.vue | 12 ++--
src/views/ConfigSpendingItemsAmountView.vue | 18 +++--
.../ConfigSpendingItemsTotalAmountView.vue | 12 ++--
src/views/ConfigSpendingItemsView.vue | 19 +++--
src/views/HomeView.vue | 4 +-
src/views/ManageChallengeView.vue | 4 +-
src/views/ManageGoalView.vue | 4 +-
11 files changed, 103 insertions(+), 85 deletions(-)
diff --git a/src/components/FormRegister.vue b/src/components/FormRegister.vue
index 9ec933a..5d8e754 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 34083de..e7e3122 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 3102f51..a869677 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 817e51b..5153c3a 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 d0a5bb6..937398b 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 15a28c5..0b1e3e4 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 16171fa..d3f0c9e 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 10d6948..f95b291 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 9ed9f5d..188e8fc 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 543cbd8..5da2394 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 2fbe057..25e1af8 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>
--
GitLab