Improve compatibility with ancient browsers

closes #63

Reviewed-on: #85

.gitea/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Backend Build and Test
+on: [push]
+
+jobs:
+  build:
+    runs-on: standard-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '>=1.24'
+
+      - name: Build
+        run: |
+          cd backend
+          go build .
+
+      - name: Test
+        run: |
+          cd backend
+          go test . -v

.gitea/workflows/deploy.yml

@@ -0,0 +1,27 @@
+name: Backend Deploy
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: standard-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login
+        with:
+          package_rw: ${{ secrets.PACKAGE_RW }}
+        run: docker login gitea.seeseepuff.be -u seeseemelk -p ${{ secrets.PACKAGE_RW }}
+
+      - name: Build
+        run: |
+          cd backend
+          docker build -t gitea.seeseepuff.be/seeseemelk/allowance-planner:$(git rev-parse --short HEAD) .
+
+      - name: Push
+        run: |
+          cd backend
+          docker push gitea.seeseepuff.be/seeseemelk/allowance-planner:$(git rev-parse --short HEAD)

README.md

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

backend/.gitignore

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

backend/Dockerfile

@@ -0,0 +1,14 @@
+FROM golang:1.24.2-alpine3.21
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY migrations ./migrations/
+COPY *.go ./
+COPY *.gohtml ./
+RUN go build -o /allowance_planner
+
+EXPOSE 8080
+ENV GIN_MODE=release
+CMD ["/allowance_planner"]

backend/api_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	TestAllowanceName = "Test History"
+	TestHistoryName = "Test History"
 )
 
 func startServer(t *testing.T) *httpexpect.Expect {
@@ -62,7 +62,7 @@ func TestGetUserAllowance(t *testing.T) {
 
 	// Create a new allowance
 	requestBody := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 5000,
 		"weight": 10,
 	}
@@ -73,7 +73,7 @@ func TestGetUserAllowance(t *testing.T) {
 	result.Length().IsEqual(2)
 	item := result.Value(1).Object()
 	item.Value("id").IsEqual(1)
-	item.Value("name").IsEqual(TestAllowanceName)
+	item.Value("name").IsEqual(TestHistoryName)
 	item.Value("target").IsEqual(5000)
 	item.Value("weight").IsEqual(10)
 	item.Value("progress").IsEqual(0)
@@ -95,7 +95,7 @@ func TestCreateUserAllowance(t *testing.T) {
 
 	// Create a new allowance
 	requestBody := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 5000,
 		"weight": 10,
 	}
@@ -120,7 +120,7 @@ func TestCreateUserAllowance(t *testing.T) {
 
 	allowance := allowances.Value(1).Object()
 	allowance.Value("id").IsEqual(allowanceId)
-	allowance.Value("name").IsEqual(TestAllowanceName)
+	allowance.Value("name").IsEqual(TestHistoryName)
 	allowance.Value("target").IsEqual(5000)
 	allowance.Value("weight").IsEqual(10)
 	allowance.Value("progress").IsEqual(0)
@@ -130,7 +130,7 @@ func TestCreateUserAllowanceNoUser(t *testing.T) {
 	e := startServer(t)
 
 	requestBody := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 5000,
 		"weight": 10,
 	}
@@ -171,7 +171,7 @@ func TestCreateUserAllowanceBadId(t *testing.T) {
 	e := startServer(t)
 
 	requestBody := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 5000,
 		"weight": 10,
 	}
@@ -187,7 +187,7 @@ func TestDeleteUserAllowance(t *testing.T) {
 
 	// Create a new allowance to delete
 	createRequest := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 1000,
 		"weight": 5,
 	}
@@ -434,7 +434,7 @@ func TestPutTaskInvalidTaskId(t *testing.T) {
 	e.PUT("/task/999").WithJSON(requestBody).Expect().Status(404)
 }
 
-func TestPostAllowance(t *testing.T) {
+func TestPostHistory(t *testing.T) {
 	e := startServer(t)
 
 	e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100}).Expect().Status(200)
@@ -445,7 +445,7 @@ func TestPostAllowance(t *testing.T) {
 	response.Value("allowance").Number().IsEqual(100 + 20 - 10)
 }
 
-func TestPostAllowanceInvalidUserId(t *testing.T) {
+func TestPostHistoryInvalidUserId(t *testing.T) {
 	e := startServer(t)
 
 	e.POST("/user/999/history").WithJSON(PostHistory{Allowance: 100}).Expect().
@@ -472,9 +472,10 @@ func TestGetUserAllowanceById(t *testing.T) {
 
 	// Create a new allowance
 	requestBody := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 5000,
 		"weight": 10,
+		"colour": "#FF5733",
 	}
 	resp := e.POST("/user/1/allowance").WithJSON(requestBody).Expect().Status(201).JSON().Object()
 	allowanceId := int(resp.Value("id").Number().Raw())
@@ -482,10 +483,21 @@ func TestGetUserAllowanceById(t *testing.T) {
 	// Retrieve the created allowance by ID
 	result := e.GET("/user/1/allowance/" + strconv.Itoa(allowanceId)).Expect().Status(200).JSON().Object()
 	result.Value("id").IsEqual(allowanceId)
-	result.Value("name").IsEqual(TestAllowanceName)
+	result.Value("name").IsEqual(TestHistoryName)
 	result.Value("target").IsEqual(5000)
 	result.Value("weight").IsEqual(10)
 	result.Value("progress").IsEqual(0)
+	result.Value("colour").IsEqual("#FF5733")
+
+	resultArray := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
+	resultArray.Length().IsEqual(2)
+	result = resultArray.Value(1).Object()
+	result.Value("id").IsEqual(allowanceId)
+	result.Value("name").IsEqual(TestHistoryName)
+	result.Value("target").IsEqual(5000)
+	result.Value("weight").IsEqual(10)
+	result.Value("progress").IsEqual(0)
+	result.Value("colour").IsEqual("#FF5733")
 }
 
 func TestGetUserByAllowanceIdInvalidAllowance(t *testing.T) {
@@ -513,9 +525,10 @@ func TestPutAllowanceById(t *testing.T) {
 
 	// Create a new allowance
 	requestBody := map[string]interface{}{
-		"name":   TestAllowanceName,
+		"name":   TestHistoryName,
 		"target": 5000,
 		"weight": 10,
+		"colour": "#FF5733",
 	}
 	resp := e.POST("/user/1/allowance").WithJSON(requestBody).Expect().Status(201).JSON().Object()
 	allowanceId := int(resp.Value("id").Number().Raw())
@@ -525,6 +538,7 @@ func TestPutAllowanceById(t *testing.T) {
 		"name":   "Updated Allowance",
 		"target": 6000,
 		"weight": 15,
+		"colour": "#3357FF",
 	}
 	e.PUT("/user/1/allowance/" + strconv.Itoa(allowanceId)).WithJSON(updateRequest).Expect().Status(200)
 
@@ -534,6 +548,7 @@ func TestPutAllowanceById(t *testing.T) {
 	result.Value("name").IsEqual("Updated Allowance")
 	result.Value("target").IsEqual(6000)
 	result.Value("weight").IsEqual(15)
+	result.Value("colour").IsEqual("#3357FF")
 }
 
 func TestCompleteTask(t *testing.T) {
@@ -549,12 +564,12 @@ func TestCompleteTask(t *testing.T) {
 	// Create two allowance goals
 	e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{
 		Name:   "Test Allowance 1",
-		Target: 1000,
+		Target: 100,
 		Weight: 50,
 	}).Expect().Status(201)
 	e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{
 		Name:   "Test Allowance 1",
-		Target: 1000,
+		Target: 10,
 		Weight: 25,
 	}).Expect().Status(201)
 
@@ -568,11 +583,11 @@ func TestCompleteTask(t *testing.T) {
 	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
 	allowances.Length().IsEqual(3)
 	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
-	allowances.Value(0).Object().Value("progress").Number().IsEqual(26)
+	allowances.Value(0).Object().Value("progress").Number().InDelta(30.34, 0.01)
 	allowances.Value(1).Object().Value("id").Number().IsEqual(1)
-	allowances.Value(1).Object().Value("progress").Number().IsEqual(50)
+	allowances.Value(1).Object().Value("progress").Number().InDelta(60.66, 0.01)
 	allowances.Value(2).Object().Value("id").Number().IsEqual(2)
-	allowances.Value(2).Object().Value("progress").Number().IsEqual(25)
+	allowances.Value(2).Object().Value("progress").Number().IsEqual(10)
 
 	// And also for user 2
 	allowances = e.GET("/user/2/allowance").Expect().Status(200).JSON().Array()
@@ -590,6 +605,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)
@@ -628,6 +673,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)
 
@@ -696,7 +746,7 @@ func getDelta(base time.Time, delta float64) (time.Time, time.Time) {
 	return start, end
 }
 
-func createTestAllowance(e *httpexpect.Expect, name string, target int, weight float64) {
+func createTestAllowance(e *httpexpect.Expect, name string, target float64, weight float64) {
 	e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{
 		Name:   name,
 		Target: target,

backend/colour.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+)
+
+func ConvertStringToColour(colourStr string) (int, error) {
+	if len(colourStr) == 0 {
+		return 0xFF0000, nil // Default colour if no string is provided
+	}
+	if colourStr[0] == '#' {
+		colourStr = colourStr[1:]
+	}
+	if len(colourStr) != 6 && len(colourStr) != 3 {
+		return 0, errors.New("colour must be a valid hex string")
+	}
+	var colour int
+	_, err := fmt.Sscanf(colourStr, "%x", &colour)
+	if err != nil {
+		return 0, fmt.Errorf("invalid colour format: %v", err)
+	}
+	if len(colourStr) == 3 {
+		r := (colour & 0xF00) >> 8
+		g := (colour & 0x0F0) >> 4
+		b := (colour & 0x00F) >> 0
+		colour = (r << 16 << 4) | (g << 8 << 4) | (b << 0 << 4)
+	}
+	return colour, nil
+}
+
+func ConvertColourToString(colour int) string {
+	return fmt.Sprintf("#%06X", colour)
+}

backend/colour_test.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestConvertStringToColourWithSign(t *testing.T) {
+	colour, err := ConvertStringToColour("#123456")
+	require.NoError(t, err)
+	require.Equal(t, 0x123456, colour)
+}
+
+func TestConvertStringToColourWithoutSign(t *testing.T) {
+	colour, err := ConvertStringToColour("123456")
+	require.NoError(t, err)
+	require.Equal(t, 0x123456, colour)
+}
+
+func TestConvertStringToColourWithSignThreeDigits(t *testing.T) {
+	colour, err := ConvertStringToColour("#ABC")
+	require.NoError(t, err)
+	require.Equal(t, 0xA0B0C0, colour)
+}
+
+func TestConvertStringToColourWithoutSignThreeDigits(t *testing.T) {
+	colour, err := ConvertStringToColour("ABC")
+	require.NoError(t, err)
+	require.Equal(t, 0xA0B0C0, colour)
+}

backend/db.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"log"
+	"math"
 	"time"
 
 	"gitea.seeseepuff.be/seeseemelk/mysqlite"
@@ -49,8 +50,10 @@ func (db *Db) GetUsers() ([]User, error) {
 func (db *Db) GetUser(id int) (*UserWithAllowance, error) {
 	user := &UserWithAllowance{}
 
+	var allowance int
 	err := db.db.Query("select u.id, u.name, (select ifnull(sum(h.amount), 0) from history h where h.user_id = u.id) from users u where u.id = ?").
-		Bind(id).ScanSingle(&user.ID, &user.Name, &user.Allowance)
+		Bind(id).ScanSingle(&user.ID, &user.Name, &allowance)
+	user.Allowance = float64(allowance) / 100.0
 	if err != nil {
 		return nil, err
 	}
@@ -70,18 +73,24 @@ func (db *Db) UserExists(userId int) (bool, error) {
 func (db *Db) GetUserAllowances(userId int) ([]Allowance, error) {
 	allowances := make([]Allowance, 0)
 	var err error
+	var progress int64
 
 	totalAllowance := Allowance{}
-	err = db.db.Query("select balance, weight from users where id = ?").Bind(userId).ScanSingle(&totalAllowance.Progress, &totalAllowance.Weight)
+	err = db.db.Query("select balance, weight from users where id = ?").Bind(userId).ScanSingle(&progress, &totalAllowance.Weight)
 	if err != nil {
 		return nil, err
 	}
+	totalAllowance.Progress = float64(progress) / 100.0
 	allowances = append(allowances, totalAllowance)
 
-	for row := range db.db.Query("select id, name, target, balance, weight from allowances where user_id = ?").
+	for row := range db.db.Query("select id, name, target, balance, weight, colour from allowances where user_id = ?").
 		Bind(userId).Range(&err) {
 		allowance := Allowance{}
-		err = row.Scan(&allowance.ID, &allowance.Name, &allowance.Target, &allowance.Progress, &allowance.Weight)
+		var target, progress, colour int
+		err = row.Scan(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight, &colour)
+		allowance.Target = float64(target) / 100.0
+		allowance.Progress = float64(progress) / 100.0
+		allowance.Colour = ConvertColourToString(colour)
 		if err != nil {
 			return nil, err
 		}
@@ -96,15 +105,22 @@ func (db *Db) GetUserAllowances(userId int) ([]Allowance, error) {
 func (db *Db) GetUserAllowanceById(userId int, allowanceId int) (*Allowance, error) {
 	allowance := &Allowance{}
 	if allowanceId == 0 {
+		var progress int64
 		err := db.db.Query("select balance, weight from users where id = ?").
-			Bind(userId).ScanSingle(&allowance.Progress, &allowance.Weight)
+			Bind(userId).ScanSingle(&progress, &allowance.Weight)
+		allowance.Progress = float64(progress) / 100.0
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		err := db.db.Query("select id, name, target, balance, weight from allowances where user_id = ? and id = ?").
+		var target, progress int64
+		var colour int
+		err := db.db.Query("select id, name, target, balance, weight, colour from allowances where user_id = ? and id = ?").
 			Bind(userId, allowanceId).
-			ScanSingle(&allowance.ID, &allowance.Name, &allowance.Target, &allowance.Progress, &allowance.Weight)
+			ScanSingle(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight, &colour)
+		allowance.Target = float64(target) / 100.0
+		allowance.Progress = float64(progress) / 100.0
+		allowance.Colour = ConvertColourToString(colour)
 		if err != nil {
 			return nil, err
 		}
@@ -128,9 +144,15 @@ func (db *Db) CreateAllowance(userId int, allowance *CreateAllowanceRequest) (in
 	}
 	defer tx.MustRollback()
 
+	// Convert string colour to a valid hex format
+	colour, err := ConvertStringToColour(allowance.Colour)
+	if err != nil {
+		return 0, err
+	}
+
 	// Insert the new allowance
-	err = tx.Query("insert into allowances (user_id, name, target, weight) values (?, ?, ?, ?)").
-		Bind(userId, allowance.Name, allowance.Target, allowance.Weight).
+	err = tx.Query("insert into allowances (user_id, name, target, weight, colour) values (?, ?, ?, ?, ?)").
+		Bind(userId, allowance.Name, int(math.Round(allowance.Target*100.0)), allowance.Weight, colour).
 		Exec()
 
 	if err != nil {
@@ -242,8 +264,14 @@ func (db *Db) UpdateAllowance(userId int, allowanceId int, allowance *UpdateAllo
 	}
 	defer tx.MustRollback()
 
-	err = tx.Query("update allowances set name=?, target=?, weight=? where id = ? and user_id = ?").
-		Bind(allowance.Name, allowance.Target, allowance.Weight, allowanceId, userId).
+	colour, err := ConvertStringToColour(allowance.Colour)
+	if err != nil {
+		return err
+	}
+
+	target := int(math.Round(allowance.Target * 100.0))
+	err = tx.Query("update allowances set name=?, target=?, weight=?, colour=? where id = ? and user_id = ?").
+		Bind(allowance.Name, target, allowance.Weight, colour, allowanceId, userId).
 		Exec()
 	if err != nil {
 		return err
@@ -284,8 +312,9 @@ func (db *Db) CreateTask(task *CreateTaskRequest) (int, error) {
 	defer tx.MustRollback()
 
 	// Insert the new task
+	reward := int(math.Round(task.Reward * 100.0))
 	err = tx.Query("insert into tasks (name, reward, assigned) values (?, ?, ?)").
-		Bind(task.Name, task.Reward, task.Assigned).
+		Bind(task.Name, reward, task.Assigned).
 		Exec()
 
 	if err != nil {
@@ -314,7 +343,9 @@ func (db *Db) GetTasks() ([]Task, error) {
 
 	for row := range db.db.Query("select id, name, reward, assigned from tasks").Range(&err) {
 		task := Task{}
-		err = row.Scan(&task.ID, &task.Name, &task.Reward, &task.Assigned)
+		var reward int64
+		err = row.Scan(&task.ID, &task.Name, &reward, &task.Assigned)
+		task.Reward = float64(reward) / 100.0
 		if err != nil {
 			return nil, err
 		}
@@ -329,8 +360,10 @@ func (db *Db) GetTasks() ([]Task, error) {
 func (db *Db) GetTask(id int) (Task, error) {
 	task := Task{}
 
+	var reward int64
 	err := db.db.Query("select id, name, reward, assigned from tasks where id = ?").
-		Bind(id).ScanSingle(&task.ID, &task.Name, &task.Reward, &task.Assigned)
+		Bind(id).ScanSingle(&task.ID, &task.Name, &reward, &task.Assigned)
+	task.Reward = float64(reward) / 100.0
 	if err != nil {
 		return Task{}, err
 	}
@@ -369,8 +402,9 @@ func (db *Db) UpdateTask(id int, task *CreateTaskRequest) error {
 	}
 	defer tx.MustRollback()
 
+	reward := int(math.Round(task.Reward * 100.0))
 	err = tx.Query("update tasks set name=?, reward=?, assigned=? where id = ?").
-		Bind(task.Name, task.Reward, task.Assigned, id).
+		Bind(task.Name, reward, task.Assigned, id).
 		Exec()
 	if err != nil {
 		return err
@@ -416,16 +450,20 @@ func (db *Db) CompleteTask(taskId int) error {
 
 		if sumOfWeights > 0 {
 			// Distribute the reward to the allowances
-			for allowanceRow := range tx.Query("select id, weight from allowances where user_id = ? and weight > 0").Bind(userId).Range(&err) {
-				var allowanceId int
+			for allowanceRow := range tx.Query("select id, weight, target, balance from allowances where user_id = ? and weight > 0 order by (target - balance) asc").Bind(userId).Range(&err) {
+				var allowanceId, allowanceTarget, allowanceBalance int
 				var allowanceWeight float64
-				err = allowanceRow.Scan(&allowanceId, &allowanceWeight)
+				err = allowanceRow.Scan(&allowanceId, &allowanceWeight, &allowanceTarget, &allowanceBalance)
 				if err != nil {
 					return err
 				}
 
 				// Calculate the amount to add to the allowance
 				amount := int((allowanceWeight / sumOfWeights) * float64(remainingReward))
+				if allowanceBalance+amount > allowanceTarget {
+					// If the amount reaches past the target, set it to the target
+					amount = allowanceTarget - allowanceBalance
+				}
 				sumOfWeights -= allowanceWeight
 				err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
 					Bind(amount, allowanceId, userId).Exec()
@@ -460,8 +498,9 @@ 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 (?, ?, ?)").
-		Bind(userId, time.Now().Unix(), allowance.Allowance).
+		Bind(userId, time.Now().Unix(), amount).
 		Exec()
 	if err != nil {
 		return err
@@ -476,11 +515,12 @@ func (db *Db) GetHistory(userId int) ([]History, error) {
 	for row := range db.db.Query("select amount, `timestamp` from history where user_id = ? order by `timestamp` desc").
 		Bind(userId).Range(&err) {
 		allowance := History{}
-		var timestamp int64
-		err = row.Scan(&allowance.Allowance, &timestamp)
+		var timestamp, amount int64
+		err = row.Scan(&amount, &timestamp)
 		if err != nil {
 			return nil, err
 		}
+		allowance.Allowance = float64(amount) / 100.0
 		allowance.Timestamp = time.Unix(timestamp, 0)
 		history = append(history, allowance)
 	}

backend/dto.go

@@ -8,46 +8,49 @@ type User struct {
 }
 
 type UserWithAllowance struct {
-	ID        int    `json:"id"`
-	Name      string `json:"name"`
-	Allowance int    `json:"allowance"`
+	ID        int     `json:"id"`
+	Name      string  `json:"name"`
+	Allowance float64 `json:"allowance"`
 }
 
 type History struct {
-	Allowance int       `json:"allowance"`
+	Allowance float64   `json:"allowance"`
 	Timestamp time.Time `json:"timestamp"`
 }
 
 type PostHistory struct {
-	Allowance int `json:"allowance"`
+	Allowance float64 `json:"allowance"`
 }
 
 // Task represents a task in the system.
 type Task struct {
-	ID       int    `json:"id"`
-	Name     string `json:"name"`
-	Reward   int    `json:"reward"`
-	Assigned *int   `json:"assigned"` // Pointer to allow null
+	ID       int     `json:"id"`
+	Name     string  `json:"name"`
+	Reward   float64 `json:"reward"`
+	Assigned *int    `json:"assigned"` // Pointer to allow null
 }
 
 type Allowance struct {
 	ID       int     `json:"id"`
 	Name     string  `json:"name"`
-	Target   int     `json:"target"`
-	Progress int     `json:"progress"`
+	Target   float64 `json:"target"`
+	Progress float64 `json:"progress"`
 	Weight   float64 `json:"weight"`
+	Colour   string  `json:"colour"`
 }
 
 type CreateAllowanceRequest struct {
 	Name   string  `json:"name"`
-	Target int     `json:"target"`
+	Target float64 `json:"target"`
 	Weight float64 `json:"weight"`
+	Colour string  `json:"colour"`
 }
 
 type UpdateAllowanceRequest struct {
 	Name   string  `json:"name"`
-	Target int     `json:"target"`
+	Target float64 `json:"target"`
 	Weight float64 `json:"weight"`
+	Colour string  `json:"colour"`
 }
 
 type BulkUpdateAllowanceRequest struct {
@@ -60,9 +63,9 @@ type CreateGoalResponse struct {
 }
 
 type CreateTaskRequest struct {
-	Name     string `json:"name" binding:"required"`
-	Reward   int    `json:"reward"`
-	Assigned *int   `json:"assigned"`
+	Name     string  `json:"name" binding:"required"`
+	Reward   float64 `json:"reward"`
+	Assigned *int    `json:"assigned"`
 }
 
 type CreateTaskResponse struct {

backend/go.sum

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

backend/main.go

@@ -43,6 +43,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 {
@@ -587,9 +592,14 @@ func start(ctx context.Context, config *ServerConfig) {
 	defer db.db.MustClose()
 
 	router := gin.Default()
-	router.Use(cors.New(cors.Config{
-		AllowOrigins: []string{"*"},
-	}))
+
+	corsConfig := cors.DefaultConfig()
+	corsConfig.AllowAllOrigins = true
+	router.Use(cors.New(corsConfig))
+
+	// Web endpoints
+	loadWebEndpoints(router)
+	// API endpoints
 	router.GET("/api/users", getUsers)
 	router.GET("/api/user/:userId", getUser)
 	router.POST("/api/user/:userId/history", postHistory)
@@ -645,5 +655,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/2_add_colour.sql

@@ -0,0 +1,2 @@
+alter table allowances
+add column colour integer;

backend/migrations/3_change_weight_default.sql

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

backend/web.go

@@ -0,0 +1,236 @@
+package main
+
+import (
+	"errors"
+	"github.com/gin-gonic/gin"
+	"log"
+	"net/http"
+	"strconv"
+)
+
+type ViewModel struct {
+	Users       []User
+	CurrentUser int
+	Allowances  []Allowance
+	Tasks       []Task
+	History     []History
+	Error       string
+}
+
+func loadWebEndpoints(router *gin.Engine) {
+	router.LoadHTMLFiles("web.gohtml")
+	router.GET("/", renderIndex)
+	router.GET("/login", renderLogin)
+	router.POST("/createTask", renderCreateTask)
+	router.GET("/completeTask", renderCompleteTask)
+	router.POST("/createAllowance", renderCreateAllowance)
+	router.GET("/completeAllowance", renderCompleteAllowance)
+}
+
+func redirectToPage(c *gin.Context, page string) {
+	scheme := c.Request.URL.Scheme
+	c.Redirect(http.StatusSeeOther, scheme+domain+page)
+}
+
+func renderLogin(c *gin.Context) {
+	if c.Query("user") != "" {
+		log.Println("Set cookie for user:", c.Query("user"))
+		c.SetCookie("user", c.Query("user"), 3600, "", "", false, true)
+	}
+	redirectToPage(c, "/")
+}
+
+func renderIndex(c *gin.Context) {
+	currentUser := getCurrentUser(c)
+	if currentUser == nil {
+		return
+	}
+	renderWithUser(c, *currentUser)
+}
+
+func renderCreateTask(c *gin.Context) {
+	currentUser := getCurrentUser(c)
+	if currentUser == nil {
+		return
+	}
+
+	name := c.PostForm("name")
+	rewardStr := c.PostForm("reward")
+	reward, err := strconv.ParseFloat(rewardStr, 64)
+	if err != nil {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+	if name == "" || reward <= 0 {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+
+	_, err = db.CreateTask(&CreateTaskRequest{
+		Name:   name,
+		Reward: reward,
+	})
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	c.Redirect(http.StatusFound, "/")
+}
+
+func renderCompleteTask(c *gin.Context) {
+	taskIDStr := c.Query("task")
+	taskID, err := strconv.Atoi(taskIDStr)
+	if err != nil {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+
+	err = db.CompleteTask(taskID)
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	c.Redirect(http.StatusFound, "/")
+}
+
+func renderCreateAllowance(c *gin.Context) {
+	currentUser := getCurrentUser(c)
+	if currentUser == nil {
+		return
+	}
+
+	name := c.PostForm("name")
+	targetStr := c.PostForm("target")
+	target, err := strconv.ParseFloat(targetStr, 64)
+	if err != nil {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+	weightStr := c.PostForm("weight")
+	weight, err := strconv.ParseFloat(weightStr, 64)
+	if err != nil {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+	if name == "" || target <= 0 || weight <= 0 {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+
+	_, err = db.CreateAllowance(*currentUser, &CreateAllowanceRequest{
+		Name:   name,
+		Target: target,
+		Weight: weight,
+	})
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	c.Redirect(http.StatusFound, "/")
+}
+
+func renderCompleteAllowance(c *gin.Context) {
+	currentUser := getCurrentUser(c)
+	if currentUser == nil {
+		return
+	}
+
+	allowanceIDStr := c.Query("allowance")
+	allowanceID, err := strconv.Atoi(allowanceIDStr)
+	if err != nil {
+		renderError(c, http.StatusBadRequest, err)
+		return
+	}
+
+	err = db.CompleteAllowance(*currentUser, allowanceID)
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	c.Redirect(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
+	}
+	if err != nil {
+		unsetUserCookie(c)
+		return nil
+	}
+	currentUser, err := strconv.Atoi(currentUserStr)
+	if err != nil {
+		unsetUserCookie(c)
+		return nil
+	}
+	userExists, err := db.UserExists(currentUser)
+	if !userExists || err != nil {
+		unsetUserCookie(c)
+		return nil
+	}
+	return &currentUser
+}
+
+func unsetUserCookie(c *gin.Context) {
+	c.SetCookie("user", "", -1, "/", "localhost", false, true)
+	c.Redirect(http.StatusFound, "/")
+}
+
+func renderNoUser(c *gin.Context) {
+	users, err := db.GetUsers()
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	c.HTML(http.StatusOK, "web.gohtml", ViewModel{
+		Users: users,
+	})
+}
+
+func renderWithUser(c *gin.Context, currentUser int) {
+	users, err := db.GetUsers()
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	allowances, err := db.GetUserAllowances(currentUser)
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	tasks, err := db.GetTasks()
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	history, err := db.GetHistory(currentUser)
+	if err != nil {
+		renderError(c, http.StatusInternalServerError, err)
+		return
+	}
+
+	c.HTML(http.StatusOK, "web.gohtml", ViewModel{
+		Users:       users,
+		CurrentUser: currentUser,
+		Allowances:  allowances,
+		Tasks:       tasks,
+		History:     history,
+	})
+}
+
+func renderError(c *gin.Context, statusCode int, err error) {
+	c.HTML(statusCode, "web.gohtml", ViewModel{
+		Error: err.Error(),
+	})
+}

backend/web.gohtml

@@ -0,0 +1,132 @@
+{{- /*gotype: allowance_planner.ViewModel*/}}
+<html lang="en">
+<head>
+	<title>Allowance Planner 2000</title>
+	<style>
+		tr:hover {
+			background-color: #f0f0f0;
+		}
+	</style>
+</head>
+<body>
+<h1>Allowance Planner 2000</h1>
+
+{{if ne .Error ""}}
+	<h2>Error</h2>
+	<p>{{.Error}}</p>
+{{else}}
+	<h2>Users</h2>
+	{{range .Users}}
+		{{if eq $.CurrentUser .ID}}
+			<strong>{{.Name}}</strong>
+		{{else}}
+			<a href="/login?user={{.ID}}">{{.Name}}</a>
+		{{end}}
+	{{end}}
+
+	{{if ne .CurrentUser 0}}
+		<h2>Allowances</h2>
+		<form action="/createAllowance" method="post">
+			<table border="1">
+				<thead>
+				<tr>
+					<th>Name</th>
+					<th>Progress</th>
+					<th>Target</th>
+					<th>Weight</th>
+					<th>Actions</th>
+				</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><label><input type="text" name="name" placeholder="Name"></label></td>
+						<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>
+					</tr>
+				{{range .Allowances}}
+					{{if eq .ID 0}}
+						<tr>
+							<td>Total</td>
+							<td>{{.Progress}}</td>
+							<td></td>
+							<td>{{.Weight}}</td>
+						</tr>
+					{{else}}
+						<tr>
+							<td>{{.Name}}</td>
+							<td><progress max="{{.Target}}" value="{{.Progress}}"></progress> ({{.Progress}})</td>
+							<td>{{.Target}}</td>
+							<td>{{.Weight}}</td>
+                            {{if ge .Progress .Target}}
+								<td>
+									<a href="/completeAllowance?allowance={{.ID}}">Mark as completed</a>
+								</td>
+                            {{end}}
+						</tr>
+					{{end}}
+				{{end}}
+				</tbody>
+			</table>
+		</form>
+
+		<h2>Tasks</h2>
+		<form method="post" action="/createTask">
+			<table border="1">
+				<thead>
+				<tr>
+					<th>Name</th>
+					<th>Assigned</th>
+					<th>Reward</th>
+					<th>Actions</th>
+				</tr>
+				</thead>
+				<tbody>
+				{{range .Tasks}}
+					<tr>
+						<td>{{.Name}}</td>
+						<td>
+							{{if eq .Assigned nil}}
+								None
+							{{else}}
+								{{.Assigned}}
+							{{end}}
+						</td>
+						<td>{{.Reward}}</td>
+						<td>
+							<a href="/completeTask?task={{.ID}}">Mark as completed</a>
+						</td>
+					</tr>
+				{{end}}
+						<tr>
+							<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>
+						</tr>
+				</tbody>
+			</table>
+		</form>
+
+		<h2>History</h2>
+		<table border="1">
+			<thead>
+			<tr>
+				<th>Timestamp</th>
+				<th>Allowance</th>
+			</tr>
+			</thead>
+			<tbody>
+			{{range .History}}
+				<tr>
+					<td>{{.Timestamp}}</td>
+					<td>{{.Allowance}}</td>
+				</tr>
+			{{end}}
+			</tbody>
+		</table>
+	{{end}}
+{{end}}
+</body>
+</html>

frontend/allowance-planner-v2/android/.gitignore

@@ -0,0 +1,101 @@
+# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
+
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Android Profiling
+*.hprof
+
+# Cordova plugins for Capacitor
+capacitor-cordova-android-plugins
+
+# Copied web assets
+app/src/main/assets/public
+
+# Generated Config files
+app/src/main/assets/capacitor.config.json
+app/src/main/assets/capacitor.plugins.json
+app/src/main/res/xml/config.xml

frontend/allowance-planner-v2/android/app/.gitignore

@@ -0,0 +1,2 @@
+/build/*
+!/build/.npmkeep

frontend/allowance-planner-v2/android/app/build.gradle

@@ -0,0 +1,54 @@
+apply plugin: 'com.android.application'
+
+android {
+    namespace "io.ionic.starter"
+    compileSdk rootProject.ext.compileSdkVersion
+    defaultConfig {
+        applicationId "io.ionic.starter"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        aaptOptions {
+             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
+             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
+            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
+    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
+    implementation project(':capacitor-android')
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation project(':capacitor-cordova-android-plugins')
+}
+
+apply from: 'capacitor.build.gradle'
+
+try {
+    def servicesJSON = file('google-services.json')
+    if (servicesJSON.text) {
+        apply plugin: 'com.google.gms.google-services'
+    }
+} catch(Exception e) {
+    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+}

frontend/allowance-planner-v2/android/app/capacitor.build.gradle

@@ -0,0 +1,22 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+
+android {
+  compileOptions {
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
+  }
+}
+
+apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
+dependencies {
+    implementation project(':capacitor-app')
+    implementation project(':capacitor-haptics')
+    implementation project(':capacitor-keyboard')
+    implementation project(':capacitor-status-bar')
+
+}
+
+
+if (hasProperty('postBuildExtras')) {
+  postBuildExtras()
+}

frontend/allowance-planner-v2/android/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

frontend/allowance-planner-v2/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.getcapacitor.myapp;
+
+import static org.junit.Assert.*;
+
+import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.getcapacitor.app", appContext.getPackageName());
+    }
+}

frontend/allowance-planner-v2/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:launchMode="singleTask"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"></meta-data>
+        </provider>
+    </application>
+
+    <!-- Permissions -->
+
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

frontend/allowance-planner-v2/android/app/src/main/java/io/ionic/starter/MainActivity.java

@@ -0,0 +1,5 @@
+package io.ionic.starter;
+
+import com.getcapacitor.BridgeActivity;
+
+public class MainActivity extends BridgeActivity {}

frontend/allowance-planner-v2/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

frontend/allowance-planner-v2/android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>

frontend/allowance-planner-v2/android/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,5 @@
+<?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"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?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"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

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

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="app_name">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/android/app/src/main/res/values/styles.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+    </style>
+
+
+    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
+        <item name="android:background">@drawable/splash</item>
+    </style>
+</resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="my_images" path="." />
+    <cache-path name="my_cache_images" path="." />
+</paths>

frontend/allowance-planner-v2/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java

@@ -0,0 +1,18 @@
+package com.getcapacitor.myapp;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

frontend/allowance-planner-v2/android/build.gradle

@@ -0,0 +1,29 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.google.gms:google-services:4.4.2'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+apply from: "variables.gradle"
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

frontend/allowance-planner-v2/android/capacitor.settings.gradle

@@ -0,0 +1,15 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+include ':capacitor-android'
+project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+
+include ':capacitor-app'
+project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+
+include ':capacitor-haptics'
+project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+
+include ':capacitor-keyboard'
+project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
+
+include ':capacitor-status-bar'
+project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')

frontend/allowance-planner-v2/android/gradle.properties

@@ -0,0 +1,22 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true

frontend/allowance-planner-v2/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

frontend/allowance-planner-v2/android/gradlew

@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

frontend/allowance-planner-v2/android/gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

frontend/allowance-planner-v2/android/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+include ':capacitor-cordova-android-plugins'
+project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
+
+apply from: 'capacitor.settings.gradle'

frontend/allowance-planner-v2/android/variables.gradle

@@ -0,0 +1,16 @@
+ext {
+    minSdkVersion = 23
+    compileSdkVersion = 35
+    targetSdkVersion = 35
+    androidxActivityVersion = '1.9.2'
+    androidxAppCompatVersion = '1.7.0'
+    androidxCoordinatorLayoutVersion = '1.2.0'
+    androidxCoreVersion = '1.15.0'
+    androidxFragmentVersion = '1.8.4'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.12.1'
+    junitVersion = '4.13.2'
+    androidxJunitVersion = '1.2.1'
+    androidxEspressoCoreVersion = '3.6.1'
+    cordovaAndroidVersion = '10.1.1'
+}

frontend/allowance-planner-v2/package-lock.json

@@ -18,6 +18,7 @@
         "@angular/platform-browser": "^19.0.0",
         "@angular/platform-browser-dynamic": "^19.0.0",
         "@angular/router": "^19.0.0",
+        "@capacitor/android": "7.2.0",
         "@capacitor/app": "7.0.1",
         "@capacitor/core": "7.2.0",
         "@capacitor/haptics": "7.0.1",
@@ -2452,6 +2453,14 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@capacitor/android": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-7.2.0.tgz",
+      "integrity": "sha512-zdhEy3jZPG5Toe/pGzKtDgIiBGywjaoEuQWnGVjBYPlSAEUtAhpZ2At7V0SCb26yluAuzrAUV0Ue+LQeEtHwFQ==",
+      "peerDependencies": {
+        "@capacitor/core": "^7.2.0"
+      }
+    },
     "node_modules/@capacitor/app": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-7.0.1.tgz",

frontend/allowance-planner-v2/package.json

@@ -23,6 +23,7 @@
     "@angular/platform-browser": "^19.0.0",
     "@angular/platform-browser-dynamic": "^19.0.0",
     "@angular/router": "^19.0.0",
+    "@capacitor/android": "7.2.0",
     "@capacitor/app": "7.0.1",
     "@capacitor/core": "7.2.0",
     "@capacitor/haptics": "7.0.1",

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

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

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

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

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

@@ -0,0 +1,10 @@
+export interface Allowance {
+    id: number;
+    name: string;
+    target: number;
+    // Current allowance value
+    progress: number;
+    // Can be any positive number (backend checks for number relative to each other)
+    weight: number;
+    colour: string;
+}

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

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

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

@@ -5,14 +5,22 @@ import { FormsModule } from '@angular/forms';
 import { AllowancePage } from './allowance.page';
 
 import { AllowancePageRoutingModule } from './allowance-routing.module';
+import { AllowanceService } from 'src/app/services/allowance.service';
+import { provideHttpClient } from '@angular/common/http';
+import { MatIconModule } from '@angular/material/icon';
 
 @NgModule({
   imports: [
     IonicModule,
     CommonModule,
     FormsModule,
-    AllowancePageRoutingModule
+    AllowancePageRoutingModule,
+    MatIconModule
   ],
-  declarations: [AllowancePage]
+  declarations: [AllowancePage],
+  providers: [
+    provideHttpClient(),
+    AllowanceService
+  ]
 })
 export class AllowancePageModule {}

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

@@ -7,4 +7,63 @@
 </ion-header>
 
 <ion-content>
+  <div class="content" *ngIf="allowance$ | async as allowance">
+    <div class="bar">
+      <div class="distribution">Allowance distribution</div>
+      <div class="allowance-bar">
+        <span
+          *ngFor="let goal of allowance"
+          class="partition"
+          [style.--partition-color]="goal.colour"
+          [style.width.%]="getPartitionSize(goal, allowance)"
+        ></span>
+      </div>
+      <div class="legend">
+        <div class="legend-item" [style.--legend-color]="goal.colour" *ngFor="let goal of allowance">
+          <div class="circle"></div>
+          <div class="title">{{ goal.name }}</div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="goal"
+      [style.--used-color]="goal.colour"
+      [ngClass]="{'other-goals': goal.id !== 0}"
+      *ngFor="let goal of allowance"
+    >
+      <div class="main" *ngIf="goal.id === 0; else other_goal">
+        <div class="title">
+          <div class="name">Main Allowance</div>
+          <div class="icon">
+            <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="move-button">Move</button> -->
+          <button class="spend-button">Spend</button>
+        </div>
+      </div>
+      <ng-template #other_goal>
+        <div class="color-wrapper">
+          <div>
+            <div class="title">
+              <div class="name">{{ goal.name }}</div>
+              <div class="icon">
+                <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="move-button">Move</button> -->
+              <button class="spend-button" [disabled]="!canFinishGoal(goal)">Finish goal</button>
+            </div>
+          </div>
+          <div class="color" [style.--background]="hexToRgb(goal.colour)" [style.width.%]="getPercentage(goal)"></div>
+        </div>
+      </ng-template>
+    </div>
+  </div>
 </ion-content>

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

@@ -0,0 +1,130 @@
+.goal {
+    border: 1px solid var(--used-color);
+    border-radius: 10px;
+    padding: 10px;
+    margin-bottom: 20px;
+    margin-left: 10px;
+    margin-right: 10px;
+    color: var(--used-color);
+}
+
+.name {
+    font-size: 20px;
+}
+
+.progress {
+    color: var(--font-color);
+    margin-left: 15px;
+    margin-top: 8px;
+    margin-bottom: 15px;
+    font-size: 16px;
+}
+
+.bar {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    margin-left: 20px;
+}
+
+.distribution {
+    color: var(--ion-color-primary);
+}
+
+.allowance-bar {
+    display: flex;
+    width: 95%;
+    height: 15px !important;
+    border-radius: 15px;
+    background-color: var(--font-color);
+    overflow: hidden;
+}
+
+.partition {
+    --partition-color: white;
+    background-color: var(--partition-color);
+    width: 25%;
+    height: 100%;
+    //border-radius: 15px;
+}
+
+.buttons,
+.title {
+    display: flex;
+    gap: 10px;
+}
+
+button {
+    height: 30px;
+    padding-inline: 30px;
+    border-radius: 10px;
+    color: white;
+    font-size: 16px;
+}
+
+button:disabled,
+button[disabled]{
+    opacity: 0.5;
+}
+
+.add-button {
+    background-color: var(--confirm-button-color);
+}
+
+.move-button {
+    background-color: var(--ion-color-primary);
+}
+
+.spend-button {
+    background-color: var(--negative-amount-color);
+}
+
+.icon {
+    margin-left: auto;
+    color: var(--font-color);
+}
+
+.color-wrapper {
+    padding: 10px;
+    border-radius: 9px;
+    position: relative;
+    z-index: 1;
+}
+
+.color {
+    --background: rgba(0, 0, 0, 0.3);
+    background-color: var(--background);
+    border-radius: 9px;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: -1;
+}
+
+.other-goals {
+    padding: unset;
+}
+
+.legend {
+    width: 95%;
+    display: flex;
+    font-size: 13px;
+    gap: 8px;
+    margin-top: 5px;
+    flex-wrap: wrap;
+}
+
+.legend-item {
+    display: flex;
+    --legend-color: white;
+    color: var(--legend-color);
+    align-items: center;
+}
+
+.circle {
+    width: 12px;
+    height: 12px;
+    background-color: var(--legend-color);
+    border-radius: 20px;
+    margin-right: 2px;
+}

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

@@ -1,5 +1,10 @@
 import { Component } from '@angular/core';
-import { UserService } from 'src/app/services/user.service';
+import { ActivatedRoute } from '@angular/router';
+import { BehaviorSubject } from 'rxjs';
+import { Allowance } from 'src/app/models/allowance';
+import { AllowanceService } from 'src/app/services/allowance.service';
+import hexRgb from 'hex-rgb';
+import { ViewWillEnter } from '@ionic/angular';
 
 @Component({
   selector: 'app-allowance',
@@ -7,8 +12,64 @@ import { UserService } from 'src/app/services/user.service';
   styleUrls: ['allowance.page.scss'],
   standalone: false,
 })
-export class AllowancePage {
+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 userService: UserService) {}
+  constructor(
+    private route: ActivatedRoute,
+    private allowanceService: AllowanceService
+  ) {
+    this.id = this.route.snapshot.params['id'];
+    this.getAllowance();
+  }
 
+  ionViewWillEnter(): void {
+    this.getAllowance();
+  }
+
+  getAllowance() {
+    setTimeout(() => {
+      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);
+  }
+
+  canFinishGoal(allowance: Allowance): boolean {
+    return allowance.progress >= allowance.target;
+  }
+
+  hexToRgb(color: string) {
+    return hexRgb(color, { alpha: 0.3, format: 'css' })
+  }
+
+  getPercentage(allowance: Allowance): number {
+    return allowance.progress / allowance.target * 100;
+  }
+
+  // Returns number in percent
+  getPartitionSize(goal: Allowance, allowanceList: Array<Allowance>): number {
+    let allowanceTotal = 0;
+    for (let allowance of allowanceList) {
+      allowanceTotal += allowance.progress;
+    }
+    return goal.progress / allowanceTotal * 100;
+  }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { Allowance } from '../models/allowance';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class AllowanceService {
+    private url = 'http://localhost:8080/api';
+
+    constructor(private http: HttpClient) {}
+
+    getAllowanceList(userId: number): Observable<Array<Allowance>> {
+        return this.http.get<Allowance[]>(`${this.url}/user/${userId}/allowance`);
+    }
+}

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

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

frontend/node_modules/.package-lock.json

@@ -0,0 +1,27 @@
+{
+  "name": "frontend",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/@ionic/pwa-elements": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@ionic/pwa-elements/-/pwa-elements-3.3.0.tgz",
+      "integrity": "sha512-vbykpxd2nGRlA67AnqDwsiVf8PUmInLyi6lQdnPDjeiML1WZa0CPe6r632nGDV9PTi+sWNde9Xexg9SD6Pwyqw==",
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=8.0.0"
+      }
+    },
+    "node_modules/hex-rgb": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-5.0.0.tgz",
+      "integrity": "sha512-NQO+lgVUCtHxZ792FodgW0zflK+ozS9X9dwGp9XvvmPlH7pyxd588cn24TD3rmPm/N0AIRXF10Otah8yKqGw4w==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}

frontend/node_modules/@ionic/pwa-elements/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Ionic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

frontend/node_modules/@ionic/pwa-elements/dist/cjs/index.cjs.js

@@ -0,0 +1,2 @@
+'use strict';
+

frontend/node_modules/@ionic/pwa-elements/dist/cjs/ionicpwaelements.cjs.js

@@ -0,0 +1,26 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const index = require('./index-d7f36e37.js');
+
+/*
+ Stencil Client Patch Browser v3.4.0 | MIT Licensed | https://stenciljs.com
+ */
+const patchBrowser = () => {
+    const importMeta = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('ionicpwaelements.cjs.js', document.baseURI).href));
+    const opts = {};
+    // TODO(STENCIL-663): Remove code related to deprecated `safari10` field.
+    if (importMeta !== '') {
+        opts.resourcesUrl = new URL('.', importMeta).href;
+        // TODO(STENCIL-661): Remove code related to the dynamic import shim
+        // TODO(STENCIL-663): Remove code related to deprecated `safari10` field.
+    }
+    return index.promiseResolve(opts);
+};
+
+patchBrowser().then(options => {
+  return index.bootstrapLazy([["pwa-camera-modal.cjs",[[1,"pwa-camera-modal",{"facingMode":[1,"facing-mode"],"hidePicker":[4,"hide-picker"],"present":[64],"dismiss":[64]}]]],["pwa-action-sheet.cjs",[[1,"pwa-action-sheet",{"header":[1],"cancelable":[4],"options":[16],"open":[32]}]]],["pwa-toast.cjs",[[1,"pwa-toast",{"message":[1],"duration":[2],"closing":[32]}]]],["pwa-camera.cjs",[[1,"pwa-camera",{"facingMode":[1,"facing-mode"],"handlePhoto":[16],"hidePicker":[4,"hide-picker"],"handleNoDeviceError":[16],"noDevicesText":[1,"no-devices-text"],"noDevicesButtonText":[1,"no-devices-button-text"],"photo":[32],"photoSrc":[32],"showShutterOverlay":[32],"flashIndex":[32],"hasCamera":[32],"rotation":[32],"deviceError":[32]}]]],["pwa-camera-modal-instance.cjs",[[1,"pwa-camera-modal-instance",{"facingMode":[1,"facing-mode"],"hidePicker":[4,"hide-picker"],"noDevicesText":[1,"no-devices-text"],"noDevicesButtonText":[1,"no-devices-button-text"]},[[16,"keyup","handleBackdropKeyUp"]]]]]], options);
+});
+
+exports.setNonce = index.setNonce;

frontend/node_modules/@ionic/pwa-elements/dist/cjs/loader.cjs.js

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const index = require('./index-d7f36e37.js');
+
+/*
+ Stencil Client Patch Esm v3.4.0 | MIT Licensed | https://stenciljs.com
+ */
+const patchEsm = () => {
+    return index.promiseResolve();
+};
+
+const defineCustomElements = (win, options) => {
+  if (typeof window === 'undefined') return Promise.resolve();
+  return patchEsm().then(() => {
+  return index.bootstrapLazy([["pwa-camera-modal.cjs",[[1,"pwa-camera-modal",{"facingMode":[1,"facing-mode"],"hidePicker":[4,"hide-picker"],"present":[64],"dismiss":[64]}]]],["pwa-action-sheet.cjs",[[1,"pwa-action-sheet",{"header":[1],"cancelable":[4],"options":[16],"open":[32]}]]],["pwa-toast.cjs",[[1,"pwa-toast",{"message":[1],"duration":[2],"closing":[32]}]]],["pwa-camera.cjs",[[1,"pwa-camera",{"facingMode":[1,"facing-mode"],"handlePhoto":[16],"hidePicker":[4,"hide-picker"],"handleNoDeviceError":[16],"noDevicesText":[1,"no-devices-text"],"noDevicesButtonText":[1,"no-devices-button-text"],"photo":[32],"photoSrc":[32],"showShutterOverlay":[32],"flashIndex":[32],"hasCamera":[32],"rotation":[32],"deviceError":[32]}]]],["pwa-camera-modal-instance.cjs",[[1,"pwa-camera-modal-instance",{"facingMode":[1,"facing-mode"],"hidePicker":[4,"hide-picker"],"noDevicesText":[1,"no-devices-text"],"noDevicesButtonText":[1,"no-devices-button-text"]},[[16,"keyup","handleBackdropKeyUp"]]]]]], options);
+  });
+};
+
+exports.setNonce = index.setNonce;
+exports.defineCustomElements = defineCustomElements;