From 89d31fe15080551a53bf0780a4177508b3169582 Mon Sep 17 00:00:00 2001 From: Huffle Date: Tue, 27 May 2025 19:06:23 +0200 Subject: [PATCH] Change server url (#111) closes #103 Reviewed-on: https://gitea.seeseepuff.be/seeseemelk/allowance_planner_2000/pulls/111 --- .../src/app/pages/allowance/allowance.page.ts | 5 ++++- .../allowance-planner-v2/src/app/pages/tasks/tasks.page.ts | 2 +- .../src/app/services/allowance.service.ts | 2 +- .../allowance-planner-v2/src/app/services/history.service.ts | 2 +- .../allowance-planner-v2/src/app/services/task.service.ts | 2 +- .../allowance-planner-v2/src/app/services/user.service.ts | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts index 4bcfcd4..1eec7f5 100644 --- a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts +++ b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts @@ -36,7 +36,7 @@ export class AllowancePage implements ViewWillEnter { allowance[0].name = 'Main Allowance'; this.allowance$.next(allowance); }) - }, 20); + }, 50); } canFinishGoal(allowance: Allowance): boolean { @@ -57,6 +57,9 @@ export class AllowancePage implements ViewWillEnter { for (let allowance of allowanceList) { allowanceTotal += allowance.progress; } + if (allowanceTotal === 0) { + return 0; + } return goal.progress / allowanceTotal * 100; } diff --git a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts index a1eab25..26d1a5f 100644 --- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts +++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts @@ -33,7 +33,7 @@ export class TasksPage implements ViewWillEnter { this.taskService.getTaskList().subscribe(tasks => { this.tasks$.next(tasks); }); - }, 10); + }, 50); } createTask() { diff --git a/frontend/allowance-planner-v2/src/app/services/allowance.service.ts b/frontend/allowance-planner-v2/src/app/services/allowance.service.ts index 5108aeb..47d981a 100644 --- a/frontend/allowance-planner-v2/src/app/services/allowance.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/allowance.service.ts @@ -7,7 +7,7 @@ import { Allowance } from '../models/allowance'; providedIn: 'root' }) export class AllowanceService { - private url = 'http://localhost:8080/api'; + private url = 'https://allowanceplanner.seeseepuff.be/api'; constructor(private http: HttpClient) {} diff --git a/frontend/allowance-planner-v2/src/app/services/history.service.ts b/frontend/allowance-planner-v2/src/app/services/history.service.ts index 02a74a9..92807ee 100644 --- a/frontend/allowance-planner-v2/src/app/services/history.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/history.service.ts @@ -7,7 +7,7 @@ import { History } from '../models/history'; providedIn: 'root' }) export class HistoryService { - private url = 'http://localhost:8080/api'; + private url = 'https://allowanceplanner.seeseepuff.be/api'; constructor(private http: HttpClient) {} diff --git a/frontend/allowance-planner-v2/src/app/services/task.service.ts b/frontend/allowance-planner-v2/src/app/services/task.service.ts index 18359c2..77d2d30 100644 --- a/frontend/allowance-planner-v2/src/app/services/task.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/task.service.ts @@ -7,7 +7,7 @@ import { Task } from '../models/task'; providedIn: 'root' }) export class TaskService { - private url = 'http://localhost:8080/api'; + private url = 'https://allowanceplanner.seeseepuff.be/api'; constructor(private http: HttpClient) {} diff --git a/frontend/allowance-planner-v2/src/app/services/user.service.ts b/frontend/allowance-planner-v2/src/app/services/user.service.ts index 86df03d..1e1ac11 100644 --- a/frontend/allowance-planner-v2/src/app/services/user.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/user.service.ts @@ -7,7 +7,7 @@ import { User } from '../models/user'; providedIn: 'root', }) export class UserService { - private url = 'http://localhost:8080/api'; + private url = 'https://allowanceplanner.seeseepuff.be/api'; constructor(private http: HttpClient) {} getUserList(): Observable> {