Merge branch 'milestone-API' into 'master'

Milestone api

See merge request !57

src/components/challenge/ActiveChallengeDisplay.vue

@@ -114,14 +114,6 @@ const deleteTheChallenge = () => {
     gap: 1.0%;
   }
 
-  .expiration-date{
-    font-weight: bold;
-  }
-
-  .sum{
-    font-weight: bold;
-  }
-
   .content{
     overflow: scroll;
   }

src/components/challenge/ActiveChallengesList.vue

@@ -136,7 +136,7 @@ watch(currentPage, fetchActiveChallenges);
     </div>
     <div class="pagination">
       <button @click="previousPage" :disabled="currentPage === 0">Forige side</button>
-      <div  v-if="pages>0" class="page-numbers">
+      <div  v-if="pages>1" class="page-numbers">
         <button
           v-for="pageNumber in pages"
           :key="pageNumber-2"

src/components/milestone/ActiveMilestonesList.vue

@@ -3,7 +3,7 @@
 import ActiveMilestoneDisplay from '@/components/milestone/ActiveMilestoneDisplay.vue'
 import { onMounted, ref } from 'vue'
 import { useTokenStore } from '@/stores/token'
-import { getAllMilestones } from '@/utils/MilestoneUtils'
+import { getAllMilestonesPaginated } from '@/utils/MilestoneUtils'
 
 interface Milestone{
   milestoneId: number;
@@ -31,7 +31,7 @@ onMounted( () => {
 const fetchActiveMilestones = async () => {
   try{
     console.log(currentPage.value)
-    const { content, totalPages, number } = await getAllMilestones(token, currentPage.value,SIZE)
+    const { content, totalPages, number } = await getAllMilestonesPaginated(token, currentPage.value,SIZE)
     pages.value = totalPages;
     currentPage.value = number;
     activeMilestones.value = content;
@@ -60,7 +60,7 @@ const nextPage = () =>{
   <div class="active-milestone-component">
     <div class="pagination">
       <button @click="previousPage" :disabled="currentPage === 0">Forige side</button>
-      <div  v-if="pages>0" class="page-numbers">
+      <div  v-if="pages>1" class="page-numbers">
         <button
           v-for="pageNumber in pages"
           :key="pageNumber-2"

src/components/milestone/MilestoneLogList.vue

@@ -94,7 +94,7 @@ const nextPage = () =>{
 
     <div class="pagination">
       <button @click="previousPage" :disabled="currentPage === 0">Forige side</button>
-      <div  v-if="pages>0" class="page-numbers">
+      <div  v-if="pages>1" class="page-numbers">
         <button
           v-for="pageNumber in pages"
           :key="pageNumber-2"

src/components/navigation/SideNav.vue

@@ -34,14 +34,17 @@ watch(currentRoute, () => {
       </button>
       <button
         class="menu-button"
-        :class="{ 'active': currentRoute.path == '/homepage/milestone' }"
+        :class="{ 'active': currentRoute.path == '/homepage/milestone'
+        || currentRoute.path == '/homepage/create-milestone'
+        || currentRoute.path == '/homepage/create-milestone'
+        || currentRoute.path == 'homepage/pathe'}"
         @click="navigateTo('/homepage/milestone')">
         <img src="/src/components/icons/navigation/piggy-bank.svg" alt="Milestone Icon" class="icon">
         <label class="button-label">Sparemål</label>
       </button>
       <button
         class="menu-button"
-        :class="{ 'active': currentRoute.path == '/homepage/challenge' }"
+        :class="{ 'active': currentRoute.path == '/homepage/challenge' || currentRoute.path == '/homepage/create-challenge'}"
         @click="navigateTo('/homepage/challenge')">
         <img src="/src/components/icons/navigation/challenge.svg" alt="Challenge Icon" class="icon">
         <label class="button-label">Utfordringer</label>

src/components/popups/CompleteChallengePopUp.vue

@@ -31,8 +31,7 @@ onMounted(async () => {
 })
 const fetchAllMilestones = async () =>{
   try{
-    const result  = await getAllMilestones(token, 0,10)
-    milestones.value = result.content;
+    milestones.value  = await getAllMilestones(token)
     chosenMilestone.value = milestones.value[0].milestoneId;
 
   } catch (error){

src/components/popups/DeleteChallengePopUp.vue

 <script setup lang="ts">
 
-import { onMounted, ref } from 'vue'
 import { useTokenStore } from '@/stores/token'
-import { getAllMilestones } from '@/utils/MilestoneUtils'
-import { completeChallenge, deleteChallenge } from '@/utils/challengeutils'
-
-interface Milestone{
-  'milestoneId': number,
-  'milestoneTitle': string
-}
+import { deleteChallenge } from '@/utils/challengeutils'
 
 const props = defineProps({
   challengeId: Number,

src/components/profile/BankAccountInfo.vue

@@ -36,8 +36,7 @@ const fetchUserInfo = async () =>{
 
 const fetchAccountInfo = async () => {
   const response = await getUserAccountInfo(token);
-  console.log('account info')
-  console.log(response)
+  accounts.value = [];
   for(let i = 0; i < response.length; i++){
     console.log(response[i].accountNumber)
     accounts.value.push(response[i].accountNumber)

src/utils/MilestoneUtils.ts

 import axios from 'axios';
 
-export const getAllMilestones = async(token: string, page:number, size:number) => {
+export const getAllMilestonesPaginated = async(token: string, page:number, size:number) => {
   const config = {
     headers: {
       "Content-Type": "application/json",
@@ -11,6 +11,21 @@ export const getAllMilestones = async(token: string, page:number, size:number) =
       'size': size
     }
   };
+  try {
+    const response = await axios.get("http://localhost:8080/milestone/user/paginated", config)
+    return response.data;
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+export const getAllMilestones = async(token: string) => {
+  const config = {
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token
+    },
+  };
   try {
     const response = await axios.get("http://localhost:8080/milestone/user", config)
     return response.data;

src/utils/profileutils.ts

@@ -203,7 +203,7 @@ export const updateBankAccountInfo = async (
     };
     const data = {
       'currentAccount': checkingAccount,
-      'savingAccount': savingAccount
+      'savingsAccount': savingAccount
     };
     return await axios.put('http://localhost:8080/users/update',data,config);
   } catch (error){