Add support for schedules

Reviewed-on: #136

backend/.gitignore

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

backend/api_test.go

@@ -15,6 +15,7 @@ const (
 func startServer(t *testing.T) *httpexpect.Expect {
 	config := ServerConfig{
 		Datasource: ":memory:",
+		//Datasource: "test.db",
 		Addr:    ":0",
 		Started: make(chan bool),
 	}
@@ -284,6 +285,54 @@ func TestCreateTask(t *testing.T) {
 	responseWithUser.Value("id").Number().IsEqual(2)
 }
 
+func TestCreateScheduleTask(t *testing.T) {
+	e := startServer(t)
+
+	// Create a new task without assigned user
+	requestBody := map[string]interface{}{
+		"name":     "Test Task",
+		"reward":   100,
+		"schedule": "0 */5 * * * *",
+	}
+
+	response := e.POST("/tasks").
+		WithJSON(requestBody).
+		Expect().
+		Status(201). // Expect Created status
+		JSON().Object()
+
+	requestBody["schedule"] = "every 5 seconds"
+	e.POST("/tasks").WithJSON(requestBody).Expect().Status(400)
+
+	// Verify the response has an ID
+	response.ContainsKey("id")
+	response.Value("id").Number().IsEqual(1)
+
+	e.GET("/tasks").Expect().Status(200).JSON().Array().Length().IsEqual(1)
+
+	// Get task
+	result := e.GET("/task/1").Expect().Status(200).JSON().Object()
+	result.Value("id").IsEqual(1)
+	result.Value("name").IsEqual("Test Task")
+	result.Value("schedule").IsEqual("0 */5 * * * *")
+	result.Value("reward").IsEqual(100)
+	result.Value("assigned").IsNull()
+
+	// Complete the task
+	e.POST("/task/1/complete").Expect().Status(200)
+
+	// Set expires date to 1 second in the past
+	db.db.Query("update tasks set next_run = ? where id = 1").Bind(time.Now().Add(10 * -time.Minute).Unix()).MustExec()
+
+	// Verify a new task is created
+	newTask := e.GET("/task/2").Expect().Status(200).JSON().Object()
+	newTask.Value("id").IsEqual(2)
+	newTask.Value("name").IsEqual("Test Task")
+	newTask.Value("schedule").IsEqual("0 */5 * * * *")
+	newTask.Value("reward").IsEqual(100)
+	newTask.Value("assigned").IsNull()
+}
+
 func TestDeleteTask(t *testing.T) {
 	e := startServer(t)
 
@@ -437,9 +486,9 @@ func TestPutTaskInvalidTaskId(t *testing.T) {
 func TestPostHistory(t *testing.T) {
 	e := startServer(t)
 
-	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100}).Expect().Status(200)
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100, Description: "Add a 100"}).Expect().Status(200)
-	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 20}).Expect().Status(200)
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 20, Description: "Lolol"}).Expect().Status(200)
-	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: -10}).Expect().Status(200)
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: -10, Description: "Subtracting"}).Expect().Status(200)
 
 	response := e.GET("/user/1").Expect().Status(200).JSON().Object()
 	response.Value("allowance").Number().IsEqual(100 + 20 - 10)
@@ -448,23 +497,36 @@ func TestPostHistory(t *testing.T) {
 func TestPostHistoryInvalidUserId(t *testing.T) {
 	e := startServer(t)
 
-	e.POST("/user/999/history").WithJSON(PostHistory{Allowance: 100}).Expect().
+	e.POST("/user/999/history").WithJSON(PostHistory{Allowance: 100, Description: "Good"}).Expect().
 		Status(404)
 }
 
+func TestPostHistoryInvalidDescription(t *testing.T) {
+	e := startServer(t)
+
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100}).Expect().
+		Status(400)
+}
+
 func TestGetHistory(t *testing.T) {
 	e := startServer(t)
 
-	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100}).Expect().Status(200)
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100, Description: "Add 100"}).Expect().Status(200)
-	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 20}).Expect().Status(200)
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 20, Description: "Add 20"}).Expect().Status(200)
-	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: -10}).Expect().Status(200)
+	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: -10, Description: "Subtract 10"}).Expect().Status(200)
 
 	response := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
 	response.Length().IsEqual(3)
+	response.Value(0).Object().Length().IsEqual(3)
 	response.Value(0).Object().Value("allowance").Number().IsEqual(100)
 	response.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	response.Value(0).Object().Value("description").String().IsEqual("Add 100")
+
 	response.Value(1).Object().Value("allowance").Number().IsEqual(20)
+	response.Value(1).Object().Value("description").String().IsEqual("Add 20")
+
 	response.Value(2).Object().Value("allowance").Number().IsEqual(-10)
+	response.Value(2).Object().Value("description").String().IsEqual("Subtract 10")
 }
 
 func TestGetUserAllowanceById(t *testing.T) {
@@ -605,6 +667,36 @@ func TestCompleteTask(t *testing.T) {
 	}
 }
 
+func TestCompleteTaskWithNoWeights(t *testing.T) {
+	e := startServer(t)
+	taskId := createTestTaskWithAmount(e, 101)
+
+	e.GET("/tasks").Expect().Status(200).JSON().Array().Length().IsEqual(1)
+
+	// Ensure main allowance has no weight
+	e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{
+		Weight: 0,
+	}).Expect().Status(200)
+
+	// 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(1)
+	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
+	allowances.Value(0).Object().Value("progress").Number().InDelta(101.00, 0.01)
+
+	// And also for user 2
+	allowances = e.GET("/user/2/allowance").Expect().Status(200).JSON().Array()
+	allowances.Length().IsEqual(1)
+	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
+	allowances.Value(0).Object().Value("progress").Number().InDelta(101.00, 0.01)
+}
+
 func TestCompleteTaskAllowanceWeightsSumTo0(t *testing.T) {
 	e := startServer(t)
 	taskId := createTestTaskWithAmount(e, 101)
@@ -643,6 +735,11 @@ func TestCompleteAllowance(t *testing.T) {
 	createTestTaskWithAmount(e, 100)
 	createTestAllowance(e, "Test Allowance 1", 100, 50)
 
+	// Update base allowance
+	e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{
+		Weight: 0,
+	}).Expect().Status(200)
+
 	// Complete the task
 	e.POST("/task/1/complete").Expect().Status(200)
 
@@ -655,10 +752,15 @@ func TestCompleteAllowance(t *testing.T) {
 	// Verify history is updated
 	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
 	history.Length().IsEqual(2)
+	history.Value(0).Object().Length().IsEqual(3)
 	history.Value(0).Object().Value("allowance").Number().IsEqual(100)
 	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	history.Value(0).Object().Value("description").String().IsEqual("Task completed: Test Task")
+
+	history.Value(1).Object().Length().IsEqual(3)
 	history.Value(1).Object().Value("allowance").Number().IsEqual(-100)
 	history.Value(1).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	history.Value(1).Object().Value("description").String().IsEqual("Allowance completed: Test Allowance 1")
 }
 
 func TestCompleteAllowanceInvalidUserId(t *testing.T) {
@@ -705,6 +807,145 @@ 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

@@ -2,6 +2,8 @@ package main
 
 import (
 	"errors"
+	"fmt"
+	"github.com/adhocore/gronx"
 	"log"
 	"math"
 	"time"
@@ -206,8 +208,9 @@ func (db *Db) CompleteAllowance(userId int, allowanceId int) error {
 
 	// Get the cost of the allowance
 	var cost int
-	err = tx.Query("select balance from allowances where id = ? and user_id = ?").
+	var allowanceName string
-		Bind(allowanceId, userId).ScanSingle(&cost)
+	err = tx.Query("select balance, name from allowances where id = ? and user_id = ?").
+		Bind(allowanceId, userId).ScanSingle(&cost, &allowanceName)
 	if err != nil {
 		return err
 	}
@@ -220,8 +223,8 @@ func (db *Db) CompleteAllowance(userId int, allowanceId int) error {
 	}
 
 	// Add a history entry
-	err = tx.Query("insert into history (user_id, timestamp, amount) values (?, ?, ?)").
+	err = tx.Query("insert into history (user_id, timestamp, amount, description) values (?, ?, ?, ?)").
-		Bind(userId, time.Now().Unix(), -cost).
+		Bind(userId, time.Now().Unix(), -cost, fmt.Sprintf("Allowance completed: %s", allowanceName)).
 		Exec()
 	if err != nil {
 		return err
@@ -311,10 +314,20 @@ func (db *Db) CreateTask(task *CreateTaskRequest) (int, error) {
 	}
 	defer tx.MustRollback()
 
+	var nextRun *int64
+	if task.Schedule != nil {
+		nextRunTime, err := gronx.NextTick(*task.Schedule, false)
+		if err != nil {
+			return 0, fmt.Errorf("failed to calculate next run: %w", err)
+		}
+		nextRunTimeAsInt := nextRunTime.Unix()
+		nextRun = &nextRunTimeAsInt
+	}
+
 	// Insert the new task
 	reward := int(math.Round(task.Reward * 100.0))
-	err = tx.Query("insert into tasks (name, reward, assigned) values (?, ?, ?)").
+	err = tx.Query("insert into tasks (name, reward, assigned, schedule, next_run) values (?, ?, ?, ?, ?)").
-		Bind(task.Name, reward, task.Assigned).
+		Bind(task.Name, reward, task.Assigned, task.Schedule, nextRun).
 		Exec()
 
 	if err != nil {
@@ -338,13 +351,17 @@ func (db *Db) CreateTask(task *CreateTaskRequest) (int, error) {
 }
 
 func (db *Db) GetTasks() ([]Task, error) {
-	tasks := make([]Task, 0)
+	err := db.UpdateScheduledTasks()
-	var err error
+	if err != nil {
+		return nil, fmt.Errorf("failed to update scheduled tasks: %w", err)
+	}
 
-	for row := range db.db.Query("select id, name, reward, assigned from tasks").Range(&err) {
+	tasks := make([]Task, 0)
+
+	for row := range db.db.Query("select id, name, reward, assigned, schedule from tasks where completed is null").Range(&err) {
 		task := Task{}
 		var reward int64
-		err = row.Scan(&task.ID, &task.Name, &reward, &task.Assigned)
+		err = row.Scan(&task.ID, &task.Name, &reward, &task.Assigned, &task.Schedule)
 		task.Reward = float64(reward) / 100.0
 		if err != nil {
 			return nil, err
@@ -360,16 +377,78 @@ func (db *Db) GetTasks() ([]Task, error) {
 func (db *Db) GetTask(id int) (Task, error) {
 	task := Task{}
 
-	var reward int64
+	err := db.UpdateScheduledTasks()
-	err := db.db.Query("select id, name, reward, assigned from tasks where id = ?").
-		Bind(id).ScanSingle(&task.ID, &task.Name, &reward, &task.Assigned)
-	task.Reward = float64(reward) / 100.0
 	if err != nil {
-		return Task{}, err
+		return Task{}, fmt.Errorf("failed to update scheduled tasks: %w", err)
 	}
+
+	var reward int64
+	err = db.db.Query("select id, name, reward, assigned, schedule from tasks where id = ? and completed is null").
+		Bind(id).ScanSingle(&task.ID, &task.Name, &reward, &task.Assigned, &task.Schedule)
+	if err != nil {
+		return task, err
+	}
+	task.Reward = float64(reward) / 100.0
 	return task, nil
 }
 
+func (db *Db) UpdateScheduledTasks() error {
+	type ScheduledTask struct {
+		ID       int
+		Schedule string
+		Expires  int64
+	}
+	tasks := make([]ScheduledTask, 0)
+	var err error
+
+	for row := range db.db.Query("select id, schedule, next_run from tasks where schedule is not null").Range(&err) {
+		task := ScheduledTask{}
+		err := row.Scan(&task.ID, &task.Schedule, &task.Expires)
+		if err != nil {
+			return err
+		}
+		if time.Now().Unix() >= task.Expires {
+			tasks = append(tasks, task)
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("failed to fetch scheduled tasks: %w", err)
+	}
+
+	tx, err := db.db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.MustRollback()
+
+	for _, task := range tasks {
+		nextRun, err := gronx.NextTickAfter(task.Schedule, time.Now(), false)
+		if err != nil {
+			return fmt.Errorf("failed to calculate next run for task %d: %w", task.ID, err)
+		}
+
+		err = tx.Query("insert into tasks (name, reward, assigned, schedule, next_run) select name, reward, assigned, schedule, ? from tasks where id = ?").
+			Bind(nextRun.Unix(), task.ID).
+			Exec()
+		if err != nil {
+			return err
+		}
+
+		err = tx.Query("update tasks set schedule = null where id = ?").Bind(task.ID).Exec()
+		if err != nil {
+			return err
+		}
+
+		tx.Query("select last_insert_rowid()").MustScanSingle(&task.ID)
+		log.Printf("Task %d scheduled for %s", task.ID, nextRun)
+	}
+	if err != nil {
+		return err
+	}
+
+	return tx.Commit()
+}
+
 func (db *Db) DeleteTask(id int) error {
 	tx, err := db.db.Begin()
 	if err != nil {
@@ -420,27 +499,52 @@ func (db *Db) CompleteTask(taskId int) error {
 	defer tx.MustRollback()
 
 	var reward int
-	err = tx.Query("select reward from tasks where id = ?").Bind(taskId).ScanSingle(&reward)
+	var rewardName string
+	err = tx.Query("select reward, name from tasks where id = ?").Bind(taskId).ScanSingle(&reward, &rewardName)
 	if err != nil {
 		return err
 	}
 
-	for userRow := range tx.Query("select id, weight from users").Range(&err) {
+	for userRow := range tx.Query("select id from users").Range(&err) {
 		var userId int
-		var userWeight float64
+		err = userRow.Scan(&userId)
-		err = userRow.Scan(&userId, &userWeight)
 		if err != nil {
 			return err
 		}
 
 		// Add the history entry
-		err = tx.Query("insert into history (user_id, timestamp, amount) values (?, ?, ?)").
+		err = tx.Query("insert into history (user_id, timestamp, amount, description) values (?, ?, ?, ?)").
-			Bind(userId, time.Now().Unix(), reward).
+			Bind(userId, time.Now().Unix(), reward, fmt.Sprintf("Task completed: %s", rewardName)).
 			Exec()
 		if err != nil {
 			return err
 		}
 
+		err := db.addDistributedReward(tx, userId, reward)
+		if err != nil {
+			return err
+		}
+	}
+	if err != nil {
+		return err
+	}
+
+	// Remove the task
+	err = tx.Query("update tasks set completed=? where id = ?").Bind(time.Now().Unix(), taskId).Exec()
+	if err != nil {
+		return err
+	}
+
+	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)
@@ -477,18 +581,7 @@ func (db *Db) CompleteTask(taskId int) error {
 	// 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 {
@@ -499,8 +592,8 @@ func (db *Db) AddHistory(userId int, allowance *PostHistory) error {
 	defer tx.MustRollback()
 
 	amount := int(math.Round(allowance.Allowance * 100.0))
-	err = tx.Query("insert into history (user_id, timestamp, amount) values (?, ?, ?)").
+	err = tx.Query("insert into history (user_id, timestamp, amount, description) values (?, ?, ?, ?)").
-		Bind(userId, time.Now().Unix(), amount).
+		Bind(userId, time.Now().Unix(), amount, allowance.Description).
 		Exec()
 	if err != nil {
 		return err
@@ -512,11 +605,11 @@ func (db *Db) GetHistory(userId int) ([]History, error) {
 	history := make([]History, 0)
 	var err error
 
-	for row := range db.db.Query("select amount, `timestamp` from history where user_id = ? order by `timestamp` desc").
+	for row := range db.db.Query("select amount, `timestamp`, description from history where user_id = ? order by `timestamp` desc").
 		Bind(userId).Range(&err) {
 		allowance := History{}
 		var timestamp, amount int64
-		err = row.Scan(&amount, &timestamp)
+		err = row.Scan(&amount, &timestamp, &allowance.Description)
 		if err != nil {
 			return nil, err
 		}
@@ -529,3 +622,92 @@ 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

@@ -16,10 +16,12 @@ type UserWithAllowance struct {
 type History struct {
 	Allowance   float64   `json:"allowance"`
 	Timestamp   time.Time `json:"timestamp"`
+	Description string    `json:"description"`
 }
 
 type PostHistory struct {
 	Allowance   float64 `json:"allowance"`
+	Description string  `json:"description"`
 }
 
 // Task represents a task in the system.
@@ -27,7 +29,8 @@ type Task struct {
 	ID       int     `json:"id"`
 	Name     string  `json:"name"`
 	Reward   float64 `json:"reward"`
-	Assigned *int    `json:"assigned"` // Pointer to allow null
+	Assigned *int    `json:"assigned"`
+	Schedule *string `json:"schedule"`
 }
 
 type Allowance struct {
@@ -66,8 +69,14 @@ type CreateTaskRequest struct {
 	Name     string  `json:"name" binding:"required"`
 	Reward   float64 `json:"reward"`
 	Assigned *int    `json:"assigned"`
+	Schedule *string `json:"schedule"`
 }
 
 type CreateTaskResponse struct {
 	ID int `json:"id"`
 }
+
+type AddAllowanceAmountRequest struct {
+	Amount      float64 `json:"amount"`
+	Description string  `json:"description"`
+}

backend/go.mod

@@ -6,11 +6,12 @@ require (
 	gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0
 	github.com/gavv/httpexpect/v2 v2.17.0
 	github.com/gin-contrib/cors v1.7.5
-	github.com/gin-gonic/gin v1.10.0
+	github.com/gin-gonic/gin v1.10.1
 )
 
 require (
 	github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 // indirect
+	github.com/adhocore/gronx v1.19.6 // indirect
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/bytedance/sonic v1.13.2 // indirect
@@ -49,7 +50,7 @@ require (
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/ugorji/go/codec v1.2.14 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.62.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -68,10 +69,10 @@ require (
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.65.7 // indirect
+	modernc.org/libc v1.65.8 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.37.0 // indirect
+	modernc.org/sqlite v1.37.1 // indirect
 	moul.io/http2curl/v2 v2.3.0 // indirect
-	zombiezen.com/go/sqlite v1.4.0 // indirect
+	zombiezen.com/go/sqlite v1.4.2 // indirect
 )

backend/go.sum

@@ -2,6 +2,8 @@ gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0 h1:aRItVfUj48fBmuec7rm/jY9KCfvHW
 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/go.mod h1:VSw57q4QFiWDbRnjdX8Cb3Ow0SFncRw+bA/ofY6Q83w=
+github.com/adhocore/gronx v1.19.6 h1:5KNVcoR9ACgL9HhEqCm5QXsab/gI4QDIybTAWcXDKDc=
+github.com/adhocore/gronx v1.19.6/go.mod h1:7oUY1WAU8rEJWmAxXR2DN0JaO4gi9khSgKjiRypqteg=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
@@ -34,6 +36,8 @@ github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w
 github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
 github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
+github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -127,6 +131,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.14 h1:yOQvXCBc3Ij46LRkRoh4Yd5qK6LVOgi0bYOXfb7ifjw=
+github.com/ugorji/go/codec v1.2.14/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.62.0 h1:8dKRBX/y2rCzyc6903Zu1+3qN0H/d2MsxPPmVNamiH0=
@@ -216,6 +222,8 @@ modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
 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.8 h1:7PXRJai0TXZ8uNA3srsmYzmTyrLoHImV5QxHeni108Q=
+modernc.org/libc v1.65.8/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
@@ -226,6 +234,8 @@ modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
 modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
 modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
+modernc.org/sqlite v1.37.1 h1:EgHJK/FPoqC+q2YBXg7fUmES37pCHFc97sI7zSayBEs=
+modernc.org/sqlite v1.37.1/go.mod h1:XwdRtsE1MpiBcL54+MbKcaDvcuej+IYSMfLN6gSKV8g=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
@@ -235,3 +245,5 @@ moul.io/http2curl/v2 v2.3.0/go.mod h1:RW4hyBjTWSYDOxapodpNEtX0g5Eb16sxklBqmd2RHc
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 zombiezen.com/go/sqlite v1.4.0 h1:N1s3RIljwtp4541Y8rM880qgGIgq3fTD2yks1xftnKU=
 zombiezen.com/go/sqlite v1.4.0/go.mod h1:0w9F1DN9IZj9AcLS9YDKMboubCACkwYCGkzoy3eG5ik=
+zombiezen.com/go/sqlite v1.4.2 h1:KZXLrBuJ7tKNEm+VJcApLMeQbhmAUOKA5VWS93DfFRo=
+zombiezen.com/go/sqlite v1.4.2/go.mod h1:5Kd4taTAD4MkBzT25mQ9uaAlLjyR0rFhsR6iINO70jc=

backend/main.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"embed"
 	"errors"
+	"fmt"
 	"gitea.seeseepuff.be/seeseemelk/mysqlite"
+	"github.com/adhocore/gronx"
 	"log"
 	"net"
 	"net/http"
@@ -43,6 +45,11 @@ type ServerConfig struct {
 	Started chan bool
 }
 
+const DefaultDomain = "localhost:8080"
+
+// The domain that the server is reachable at.
+var domain = DefaultDomain
+
 func getUsers(c *gin.Context) {
 	users, err := db.GetUsers()
 	if err != nil {
@@ -368,6 +375,56 @@ 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 {
@@ -381,6 +438,14 @@ func createTask(c *gin.Context) {
 		return
 	}
 
+	if taskRequest.Schedule != nil {
+		valid := gronx.IsValid(*taskRequest.Schedule)
+		if !valid {
+			c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("Invalid cron schedule: %s", *taskRequest.Schedule)})
+			return
+		}
+	}
+
 	// If assigned is not nil, check if user exists
 	if taskRequest.Assigned != nil {
 		exists, err := db.UserExists(*taskRequest.Assigned)
@@ -458,6 +523,11 @@ func putTask(c *gin.Context) {
 		c.JSON(http.StatusNotFound, gin.H{"error": "Task not found"})
 		return
 	}
+	if err != nil {
+		log.Printf("Error getting task: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": ErrInternalServerError})
+		return
+	}
 
 	err = db.UpdateTask(taskId, &taskRequest)
 	if err != nil {
@@ -539,6 +609,11 @@ func postHistory(c *gin.Context) {
 		return
 	}
 
+	if historyRequest.Description == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Description cannot be empty"})
+		return
+	}
+
 	exists, err := db.UserExists(userId)
 	if err != nil {
 		log.Printf(ErrCheckingUserExist, err)
@@ -606,6 +681,7 @@ 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)
@@ -650,5 +726,10 @@ func main() {
 		config.Datasource = "allowance_planner.db3"
 		log.Printf("Warning: No DB_PATH set, using default of %s", config.Datasource)
 	}
+	domain = os.Getenv("DOMAIN")
+	if domain == "" {
+		domain = DefaultDomain
+		log.Printf("Warning: No DOMAIN set, using default of %s", domain)
+	}
 	start(context.Background(), &config)
 }

backend/migrations/1_initial.sql

@@ -2,7 +2,7 @@ create table users
 (
     id   integer primary key,
     name text not null,
-    weight real not null default 0.0,
+    weight real not null default 10.0,
     balance integer not null default 0
 ) strict;
 

backend/migrations/3_change_weight_default.sql

@@ -0,0 +1 @@
+update users set weight = 10.0 where weight = 0.0;

backend/migrations/4_add_history_description.sql

@@ -0,0 +1,2 @@
+alter table history
+add column description text;

backend/migrations/5_add_schedules.sql

@@ -0,0 +1,3 @@
+alter table tasks add column schedule text;
+alter table tasks add column completed date;
+alter table tasks add column next_run date;

backend/web.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"github.com/gin-gonic/gin"
+	"log"
 	"net/http"
 	"strconv"
 )
@@ -26,11 +27,22 @@ func loadWebEndpoints(router *gin.Engine) {
 	router.GET("/completeAllowance", renderCompleteAllowance)
 }
 
+func redirectToPage(c *gin.Context, page string) {
+	redirectToPageStatus(c, page, http.StatusSeeOther)
+}
+
+func redirectToPageStatus(c *gin.Context, page string, status int) {
+	scheme := c.Request.URL.Scheme
+	target := scheme + domain + page
+	c.Redirect(status, target)
+}
+
 func renderLogin(c *gin.Context) {
 	if c.Query("user") != "" {
-		c.SetCookie("user", c.Query("user"), 3600, "/", "localhost", false, true)
+		log.Println("Set cookie for user:", c.Query("user"))
+		c.SetCookie("user", c.Query("user"), 3600, "", "", false, true)
 	}
-	c.Redirect(http.StatusFound, "/")
+	redirectToPage(c, "/")
 }
 
 func renderIndex(c *gin.Context) {
@@ -59,16 +71,24 @@ func renderCreateTask(c *gin.Context) {
 		return
 	}
 
-	_, err = db.CreateTask(&CreateTaskRequest{
+	request := &CreateTaskRequest{
 		Name:   name,
 		Reward: reward,
-	})
+	}
+
+	schedule := c.PostForm("schedule")
+	if schedule != "" {
+		request.Schedule = &schedule
+	}
+	
+	_, err = db.CreateTask(request)
+
 	if err != nil {
 		renderError(c, http.StatusInternalServerError, err)
 		return
 	}
 
-	c.Redirect(http.StatusFound, "/")
+	redirectToPageStatus(c, "/", http.StatusFound)
 }
 
 func renderCompleteTask(c *gin.Context) {
@@ -85,7 +105,7 @@ func renderCompleteTask(c *gin.Context) {
 		return
 	}
 
-	c.Redirect(http.StatusFound, "/")
+	redirectToPageStatus(c, "/", http.StatusFound)
 }
 
 func renderCreateAllowance(c *gin.Context) {
@@ -122,7 +142,7 @@ func renderCreateAllowance(c *gin.Context) {
 		return
 	}
 
-	c.Redirect(http.StatusFound, "/")
+	redirectToPageStatus(c, "/", http.StatusFound)
 }
 
 func renderCompleteAllowance(c *gin.Context) {
@@ -144,11 +164,12 @@ func renderCompleteAllowance(c *gin.Context) {
 		return
 	}
 
-	c.Redirect(http.StatusFound, "/")
+	redirectToPageStatus(c, "/", http.StatusFound)
 }
 
 func getCurrentUser(c *gin.Context) *int {
 	currentUserStr, err := c.Cookie("user")
+	log.Println("Cookie string:", currentUserStr)
 	if errors.Is(err, http.ErrNoCookie) {
 		renderNoUser(c)
 		return nil
@@ -172,7 +193,7 @@ func getCurrentUser(c *gin.Context) *int {
 
 func unsetUserCookie(c *gin.Context) {
 	c.SetCookie("user", "", -1, "/", "localhost", false, true)
-	c.Redirect(http.StatusFound, "/")
+	redirectToPageStatus(c, "/", http.StatusFound)
 }
 
 func renderNoUser(c *gin.Context) {

backend/web.gohtml

@@ -3,9 +3,11 @@
 <head>
 	<title>Allowance Planner 2000</title>
 	<style>
+		<!--
 		tr:hover {
 			background-color: #f0f0f0;
 		}
+		-->
 	</style>
 </head>
 <body>
@@ -27,7 +29,7 @@
 	{{if ne .CurrentUser 0}}
 		<h2>Allowances</h2>
 		<form action="/createAllowance" method="post">
-			<table border="1">
+			<table border=1>
 				<thead>
 				<tr>
 					<th>Name</th>
@@ -43,7 +45,7 @@
 						<td></td>
 						<td><label><input type="number" name="target" placeholder="Target"></label></td>
 						<td><label><input type="number" name="weight" placeholder="Weight"></label></td>
-						<td><button>Create</button></td>
+						<td><input type="submit" value="Create"></td>
 					</tr>
 				{{range .Allowances}}
 					{{if eq .ID 0}}
@@ -79,6 +81,7 @@
 					<th>Name</th>
 					<th>Assigned</th>
 					<th>Reward</th>
+					<th>Schedule</th>
 					<th>Actions</th>
 				</tr>
 				</thead>
@@ -94,6 +97,7 @@
 							{{end}}
 						</td>
 						<td>{{.Reward}}</td>
+						<td>{{.Schedule}}</td>
 						<td>
 							<a href="/completeTask?task={{.ID}}">Mark as completed</a>
 						</td>
@@ -103,7 +107,8 @@
 							<td><label><input type="text" name="name" placeholder="Name"></label></td>
 							<td></td>
 							<td><label><input type="number" name="reward" placeholder="Reward"></label></td>
-							<td><button>Create</button></td>
+							<td><label><input type="text" name="schedule" placeholder="Schedule"></label></td>
+							<td><input type="submit" value="Create"></td>
 						</tr>
 				</tbody>
 			</table>

common/api.yaml

@@ -422,7 +422,10 @@ components:
           description: The task name
         reward:
           type: integer
-          description: The task reward, in cents
+          description: The task reward
+        schedule:
+          type: string
+          description: The schedule of the task, in cron format
         assigned:
           type: integer
           description: The user ID of the user assigned to the task

frontend/allowance-planner-v2/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

frontend/allowance-planner-v2/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

frontend/allowance-planner-v2/android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">allowance-planner-v2</string>
+    <string name="app_name">Allowance Planner V2</string>
-    <string name="title_activity_main">allowance-planner-v2</string>
+    <string name="title_activity_main">Allowance Planner V2</string>
     <string name="package_name">io.ionic.starter</string>
     <string name="custom_url_scheme">io.ionic.starter</string>
 </resources>

frontend/allowance-planner-v2/capacitor.config.ts

@@ -2,7 +2,7 @@ import type { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
   appId: 'io.ionic.starter',
-  appName: 'allowance-planner-v2',
+  appName: 'Allowance Planner V2',
   webDir: 'www'
 };
 

frontend/allowance-planner-v2/package.json

@@ -47,6 +47,7 @@
     "@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/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/models/history.ts

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

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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,27 @@
+<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

@@ -0,0 +1,49 @@
+.toolbar {
+    display: flex;
+    align-items: center;
+}
+
+.icon {
+    margin-left: 5px;
+}
+
+form {
+    height: 100%;
+}
+
+form,
+.item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+input {
+    border: 1px solid var(--ion-color-primary);
+    border-radius: 5px;
+    width: 250px;
+    height: 40px;
+    padding-inline: 10px;
+    display: flex;
+    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: 100px;
+}
+
+button:disabled,
+button[disabled]{
+    opacity: 0.5;
+}

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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,51 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,52 @@
+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

@@ -6,6 +6,22 @@ const routes: Routes = [
   {
     path: ':id',
     component: AllowancePage,
+  },
+  {
+    path: ':id/add',
+    loadChildren: () => import('../edit-allowance/edit-allowance.module').then(m => m.EditAllowancePageModule)
+  },
+  {
+    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

@@ -1,8 +1,11 @@
 <ion-header [translucent]="true" class="ion-no-border">
   <ion-toolbar>
+    <div class="toolbar">
       <ion-title>
         Allowance
       </ion-title>
+      <button class="top-add-button" (click)="createAllowance()">Add Goal</button>
+    </div>
   </ion-toolbar>
 </ion-header>
 
@@ -34,15 +37,15 @@
       <div class="main" *ngIf="goal.id === 0; else other_goal">
         <div class="title">
           <div class="name">Main Allowance</div>
-          <div class="icon">
+          <div class="icon" (click)="updateAllowance(goal.id)">
             <mat-icon>settings</mat-icon>
           </div>
         </div>
         <div class="progress">{{ goal.progress }} SP</div>
         <div class="buttons">
-          <button class="add-button">Add</button>
+          <button class="add-button" (click)="addAllowance(goal.id)">Add</button>
           <!-- <button class="move-button">Move</button> -->
-          <button class="spend-button">Spend</button>
+          <button class="spend-button" (click)="spendAllowance(goal.id)">Spend</button>
         </div>
       </div>
       <ng-template #other_goal>
@@ -50,15 +53,15 @@
           <div>
             <div class="title">
               <div class="name">{{ goal.name }}</div>
-              <div class="icon">
+              <div class="icon" (click)="updateAllowance(goal.id)">
                 <mat-icon>settings</mat-icon>
               </div>
             </div>
             <div class="progress">{{ goal.progress }} / {{ goal.target }} SP</div>
             <div class="buttons">
-              <button class="add-button">Add</button>
+              <button class="add-button" (click)="addAllowance(goal.id)">Add</button>
               <!-- <button class="move-button">Move</button> -->
-              <button class="spend-button" [disabled]="!canFinishGoal(goal)">Finish goal</button>
+              <button class="spend-button" [disabled]="!canFinishGoal(goal)" (click)="completeGoal(goal.id)">Finish goal</button>
             </div>
           </div>
           <div class="color" [style.--background]="hexToRgb(goal.colour)" [style.width.%]="getPercentage(goal)"></div>

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

@@ -58,11 +58,10 @@ button {
     padding-inline: 30px;
     border-radius: 10px;
     color: white;
-    font-size: 16px;
 }
 
 button:disabled,
-button[disabled]{
+button[disabled] {
     opacity: 0.5;
 }
 
@@ -128,3 +127,13 @@ button[disabled]{
     border-radius: 20px;
     margin-right: 2px;
 }
+
+.toolbar {
+    display: flex;
+}
+
+.top-add-button {
+    background-color: var(--ion-color-primary);
+    margin-right: 15px;
+    padding-inline: 15px;
+}

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

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
 import { Allowance } from 'src/app/models/allowance';
 import { AllowanceService } from 'src/app/services/allowance.service';
@@ -14,23 +14,11 @@ import { ViewWillEnter } from '@ionic/angular';
 })
 export class AllowancePage implements ViewWillEnter {
   private id: number;
-  // Move to add/edit page later
-  private possibleColors: Array<string> = [
-    '#6199D9',
-    '#D98B61',
-    '#DBC307',
-    '#13DEB5',
-    '#7DCB7D',
-    '#CF1DBD',
-    '#F53311',
-    '#2F00FF',
-    '#098B0D',
-    '#1BC2E8'
-  ];
   public allowance$: BehaviorSubject<Array<Allowance>> = new BehaviorSubject<Array<Allowance>>([]);
 
   constructor(
     private route: ActivatedRoute,
+    private router: Router,
     private allowanceService: AllowanceService
   ) {
     this.id = this.route.snapshot.params['id'];
@@ -46,10 +34,9 @@ export class AllowancePage implements ViewWillEnter {
       this.allowanceService.getAllowanceList(this.id).subscribe(allowance => {
         allowance[0].colour = '#9C4BE4';
         allowance[0].name = 'Main Allowance';
-        console.log('Allowance list: ', allowance);
         this.allowance$.next(allowance);
       })
-    }, 10);
+    }, 100);
   }
 
   canFinishGoal(allowance: Allowance): boolean {
@@ -70,6 +57,30 @@ export class AllowancePage implements ViewWillEnter {
     for (let allowance of allowanceList) {
       allowanceTotal += allowance.progress;
     }
+    if (allowanceTotal === 0) {
+      return 0;
+    }
     return goal.progress / allowanceTotal * 100;
   }
+
+  createAllowance() {
+    this.router.navigate(['add'], { relativeTo: this.route });
+  }
+
+  updateAllowance(id: number) {
+    this.router.navigate(['edit', id], { relativeTo: this.route });
+  }
+
+  completeGoal(goalId: number) {
+    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/edit-allowance/edit-allowance-routing.module.ts

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

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

@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EditAllowancePageRoutingModule } from './edit-allowance-routing.module';
+
+import { EditAllowancePage } from './edit-allowance.page';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSelectModule } from '@angular/material/select';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EditAllowancePageRoutingModule,
+    ReactiveFormsModule,
+    MatIconModule,
+    MatSelectModule
+  ],
+  declarations: [EditAllowancePage]
+})
+export class EditAllowancePageModule {}

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

@@ -0,0 +1,47 @@
+<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">Create Goal</ion-title>
+      <ion-title *ngIf="!isAddMode && goalId != 0">Edit Goal</ion-title>
+      <ion-title *ngIf="!isAddMode && goalId == 0">Edit Allowance</ion-title>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <form [formGroup]="form">
+    <div class="item" *ngIf="isAddMode || goalId != 0">
+      <label>Goal Name</label>
+      <input id="name" type="text" formControlName="name"/>
+    </div>
+
+    <div class="item" *ngIf="isAddMode || goalId != 0">
+      <label>Target</label>
+      <input id="target" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="target"/>
+    </div>
+
+    <label>Weight</label>
+    <input id="weight" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="weight"/>
+
+    <div class="item" *ngIf="isAddMode || goalId != 0">
+      <label>Colour</label>
+      <mat-select [(value)]="selectedColor" formControlName="color" [style.--color]="selectedColor">
+        <mat-option *ngFor="let color of possibleColors" [value]="color" [style.--background]="color">{{color}}</mat-option>
+      </mat-select>
+    </div>
+
+    <button type="button" [disabled]="!form.valid" (click)="submit()">
+      <span *ngIf="isAddMode">Add Goal</span>
+      <span *ngIf="!isAddMode && goalId != 0">Update Goal</span>
+      <span *ngIf="!isAddMode && goalId == 0">Update Allowance</span>
+    </button>
+    <button
+      *ngIf="!isAddMode && goalId !=0"
+      class="remove-button"
+      (click)="deleteAllowance()"
+    >Delete Goal</button>
+  </form>
+</ion-content>

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

@@ -0,0 +1,64 @@
+.toolbar {
+    display: flex;
+    align-items: center;
+}
+
+.remove-button {
+    margin-top: 10px;
+    background-color: var(--negative-amount-color);
+}
+
+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;
+}
+
+input,
+mat-select {
+    --color: black;
+    color: var(--color);
+    border: 1px solid var(--ion-color-primary);
+    border-radius: 5px;
+    width: 250px;
+    height: 40px;
+    padding-inline: 10px;
+    display: flex;
+    align-items: center;
+    font-family: (--ion-font-family);
+}
+
+mat-option {
+    --background: white;
+    color: var(--background);
+    font-family: (--ion-font-family);
+}
+
+button {
+    background-color: var(--ion-color-primary);
+    border-radius: 5px;
+    color: white;
+    padding: 10px;
+    width: 250px;
+    margin-top: 100px;
+}
+
+button:disabled,
+button[disabled]{
+    opacity: 0.5;
+}
+
+.icon {
+    margin-left: 5px;
+}

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

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

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

@@ -0,0 +1,109 @@
+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 { AllowanceService } from 'src/app/services/allowance.service';
+
+@Component({
+  selector: 'app-edit-allowance',
+  templateUrl: './edit-allowance.page.html',
+  styleUrls: ['./edit-allowance.page.scss'],
+  standalone: false
+})
+export class EditAllowancePage implements OnInit {
+  public form: FormGroup;
+  public goalId: number;
+  public userId: number;
+  public isAddMode: boolean;
+  public selectedColor: string = '';
+  public possibleColors: Array<string> = [
+    '#6199D9',
+    '#D98B61',
+    '#DBC307',
+    '#13DEB5',
+    '#7DCB7D',
+    '#CF1DBD',
+    '#F53311',
+    '#2F00FF',
+    '#098B0D',
+    '#1BC2E8'
+  ];
+
+  constructor(
+    private route: ActivatedRoute,
+    private formBuilder: FormBuilder,
+    private allowanceService: AllowanceService,
+    private router: Router,
+    private location: Location
+  ) {
+    this.userId = this.route.snapshot.params['id'];
+    this.goalId = this.route.snapshot.params['goalId'];
+    this.isAddMode = !this.goalId;
+
+    this.allowanceService.getAllowanceList(this.userId).subscribe((list) => {
+      for (let allowance of list) {
+        this.possibleColors = this.possibleColors.filter(color => color !== allowance.colour);
+        if (!this.isAddMode && +this.goalId === allowance.id) {
+          this.possibleColors.unshift(allowance.colour);
+        }
+      }
+    });
+
+    this.form = this.formBuilder.group({
+      name: ['', Validators.required],
+      target: ['', Validators.required],
+      weight: ['', Validators.required],
+      color: ['', Validators.required]
+    });
+  }
+
+  ngOnInit() {
+    if (!this.isAddMode) {
+      this.allowanceService.getAllowanceById(this.goalId, this.userId).subscribe((allowance) => {
+        if (+this.goalId === 0) {
+          this.form.setValue({
+            name: 'Main Allowance',
+            target: 0,
+            weight: allowance.weight,
+            color: '#9C4BE4'
+          });
+        } else {
+          this.form.setValue({
+            name: allowance.name,
+            target: allowance.target,
+            weight: allowance.weight,
+            color: allowance.colour
+          });
+          this.selectedColor = this.form.value.color;
+        }
+      });
+    }
+  }
+
+  submit() {
+    const formValue = this.form.value;
+    const allowance = {
+      name: formValue.name,
+      target: formValue.target,
+      weight: formValue.weight,
+      colour: formValue.color,
+    };
+
+    if (this.isAddMode) {
+      this.allowanceService.createAllowance(allowance, this.userId);
+    } else {
+      this.allowanceService.updateAllowance(allowance, this.goalId, this.userId);
+    }
+
+    this.router.navigate(['/tabs/allowance', this.userId]);
+  }
+
+  deleteAllowance() {
+    this.allowanceService.deleteAllowance(this.goalId, this.userId);
+    this.router.navigate(['/tabs/allowance', this.userId]);
+  }
+
+  navigateBack() {
+    this.location.back();
+  }
+}

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

@@ -7,6 +7,8 @@ import { IonicModule } from '@ionic/angular';
 import { EditTaskPageRoutingModule } from './edit-task-routing.module';
 
 import { EditTaskPage } from './edit-task.page';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSelectModule } from '@angular/material/select';
 
 @NgModule({
   imports: [
@@ -14,7 +16,9 @@ import { EditTaskPage } from './edit-task.page';
     FormsModule,
     IonicModule,
     EditTaskPageRoutingModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    MatIconModule,
+    MatSelectModule
   ],
   declarations: [EditTaskPage]
 })

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

@@ -1,13 +1,11 @@
 <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">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>
@@ -18,16 +16,21 @@
     <input id="name" type="text" formControlName="name"/>
 
     <label>Reward</label>
-    <input id="name" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="reward"/>
+    <input id="reward" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="reward"/>
 
     <label>Assigned</label>
-    <select formControlName="assigned">
+    <mat-select formControlName="assigned">
-      <option *ngFor="let user of users" [value]="user.id">{{ user.name }}</option>
+      <mat-option *ngFor="let user of users" [value]="user.id">{{ user.name }}</mat-option>
-    </select>
+    </mat-select>
 
     <button type="button" [disabled]="!form.valid" (click)="submit()">
       <span *ngIf="isAddMode">Add Task</span>
       <span *ngIf="!isAddMode">Update Task</span>
     </button>
+    <button
+      *ngIf="!isAddMode"
+      class="remove-button"
+      (click)="deleteTask()"
+    >Delete task</button>
   </form>
 </ion-content>

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

@@ -1,12 +1,11 @@
 .toolbar {
     display: flex;
+    align-items: center;
 }
 
 .remove-button {
-    background-color: var(--ion-color-primary);
+    margin-top: 10px;
-    margin-right: 15px;
+    background-color: var(--negative-amount-color);
-    width: 85px;
-    margin-bottom: 0;
 }
 
 form {
@@ -23,10 +22,15 @@ label {
 }
 
 input,
-select {
+mat-select {
     border: 1px solid var(--ion-color-primary);
     border-radius: 5px;
     width: 250px;
+    height: 40px;
+    padding-inline: 10px;
+    display: flex;
+    align-items: center;
+    font-family: (--ion-font-family);
 }
 
 button {
@@ -35,11 +39,14 @@ button {
     color: white;
     padding: 10px;
     width: 250px;
-    margin-top: auto;
+    margin-top: 100px;
-    margin-bottom: 50px;
 }
 
 button:disabled,
 button[disabled]{
     opacity: 0.5;
 }
+
+.icon {
+    margin-left: 5px;
+}

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

@@ -23,7 +23,8 @@ export class EditTaskPage implements OnInit {
     private formBuilder: FormBuilder,
     private taskService: TaskService,
     private userService: UserService,
-    private router: Router
+    private router: Router,
+    private location: Location
   ) {
     this.id = this.route.snapshot.params['id'];
     this.isAddMode = !this.id;
@@ -77,4 +78,8 @@ export class EditTaskPage implements OnInit {
     this.taskService.deleteTask(this.id);
     this.router.navigate(['/tabs/tasks']);
   }
+
+  navigateBack() {
+    this.location.back();
+  }
 }

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

@@ -5,6 +5,8 @@ import { FormsModule } from '@angular/forms';
 import { HistoryPage } from './history.page';
 
 import { HistoryPageRoutingModule } from './history-routing.module';
+import { provideHttpClient } from '@angular/common/http';
+import { HistoryService } from 'src/app/services/history.service';
 
 @NgModule({
   imports: [
@@ -13,6 +15,10 @@ import { HistoryPageRoutingModule } from './history-routing.module';
     FormsModule,
     HistoryPageRoutingModule
   ],
-  declarations: [HistoryPage]
+  declarations: [HistoryPage],
+  providers: [
+    provideHttpClient(),
+    HistoryService
+  ]
 })
 export class HistoryPageModule {}

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

@@ -7,5 +7,14 @@
 </ion-header>
 
 <ion-content>
-
+  <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>
+    <div
+      class="amount"
+      [ngClass]="{ 'negative': history.allowance < 0 }"
+    >{{ history.allowance }} SP</div>
+  </div>
 </ion-content>

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

@@ -0,0 +1,30 @@
+.item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: 1px solid var(--line-color);
+    padding: 8px;
+}
+
+.left {
+    width: 70%;
+    font-size: 18px;
+}
+
+.date {
+    color: var(--line-color);
+}
+
+.description {
+    color: var(--font-color);
+}
+
+.amount {
+    margin-left: auto;
+    font-size: 22px;
+    color: var(--positive-amount-color);
+}
+
+.negative {
+    color: var(--negative-amount-color);
+}

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

@@ -1,4 +1,9 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ViewWillEnter } from '@ionic/angular';
+import { BehaviorSubject } from 'rxjs';
+import { History } from 'src/app/models/history';
+import { HistoryService } from 'src/app/services/history.service';
 
 @Component({
   selector: 'app-history',
@@ -6,8 +11,28 @@ import { Component } from '@angular/core';
   styleUrls: ['history.page.scss'],
   standalone: false,
 })
-export class HistoryPage {
+export class HistoryPage implements ViewWillEnter {
+  userId: number;
+  public history$: BehaviorSubject<Array<History>> = new BehaviorSubject<Array<History>>([]);
   
-  constructor() {}
 
+  constructor(
+    private route: ActivatedRoute,
+    private historyService: HistoryService
+  ) {
+    this.userId = this.route.snapshot.params['id'];
+    this.getHistory();
+  }
+
+  ionViewWillEnter(): void {
+    this.getHistory();
+  }
+
+  getHistory() {
+    setTimeout(() => {
+      this.historyService.getHistoryList(this.userId).subscribe(history => {
+        this.history$.next(history);
+      })
+    }, 20);
+  }
 }

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

@@ -8,7 +8,7 @@ const routes: Routes = [
     component: TabsPage,
     children: [
       {
-        path: 'history',
+        path: 'history/:id',
         loadChildren: () => import('../history/history.module').then(m => m.HistoryPageModule)
       },
       {

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

@@ -1,6 +1,6 @@
 <ion-tabs>
   <ion-tab-bar slot="bottom">
-    <ion-tab-button tab="history" href="/tabs/history">
+    <ion-tab-button [tab]="historyTab" [href]="historyNav">
       <mat-icon>history</mat-icon>
     </ion-tab-button>
     <ion-tab-button tab="allowance" href="/tabs/allowance">

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

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { StorageService } from 'src/app/services/storage.service';
 
 @Component({
   selector: 'app-tabs',
@@ -7,6 +8,16 @@ import { Component } from '@angular/core';
   standalone: false,
 })
 export class TabsPage {
-  constructor() {}
+  historyNav = '';
+  historyTab = '';
+
+  constructor(private storageService: StorageService) {
+    this.storageService.getCurrentUserId().then((userId) => {
+        if (userId !== undefined && userId !== null) {
+          this.historyNav = `/tabs/history/${userId}`;
+          this.historyTab = `history/${userId}`;
+        }
+      });
+  }
 
 }

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

@@ -11,14 +11,19 @@
 
 <ion-content>
   <div class="content">
-    <div class="icon">
+    <!-- <div class="icon">
       <mat-icon>filter_alt</mat-icon>
-    </div>
+    </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="name">{{ task.name }}</div>
+          <div class="text">
+            <div class="name">
+              {{ task.name }}
+              <span class="assigned">{{ usernames[task.assigned ? task.assigned : 0] }}</span>
+            </div>
+          </div>
           <div
             class="reward"
             [ngClass]="{ 'negative': task.reward < 0 }"

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

@@ -31,6 +31,8 @@ mat-icon {
     align-items: center;
     border-bottom: 1px solid var(--line-color);
     padding: 5px;
+    padding-block: 10px;
+    font-size: 18px;
 }
 
 .item {
@@ -41,7 +43,6 @@ mat-icon {
 }
 
 .name {
-    margin-left: 10px;
     color: var(--font-color);
 }
 
@@ -49,6 +50,7 @@ mat-icon {
     margin-left: auto;
     margin-right: 15px;
     color: var(--positive-amount-color);
+    font-size: 22px;
 }
 
 .negative {
@@ -56,15 +58,28 @@ mat-icon {
 }
 
 button {
-    width: 57px;
+    height: 45px;
-    height: 30px;
     border-radius: 10px;
     color: white;
     background: var(--confirm-button-color);
+    padding-inline: 15px;
 }
 
 .add-button {
     background-color: var(--ion-color-primary);
     margin-right: 15px;
-    width: 75px;
+    height: 30px;
+}
+
+.assigned {
+    color: var(--line-color);
+    margin-left: 3px;
+    font-size: 15px;
+}
+
+.text {
+    display: flex;
+    align-items: center;
+    width: 60%;
+    margin-left: 10px;
 }

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

@@ -14,6 +14,7 @@ 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,
@@ -32,7 +33,7 @@ export class TasksPage implements ViewWillEnter {
       this.taskService.getTaskList().subscribe(tasks => {
         this.tasks$.next(tasks);
       });
-    }, 10);
+    }, 100);
   }
 
   createTask() {

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

@@ -7,11 +7,35 @@ 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) {}
 
     getAllowanceList(userId: number): Observable<Array<Allowance>> {
         return this.http.get<Allowance[]>(`${this.url}/user/${userId}/allowance`);
     }
+
+    getAllowanceById(allowanceId: number, userId: number): Observable<Allowance> {
+        return this.http.get<Allowance>(`${this.url}/user/${userId}/allowance/${allowanceId}`);
+    }
+
+    createAllowance(allowance: Partial<Allowance>, userId: number) {
+        this.http.post(`${this.url}/user/${userId}/allowance`, allowance).subscribe();
+    }
+
+    updateAllowance(allowance: Partial<Allowance>, allowanceId: number, userId: number) {
+        this.http.put(`${this.url}/user/${userId}/allowance/${allowanceId}`, allowance).subscribe();
+    }
+
+    deleteAllowance(allowanceId: number, userId: number) {
+        this.http.delete(`${this.url}/user/${userId}/allowance/${allowanceId}`).subscribe();
+    }
+
+    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

@@ -0,0 +1,17 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { History } from '../models/history';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class HistoryService {
+    private url = 'https://allowanceplanner.seeseepuff.be/api';
+
+    constructor(private http: HttpClient) {}
+
+    getHistoryList(userId: number): Observable<Array<History>> {
+        return this.http.get<History[]>(`${this.url}/user/${userId}/history`);
+    }
+}

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

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<Array<User>> {

frontend/allowance-planner-v2/src/global.scss

@@ -38,8 +38,34 @@
 
 ion-title {
     color: var(--ion-color-primary);
+    font-size: 24px;
 }
 
 ion-header {
     border-bottom: 1px solid var(--line-color);
 }
+
+button {
+    font-size: 16px;
+}
+
+ion-header.md {
+    ion-toolbar:first-child {
+        --padding-top: 30px;
+        --padding-bottom: 15px;
+    }
+}
+
+label {
+    font-size: 18px;
+}
+
+ion-alert .alert-wrapper.sc-ion-alert-md {
+    background-color: var(--ion-background-color) !important;
+    --background: unset !important;
+    box-shadow: unset;
+}
+
+ion-alert .alert-tappable.sc-ion-alert-md {
+    background-color: var(--test-color);
+}