seeseemelk/allowance_planner_2000
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: seeseemelk:19292ec746c28ef121e391f2e0fc061224da0720
Branches Tags
seeseemelk:main seeseemelk:schedules seeseemelk:icon seeseemelk:19/post-allowance-complete
..
compare: seeseemelk:19/post-allowance-complete
Branches Tags
seeseemelk:main seeseemelk:schedules seeseemelk:icon seeseemelk:19/post-allowance-complete

5 Commits
19292ec746 ... 19/post-al

Author SHA1 Message Date
Sebastiaan de Schaetzen
b2f532fa22 Add post allowance complete 2025-05-18 09:21:28 +02:00
Sebastiaan de Schaetzen
b56738653d Add complete task test with sum of weights == 0 2025-05-18 09:01:48 +02:00
Sebastiaan de Schaetzen
5d803bb01c Add complete allowance endpoint 2025-05-18 08:45:15 +02:00
Sebastiaan de Schaetzen
2620d6ee47 Use default database file if none is specified 2025-05-18 08:44:46 +02:00
Sebastiaan de Schaetzen
74536bd49d Add invalid id test 2025-05-18 08:32:33 +02:00
21 changed files with 42 additions and 388 deletions
Expand all files Collapse all files

9
README.md
View File

@@ -2,15 +2,8 @@
An improved Allowance Planner app. An improved Allowance Planner app.
## Running backend ## Running backend
In order to run the backend, go to the `backend` directory and run: In order to run the backend, go to the `backend directory and run:
```bash ```bash
$ go run . $ go run .
``` ```
## Running frontend
In order to run the frontend, go to the `allowance-planner-v2` directory in the `frontend` directory and run:
```bash
$ ionic serve
```

1
backend/.gitignore vendored
View File

@@ -1,3 +1,2 @@
*.db3 *.db3
*.db3-* *.db3-*
/allowance_planner

32
backend/api_test.go
View File

@@ -623,38 +623,6 @@ func TestCompleteTaskInvalidId(t *testing.T) {
e.POST("/task/999/complete").Expect().Status(404) e.POST("/task/999/complete").Expect().Status(404)
} }
func TestCompleteTaskAllowanceWeightsSumTo0(t *testing.T) {
e := startServer(t)
taskId := createTestTaskWithAmount(e, 101)
e.GET("/tasks").Expect().Status(200).JSON().Array().Length().IsEqual(1)
// Update rest allowance
e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{
Weight: 0,
}).Expect().Status(200)
// Create two allowance goals
e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{
Name: "Test Allowance 1",
Target: 1000,
Weight: 0,
}).Expect().Status(201)
// Complete the task
e.POST("/task/" + strconv.Itoa(taskId) + "/complete").Expect().Status(200)
// Verify the task is marked as completed
e.GET("/task/" + strconv.Itoa(taskId)).Expect().Status(404)
// Verify the allowances are updated for user 1
allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
allowances.Length().IsEqual(2)
allowances.Value(0).Object().Value("id").Number().IsEqual(0)
allowances.Value(0).Object().Value("progress").Number().IsEqual(101)
allowances.Value(1).Object().Value("id").Number().IsEqual(1)
allowances.Value(1).Object().Value("progress").Number().IsEqual(0)
}
func TestCompleteAllowance(t *testing.T) { func TestCompleteAllowance(t *testing.T) {
e := startServer(t) e := startServer(t)
createTestTaskWithAmount(e, 100) createTestTaskWithAmount(e, 100)

8
backend/go.sum
View File

@@ -1,3 +1,7 @@
gitea.seeseepuff.be/seeseemelk/mysqlite v0.12.0 h1:kl0VFgvm52UKxJhZpf1hvucxZdOoXY50g/VmzsWH+/8=
gitea.seeseepuff.be/seeseemelk/mysqlite v0.12.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE=
gitea.seeseepuff.be/seeseemelk/mysqlite v0.13.0 h1:nqSXu5i5fHB1rrx/kfi8Phn/J6eFa2yh02FiGc9U1yg=
gitea.seeseepuff.be/seeseemelk/mysqlite v0.13.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE=
gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0 h1:aRItVfUj48fBmuec7rm/jY9KCfvHW2VzJfItVk4t8sw= gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0 h1:aRItVfUj48fBmuec7rm/jY9KCfvHW2VzJfItVk4t8sw=
gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE= gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE=
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4= github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4=
@@ -214,10 +218,14 @@ modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc= modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
modernc.org/libc v1.65.6 h1:OhJUhmuJ6MVZdqL5qmnd0/my46DKGFhSX4WOR7ijfyE=
modernc.org/libc v1.65.6/go.mod h1:MOiGAM9lrMBT9L8xT1nO41qYl5eg9gCp9/kWhz5L7WA=
modernc.org/libc v1.65.7 h1:Ia9Z4yzZtWNtUIuiPuQ7Qf7kxYrxP1/jeHZzG8bFu00= modernc.org/libc v1.65.7 h1:Ia9Z4yzZtWNtUIuiPuQ7Qf7kxYrxP1/jeHZzG8bFu00=
modernc.org/libc v1.65.7/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU= modernc.org/libc v1.65.7/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU=
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
modernc.org/memory v1.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4=
modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=

9
backend/lite.gohtml
View File

@@ -1,9 +0,0 @@
<html lang="en">
<head>
<title>Allowance Planner 2000</title>
</head>
<body>
<h1>Allowance Planner 2000</h1>
<h2>Users</h2>
</body>
</html>

18
backend/main.go
View File

@@ -578,10 +578,6 @@ func getHistory(c *gin.Context) {
c.IndentedJSON(http.StatusOK, history) c.IndentedJSON(http.StatusOK, history)
} }
func renderLite(c *gin.Context) {
c.HTML(http.StatusOK, "lite.gohtml", nil)
}
/* /*
Initialises the database, and then starts the server. Initialises the database, and then starts the server.
If the context gets cancelled, the server is shutdown and the database is closed. If the context gets cancelled, the server is shutdown and the database is closed.
@@ -591,15 +587,9 @@ func start(ctx context.Context, config *ServerConfig) {
defer db.db.MustClose() defer db.db.MustClose()
router := gin.Default() router := gin.Default()
router.Use(cors.New(cors.Config{
corsConfig := cors.DefaultConfig() AllowOrigins: []string{"*"},
corsConfig.AllowAllOrigins = true }))
router.Use(cors.New(corsConfig))
// Web endpoints
router.LoadHTMLFiles("lite.gohtml")
router.GET("/", renderLite)
// API endpoints
router.GET("/api/users", getUsers) router.GET("/api/users", getUsers)
router.GET("/api/user/:userId", getUser) router.GET("/api/user/:userId", getUser)
router.POST("/api/user/:userId/history", postHistory) router.POST("/api/user/:userId/history", postHistory)
@@ -649,7 +639,7 @@ func start(ctx context.Context, config *ServerConfig) {
func main() { func main() {
config := ServerConfig{ config := ServerConfig{
Datasource: os.Getenv("DB_PATH"), Datasource: os.Getenv("DB_PATH"),
Addr: ":8081", Addr: ":8080",
} }
if config.Datasource == "" { if config.Datasource == "" {
config.Datasource = "allowance_planner.db3" config.Datasource = "allowance_planner.db3"

1
frontend/allowance-planner-v2/src/app/app-routing.module.ts
View File

@@ -11,7 +11,6 @@ const routes: Routes = [
path: '', path: '',
loadChildren: () => import('./pages/tabs/tabs.module').then(m => m.TabsPageModule) loadChildren: () => import('./pages/tabs/tabs.module').then(m => m.TabsPageModule)
}, },
]; ];
@NgModule({ @NgModule({
imports: [ imports: [

4
frontend/allowance-planner-v2/src/app/app.module.ts
View File

@@ -3,12 +3,11 @@ import { BrowserModule } from '@angular/platform-browser';
import { RouteReuseStrategy } from '@angular/router'; import { RouteReuseStrategy } from '@angular/router';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
import { Drivers } from '@ionic/storage'; import { Drivers, Storage } from '@ionic/storage';
import { IonicStorageModule } from '@ionic/storage-angular'; import { IonicStorageModule } from '@ionic/storage-angular';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { ReactiveFormsModule } from '@angular/forms';
@NgModule({ @NgModule({
declarations: [AppComponent], declarations: [AppComponent],
@@ -16,7 +15,6 @@ import { ReactiveFormsModule } from '@angular/forms';
BrowserModule, BrowserModule,
IonicModule.forRoot(), IonicModule.forRoot(),
AppRoutingModule, AppRoutingModule,
ReactiveFormsModule,
IonicStorageModule.forRoot({ IonicStorageModule.forRoot({
name: '__mydb', name: '__mydb',
driverOrder: [Drivers.IndexedDB, Drivers.LocalStorage] driverOrder: [Drivers.IndexedDB, Drivers.LocalStorage]

2
frontend/allowance-planner-v2/src/app/models/task.ts
View File

@@ -2,5 +2,5 @@ export interface Task {
id: number; id: number;
name: string; name: string;
reward: number; reward: number;
assigned: number | null; assigned: number;
} }

17
frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task-routing.module.ts
View File

@@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EditTaskPage } from './edit-task.page';
const routes: Routes = [
{
path: '',
component: EditTaskPage,
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class EditTaskPageRoutingModule {}

21
frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.module.ts
View File

@@ -1,21 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { EditTaskPageRoutingModule } from './edit-task-routing.module';
import { EditTaskPage } from './edit-task.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
EditTaskPageRoutingModule,
ReactiveFormsModule
],
declarations: [EditTaskPage]
})
export class EditTaskPageModule {}

33
frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html
View File

@@ -1,33 +0,0 @@
<ion-header [translucent]="true">
<ion-toolbar>
<div class="toolbar">
<ion-title *ngIf="isAddMode">Create Task</ion-title>
<ion-title *ngIf="!isAddMode">Edit Task</ion-title>
<button
*ngIf="!isAddMode"
class="remove-button"
(click)="deleteTask()"
>Delete task</button>
</div>
</ion-toolbar>
</ion-header>
<ion-content [fullscreen]="true">
<form [formGroup]="form">
<label>Task Name</label>
<input id="name" type="text" formControlName="name"/>
<label>Reward</label>
<input id="name" type="number" formControlName="reward"/>
<label>Assigned</label>
<select formControlName="assigned">
<option *ngFor="let user of users" [value]="user.id">{{ user.name }}</option>
</select>
<button type="button" [disabled]="!form.valid" (click)="submit()">
<span *ngIf="isAddMode">Add Task</span>
<span *ngIf="!isAddMode">Update Task</span>
</button>
</form>
</ion-content>

45
frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss
View File

@@ -1,45 +0,0 @@
.toolbar {
display: flex;
}
.remove-button {
background-color: var(--ion-color-primary);
margin-right: 15px;
width: 85px;
margin-bottom: 0;
}
form {
display: flex;
flex-direction: column;
align-items: center;
height: 100%;
}
label {
color: var(--ion-color-primary);
margin-top: 25px;
margin-bottom: 10px;
}
input,
select {
border: 1px solid var(--ion-color-primary);
border-radius: 5px;
width: 250px;
}
button {
background-color: var(--ion-color-primary);
border-radius: 5px;
color: white;
padding: 10px;
width: 250px;
margin-top: auto;
margin-bottom: 50px;
}
button:disabled,
button[disabled]{
opacity: 0.5;
}

17
frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.spec.ts
View File

@@ -1,17 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { EditTaskPage } from './edit-task.page';
describe('EditTaskPage', () => {
let component: EditTaskPage;
let fixture: ComponentFixture<EditTaskPage>;
beforeEach(() => {
fixture = TestBed.createComponent(EditTaskPage);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

80
frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.ts
View File

@@ -1,80 +0,0 @@
import { Location } from '@angular/common';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { User } from 'src/app/models/user';
import { TaskService } from 'src/app/services/task.service';
import { UserService } from 'src/app/services/user.service';
@Component({
selector: 'app-edit-task',
templateUrl: './edit-task.page.html',
styleUrls: ['./edit-task.page.scss'],
standalone: false,
})
export class EditTaskPage implements OnInit {
form: FormGroup;
id: number;
isAddMode: boolean;
users: Array<User> = [{id: 0, name: 'unassigned'}];
constructor(
private route: ActivatedRoute,
private formBuilder: FormBuilder,
private taskService: TaskService,
private userService: UserService,
private router: Router
) {
this.id = this.route.snapshot.params['id'];
this.isAddMode = !this.id;
this.form = this.formBuilder.group({
name: ['', Validators.required],
reward: ['', [Validators.required, Validators.pattern("^[0-9]*$")]],
assigned: [0, Validators.required]
});
}
ngOnInit() {
this.userService.getUserList().subscribe(users => {
this.users.push(...users);
});
if (!this.isAddMode) {
this.taskService.getTaskById(this.id).subscribe(task => {
this.form.setValue({
name: task.name,
reward: task.reward,
assigned: task.assigned !== null ? task.assigned : 0
});
});
}
}
submit() {
const formValue = this.form.value;
let assigned: number | null = Number(formValue.assigned);
if (assigned === 0) {
assigned = null;
}
const task = {
name: formValue.name,
reward: formValue.reward,
assigned
}
if (this.isAddMode) {
this.taskService.createTask(task);
} else {
this.taskService.updateTask(this.id, task);
}
this.router.navigate(['/tabs/tasks']);
}
deleteTask() {
this.taskService.deleteTask(this.id);
this.router.navigate(['/tabs/tasks']);
}
}

2
frontend/allowance-planner-v2/src/app/pages/tabs/tabs-routing.module.ts
View File

@@ -17,7 +17,7 @@ const routes: Routes = [
}, },
{ {
path: 'tasks', path: 'tasks',
loadChildren: () => import('../tasks/tasks.module').then(m => m.TasksPageModule), loadChildren: () => import('../tasks/tasks.module').then(m => m.TasksPageModule)
}, },
{ {
path: '', path: '',

4
frontend/allowance-planner-v2/src/app/pages/tasks/tasks-routing.module.ts
View File

@@ -6,9 +6,7 @@ const routes: Routes = [
{ {
path: '', path: '',
component: TasksPage, component: TasksPage,
}, }
{ path: 'add', loadChildren: () => import('../edit-task/edit-task.module').then(m => m.EditTaskPageModule) },
{ path: 'edit/:id', loadChildren: () => import('../edit-task/edit-task.module').then(m => m.EditTaskPageModule) }
]; ];
@NgModule({ @NgModule({

35
frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html
View File

@@ -1,30 +1,23 @@
<ion-header [translucent]="true" class="ion-no-border"> <ion-header [translucent]="true" class="ion-no-border">
<ion-toolbar> <ion-toolbar>
<div class="toolbar"> <ion-title>
<ion-title> Tasks
Tasks </ion-title>
</ion-title>
<button class="add-button" (click)="createTask()">Add task</button>
</div>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="content"> <div class="icon">
<div class="icon"> <mat-icon>filter_alt</mat-icon>
<mat-icon>filter_alt</mat-icon> </div>
</div> <div class="list">
<div class="list"> <div class="task" *ngFor="let task of tasks">
<div class="task" *ngFor="let task of tasks$ | async"> <button>Done</button>
<button (click)="completeTask(task.id)">Done</button> <div class="name">{{ task.name }}</div>
<div (click)="updateTask(task.id)" class="item"> <div
<div class="name">{{ task.name }}</div> class="reward"
<div [ngClass]="{ 'negative': task.reward < 0 }"
class="reward" >{{ task.reward.toFixed(2) }} SP</div>
[ngClass]="{ 'negative': task.reward < 0 }"
>{{ task.reward.toFixed(2) }} SP</div>
</div>
</div>
</div> </div>
</div> </div>
</ion-content> </ion-content>

23
frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.scss
View File

@@ -1,13 +1,3 @@
.toolbar {
display: flex;
}
.content {
display: flex;
flex-direction: column;
height: 100%;
}
.icon { .icon {
padding: 5px; padding: 5px;
display: flex; display: flex;
@@ -33,13 +23,6 @@ mat-icon {
padding: 5px; padding: 5px;
} }
.item {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
}
.name { .name {
margin-left: 10px; margin-left: 10px;
color: var(--font-color); color: var(--font-color);
@@ -61,10 +44,4 @@ button {
border-radius: 10px; border-radius: 10px;
color: white; color: white;
background: var(--confirm-button-color); background: var(--confirm-button-color);
}
.add-button {
background-color: var(--ion-color-primary);
margin-right: 15px;
width: 75px;
} }

46
frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts
View File

@@ -1,50 +1,24 @@
import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { TaskService } from 'src/app/services/task.service'; import { TaskService } from 'src/app/services/task.service';
import { Task } from 'src/app/models/task'; import { Task } from 'src/app/models/task';
import { ActivatedRoute, Router } from '@angular/router';
import { BehaviorSubject } from 'rxjs';
import { ViewWillEnter } from '@ionic/angular';
@Component({ @Component({
selector: 'app-tasks', selector: 'app-tasks',
templateUrl: 'tasks.page.html', templateUrl: 'tasks.page.html',
styleUrls: ['tasks.page.scss'], styleUrls: ['tasks.page.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false, standalone: false,
}) })
export class TasksPage implements ViewWillEnter { export class TasksPage implements OnInit {
public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]); public tasks: Array<Task> = [];
constructor( constructor(
private taskService: TaskService, private taskService: TaskService
private router: Router, ) {}
private route: ActivatedRoute
) { ngOnInit(): void {
this.getTasks(); this.taskService.getTaskList().subscribe(tasks => {
this.tasks = tasks;
});
} }
ionViewWillEnter(): void {
this.getTasks();
}
getTasks() {
setTimeout(() => {
this.taskService.getTaskList().subscribe(tasks => {
this.tasks$.next(tasks);
});
}, 10);
}
createTask() {
this.router.navigate(['add'], { relativeTo: this.route });
}
updateTask(id: number) {
this.router.navigate(['edit', id], { relativeTo: this.route });
}
completeTask(id: number) {
this.taskService.completeTask(id);
this.getTasks();
}
} }

23
frontend/allowance-planner-v2/src/app/services/task.service.ts
View File

@@ -7,31 +7,10 @@ import { Task } from '../models/task';
providedIn: 'root' providedIn: 'root'
}) })
export class TaskService { export class TaskService {
private url = 'http://localhost:8080/api'; private url = 'http://localhost:8080/api'
constructor(private http: HttpClient) {} constructor(private http: HttpClient) {}
getTaskList(): Observable<Array<Task>> { getTaskList(): Observable<Array<Task>> {
return this.http.get<Task[]>(`${this.url}/tasks`); return this.http.get<Task[]>(`${this.url}/tasks`);
} }
getTaskById(taskId: number): Observable<Task> {
return this.http.get<Task>(`${this.url}/task/${taskId}`);
}
createTask(task: Partial<Task>) {
this.http.post(`${this.url}/tasks`, task).subscribe();
}
updateTask(id: number, task: Partial<Task>) {
this.http.put(`${this.url}/task/${id}`, task).subscribe();
}
completeTask(id: number) {
this.http.post(`${this.url}/task/${id}/complete`, {}).subscribe();
}
deleteTask(id: number) {
this.http.delete(`${this.url}/task/${id}`).subscribe();
}
} }