Add post allowance complete

README.md

@@ -2,15 +2,8 @@
 An improved Allowance Planner app.
 
 ## 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
 $ 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
-```

backend/api_test.go

@@ -623,38 +623,6 @@ func TestCompleteTaskInvalidId(t *testing.T) {
 	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) {
 	e := startServer(t)
 	createTestTaskWithAmount(e, 100)

backend/main.go

@@ -587,11 +587,9 @@ func start(ctx context.Context, config *ServerConfig) {
 	defer db.db.MustClose()
 
 	router := gin.Default()
-
-	corsConfig := cors.DefaultConfig()
-	corsConfig.AllowAllOrigins = true
-	router.Use(cors.New(corsConfig))
-
+	router.Use(cors.New(cors.Config{
+		AllowOrigins: []string{"*"},
+	}))
 	router.GET("/api/users", getUsers)
 	router.GET("/api/user/:userId", getUser)
 	router.POST("/api/user/:userId/history", postHistory)

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

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

frontend/allowance-planner-v2/src/app/app.module.ts

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

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

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

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

@@ -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 {}

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

@@ -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 {}

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

@@ -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>

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

@@ -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;
-}

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

@@ -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();
-  });
-});

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

@@ -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']);
-  }
-}

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

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

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

@@ -6,9 +6,7 @@ const routes: Routes = [
   {
     path: '',
     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({

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

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

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

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

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

@@ -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 { Task } from 'src/app/models/task';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs';
-import { ViewWillEnter } from '@ionic/angular';
 
 @Component({
   selector: 'app-tasks',
   templateUrl: 'tasks.page.html',
   styleUrls: ['tasks.page.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: false,
 })
-export class TasksPage implements ViewWillEnter {
-  public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]);
+export class TasksPage implements OnInit {
+  public tasks: Array<Task> = [];
 
   constructor(
-    private taskService: TaskService,
-    private router: Router,
-    private route: ActivatedRoute
-  ) {
-    this.getTasks();
-  }
+    private taskService: TaskService
+  ) {}
 
-  ionViewWillEnter(): void {
-    this.getTasks();
-  }
-
-  getTasks() {
-    setTimeout(() => {
+  ngOnInit(): void {
     this.taskService.getTaskList().subscribe(tasks => {
-        this.tasks$.next(tasks);
+      this.tasks = 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();
-  }
 }

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

@@ -7,31 +7,10 @@ import { Task } from '../models/task';
     providedIn: 'root'
 })
 export class TaskService {
-    private url = 'http://localhost:8080/api';
-
+    private url = 'http://localhost:8080/api'
     constructor(private http: HttpClient) {}
 
     getTaskList(): Observable<Array<Task>> {
         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();
-    }
 }