diff --git a/handler/transaction_recurring.go b/handler/transaction_recurring.go index 008cee5..437e31c 100644 --- a/handler/transaction_recurring.go +++ b/handler/transaction_recurring.go @@ -7,8 +7,6 @@ import ( t "spend-sparrow/template/transaction_recurring" "spend-sparrow/types" "spend-sparrow/utils" - - "github.com/a-h/templ" ) type TransactionRecurring interface { @@ -28,7 +26,7 @@ func NewTransactionRecurring(s service.TransactionRecurring, r *Render) Transact } func (h TransactionRecurringImpl) Handle(r *http.ServeMux) { - r.Handle("GET /transaction-recurring/{id}", h.handleTransactionRecurringItemComp()) + r.Handle("GET /transaction-recurring", h.handleTransactionRecurringItemComp()) r.Handle("POST /transaction-recurring/{id}", h.handleUpdateTransactionRecurring()) r.Handle("DELETE /transaction-recurring/{id}", h.handleDeleteTransactionRecurring()) } @@ -41,29 +39,10 @@ func (h TransactionRecurringImpl) handleTransactionRecurringItemComp() http.Hand return } - id := r.PathValue("id") + id := r.URL.Query().Get("id") accountId := r.URL.Query().Get("account-id") treasureChestId := r.URL.Query().Get("treasure-chest-id") - - if id == "new" { - comp := t.EditTransactionRecurring(nil, accountId, treasureChestId) - h.r.Render(r, w, comp) - return - } - - transaction, err := h.s.Get(user, id) - if err != nil { - handleError(w, r, err) - return - } - - var comp templ.Component - if r.URL.Query().Get("edit") == "true" { - comp = t.EditTransactionRecurring(transaction, accountId, treasureChestId) - } else { - comp = t.TransactionRecurringItem(transaction) - } - h.r.Render(r, w, comp) + h.renderItems(w, r, user, id, accountId, treasureChestId) } } @@ -75,10 +54,6 @@ func (h TransactionRecurringImpl) handleUpdateTransactionRecurring() http.Handle return } - var ( - transaction *types.TransactionRecurring - err error - ) input := types.TransactionRecurringInput{ Id: r.PathValue("id"), IntervalMonths: r.FormValue("interval-months"), @@ -91,21 +66,20 @@ func (h TransactionRecurringImpl) handleUpdateTransactionRecurring() http.Handle } if input.Id == "new" { - transaction, err = h.s.Add(user, input) + _, err := h.s.Add(user, input) if err != nil { handleError(w, r, err) return } } else { - transaction, err = h.s.Update(user, input) + _, err := h.s.Update(user, input) if err != nil { handleError(w, r, err) return } } - comp := t.TransactionRecurringItem(transaction) - h.r.Render(r, w, comp) + h.renderItems(w, r, user, "", input.AccountId, input.TreasureChestId) } } @@ -118,11 +92,40 @@ func (h TransactionRecurringImpl) handleDeleteTransactionRecurring() http.Handle } id := r.PathValue("id") + accountId := r.URL.Query().Get("account-id") + treasureChestId := r.URL.Query().Get("treasure-chest-id") err := h.s.Delete(user, id) if err != nil { handleError(w, r, err) return } + + h.renderItems(w, r, user, "", accountId, treasureChestId) } } + +func (h TransactionRecurringImpl) renderItems(w http.ResponseWriter, r *http.Request, user *types.User, id, accountId, treasureChestId string) { + + var transactionsRecurring []*types.TransactionRecurring + var err error + if accountId == "" && treasureChestId == "" { + utils.TriggerToastWithStatus(w, r, "error", "Please select an account or treasure chest", http.StatusBadRequest) + } + if accountId != "" { + transactionsRecurring, err = h.s.GetAllByAccount(user, accountId) + if err != nil { + handleError(w, r, err) + return + } + } else { + transactionsRecurring, err = h.s.GetAllByTreasureChest(user, treasureChestId) + if err != nil { + handleError(w, r, err) + return + } + } + + comp := t.TransactionRecurringItems(transactionsRecurring, id, accountId, treasureChestId) + h.r.Render(r, w, comp) +} diff --git a/handler/treasure_chest.go b/handler/treasure_chest.go index 0e62f6c..c177a06 100644 --- a/handler/treasure_chest.go +++ b/handler/treasure_chest.go @@ -84,7 +84,7 @@ func (h TreasureChestImpl) handleTreasureChestItemComp() http.HandlerFunc { } transactionsRecurring, err := h.transactionRecurring.GetAllByTreasureChest(user, treasureChest.Id.String()) - transactionsRec := tr.TransactionRecurringItems(transactionsRecurring, "", "", "") + transactionsRec := tr.TransactionRecurringItems(transactionsRecurring, "", "", treasureChest.Id.String()) var comp templ.Component if r.URL.Query().Get("edit") == "true" { diff --git a/input.css b/input.css index 6c4abce..669d824 100644 --- a/input.css +++ b/input.css @@ -56,7 +56,7 @@ input:focus { transition: all 150ms linear; @apply px-3 py-2 text-lg; } -.input:has(input:focus) { +.input:has(input:focus), .input:focus { border-color: var(--color-gray-400); box-shadow: 0 0 0 2px var(--color-gray-200); } diff --git a/service/default.go b/service/default.go index 130f672..56ccd3d 100644 --- a/service/default.go +++ b/service/default.go @@ -6,7 +6,7 @@ import ( ) var ( - safeInputRegex = regexp.MustCompile(`^[a-zA-Z0-9ÄÖÜäöüß,& -]+$`) + safeInputRegex = regexp.MustCompile(`^[a-zA-Z0-9ÄÖÜäöüß,&'" -]+$`) ) func validateString(value string, fieldName string) error { diff --git a/template/transaction_recurring/transaction_recurring.templ b/template/transaction_recurring/transaction_recurring.templ index b536191..75831f8 100644 --- a/template/transaction_recurring/transaction_recurring.templ +++ b/template/transaction_recurring/transaction_recurring.templ @@ -6,23 +6,34 @@ import "spend-sparrow/types" templ TransactionRecurringItems(transactionsRecurring []*types.TransactionRecurring, editId, accountId, treasureChestId string) { -
+
+ Active Party Description Interval Value + if editId == "new" { + @EditTransactionRecurring(nil, accountId, treasureChestId) + } for _, transaction := range transactionsRecurring { if transaction.Id.String() == editId { @EditTransactionRecurring(transaction, accountId, treasureChestId) } else { - @TransactionRecurringItem(transaction) + @TransactionRecurringItem(transaction, accountId, treasureChestId) } }
} -templ TransactionRecurringItem(transactionRecurring *types.TransactionRecurring) { +templ TransactionRecurringItem(transactionRecurring *types.TransactionRecurring, accountId, treasureChestId string) { +

+ if transactionRecurring.Active { + Yes + } else { + No + } +

if transactionRecurring.Party != "" { { transactionRecurring.Party } @@ -47,8 +58,8 @@ templ TransactionRecurringItem(transactionRecurring *types.TransactionRecurring) }

- +
+ + +
} func displayBalance(balance int64) string { diff --git a/template/treasurechest/treasure_chest.templ b/template/treasurechest/treasure_chest.templ index b553f95..693fead 100644 --- a/template/treasurechest/treasure_chest.templ +++ b/template/treasurechest/treasure_chest.templ @@ -100,9 +100,9 @@ templ EditTreasureChest(treasureChest *types.TreasureChest, parents []*types.Tre

Monthly Transactions