diff --git a/apps/finance/services/api/main/handler.go b/apps/finance/services/api/main/handler.go index c50ec9c..ffbdae0 100644 --- a/apps/finance/services/api/main/handler.go +++ b/apps/finance/services/api/main/handler.go @@ -9,6 +9,7 @@ import ( "log/slog" "math" "net/http" + "sort" "strings" "time" @@ -77,6 +78,22 @@ func parseTmpl(files ...string) *template.Template { "round": func(f float64) float64 { return math.Round(f) }, + "clampPct": func(spent, budget int64) int64 { + if budget <= 0 { + return 0 + } + pct := int64(float64(spent) / float64(budget) * 100) + if pct > 100 { + return 100 + } + if pct < 0 { + return 0 + } + return pct + }, + "isOver": func(spent, budget int64) bool { + return budget > 0 && spent > budget + }, "jsonVals": func(m map[string]int64) template.JS { var vals []string for _, v := range m { @@ -252,16 +269,41 @@ func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) { balPoints = balPoints[len(balPoints)-90:] } - render(w, dashboardTmpl, &DashboardData{ - UserID: a.UserID, - Email: a.Email, - Title: "Dashboard", - Route: "dashboard", - IsOwner: true, - ThisMonth: thisMonth, - LastMonth: lastMonth, - RecentTxns: recent, - BalanceTrend: balPoints, + // compute income vs expense split for this month + thisMonthIncome := int64(0) + thisMonthExpense := int64(0) + for _, amt := range thisMonth.ByCategory { + if amt > 0 { + thisMonthIncome += amt + } else { + thisMonthExpense += amt + } + } + + // budget data: map category name -> budget cents + catBudgets := make(map[string]int64) + catColors := make(map[string]string) + for _, c := range cats { + if c.BudgetCents > 0 { + catBudgets[c.Name] = c.BudgetCents + } + catColors[c.Name] = c.Color + } + + render(w, dashboardTmpl, map[string]interface{}{ + "UserID": a.UserID, + "Email": a.Email, + "Title": "Dashboard", + "Route": "dashboard", + "IsOwner": true, + "ThisMonth": thisMonth, + "LastMonth": lastMonth, + "RecentTxns": recent, + "BalanceTrend": balPoints, + "ThisMonthIncome": thisMonthIncome, + "ThisMonthExpense": thisMonthExpense, + "CategoryBudgets": catBudgets, + "CategoryColors": catColors, }) } @@ -306,21 +348,78 @@ func (h *Handler) Transactions(w http.ResponseWriter, r *http.Request) { } cats, _ := h.store.getCategories(ctx, a.UserID) + accounts, _ := h.store.getAccounts(ctx, a.UserID) + + accountNames := make(map[string]string) + for _, acc := range accounts { + accountNames[acc.ID] = acc.Name + } + + catColors := make(map[string]string) + for _, c := range cats { + catColors[c.Name] = c.Color + } render(w, txnsTmpl, map[string]interface{}{ - "UserID": a.UserID, - "Email": a.Email, - "Title": "Transactions", - "Route": "transactions", - "IsOwner": true, - "Txns": txns, - "Categories": cats, - "Cat": cat, - "Search": search, - "Days": daysStr, + "UserID": a.UserID, + "Email": a.Email, + "Title": "Transactions", + "Route": "transactions", + "IsOwner": true, + "Txns": txns, + "Categories": cats, + "Accounts": accounts, + "AccountNames": accountNames, + "CategoryColors": catColors, + "Cat": cat, + "Search": search, + "Days": daysStr, }) } +func (h *Handler) CreateTransaction(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + a := getAuth(r) + + var body struct { + AccountID string `json:"account_id"` + Date string `json:"date"` + Description string `json:"description"` + AmountCents int64 `json:"amount_cents"` + Category string `json:"category"` + } + if err := json.NewDecoder(r.Body).Decode(&body); err != nil { + http.Error(w, "bad request", http.StatusBadRequest) + return + } + + date, err := time.Parse("2006-01-02", body.Date) + if err != nil { + date = time.Now() + } + + txn := Transaction{ + ID: bson.NewObjectID().Hex(), + UserID: a.UserID, + AccountID: body.AccountID, + Date: date, + Description: body.Description, + AmountCents: body.AmountCents, + Category: body.Category, + CreatedAt: time.Now(), + } + + if err := h.store.createTransactions(ctx, []Transaction{txn}); err != nil { + slog.Error("create transaction", "err", err) + http.Error(w, "internal error", http.StatusInternalServerError) + return + } + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusCreated) + json.NewEncoder(w).Encode(txn) +} + func (h *Handler) ImportPage(w http.ResponseWriter, r *http.Request) { a := getAuth(r) accounts, _ := h.store.getAccounts(r.Context(), a.UserID) @@ -1085,18 +1184,11 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) { mux.HandleFunc("POST /sharing", h.Sharing) mux.HandleFunc("DELETE /sharing/{viewer_id}", h.Sharing) mux.HandleFunc("GET /api/users/search", h.SearchUsers) + mux.HandleFunc("POST /api/transactions", h.CreateTransaction) mux.HandleFunc("PUT /api/transactions/{id}", h.UpdateTransaction) mux.HandleFunc("DELETE /api/transactions/{id}", h.DeleteTransaction) } func sortStrings(s []string) { - if len(s) == 0 { - return - } + sort.Strings(s) } - -type stringSlice []string - -func (s stringSlice) Len() int { return len(s) } -func (s stringSlice) Less(i, j int) bool { return s[i] < s[j] } -func (s stringSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] } diff --git a/apps/finance/services/api/main/templates/categories.html b/apps/finance/services/api/main/templates/categories.html index 3d9e9f0..6746d77 100644 --- a/apps/finance/services/api/main/templates/categories.html +++ b/apps/finance/services/api/main/templates/categories.html @@ -1,44 +1,59 @@ {{define "content"}} {{$d := .}} -

Categories

+

Categories

-
-
-
+
+

Add Category

+ +
-
+
- +
- +
-
+
- + + + + + + {{range $d.Categories}} - - - + + + {{else}} - + {{end}}
ColorNameMonthly Budget
ColorNameMonthly Budget
{{.Name}}
- - €{{cents .BudgetCents}} + + {{.Name}} + + {{if gt .BudgetCents 0}}€{{cents .BudgetCents}}{{else}}No budget set{{end}} - + +
No categories yet.
No categories yet. Add one above.
@@ -47,19 +62,41 @@ {{end}} diff --git a/apps/finance/services/api/main/templates/dashboard.html b/apps/finance/services/api/main/templates/dashboard.html index 11fa960..6bd111a 100644 --- a/apps/finance/services/api/main/templates/dashboard.html +++ b/apps/finance/services/api/main/templates/dashboard.html @@ -1,39 +1,88 @@ {{define "content"}} {{$d := .}} {{$change := sub $d.ThisMonth.TotalCents $d.LastMonth.TotalCents}} -

Dashboard

+

Dashboard

-
+ +
-

This Month

+

This Month (Net)

€0
-

Last Month

-
€0
+

Income

+
€0
-

Change

+

Expenses

+
€0
+
+
+

vs Last Month

€0
-
+ +

Spending by Category (This Month)

- + {{if $d.ThisMonth.ByCategory}} + + {{else}} +
No spending data this month.
+ {{end}}
-

Balance Trend

- +

Balance Trend (90 days)

+ {{if $d.BalanceTrend}} + + {{else}} +
No transactions yet. Import some!
+ {{end}}
+ +{{if $d.CategoryBudgets}}
-

Recent Transactions

+

Budget vs Actual (This Month)

+
+ {{range $cat, $budget := $d.CategoryBudgets}} + {{$spent := index $d.ThisMonth.ByCategory $cat}} + {{$color := index $d.CategoryColors $cat}} + {{$spentAbs := centsAbs $spent}} +
+
+ + {{if $color}}{{end}} + {{$cat}} + + + €{{cents $spentAbs}} / €{{cents $budget}} + +
+
+
+
+
+ {{end}} +
+

Set budgets in Categories.

+
+{{end}} + + +
+
+

Recent Transactions

+ View all +
@@ -46,16 +95,25 @@ {{range $d.RecentTxns}} + {{$color := index $d.CategoryColors .Category}} - - - - + + + {{else}} - + {{end}}
{{dateShort .Date}}{{.Description}}{{.Category}} - €{{cents .AmountCents}} + {{dateShort .Date}}{{.Description}} + + {{if $color}}{{end}} + {{.Category}} + + + {{if lt .AmountCents 0}}−{{else}}+{{end}}€{{cents (centsAbs .AmountCents)}}
No transactions yet. Import some!
No transactions yet. Import some!
@@ -64,50 +122,42 @@ - {{end}}