diff --git a/src/components/challenge/ActiveChallengeDisplay.vue b/src/components/challenge/ActiveChallengeDisplay.vue
index 3354bb1f67b6aedc8a0039fbc099386ad3fdc24c..7432e9ad08b9a9af121512fbbcd189369755028a 100644
--- a/src/components/challenge/ActiveChallengeDisplay.vue
+++ b/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;
}
diff --git a/src/components/challenge/ActiveChallengesList.vue b/src/components/challenge/ActiveChallengesList.vue
index 38c8c0fd19e511eb0d3ff3a77cbe34e24dd01446..0bd1736cc4595306248f5a7c82f840649967fb51 100644
--- a/src/components/challenge/ActiveChallengesList.vue
+++ b/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"
diff --git a/src/components/milestone/ActiveMilestonesList.vue b/src/components/milestone/ActiveMilestonesList.vue
index 8d352b416aaf48acc15a674b8b6550681c535d14..416bc7d15a2146945e8b0e55dda9582f89dcaa24 100644
--- a/src/components/milestone/ActiveMilestonesList.vue
+++ b/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"
diff --git a/src/components/milestone/MilestoneLogList.vue b/src/components/milestone/MilestoneLogList.vue
index 084892961ea058c193912decf50e37f21319028b..13619f57401857598ee2bc4ee112ffed71c6529d 100644
--- a/src/components/milestone/MilestoneLogList.vue
+++ b/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"
diff --git a/src/components/navigation/SideNav.vue b/src/components/navigation/SideNav.vue
index 6712b5b7a28fb41eb6337e0ddbac2ef32125d5fe..37e045ed991b416ae4bc9786b4714ca47c67b8ef 100644
--- a/src/components/navigation/SideNav.vue
+++ b/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>
diff --git a/src/components/popups/CompleteChallengePopUp.vue b/src/components/popups/CompleteChallengePopUp.vue
index b9f50147918e4afc43a9a8d8fd14cdb31c5ecc5a..5d684a76a77f8f204dc9fd4f00e8c241e9e203e5 100644
--- a/src/components/popups/CompleteChallengePopUp.vue
+++ b/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){
diff --git a/src/components/popups/DeleteChallengePopUp.vue b/src/components/popups/DeleteChallengePopUp.vue
index 55397cb14a994793c8e14fbc275b03aa460f47ea..a98287f6fe6a8b1019d329420d32e5e8038e615d 100644
--- a/src/components/popups/DeleteChallengePopUp.vue
+++ b/src/components/popups/DeleteChallengePopUp.vue
@@ -1,14 +1,7 @@
<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,
diff --git a/src/components/profile/BankAccountInfo.vue b/src/components/profile/BankAccountInfo.vue
index 5d7e7c03d0490a791191d895e1b1b0d2933eaf3d..c4d86cc8dbeb06ea3c7f134a51a2d99a7ebbfe50 100644
--- a/src/components/profile/BankAccountInfo.vue
+++ b/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)
diff --git a/src/utils/MilestoneUtils.ts b/src/utils/MilestoneUtils.ts
index 880f88c2a8015a5389a0f07293f7982676504706..21f42e29a79081e41f578ca6033ad56594a806e3 100644
--- a/src/utils/MilestoneUtils.ts
+++ b/src/utils/MilestoneUtils.ts
@@ -1,6 +1,6 @@
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;
diff --git a/src/utils/profileutils.ts b/src/utils/profileutils.ts
index a9e8349021ff11dae876072d9d337c6f6cb8722f..4fe4261a014805c2aff7e420c6f7c6e585a4a111 100644
--- a/src/utils/profileutils.ts
+++ b/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){