Add lite website (#73)

Reviewed-on: #73

backend/.gitignore

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

backend/api_test.go

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

backend/db.go

@@ -416,16 +416,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) {
+			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 int
+				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()

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

@@ -592,6 +592,9 @@ func start(ctx context.Context, config *ServerConfig) {
 	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)

backend/web.go

@@ -0,0 +1,228 @@
+package main
+
+import (
+	"errors"
+	"github.com/gin-gonic/gin"
+	"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 renderLogin(c *gin.Context) {
+	if c.Query("user") != "" {
+		c.SetCookie("user", c.Query("user"), 3600, "/", "localhost", false, true)
+	}
+	c.Redirect(http.StatusFound, "/")
+}
+
+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.Atoi(rewardStr)
+	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.Atoi(targetStr)
+	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")
+	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>