diff --git a/internal/handler/space.go b/internal/handler/space.go index b9ab270..dee72ab 100644 --- a/internal/handler/space.go +++ b/internal/handler/space.go @@ -78,15 +78,9 @@ func (h *spaceHandler) HomePage(w http.ResponseWriter, r *http.Request) { ownedCards := h.buildSpaceCards(owned) sharedCards := h.buildSpaceCards(shared) - total := decimal.Zero - for _, c := range ownedCards { - total = total.Add(c.TotalBalance) - } - ui.Render(w, r, pages.Home(pages.HomeProps{ OwnedSpaces: ownedCards, SharedSpaces: sharedCards, - TotalBalance: total, })) } @@ -106,12 +100,7 @@ func (h *spaceHandler) SpacesPage(w http.ResponseWriter, r *http.Request) { cards := h.buildSpaceCards(spaces) - total := decimal.Zero - for _, c := range cards { - total = total.Add(c.TotalBalance) - } - - ui.Render(w, r, pages.Spaces(cards, total)) + ui.Render(w, r, pages.Spaces(cards)) } func (h *spaceHandler) SharedSpacesPage(w http.ResponseWriter, r *http.Request) { @@ -141,22 +130,10 @@ func (h *spaceHandler) buildSpaceCards(spaces []*model.Space) []blocks.SpaceCard memberCount = 0 } - accounts, err := h.accountService.GetAccountsForSpace(sp.ID) - if err != nil { - slog.Error("failed to get space accounts", "error", err, "space_id", sp.ID) - accounts = nil - } - - totalBalance := decimal.Zero - for _, acc := range accounts { - totalBalance = totalBalance.Add(acc.Balance) - } - cards = append(cards, blocks.SpaceCardInfo{ - ID: sp.ID, - Name: sp.Name, - MemberCount: memberCount, - TotalBalance: totalBalance, + ID: sp.ID, + Name: sp.Name, + MemberCount: memberCount, }) } return cards diff --git a/internal/ui/blocks/space_card.templ b/internal/ui/blocks/space_card.templ index e98ae98..14c3d01 100644 --- a/internal/ui/blocks/space_card.templ +++ b/internal/ui/blocks/space_card.templ @@ -1,16 +1,14 @@ package blocks -import "github.com/shopspring/decimal" import "strings" import "git.juancwu.dev/juancwu/budgit/internal/ui/components/icon" import "fmt" import "git.juancwu.dev/juancwu/budgit/internal/routeurl" type SpaceCardInfo struct { - ID string - Name string - MemberCount int - TotalBalance decimal.Decimal + ID string + Name string + MemberCount int } templ SpaceCard(info SpaceCardInfo) { @@ -23,8 +21,6 @@ templ SpaceCard(info SpaceCardInfo) {

{ info.Name }

- ${ info.TotalBalance.StringFixedBank(2) } - { fmt.Sprintf("%d members", info.MemberCount) }

diff --git a/internal/ui/pages/home.templ b/internal/ui/pages/home.templ index 54ec359..dc3765c 100644 --- a/internal/ui/pages/home.templ +++ b/internal/ui/pages/home.templ @@ -9,14 +9,11 @@ import ( "git.juancwu.dev/juancwu/budgit/internal/ui/components/button" "git.juancwu.dev/juancwu/budgit/internal/ui/components/icon" "git.juancwu.dev/juancwu/budgit/internal/ui/layouts" - "git.juancwu.dev/juancwu/budgit/internal/ui/utils" - "github.com/shopspring/decimal" ) type HomeProps struct { OwnedSpaces []blocks.SpaceCardInfo SharedSpaces []blocks.SpaceCardInfo - TotalBalance decimal.Decimal } templ Home(props HomeProps) { @@ -36,14 +33,6 @@ templ Home(props HomeProps) {

Hello, { displayName }

if totalSpaces == 0 {

Create a space to start tracking your expenses.

- } else { - {{ - countPhrase := fmt.Sprintf("Across %d spaces", totalSpaces) - if totalSpaces == 1 { - countPhrase = "Across 1 space" - } - }} -

{ countPhrase } you own you have ${ utils.FormatDecimalWithThousands(props.TotalBalance.StringFixedBank(2)) } tracked.

}
diff --git a/internal/ui/pages/spaces.templ b/internal/ui/pages/spaces.templ index 5148575..58b1c97 100644 --- a/internal/ui/pages/spaces.templ +++ b/internal/ui/pages/spaces.templ @@ -1,8 +1,6 @@ package pages import ( - "fmt" - "git.juancwu.dev/juancwu/budgit/internal/ctxkeys" "git.juancwu.dev/juancwu/budgit/internal/routeurl" "git.juancwu.dev/juancwu/budgit/internal/ui/blocks" @@ -10,11 +8,9 @@ import ( "git.juancwu.dev/juancwu/budgit/internal/ui/components/icon" "git.juancwu.dev/juancwu/budgit/internal/ui/components/sidebar" "git.juancwu.dev/juancwu/budgit/internal/ui/layouts" - "git.juancwu.dev/juancwu/budgit/internal/ui/utils" - "github.com/shopspring/decimal" ) -templ Spaces(spaces []blocks.SpaceCardInfo, totalBalance decimal.Decimal) { +templ Spaces(spaces []blocks.SpaceCardInfo) { {{ user := ctxkeys.User(ctx) displayName := "" @@ -30,14 +26,6 @@ templ Spaces(spaces []blocks.SpaceCardInfo, totalBalance decimal.Decimal) {

Hello, { displayName }

if len(spaces) == 0 {

Create a space to start tracking your expenses.

- } else { - {{ - countPhrase := fmt.Sprintf("Across %d spaces", len(spaces)) - if len(spaces) == 1 { - countPhrase = "Across 1 space" - } - }} -

{ countPhrase } you have ${ utils.FormatDecimalWithThousands(totalBalance.StringFixedBank(2)) } tracked.

}