juancwu/budgit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: transfer funds between accounts
All checks were successful
Deploy / build-and-deploy (push) Successful in 1m32s
Details

Browse source
This commit is contained in:
juancwu 2026-05-04 02:18:30 +00:00
commit ff237e2fab
14 changed files with 1186 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/ui/pages/space_account.templ
View file

@ -16,7 +16,8 @@ type SpaceAccountPageProps struct {
AccountID string
AccountName string
AccountBalance decimal.Decimal
RecentTransactions []*model.Transaction
RecentTransactions []*model.Transaction
NonEditableTransactionIDs map[string]bool
}
templ SpaceAccountPage(props SpaceAccountPageProps) {
@ -92,9 +93,10 @@ templ SpaceAccountPage(props SpaceAccountPageProps) {
}
@card.Content() {
@blocks.TransactionList(blocks.TransactionListProps{
SpaceID: props.SpaceID,
AccountID: props.AccountID,
Transactions: props.RecentTransactions,
SpaceID: props.SpaceID,
AccountID: props.AccountID,
Transactions: props.RecentTransactions,
NonEditableIDs: props.NonEditableTransactionIDs,
})
}
@card.Footer(card.FooterProps{Class: "justify-end"}) {

23
internal/ui/pages/space_account_activity.templ
View file

@ -147,9 +147,12 @@ func accountActivityTxMessage(spaceID, accountID string, log *model.TransactionA
switch log.Action {
case model.TransactionAuditActionCreated:
var meta struct {
TransactionType string `json:"transaction_type"`
Title string `json:"title"`
Amount string `json:"amount"`
TransactionType string `json:"transaction_type"`
Title string `json:"title"`
Amount string `json:"amount"`
TransferRole string `json:"transfer_role"`
TransferOtherAcct string `json:"transfer_other_acct"`
TransferOtherName string `json:"transfer_other_name"`
}
_ = json.Unmarshal(log.Metadata, &meta)
title := meta.Title
@ -161,6 +164,20 @@ func accountActivityTxMessage(spaceID, accountID string, log *model.TransactionA
if meta.Amount != "" {
amountSuffix = fmt.Sprintf(" for $%s", templEscape(meta.Amount))
}
// Transfer events get a more descriptive sentence so users can see
// which side this entry is and where the money went / came from.
if meta.TransferRole != "" {
direction := "to"
if meta.TransferRole == "destination" {
direction = "from"
}
otherName := meta.TransferOtherName
if otherName == "" {
otherName = "another account"
}
return fmt.Sprintf("%s transferred %s%s %s %s.",
actor, titleHTML, amountSuffix, templEscape(direction), bold(otherName))
}
return fmt.Sprintf("%s added a %s %s%s.",
actor, templEscape(transactionTypeLabel(meta.TransactionType)), titleHTML, amountSuffix)
case model.TransactionAuditActionEdited:

26
internal/ui/pages/space_account_transactions.templ
View file

@ -11,15 +11,16 @@ import "git.juancwu.dev/juancwu/budgit/internal/ui/components/icon"
import "git.juancwu.dev/juancwu/budgit/internal/ui/components/pagination"
type SpaceAccountTransactionsPageProps struct {
SpaceID string
SpaceName string
AccountID string
AccountName string
Transactions []*model.Transaction
CurrentPage int
TotalPages int
TotalCount int
PerPage int
SpaceID string
SpaceName string
AccountID string
AccountName string
Transactions []*model.Transaction
NonEditableTransactionIDs map[string]bool
CurrentPage int
TotalPages int
TotalCount int
PerPage int
}
templ SpaceAccountTransactionsPage(props SpaceAccountTransactionsPageProps) {
@ -62,9 +63,10 @@ templ SpaceAccountTransactionsPage(props SpaceAccountTransactionsPageProps) {
}
@card.Content() {
@blocks.TransactionList(blocks.TransactionListProps{
SpaceID: props.SpaceID,
AccountID: props.AccountID,
Transactions: props.Transactions,
SpaceID: props.SpaceID,
AccountID: props.AccountID,
Transactions: props.Transactions,
NonEditableIDs: props.NonEditableTransactionIDs,
})
}
if props.TotalPages > 1 {

32
internal/ui/pages/space_create_transfer.templ Normal file
View file

@ -0,0 +1,32 @@
package pages
import "git.juancwu.dev/juancwu/budgit/internal/ui/forms"
import "git.juancwu.dev/juancwu/budgit/internal/ui/layouts"
type SpaceCreateTransferPageProps struct {
SpaceID string
SpaceName string
AccountID string
AccountName string
Form forms.CreateTransferProps
}
templ SpaceCreateTransferPage(props SpaceCreateTransferPageProps) {
@layouts.AppWithBreadcrumb(
"Transfer Funds",
accountChildBreadcrumb(props.SpaceID, props.SpaceName, props.AccountID, props.AccountName, "Transfer Funds"),
spaceOverviewSidebarContent(),
spaceSpecificSidebarContent(props.SpaceID),
spaceAccountSidebarContent(props.SpaceID, props.AccountID),
) {
<div class="container max-w-3xl px-6 py-8 mx-auto space-y-8">
<div>
<h1 class="text-3xl font-bold">Transfer Funds</h1>
<p class="text-muted-foreground mt-2">
Move money out of { props.AccountName } into another account in this space.
</p>
</div>
@forms.CreateTransfer(props.Form)
</div>
}
}

10
internal/ui/pages/space_overview.templ
View file

@ -144,6 +144,16 @@ templ spaceAccountSidebarContent(spaceID, accountID string) {
<span>Deposit Funds</span>
}
}
@sidebar.MenuItem() {
@sidebar.MenuButton(sidebar.MenuButtonProps{
Href: routeurl.URL("page.app.spaces.space.accounts.account.transfers.create", "spaceID", spaceID, "accountID", accountID),
IsActive: ctxkeys.URLPath(ctx) == routeurl.URL("page.app.spaces.space.accounts.account.transfers.create", "spaceID", spaceID, "accountID", accountID),
Tooltip: "Transfer Funds",
}) {
@icon.ArrowRightLeft()
<span>Transfer Funds</span>
}
}
@sidebar.MenuItem() {
@sidebar.MenuButton(sidebar.MenuButtonProps{
Href: routeurl.URL("page.app.spaces.space.accounts.account.activity", "spaceID", spaceID, "accountID", accountID),

51
internal/ui/pages/space_transaction.templ
View file

@ -9,14 +9,16 @@ import "git.juancwu.dev/juancwu/budgit/internal/ui/layouts"
import "git.juancwu.dev/juancwu/budgit/internal/ui/utils"
type SpaceTransactionPageProps struct {
SpaceID string
SpaceName string
AccountID string
AccountName string
Transaction *model.Transaction
CategoryName string
RecentAuditLogs []*model.TransactionAuditLogWithActor
AuditLogCount int
SpaceID string
SpaceName string
AccountID string
AccountName string
Transaction *model.Transaction
CategoryName string
RecentAuditLogs []*model.TransactionAuditLogWithActor
AuditLogCount int
RelatedTransaction *model.Transaction
RelatedAccount *model.Account
}
templ SpaceTransactionPage(props SpaceTransactionPageProps) {
@ -53,13 +55,15 @@ templ SpaceTransactionPage(props SpaceTransactionPageProps) {
{ label } in { props.AccountName }
</p>
</div>
@button.Button(button.Props{
Variant: button.VariantDefault,
Href: routeurl.URL("page.app.spaces.space.accounts.account.transactions.transaction.edit", "spaceID", props.SpaceID, "accountID", props.AccountID, "transactionID", props.Transaction.ID),
Class: "flex items-center gap-2",
}) {
@icon.Pencil(icon.Props{Class: "size-4"})
Edit
if props.RelatedTransaction == nil {
@button.Button(button.Props{
Variant: button.VariantDefault,
Href: routeurl.URL("page.app.spaces.space.accounts.account.transactions.transaction.edit", "spaceID", props.SpaceID, "accountID", props.AccountID, "transactionID", props.Transaction.ID),
Class: "flex items-center gap-2",
}) {
@icon.Pencil(icon.Props{Class: "size-4"})
Edit
}
}
</div>
@card.Card() {
@ -100,6 +104,23 @@ templ SpaceTransactionPage(props SpaceTransactionPageProps) {
<p class="whitespace-pre-wrap">{ *props.Transaction.Description }</p>
</div>
}
if props.RelatedTransaction != nil && props.RelatedAccount != nil {
{{
direction := "to"
if props.Transaction.Type == model.TransactionTypeDeposit {
direction = "from"
}
}}
<div>
<p class="text-sm text-muted-foreground">Transferred { direction }</p>
<a
class="font-medium underline-offset-2 hover:underline"
href={ templ.SafeURL(routeurl.URL("page.app.spaces.space.accounts.account.transactions.transaction", "spaceID", props.SpaceID, "accountID", props.RelatedAccount.ID, "transactionID", props.RelatedTransaction.ID)) }
>
{ props.RelatedAccount.Name }
</a>
</div>
}
}
}
@card.Card() {