diff --git a/apps/finance/services/api/main/handler.go b/apps/finance/services/api/main/handler.go index a5103ed..4be62c7 100644 --- a/apps/finance/services/api/main/handler.go +++ b/apps/finance/services/api/main/handler.go @@ -125,6 +125,8 @@ var ( taxTmpl = parseTmpl("templates/base.html", "templates/tax.html") householdTmpl = parseTmpl("templates/base.html", "templates/household.html") autoImportTmpl = parseTmpl("templates/base.html", "templates/auto_import.html") + peopleTmpl = parseTmpl("templates/base.html", "templates/people.html") + settingsTmpl = parseTmpl("templates/base.html", "templates/settings.html") ) type authInfo struct { @@ -2252,6 +2254,159 @@ func (h *Handler) AutoImport(w http.ResponseWriter, r *http.Request) { }) } +// ── People (Sharing + Household merged) ─────────────────────────────────────── + +func (h *Handler) People(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + a := getAuth(r) + tab := r.URL.Query().Get("tab") + if tab == "" { + tab = "sharing" + } + + // Handle mutations — redirect back preserving tab + if r.Method == http.MethodPost { + _ = r.ParseForm() + switch r.FormValue("_action") { + case "share": + viewerID := r.FormValue("viewer_id") + if viewerID != "" && viewerID != a.UserID { + existing, _ := h.store.getPermissions(ctx, a.UserID) + already := false + for _, p := range existing { + if p.ViewerID == viewerID { + already = true + break + } + } + if !already { + _ = h.store.createPermission(ctx, &Permission{ + ID: bson.NewObjectID().Hex(), + OwnerID: a.UserID, + ViewerID: viewerID, + CreatedAt: time.Now(), + }) + } + } + http.Redirect(w, r, "/people?tab=sharing", http.StatusSeeOther) + return + case "household": + partnerEmail := strings.TrimSpace(r.FormValue("partner_email")) + if partnerEmail != "" { + _ = h.store.createHousehold(ctx, &Household{ + ID: bson.NewObjectID().Hex(), + OwnerID: a.UserID, + PartnerID: partnerEmail, + CreatedAt: time.Now(), + }) + } + http.Redirect(w, r, "/people?tab=household", http.StatusSeeOther) + return + } + } + + if r.Method == http.MethodDelete { + switch r.URL.Query().Get("kind") { + case "share": + _ = h.store.deletePermission(ctx, a.UserID, r.PathValue("id")) + case "household": + _ = h.store.deleteHousehold(ctx, a.UserID) + } + w.WriteHeader(http.StatusNoContent) + return + } + + data := &PeopleData{ + UserID: a.UserID, + Email: a.Email, + Title: "People", + Route: "people", + Tab: tab, + } + + // Sharing data + perms, _ := h.store.getPermissions(ctx, a.UserID) + granted, _ := h.store.getGrantedViewers(ctx, a.UserID) + viewerIDs := map[string]bool{} + for _, p := range perms { + viewerIDs[p.ViewerID] = true + } + for id := range viewerIDs { + data.Viewers = append(data.Viewers, SharingUser{ID: id, Email: id}) + } + data.Grants = perms + data.Granted = granted + + // Household data + now := time.Now() + hh, err := h.store.getHousehold(ctx, a.UserID) + if err == nil && hh != nil { + data.HasHousehold = true + data.IsOwner = hh.OwnerID == a.UserID + partnerID := hh.PartnerID + if hh.OwnerID != a.UserID { + partnerID = hh.OwnerID + } + data.PartnerID = partnerID + data.PartnerEmail = partnerID + + monthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC) + nextMonth := monthStart.AddDate(0, 1, 0) + myTxns, _ := h.store.getTransactions(ctx, a.UserID, bson.M{"date": bson.M{"$gte": monthStart, "$lt": nextMonth}}) + partnerTxns, _ := h.store.getTransactions(ctx, partnerID, bson.M{"date": bson.M{"$gte": monthStart, "$lt": nextMonth}}) + for _, t := range myTxns { + if t.AmountCents > 0 { + data.MyIncomeCents += t.AmountCents + } else { + data.CombinedExpenseCents += -t.AmountCents + } + } + for _, t := range partnerTxns { + if t.AmountCents > 0 { + data.PartnerIncomeCents += t.AmountCents + } else { + data.CombinedExpenseCents += -t.AmountCents + } + } + data.CombinedIncomeCents = data.MyIncomeCents + data.PartnerIncomeCents + data.CombinedDisposable = data.CombinedIncomeCents - data.CombinedExpenseCents + myGoals, _ := h.store.getGoals(ctx, a.UserID) + partnerGoals, _ := h.store.getGoals(ctx, partnerID) + for _, g := range myGoals { + data.MyGoals = append(data.MyGoals, GoalPlan{Goal: g}) + } + for _, g := range partnerGoals { + data.PartnerGoals = append(data.PartnerGoals, GoalPlan{Goal: g}) + } + } + + render(w, peopleTmpl, data) +} + +// ── Settings (Accounts + Categories merged) ──────────────────────────────────── + +func (h *Handler) Settings(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + a := getAuth(r) + tab := r.URL.Query().Get("tab") + if tab == "" { + tab = "accounts" + } + + accounts, _ := h.store.getAccounts(ctx, a.UserID) + categories, _ := h.store.getCategories(ctx, a.UserID) + + render(w, settingsTmpl, &SettingsData{ + UserID: a.UserID, + Email: a.Email, + Title: "Settings", + Route: "settings", + Tab: tab, + Accounts: accounts, + Categories: categories, + }) +} + func (h *Handler) RegisterRoutes(mux *http.ServeMux) { mux.HandleFunc("GET /{$}", h.Dashboard) mux.HandleFunc("GET /transactions", h.Transactions) @@ -2259,10 +2414,8 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) { mux.HandleFunc("POST /import/preview", h.ImportPreview) mux.HandleFunc("POST /import/confirm", h.ImportConfirm) mux.HandleFunc("POST /import/securities", h.ImportSecurities) - mux.HandleFunc("GET /accounts", h.Accounts) mux.HandleFunc("POST /accounts", h.Accounts) mux.HandleFunc("DELETE /accounts/{id}", h.Accounts) - mux.HandleFunc("GET /categories", h.Categories) mux.HandleFunc("POST /categories", h.Categories) mux.HandleFunc("PUT /categories/{id}", h.Categories) mux.HandleFunc("DELETE /categories/{id}", h.Categories) @@ -2273,18 +2426,31 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) { mux.HandleFunc("POST /goals", h.Goals) mux.HandleFunc("GET /networth", h.NetWorth) mux.HandleFunc("GET /simulator", h.Simulator) - mux.HandleFunc("GET /sharing", h.Sharing) - mux.HandleFunc("POST /sharing", h.Sharing) - mux.HandleFunc("DELETE /sharing/{viewer_id}", h.Sharing) + // legacy redirects so old bookmarks / links keep working + mux.HandleFunc("GET /sharing", func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, "/people?tab=sharing", http.StatusMovedPermanently) + }) + mux.HandleFunc("GET /household", func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, "/people?tab=household", http.StatusMovedPermanently) + }) + mux.HandleFunc("GET /accounts", func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, "/settings?tab=accounts", http.StatusMovedPermanently) + }) + mux.HandleFunc("GET /categories", func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, "/settings?tab=categories", http.StatusMovedPermanently) + }) + // people page + mux.HandleFunc("GET /people", h.People) + mux.HandleFunc("POST /people", h.People) + mux.HandleFunc("DELETE /people/{id}", h.People) + // settings page + mux.HandleFunc("GET /settings", h.Settings) 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) mux.HandleFunc("GET /tax", h.Tax) mux.HandleFunc("GET /tax/export.csv", h.TaxExport) - mux.HandleFunc("GET /household", h.Household) - mux.HandleFunc("POST /household", h.Household) - mux.HandleFunc("DELETE /household", h.Household) mux.HandleFunc("GET /auto-import", h.AutoImport) } diff --git a/apps/finance/services/api/main/models.go b/apps/finance/services/api/main/models.go index d230dda..fa15ee0 100644 --- a/apps/finance/services/api/main/models.go +++ b/apps/finance/services/api/main/models.go @@ -270,6 +270,44 @@ type Household struct { CreatedAt time.Time `bson:"created_at" json:"created_at"` } +// PeopleData combines Sharing and Household into a single page. +type PeopleData struct { + UserID string + Email string + Title string + Route string + Tab string // "sharing" | "household" + + // sharing tab + Grants []Permission + Viewers []SharingUser + Granted []Permission + + // household tab + HasHousehold bool + IsOwner bool + PartnerEmail string + PartnerID string + CombinedIncomeCents int64 + CombinedExpenseCents int64 + CombinedDisposable int64 + MyIncomeCents int64 + PartnerIncomeCents int64 + MyGoals []GoalPlan + PartnerGoals []GoalPlan +} + +// SettingsData combines Accounts and Categories into a single page. +type SettingsData struct { + UserID string + Email string + Title string + Route string + Tab string // "accounts" | "categories" + Accounts []Account + Categories []Category +} + type HouseholdData struct { UserID string Email string diff --git a/apps/finance/services/api/main/templates/base.html b/apps/finance/services/api/main/templates/base.html index 0291d0e..3f5d3fa 100644 --- a/apps/finance/services/api/main/templates/base.html +++ b/apps/finance/services/api/main/templates/base.html @@ -140,6 +140,48 @@ .nav a:not(.nav-brand):hover { color: var(--text); background: var(--surface2); } .nav a.active { color: var(--accent2); background: var(--accent-glow); } .nav-spacer { flex: 1; } + + /* ── Nav dropdown ─────────────────────────────────────────────────── */ + .nav-group { position: relative; } + .nav-group-btn { + display: flex; align-items: center; gap: 4px; + color: var(--text2); + font-size: 13.5px; font-weight: 500; + padding: 6px 10px; + border-radius: var(--radius-sm); + border: none; background: none; cursor: pointer; + transition: all 0.18s ease; white-space: nowrap; + } + .nav-group-btn:hover { color: var(--text); background: var(--surface2); } + .nav-group-btn.active { color: var(--accent2); background: var(--accent-glow); } + .nav-group-btn svg { width:10px; height:10px; transition: transform 0.18s ease; } + .nav-group:hover .nav-group-btn svg { transform: rotate(180deg); } + .nav-dropdown { + display: none; + position: absolute; top: calc(100% + 6px); left: 0; + background: var(--surface); + border: 1px solid var(--border2); + border-radius: var(--radius); + box-shadow: var(--shadow-md); + min-width: 160px; + z-index: 200; + padding: 6px; + flex-direction: column; gap: 2px; + } + .nav-group:hover .nav-dropdown { display: flex; } + .nav-dropdown a { + display: block; + padding: 7px 12px; + border-radius: var(--radius-sm); + font-size: 13px; font-weight: 500; + color: var(--text2); text-decoration: none; + white-space: nowrap; + transition: all 0.15s ease; + } + .nav-dropdown a:hover { color: var(--text); background: var(--surface2); } + .nav-dropdown a.active { color: var(--accent2); background: var(--accent-glow); } + .nav-dropdown hr { border: none; border-top: 1px solid var(--border); margin: 4px 0; } + .nav-email { font-size: 12px; color: var(--text3); @@ -391,21 +433,39 @@
₣
Finance - Dashboard + Dashboard Transactions - Import - Accounts - Categories - Reports - Projections Portfolio Goals - Net Worth - What If - Tax - Household - Import Guide - Sharing + + {{$analysisActive := or (eq .Route "reports") (eq .Route "projections") (eq .Route "networth") (eq .Route "simulator") (eq .Route "tax")}} +
+ +
+ Reports + Projections + Tax +
+ Net Worth + What If +
+
+ + People + + {{$settingsActive := or (eq .Route "settings") (eq .Route "auto-import")}} +
+ +
+ Accounts & Categories + Import CSV + Import Guide +
+
{{.Email}} diff --git a/apps/finance/services/api/main/templates/people.html b/apps/finance/services/api/main/templates/people.html new file mode 100644 index 0000000..6bcbebe --- /dev/null +++ b/apps/finance/services/api/main/templates/people.html @@ -0,0 +1,167 @@ +{{template "base" .}} + +{{define "content"}} +{{$d := .}} + + +

People

+ +
+ Sharing + Household +
+ +{{if eq $d.Tab "sharing"}} + +
+

Grant read access

+

Enter another user's ID to let them view your finances in read-only mode.

+
+ +
+ + +
+
+
+ +{{if $d.Viewers}} +
+

People with access to your data

+ {{range $d.Viewers}} +
+ {{.Email}} + +
+ {{end}} +
+{{end}} + +{{if $d.Granted}} +
+

Accounts you can view

+ {{range $d.Granted}} +
+ {{.OwnerID}} + View → +
+ {{end}} +
+{{end}} + +{{if and (not $d.Viewers) (not $d.Granted)}} +
No sharing configured yet.
+{{end}} + +{{else}}{{/* household tab */}} + +{{if not $d.HasHousehold}} +
+

Link a partner account

+

Combine finances with a partner to see a shared monthly overview and goals.

+
+ +
+ + +
+
+
+{{else}} + +
+
+
Linked partner
+
{{$d.PartnerEmail}}
+
+ +
+ +
+
+ +
€{{cents $d.CombinedIncomeCents}}
+
+
+ +
€{{cents $d.MyIncomeCents}}
+
+
+ +
€{{cents $d.PartnerIncomeCents}}
+
+
+ +
€{{cents $d.CombinedExpenseCents}}
+
+
+ +
+ {{if lt $d.CombinedDisposable 0}}-{{end}}€{{cents (centsAbs $d.CombinedDisposable)}} +
+
+
+ +{{if or $d.MyGoals $d.PartnerGoals}} +
+
+

Your Goals

+ {{range $d.MyGoals}} +
+ {{.Name}} + {{if .Committed}}committed{{end}} +
+ {{else}}
No goals
{{end}} +
+
+

Partner Goals

+ {{range $d.PartnerGoals}} +
+ {{.Name}} + {{if .Committed}}committed{{end}} +
+ {{else}}
No goals
{{end}} +
+
+{{end}} + +{{end}}{{/* HasHousehold */}} +{{end}}{{/* tab */}} + + +{{end}} diff --git a/apps/finance/services/api/main/templates/settings.html b/apps/finance/services/api/main/templates/settings.html new file mode 100644 index 0000000..75bc3a0 --- /dev/null +++ b/apps/finance/services/api/main/templates/settings.html @@ -0,0 +1,191 @@ +{{template "base" .}} + +{{define "content"}} +{{$d := .}} + + +

Settings

+ +
+ Accounts + Categories +
+ +{{if eq $d.Tab "accounts"}} + +
+

Add account

+
+
+ + + +
+
+
+ +
+ {{if $d.Accounts}} + + + + {{range $d.Accounts}} + + + + + + {{end}} + +
NameType
{{.Name}}{{.Type}} + +
+ {{else}} +
No accounts yet — add one above.
+ {{end}} +
+ +{{else}}{{/* categories tab */}} + +
+

Add category

+
+
+ + + + +
+
+
+ +
+ {{if $d.Categories}} + + + + {{range $d.Categories}} + + + + + + {{end}} + +
CategoryMonthly Budget
+ + {{.Name}} + + {{if .BudgetCents}} + €{{cents .BudgetCents}} + {{else}} + — + {{end}} + + + +
+ {{else}} +
No categories yet — add one above.
+ {{end}} +
+ +{{end}} + + + + + +{{end}}