refactor: Button1 to BaseButton

src/components/Buttons/__tests__/Button1.spec.ts → src/components/BaseComponents/Buttons/__tests__/BaseButton.spec.ts

 import { describe, it, expect } from 'vitest'
 import { mount } from '@vue/test-utils'
-import ButtonComponent from '@/components/Buttons/Button1.vue'
+import ButtonComponent from '../BaseButton.vue'
 
 describe('ButtonComponent', () => {
   it('displays the passed buttonText prop', () => {

src/components/Configuration/ConfigurationSteps/Commitment.vue

 <script setup lang="ts">
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import { useRouter } from 'vue-router'
 import { ref } from 'vue'
 import { useConfigurationStore } from '@/stores/ConfigurationStore'
@@ -59,7 +59,7 @@ const handleSubmit = () => {
     </form>
     <p class="text-danger">{{ errorMsg }}</p>
     <div class="confirm-button-container">
-      <button1 id="confirmButton" @click="handleSubmit" button-text="Fortsett"></button1>
+      <BaseButton id="confirmButton" @click="handleSubmit" button-text="Fortsett"></BaseButton>
     </div>
   </div>
 </template>

src/components/Configuration/ConfigurationSteps/Experience.vue

 <script setup lang="ts">
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import { useRouter } from 'vue-router'
 import { ref } from 'vue'
 import { useConfigurationStore } from '@/stores/ConfigurationStore'
@@ -61,7 +61,7 @@ const handleSubmit = () => {
     </form>
     <p class="text-danger">{{ errorMsg }}</p>
     <div class="confirm-button-container">
-      <button1 id="confirmButton" @click="handleSubmit" button-text="Continue"/>
+      <BaseButton id="confirmButton" @click="handleSubmit" button-text="Continue"/>
     </div>
 </div>
 </template>

src/components/Configuration/ConfigurationSteps/FirstSavingGoal.vue

 <script setup lang="ts">
-import BaseInput from '@/components/InputFields/BaseInput.vue'
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue'
 import { ref } from 'vue'
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import { useRouter } from 'vue-router'
 import {type CreateGoalDTO, GoalService} from "@/api";
 
@@ -111,7 +111,7 @@ const handleSumInputEvent = (newSum: number) => {
     </form>
 
     <div class="confirm-button-container">
-      <button1 id="confirmButton" @click="handleSubmit" button-text="Continue"></button1>
+      <BaseButton id="confirmButton" @click="handleSubmit" button-text="Continue"></BaseButton>
     </div>
     <div style="color: red">
       {{ errorMessage }}

src/components/Configuration/ConfigurationSteps/SuitableChallenges.vue

 <script setup lang="ts">
 import { useRouter } from 'vue-router'
 import ChallangeCheckBox from '@/components/Configuration/ChallangeCheckBox.vue'
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import { ref } from 'vue'
 import { useConfigurationStore } from '@/stores/ConfigurationStore'
 import { useUserInfoStore } from '@/stores/UserStore'
@@ -117,7 +117,7 @@ const handleSubmit = () => {
     <p class="text-danger">{{ errorMsg }}</p>
 
     <div class="confirm-button-container">
-      <button1 id="confirmButton" @click="handleSubmit" button-text="Continue"/>
+      <BaseButton id="confirmButton" @click="handleSubmit" button-text="Continue"/>
     </div>
   </div>
 </template>

src/components/Login/LoginForm.vue

 <script setup lang="ts">
-import BaseInput from '@/components/InputFields/BaseInput.vue'
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import { ref } from 'vue'
 import { useUserInfoStore } from '@/stores/UserStore';
 import { AuthenticationService, OpenAPI, type LoginRequest } from '@/api';
@@ -111,7 +111,7 @@ const handleSubmit = async () => {
       </div>
 
       <p class="text-danger" data-cy="error">{{ errorMsg }}</p>
-      <button1 id="confirmButton" type="submit" @click="handleSubmit" :disabled="isSubmitting" button-text="Logg inn"></button1>
+      <BaseButton id="confirmButton" type="submit" @click="handleSubmit" :disabled="isSubmitting" button-text="Logg inn"></BaseButton>
 
       <a class="btn bankid-btn" href="https://preprod.signicat.com/oidc/authorize?response_type=code&scope=openid+profile+signicat.national_id&client_id=demo-preprod&redirect_uri=http%3A%2F%2Flocalhost%3A8080%2Fredirect&acr_values=urn:signicat:oidc:method:nbid&state=nbid:auth_demo_bankid:123456789">
         <img src="/src/assets/bankid.svg" width="26" height="26">

src/components/SignUp/SignUpForm.vue

 <script setup lang="ts">
-import BaseInput from '@/components/InputFields/BaseInput.vue'
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { AuthenticationService } from '@/api'
@@ -129,7 +129,7 @@ const handleSubmit = async () => {
       </div>
       <p class="text-danger">{{ errorMsg }}</p>
       <p v-if="!samePasswords" class="text-danger">Passordene er ikke like</p>
-      <button1 id="confirmButton" @click="handleSubmit" :disabled="isSubmitting" button-text="Registrer deg"></button1>
+      <BaseButton id="confirmButton" @click="handleSubmit" :disabled="isSubmitting" button-text="Registrer deg"></BaseButton>
       <LoginLink/>
     </form>
   </div>

src/views/Authentication/ChangePasswordView.vue

@@ -31,7 +31,7 @@
 
             <p class="text-danger" data-cy="error">{{ errorMsg }}</p>
             <p v-if="!samePasswords" class="text-danger">Passordene er ikke like</p>
-            <button1 id="confirmButton" type="submit" @click="handleSubmit" :disabled="isSubmitting" button-text="Oppdater passordet"></button1>
+            <BaseButton id="confirmButton" type="submit" @click="handleSubmit" :disabled="isSubmitting" button-text="Oppdater passordet"></BaseButton>
 
             <SignUpLink/>
           </form>
@@ -75,11 +75,10 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-import axios from 'axios';
 import { UserService } from '@/api';
 import SignUpLink from '@/components/SignUp/SignUpLink.vue'
-import Button1 from '@/components/Buttons/Button1.vue'
-import BaseInput from '@/components/InputFields/BaseInput.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue'
 import handleUnknownError from '@/components/Exceptions/unkownErrorHandler'
 
 const router = useRouter();

src/views/Authentication/ForgottenPasswordView.vue

@@ -16,7 +16,7 @@
         <div v-else class="text-success">
           {{ confirmationMessage }}
         </div>
-        <button1 id="confirmButton" type="submit" :disabled="isSubmitting" button-text="Send e-post"></button1>
+        <BaseButton id="confirmButton" type="submit" :disabled="isSubmitting" button-text="Send e-post"></BaseButton>
 
         <div class="login-link">
           <Router-Link to="/login" class="small">Gå tilbake</Router-Link>
@@ -29,8 +29,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { UserService } from '@/api';
-import BaseInput from '@/components/InputFields/BaseInput.vue'
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 
 const formRef = ref()
 const form = formRef.value;

src/views/Budget/BudgetOverview.vue

 <script setup lang="ts">
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import BudgetBox from '@/components/Budget/BudgetBox.vue'
 import { onMounted, ref } from 'vue'
 import handleUnknownError from '@/components/Exceptions/unkownErrorHandler'
@@ -72,12 +72,12 @@ const goToBudget = (id: number) => {
 <template>
   <div class="container">
     <h1 class="text-center">Dine Budsjetter</h1>
-    <button1 id="createBudgetButton" button-text="Opprett nytt budsjett" class="btn btn-primary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample"/>
+    <BaseButton id="createBudgetButton" button-text="Opprett nytt budsjett" class="btn btn-primary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample"/>
     <div class="collapse" id="collapseExample">
       <div class="container collapse-container">
         <div class="input-group">
           <input id="collapseInput" class="form-control" type="text" placeholder="Skriv inn navn på budsjettet" v-model="budgetNameInput">
-          <button1 id="collapseButton" button-text="Opprett" data-bs-dismiss="modal" @click="createNewBudget"/>
+          <BaseButton id="collapseButton" button-text="Opprett" data-bs-dismiss="modal" @click="createNewBudget"/>
         </div>
       </div>
     </div>

src/views/Budget/BudgetView.vue

 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import Button1 from '@/components/Buttons/Button1.vue'
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue'
 import ExpenseBox from '@/components/Budget/ExpenseBox.vue'
 import { useRouter } from 'vue-router'
 import { useBudgetStore } from '@/stores/BudgetStore'
@@ -225,8 +225,8 @@ const importBudget = async (budgetId: number) => {
     <h1 class="text-center">{{ title }}</h1>
 
     <div class="button-container">
-      <button1 id="goBack" @click="router.push('/budsjett-oversikt')" button-text="Gå tilbake"/>
-      <button1 id="optionButton" button-text="Alternativer" data-bs-toggle="modal" data-bs-target="#modal"/>
+      <BaseButton id="goBack" @click="router.push('/budsjett-oversikt')" button-text="Gå tilbake"/>
+      <BaseButton id="optionButton" button-text="Alternativer" data-bs-toggle="modal" data-bs-target="#modal"/>
     </div>
 
     <p class="text-danger">{{ errorMsg }}</p>
@@ -246,7 +246,7 @@ const importBudget = async (budgetId: number) => {
                 <form ref="renameFormRef" @submit.prevent="updateBudget(budget, budgetTitle)">
                   <div class="input-group">
                     <input id="collapseInput" class="col-5 form-control" type="text" required minlength="1" placeholder="Skriv inn nytt navn på budsjettet" v-model="budgetTitle">
-                    <button1 id="collapseButton" type="submit" button-text="Bekreft" data-bs-dismiss="modal"/>
+                    <BaseButton id="collapseButton" type="submit" button-text="Bekreft" data-bs-dismiss="modal"/>
                   </div>
                 </form>
               </div>

src/views/FeedbackView.vue

@@ -9,7 +9,7 @@
         <label for="feedback">Din tilbakemelding:</label>
         <textarea v-model="message" placeholder="Write here" rows="5" name="comment[text]" id="comment_text" cols="33"
           required></textarea>
-        <Button1 button-text="Send" @click="submitForm">Send inn</Button1>
+        <BaseButton button-text="Send" @click="submitForm">Send inn</BaseButton>
         <p v-if="submissionStatus">{{ submissionStatus }}</p>
       </form>
     </div>
@@ -19,8 +19,8 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import BaseInput from '@/components/InputFields/BaseInput.vue';
-import Button1 from '@/components/Buttons/Button1.vue';
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue';
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue';
 
 const email = ref("");
 const message = ref("");

src/views/NotFoundView.vue

@@ -11,7 +11,7 @@
                         Beklager, det har oppstått en feil. Forespurt side ikke funnet!
                     </div>
                     <div class="error-actions">
-                        <Button1 data-cy="to-home" button-text="Ta meg hjem" @click="home" />
+                        <BaseButton data-cy="to-home" button-text="Ta meg hjem" @click="home" />
                     </div>
                 </div>
             </div>
@@ -22,7 +22,7 @@
 
 <script setup lang="ts">
 import { useRouter } from 'vue-router';
-import Button1 from '@/components/Buttons/Button1.vue';
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue';
 
 const router = useRouter();
 

src/views/UnauthorizedView.vue

@@ -8,7 +8,7 @@
                 <div class="col-md-10">
                     <h3>OOPS!!! Beklager...</h3>
                     <p>Beklager, din tilgang er nektet av sikkerhetsgrunner på serveren vår og også våre sensitive data.<br/>Vennligst gå tilbake til startsiden for å fortsette å surfe.</p>
-                    <Button1 :button-text="'Ta meg hjem'" @click="home" />
+                    <BaseButton :button-text="'Ta meg hjem'" @click="home" />
                 </div>
             </div>
         </div>
@@ -18,7 +18,7 @@
 
 <script setup lang="ts">
 import { useRouter } from 'vue-router';
-import Button1 from '@/components/Buttons/Button1.vue';
+import BaseButton from '@/components/BaseComponents/Buttons/BaseButton.vue';
 
 const router = useRouter();