Add support for descriptions in history

backend/api_test.go

@@ -758,145 +758,6 @@ func TestPutBulkAllowance(t *testing.T) {
 	allowances.Value(2).Object().Value("weight").Number().IsEqual(10)
 }
 
-func TestAddAllowanceSimple(t *testing.T) {
-	e := startServer(t)
-
-	createTestAllowance(e, "Test Allowance 1", 1000, 1)
-
-	request := map[string]interface{}{
-		"amount":      10,
-		"description": "Added to allowance 1",
-	}
-	e.POST("/user/1/allowance/1/add").WithJSON(request).Expect().Status(200)
-
-	// Verify the allowance is updated
-	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
-	allowances.Value(1).Object().Value("id").Number().IsEqual(1)
-	allowances.Value(1).Object().Value("progress").Number().InDelta(10.0, 0.01)
-
-	// Verify the history is updated
-	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
-	history.Length().IsEqual(1)
-	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
-	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
-	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
-}
-
-func TestAddAllowanceWithSpillage(t *testing.T) {
-	e := startServer(t)
-
-	createTestAllowance(e, "Test Allowance 1", 5, 1)
-	createTestAllowance(e, "Test Allowance 2", 5, 1)
-	e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{Weight: 1}).Expect().Status(200)
-
-	request := map[string]interface{}{
-		"amount":      10,
-		"description": "Added to allowance 1",
-	}
-	e.POST("/user/1/allowance/1/add").WithJSON(request).Expect().Status(200)
-
-	// Verify the allowance is updated
-	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
-	allowances.Value(1).Object().Value("id").Number().IsEqual(1)
-	allowances.Value(1).Object().Value("progress").Number().InDelta(5.0, 0.01)
-
-	allowances.Value(2).Object().Value("id").Number().IsEqual(2)
-	allowances.Value(2).Object().Value("progress").Number().InDelta(2.5, 0.01)
-
-	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
-	allowances.Value(0).Object().Value("progress").Number().InDelta(2.5, 0.01)
-
-	// Verify the history is updated
-	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
-	history.Length().IsEqual(1)
-	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
-	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
-	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
-}
-
-func TestAddAllowanceIdZero(t *testing.T) {
-	e := startServer(t)
-
-	createTestAllowance(e, "Test Allowance 1", 1000, 1)
-
-	request := map[string]interface{}{
-		"amount":      10,
-		"description": "Added to allowance 1",
-	}
-	e.POST("/user/1/allowance/0/add").WithJSON(request).Expect().Status(200)
-
-	// Verify the allowance is updated
-	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
-	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
-	allowances.Value(0).Object().Value("progress").Number().InDelta(10.0, 0.01)
-
-	// Verify the history is updated
-	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
-	history.Length().IsEqual(1)
-	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
-	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
-	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
-}
-
-func TestSubtractAllowanceSimple(t *testing.T) {
-	e := startServer(t)
-
-	createTestAllowance(e, "Test Allowance 1", 1000, 1)
-
-	request := map[string]interface{}{
-		"amount":      10,
-		"description": "Added to allowance 1",
-	}
-	e.POST("/user/1/allowance/1/add").WithJSON(request).Expect().Status(200)
-	request["amount"] = -2.5
-	e.POST("/user/1/allowance/1/add").WithJSON(request).Expect().Status(200)
-
-	// Verify the allowance is updated
-	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
-	allowances.Value(1).Object().Value("id").Number().IsEqual(1)
-	allowances.Value(1).Object().Value("progress").Number().InDelta(7.5, 0.01)
-
-	// Verify the history is updated
-	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
-	history.Length().IsEqual(2)
-	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
-	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
-	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
-
-	history.Value(1).Object().Value("allowance").Number().InDelta(-2.5, 0.01)
-	history.Value(1).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
-	history.Value(1).Object().Value("description").String().IsEqual("Added to allowance 1")
-}
-
-func TestSubtractllowanceIdZero(t *testing.T) {
-	e := startServer(t)
-
-	createTestAllowance(e, "Test Allowance 1", 1000, 1)
-
-	request := map[string]interface{}{
-		"amount":      10,
-		"description": "Added to allowance 1",
-	}
-	e.POST("/user/1/allowance/0/add").WithJSON(request).Expect().Status(200)
-	request["amount"] = -2.5
-	e.POST("/user/1/allowance/0/add").WithJSON(request).Expect().Status(200)
-
-	// Verify the allowance is updated
-	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
-	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
-	allowances.Value(0).Object().Value("progress").Number().InDelta(7.5, 0.01)
-
-	// Verify the history is updated
-	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
-	history.Length().IsEqual(2)
-	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
-	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
-	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
-
-	history.Value(1).Object().Value("allowance").Number().InDelta(-2.5, 0.01)
-	history.Value(1).Object().Value("description").String().IsEqual("Added to allowance 1")
-}
-
 func getDelta(base time.Time, delta float64) (time.Time, time.Time) {
 	start := base.Add(-time.Duration(delta) * time.Second)
 	end := base.Add(time.Duration(delta) * time.Second)

backend/db.go

@@ -428,9 +428,10 @@ func (db *Db) CompleteTask(taskId int) error {
 		return err
 	}
 
-	for userRow := range tx.Query("select id from users").Range(&err) {
+	for userRow := range tx.Query("select id, weight from users").Range(&err) {
 		var userId int
-		err = userRow.Scan(&userId)
+		var userWeight float64
+		err = userRow.Scan(&userId, &userWeight)
 		if err != nil {
 			return err
 		}
@@ -443,28 +444,6 @@ func (db *Db) CompleteTask(taskId int) error {
 			return err
 		}
 
-		err := db.addDistributedReward(tx, userId, reward)
-		if err != nil {
-			return err
-		}
-	}
-	if err != nil {
-		return err
-	}
-
-	// Remove the task
-	err = tx.Query("delete from tasks where id = ?").Bind(taskId).Exec()
-
-	return tx.Commit()
-}
-
-func (db *Db) addDistributedReward(tx *mysqlite.Tx, userId int, reward int) error {
-	var userWeight float64
-	err := tx.Query("select weight from users where id = ?").Bind(userId).ScanSingle(&userWeight)
-	if err != nil {
-		return err
-	}
-
 		// Calculate the sums of all weights
 		var sumOfWeights float64
 		err = tx.Query("select sum(weight) from allowances where user_id = ? and weight > 0").Bind(userId).ScanSingle(&sumOfWeights)
@@ -501,7 +480,18 @@ func (db *Db) addDistributedReward(tx *mysqlite.Tx, userId int, reward int) erro
 		// Add the remaining reward to the user
 		err = tx.Query("update users set balance = balance + ? where id = ?").
 			Bind(remainingReward, userId).Exec()
+		if err != nil {
 			return err
+		}
+	}
+	if err != nil {
+		return err
+	}
+
+	// Remove the task
+	err = tx.Query("delete from tasks where id = ?").Bind(taskId).Exec()
+
+	return tx.Commit()
 }
 
 func (db *Db) AddHistory(userId int, allowance *PostHistory) error {
@@ -542,92 +532,3 @@ func (db *Db) GetHistory(userId int) ([]History, error) {
 	}
 	return history, nil
 }
-
-func (db *Db) AddAllowanceAmount(userId int, allowanceId int, request AddAllowanceAmountRequest) error {
-	tx, err := db.db.Begin()
-	if err != nil {
-		return err
-	}
-	defer tx.MustRollback()
-
-	// Convert amount to integer (cents)
-	remainingAmount := int(math.Round(request.Amount * 100))
-
-	// Insert history entry
-	err = tx.Query("insert into history (user_id, timestamp, amount, description) values (?, ?, ?, ?)").
-		Bind(userId, time.Now().Unix(), remainingAmount, request.Description).
-		Exec()
-	if err != nil {
-		return err
-	}
-
-	if allowanceId == 0 {
-		if remainingAmount < 0 {
-			var userBalance int
-			err = tx.Query("select balance from users where id = ?").
-				Bind(userId).ScanSingle(&userBalance)
-			if err != nil {
-				return err
-			}
-			if remainingAmount > userBalance {
-				return fmt.Errorf("cannot remove more than the current balance: %d", userBalance)
-			}
-		}
-		err = tx.Query("update users set balance = balance + ? where id = ?").
-			Bind(remainingAmount, userId).Exec()
-		if err != nil {
-			return err
-		}
-	} else if remainingAmount < 0 {
-		var progress int
-		err = tx.Query("select balance from allowances where id = ? and user_id = ?").
-			Bind(allowanceId, userId).ScanSingle(&progress)
-		if err != nil {
-			return err
-		}
-
-		if remainingAmount > progress {
-			return fmt.Errorf("cannot remove more than the current allowance balance: %d", progress)
-		}
-
-		err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
-			Bind(remainingAmount, allowanceId, userId).Exec()
-		if err != nil {
-			return err
-		}
-	} else {
-		// Fetch the target and progress of the specified allowance
-		var target, progress int
-		err = tx.Query("select target, balance from allowances where id = ? and user_id = ?").
-			Bind(allowanceId, userId).ScanSingle(&target, &progress)
-		if err != nil {
-			return err
-		}
-
-		// Calculate the amount to add to the current allowance
-		toAdd := remainingAmount
-		if progress+toAdd > target {
-			toAdd = target - progress
-		}
-		remainingAmount -= toAdd
-
-		// Update the current allowance
-		if toAdd > 0 {
-			err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
-				Bind(toAdd, allowanceId, userId).Exec()
-			if err != nil {
-				return err
-			}
-		}
-
-		// If there's remaining amount, distribute it to the user's allowances
-		if remainingAmount > 0 {
-			err = db.addDistributedReward(tx, userId, remainingAmount)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return tx.Commit()
-}

backend/dto.go

@@ -73,8 +73,3 @@ type CreateTaskRequest struct {
 type CreateTaskResponse struct {
 	ID int `json:"id"`
 }
-
-type AddAllowanceAmountRequest struct {
-	Amount      float64 `json:"amount"`
-	Description string  `json:"description"`
-}

backend/main.go

@@ -368,56 +368,6 @@ func completeAllowance(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, gin.H{"message": "Allowance completed successfully"})
 }
 
-func addToAllowance(c *gin.Context) {
-	userIdStr := c.Param("userId")
-	allowanceIdStr := c.Param("allowanceId")
-
-	userId, err := strconv.Atoi(userIdStr)
-	if err != nil {
-		log.Printf(ErrInvalidUserID+": %v", err)
-		c.JSON(http.StatusBadRequest, gin.H{"error": ErrInvalidUserID})
-		return
-	}
-
-	allowanceId, err := strconv.Atoi(allowanceIdStr)
-	if err != nil {
-		log.Printf("Invalid allowance ID: %v", err)
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid allowance ID"})
-		return
-	}
-
-	exists, err := db.UserExists(userId)
-	if err != nil {
-		log.Printf(ErrCheckingUserExist, err)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": ErrInternalServerError})
-		return
-	}
-	if !exists {
-		c.JSON(http.StatusNotFound, gin.H{"error": ErrUserNotFound})
-		return
-	}
-
-	var allowanceRequest AddAllowanceAmountRequest
-	if err := c.ShouldBindJSON(&allowanceRequest); err != nil {
-		log.Printf("Error parsing request body: %v", err)
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
-		return
-	}
-
-	err = db.AddAllowanceAmount(userId, allowanceId, allowanceRequest)
-	if errors.Is(err, mysqlite.ErrNoRows) {
-		c.JSON(http.StatusNotFound, gin.H{"error": "Allowance not found"})
-		return
-	}
-	if err != nil {
-		log.Printf("Error completing allowance: %v", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": ErrInternalServerError})
-		return
-	}
-
-	c.IndentedJSON(http.StatusOK, gin.H{"message": "Allowance completed successfully"})
-}
-
 func createTask(c *gin.Context) {
 	var taskRequest CreateTaskRequest
 	if err := c.ShouldBindJSON(&taskRequest); err != nil {
@@ -661,7 +611,6 @@ func start(ctx context.Context, config *ServerConfig) {
 	router.DELETE("/api/user/:userId/allowance/:allowanceId", deleteUserAllowance)
 	router.PUT("/api/user/:userId/allowance/:allowanceId", putUserAllowance)
 	router.POST("/api/user/:userId/allowance/:allowanceId/complete", completeAllowance)
-	router.POST("/api/user/:userId/allowance/:allowanceId/add", addToAllowance)
 	router.POST("/api/tasks", createTask)
 	router.GET("/api/tasks", getTasks)
 	router.GET("/api/task/:taskId", getTask)

frontend/allowance-planner-v2/package.json

@@ -47,7 +47,6 @@
     "@angular/cli": "^19.0.0",
     "@angular/compiler-cli": "^19.0.0",
     "@angular/language-service": "^19.0.0",
-    "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "7.2.0",
     "@ionic/angular-toolkit": "^12.0.0",
     "@types/jasmine": "~5.1.0",

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

@@ -1,5 +1,4 @@
 export interface History {
     timestamp: string;
     allowance: number;
-    description: string;
 }

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

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

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

@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { AddAllowancePageRoutingModule } from './add-allowance-routing.module';
-
-import { AddAllowancePage } from './add-allowance.page';
-import { MatIconModule } from '@angular/material/icon';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    AddAllowancePageRoutingModule,
-    ReactiveFormsModule,
-    MatIconModule
-  ],
-  declarations: [AddAllowancePage]
-})
-export class AddAllowancePageModule {}

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

@@ -1,27 +0,0 @@
-<ion-header [translucent]="true">
-  <ion-toolbar>
-    <div class="toolbar">
-      <div class="icon" (click)="navigateBack()">
-        <mat-icon>arrow_back</mat-icon>
-      </div>
-      <ion-title *ngIf="isAddMode && goalId == 0">Add to Allowance</ion-title>
-      <ion-title *ngIf="isAddMode && goalId != 0">Add to Goal</ion-title>
-      <ion-title *ngIf="!isAddMode">Spend Allowance</ion-title>
-    </div>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content [fullscreen]="true">
-  <form [formGroup]="form">
-    <label>Amount</label>
-    <input id="amount" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="amount"/>
-
-    <label>Description</label>
-    <input id="description" type="text" formControlName="description"/>
-
-    <button type="button" [disabled]="!form.valid" (click)="changeAllowance()">
-      <span *ngIf="isAddMode">Add</span>
-      <span *ngIf="!isAddMode">Spend</span>
-    </button>
-  </form>
-</ion-content>

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

@@ -1,40 +0,0 @@
-.toolbar {
-    display: flex;
-    align-items: center;
-}
-
-.icon {
-    margin-left: 5px;
-}
-
-form {
-    height: 100%;
-}
-
-form,
-.item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-label {
-    color: var(--ion-color-primary);
-    margin-top: 25px;
-    margin-bottom: 10px;
-}
-
-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/add-allowance/add-allowance.page.spec.ts

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

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

@@ -1,51 +0,0 @@
-import { Location } from '@angular/common';
-import { Component } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AllowanceService } from 'src/app/services/allowance.service';
-
-@Component({
-  selector: 'app-add-allowance',
-  templateUrl: './add-allowance.page.html',
-  styleUrls: ['./add-allowance.page.scss'],
-  standalone: false,
-})
-export class AddAllowancePage {
-  public form: FormGroup;
-  public goalId: number;
-  public userId: number;
-  public isAddMode = true;
-// Marcus' first comment
-//            b    ........a`.OK  ø¶Ópppppppp--P09OP
-
-
-  constructor(
-    private allowanceService: AllowanceService,
-    private route: ActivatedRoute,
-    private formBuilder: FormBuilder,
-    private router: Router,
-    private location: Location
-  ) {
-    this.userId = this.route.snapshot.params['id'];
-    this.goalId = this.route.snapshot.params['goalId'];
-
-    this.form = this.formBuilder.group({
-      amount: ['', Validators.required],
-      description: ['', Validators.required]
-    });
-  }
-
-  changeAllowance() {
-    this.allowanceService.addOrSpendAllowance(
-      this.goalId,
-      this.userId,
-      this.form.value.amount,
-      this.form.value.description
-    );
-    this.router.navigate(['/tabs/allowance', this.userId]);
-  }
-
-  navigateBack() {
-    this.location.back();
-  }
-}

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

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

frontend/allowance-planner-v2/src/app/pages/add-allowance/spend-allowance.module.ts

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { SpendAllowancePageRoutingModule } from './spend-allowance-routing.module';
-import { SpendllowancePage } from './spend-allowance.page';
-import { MatIconModule } from '@angular/material/icon';
-
-@NgModule({
-    imports: [
-        CommonModule,
-        FormsModule,
-        IonicModule,
-        SpendAllowancePageRoutingModule,
-        ReactiveFormsModule,
-        MatIconModule
-    ],
-    declarations: [SpendllowancePage]
-})
-export class SpendAllowancePageModule {}

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

@@ -1,52 +0,0 @@
-import { Location } from '@angular/common';
-import { Component } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AllowanceService } from 'src/app/services/allowance.service';
-
-@Component({
-    selector: 'app-spend-allowance',
-    templateUrl: './add-allowance.page.html',
-    styleUrls: ['./add-allowance.page.scss'],
-    standalone: false,
-})
-export class SpendllowancePage {
-    public form: FormGroup;
-    public goalId: number;
-    public userId: number;
-    public isAddMode = false;
-
-    constructor(
-        private allowanceService: AllowanceService,
-        private route: ActivatedRoute,
-        private formBuilder: FormBuilder,
-        private router: Router,
-        private location: Location
-    ) {
-        this.userId = this.route.snapshot.params['id'];
-        this.goalId = this.route.snapshot.params['goalId'];
-
-        this.form = this.formBuilder.group({
-        amount: ['', Validators.required],
-        description: ['', Validators.required]
-        });
-
-        this.allowanceService.getAllowanceById(this.goalId, this.userId).subscribe(allowance => {
-            this.form.controls['amount'].addValidators([Validators.max(allowance.progress)]);
-        }); 
-    }
-
-    changeAllowance() {
-        this.allowanceService.addOrSpendAllowance(
-        this.goalId,
-        this.userId,
-        -this.form.value.amount,
-        this.form.value.description
-        );
-        this.router.navigate(['/tabs/allowance', this.userId]);
-    }
-
-    navigateBack() {
-        this.location.back();
-    }
-}

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

@@ -14,14 +14,6 @@ const routes: Routes = [
   {
     path: ':id/edit/:goalId',
     loadChildren: () => import('../edit-allowance/edit-allowance.module').then(m => m.EditAllowancePageModule)
-  },
-  {
-    path: ':id/increase/:goalId',
-    loadChildren: () => import('../add-allowance/add-allowance.module').then(m => m.AddAllowancePageModule)
-  },
-  {
-    path: ':id/spend/:goalId',
-    loadChildren: () => import('../add-allowance/spend-allowance.module').then(m => m.SpendAllowancePageModule)
   }
 ];
 

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

@@ -43,9 +43,9 @@
         </div>
         <div class="progress">{{ goal.progress }} SP</div>
         <div class="buttons">
-          <button class="add-button" (click)="addAllowance(goal.id)">Add</button>
+          <button class="add-button">Add</button>
           <!-- <button class="move-button">Move</button> -->
-          <button class="spend-button" (click)="spendAllowance(goal.id)">Spend</button>
+          <button class="spend-button">Spend</button>
         </div>
       </div>
       <ng-template #other_goal>
@@ -59,7 +59,7 @@
             </div>
             <div class="progress">{{ goal.progress }} / {{ goal.target }} SP</div>
             <div class="buttons">
-              <button class="add-button" (click)="addAllowance(goal.id)">Add</button>
+              <button class="add-button">Add</button>
               <!-- <button class="move-button">Move</button> -->
               <button class="spend-button" [disabled]="!canFinishGoal(goal)" (click)="completeGoal(goal.id)">Finish goal</button>
             </div>

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);
       })
-    }, 50);
+    }, 20);
   }
 
   canFinishGoal(allowance: Allowance): boolean {
@@ -57,9 +57,6 @@ export class AllowancePage implements ViewWillEnter {
     for (let allowance of allowanceList) {
       allowanceTotal += allowance.progress;
     }
-    if (allowanceTotal === 0) {
-      return 0;
-    }
     return goal.progress / allowanceTotal * 100;
   }
 
@@ -75,12 +72,4 @@ export class AllowancePage implements ViewWillEnter {
     this.allowanceService.completeGoal(goalId, this.id);
     this.getAllowance();
   }
-
-  addAllowance(id: number) {
-    this.router.navigate(['increase', id], { relativeTo: this.route });
-  }
-
-  spendAllowance(id: number) {
-    this.router.navigate(['spend', id], { relativeTo: this.route });
-  }
 }

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

@@ -10,11 +10,11 @@
   <div class="item" *ngFor="let history of history$ | async">
     <div class="left">
       <div class="date">{{ history.timestamp | date: 'yyyy-MM-dd' }}</div>
-      <div class="description">{{ history.description }}</div>
+      <div class="description">Seba made an oopsie</div>
     </div>
     <div
       class="amount"
       [ngClass]="{ 'negative': history.allowance < 0 }"
-    >{{ history.allowance }} SP</div>
+    >{{ history.allowance }}</div>
   </div>
 </ion-content>

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

@@ -6,10 +6,6 @@
     padding: 8px;
 }
 
-.left {
-    width: 70%;
-}
-
 .date {
     color: var(--line-color);
 }

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

@@ -19,7 +19,6 @@
         <button (click)="completeTask(task.id)">Done</button>
         <div (click)="updateTask(task.id)" class="item">
           <div class="name">{{ task.name }}</div>
-          <div class="assigned">{{ usernames[task.assigned ? task.assigned : 0] }}</div>
           <div
             class="reward"
             [ngClass]="{ 'negative': task.reward < 0 }"

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

@@ -68,9 +68,3 @@ button {
     margin-right: 15px;
     width: 75px;
 }
-
-.assigned {
-    color: var(--line-color);
-    margin-left: 3px;
-    font-size: 12px;
-}

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

@@ -14,7 +14,6 @@ import { ViewWillEnter } from '@ionic/angular';
 })
 export class TasksPage implements ViewWillEnter {
   public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]);
-  public usernames = ['', 'See', 'Huffle']
 
   constructor(
     private taskService: TaskService,
@@ -33,7 +32,7 @@ export class TasksPage implements ViewWillEnter {
       this.taskService.getTaskList().subscribe(tasks => {
         this.tasks$.next(tasks);
       });
-    }, 50);
+    }, 10);
   }
 
   createTask() {

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 = 'https://allowanceplanner.seeseepuff.be/api';
+    private url = 'http://localhost:8080/api';
 
     constructor(private http: HttpClient) {}
 
@@ -34,8 +34,4 @@ export class AllowanceService {
     completeGoal(goalId: number, userId: number) {
         this.http.post(`${this.url}/user/${userId}/allowance/${goalId}/complete`, {}).subscribe();
     }
-
-    addOrSpendAllowance(goalId: number, userId: number, amount: number, description: string) {
-        this.http.post(`${this.url}/user/${userId}/allowance/${goalId}/add`, { amount, description }).subscribe();
-    }
 }

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 = 'https://allowanceplanner.seeseepuff.be/api';
+    private url = 'http://localhost:8080/api';
 
     constructor(private http: HttpClient) {}
 

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 = 'https://allowanceplanner.seeseepuff.be/api';
+    private url = 'http://localhost:8080/api';
 
     constructor(private http: HttpClient) {}
 

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 = 'https://allowanceplanner.seeseepuff.be/api';
+    private url = 'http://localhost:8080/api';
     constructor(private http: HttpClient) {}
 
     getUserList(): Observable<Array<User>> {