Compare commits
6 Commits
85f796814c
...
icon
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46a4bfcd27 | ||
|
|
efc2453243 | ||
|
|
89d31fe150 | ||
|
|
2e81a635ee | ||
|
|
305566c911 | ||
|
|
8c2af22c85 |
3469
frontend/allowance-planner-v2/package-lock.json
generated
3469
frontend/allowance-planner-v2/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -47,6 +47,7 @@
|
|||||||
"@angular/cli": "^19.0.0",
|
"@angular/cli": "^19.0.0",
|
||||||
"@angular/compiler-cli": "^19.0.0",
|
"@angular/compiler-cli": "^19.0.0",
|
||||||
"@angular/language-service": "^19.0.0",
|
"@angular/language-service": "^19.0.0",
|
||||||
|
"@capacitor/assets": "^3.0.5",
|
||||||
"@capacitor/cli": "7.2.0",
|
"@capacitor/cli": "7.2.0",
|
||||||
"@ionic/angular-toolkit": "^12.0.0",
|
"@ionic/angular-toolkit": "^12.0.0",
|
||||||
"@types/jasmine": "~5.1.0",
|
"@types/jasmine": "~5.1.0",
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export class AllowancePage implements ViewWillEnter {
|
|||||||
allowance[0].name = 'Main Allowance';
|
allowance[0].name = 'Main Allowance';
|
||||||
this.allowance$.next(allowance);
|
this.allowance$.next(allowance);
|
||||||
})
|
})
|
||||||
}, 20);
|
}, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
canFinishGoal(allowance: Allowance): boolean {
|
canFinishGoal(allowance: Allowance): boolean {
|
||||||
@@ -57,6 +57,9 @@ export class AllowancePage implements ViewWillEnter {
|
|||||||
for (let allowance of allowanceList) {
|
for (let allowance of allowanceList) {
|
||||||
allowanceTotal += allowance.progress;
|
allowanceTotal += allowance.progress;
|
||||||
}
|
}
|
||||||
|
if (allowanceTotal === 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
return goal.progress / allowanceTotal * 100;
|
return goal.progress / allowanceTotal * 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
<button (click)="completeTask(task.id)">Done</button>
|
<button (click)="completeTask(task.id)">Done</button>
|
||||||
<div (click)="updateTask(task.id)" class="item">
|
<div (click)="updateTask(task.id)" class="item">
|
||||||
<div class="name">{{ task.name }}</div>
|
<div class="name">{{ task.name }}</div>
|
||||||
|
<div class="assigned">{{ usernames[task.assigned ? task.assigned : 0] }}</div>
|
||||||
<div
|
<div
|
||||||
class="reward"
|
class="reward"
|
||||||
[ngClass]="{ 'negative': task.reward < 0 }"
|
[ngClass]="{ 'negative': task.reward < 0 }"
|
||||||
|
|||||||
@@ -68,3 +68,9 @@ button {
|
|||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
width: 75px;
|
width: 75px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.assigned {
|
||||||
|
color: var(--line-color);
|
||||||
|
margin-left: 3px;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import { ViewWillEnter } from '@ionic/angular';
|
|||||||
})
|
})
|
||||||
export class TasksPage implements ViewWillEnter {
|
export class TasksPage implements ViewWillEnter {
|
||||||
public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]);
|
public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]);
|
||||||
|
public usernames = ['', 'See', 'Huffle']
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private taskService: TaskService,
|
private taskService: TaskService,
|
||||||
@@ -32,7 +33,7 @@ export class TasksPage implements ViewWillEnter {
|
|||||||
this.taskService.getTaskList().subscribe(tasks => {
|
this.taskService.getTaskList().subscribe(tasks => {
|
||||||
this.tasks$.next(tasks);
|
this.tasks$.next(tasks);
|
||||||
});
|
});
|
||||||
}, 10);
|
}, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
createTask() {
|
createTask() {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { Allowance } from '../models/allowance';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AllowanceService {
|
export class AllowanceService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { History } from '../models/history';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class HistoryService {
|
export class HistoryService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { Task } from '../models/task';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class TaskService {
|
export class TaskService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { User } from '../models/user';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class UserService {
|
export class UserService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
getUserList(): Observable<Array<User>> {
|
getUserList(): Observable<Array<User>> {
|
||||||
|
|||||||
BIN
frontend/allowance-planner-v2/src/assets/icon-background.png
Normal file
BIN
frontend/allowance-planner-v2/src/assets/icon-background.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
BIN
frontend/allowance-planner-v2/src/assets/icon-foreground.png
Normal file
BIN
frontend/allowance-planner-v2/src/assets/icon-foreground.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 163 KiB |
Reference in New Issue
Block a user