mainPage refactoring

This commit is contained in:
2025-09-22 13:54:09 +01:00
parent da6dd28529
commit 84601cfef0
5 changed files with 74 additions and 64 deletions
@@ -1,4 +1,4 @@
{{ define "expenses" }} {{ define "mainPage" }}
{{ template "expensesFilterBox" . }} {{ template "expensesFilterBox" . }}
{{ template "expensesTable" . }} {{ template "expensesTable" . }}
{{ end }} {{ end }}
+4 -6
View File
@@ -26,13 +26,13 @@
{{ if .renderNavBar }} {{ if .renderNavBar }}
<nav id="page-navigation"> <nav id="page-navigation">
<button <button
hx-post="/expenses" hx-post="/"
hx-target="#content" hx-target="#content"
hx-target-5*="#doc" hx-target-5*="#doc"
hx-swap="innerHTML" hx-swap="innerHTML"
hx-replace-url="true" hx-replace-url="true"
id="expenses" id="expenses"
class="nav-button {{ if eq .page "expenses" }}selected{{ end }}">EXPENSES</button> class="nav-button {{ if eq .page "mainPage" }}selected{{ end }}">EXPENSES</button>
<button <button
hx-post="/overview" hx-post="/overview"
hx-target="#content" hx-target="#content"
@@ -52,10 +52,8 @@
{{ end }} {{ end }}
<main id="content"> <main id="content">
{{ if eq .content "expense" }} {{ if eq .content "mainPage" }}
{{ template "expense" . }} {{ template "mainPage" . }}
{{ else if eq .content "expenses" }}
{{ template "expenses" . }}
{{ else if eq .content "login" }} {{ else if eq .content "login" }}
{{ template "login" . }} {{ template "login" . }}
{{ else if eq .content "newExpense" }} {{ else if eq .content "newExpense" }}
-48
View File
@@ -66,53 +66,6 @@ func getExpenses(c *gin.Context) {
}) })
} }
func expensesGlobalPage(c *gin.Context) {
ctx, err := getLoggedInUserCTX(c)
if err != nil {
ServerErrorView(c, "Could not get logged in user")
return
}
eFilter := repo.NewExpFilter()
expenses, err := exp.App.GetAllExpenses(ctx, eFilter)
if err != nil {
log.Println("error:", err)
ServerErrorView(c, "Could not get logged in user")
return
}
categories, err := exp.App.GetAllCategories(ctx)
if err != nil {
log.Println("error:", err)
ServerErrorView(c, "Unable to get categories")
return
}
stores, err := exp.App.GetAllStores(ctx)
if err != nil {
log.Println("error:", err)
ServerErrorView(c, "Unable to get stores")
return
}
types, err := exp.App.GetAllTypes(ctx)
if err != nil {
log.Println("error:", err)
ServerErrorView(c, "Unable to get types")
return
}
c.HTML(http.StatusOK, "terminal", gin.H{
"page": "expenses",
"renderNavBar": true,
"content": "expenses",
"expenses": expenses,
"categories": categories,
"stores": stores,
"types": types,
})
}
func expensePage(c *gin.Context) { func expensePage(c *gin.Context) {
ctx, err := getLoggedInUserCTX(c) ctx, err := getLoggedInUserCTX(c)
if err != nil { if err != nil {
@@ -352,7 +305,6 @@ func qrRequest(c *gin.Context) {
func RouteExpenses(router *gin.RouterGroup) { func RouteExpenses(router *gin.RouterGroup) {
router.GET(ExpensesPath, getExpenses) router.GET(ExpensesPath, getExpenses)
router.GET(ExpensesPath+"/:id", expensePage) router.GET(ExpensesPath+"/:id", expensePage)
router.GET("/main", expensesGlobalPage)
router.GET(ExpensesPath+"/new", newExpensePage) router.GET(ExpensesPath+"/new", newExpensePage)
router.POST(ExpensesPath+"/new", createExpense) router.POST(ExpensesPath+"/new", createExpense)
+43 -6
View File
@@ -2,10 +2,12 @@ package pages
import ( import (
"context" "context"
"errors"
"fmt"
"log" "log"
"time" "time"
expenses "github.com/ESilva15/expenses/expenses" exp "github.com/ESilva15/expenses/expenses"
mod "github.com/ESilva15/expenses/expenses/models" mod "github.com/ESilva15/expenses/expenses/models"
"github.com/ESilva15/expenses/expenses/repo" "github.com/ESilva15/expenses/expenses/repo"
ginaux "github.com/ESilva15/expenses/ginAux" ginaux "github.com/ESilva15/expenses/ginAux"
@@ -67,7 +69,7 @@ func processFormShares(c *gin.Context) ([]mod.Share, error) {
shareIDs := c.PostFormArray("shares-ids[]") shareIDs := c.PostFormArray("shares-ids[]")
shares := c.PostFormArray("shares-percent[]") shares := c.PostFormArray("shares-percent[]")
return expenses.ParseFormShares(userIDs, shares, shareIDs) return exp.ParseFormShares(userIDs, shares, shareIDs)
} }
func processFormPayments(c *gin.Context) ([]mod.Payment, error) { func processFormPayments(c *gin.Context) ([]mod.Payment, error) {
@@ -75,7 +77,7 @@ func processFormPayments(c *gin.Context) ([]mod.Payment, error) {
paymentIDs := c.PostFormArray("payments-ids[]") paymentIDs := c.PostFormArray("payments-ids[]")
values := c.PostFormArray("payments-payment[]") values := c.PostFormArray("payments-payment[]")
return expenses.ParseFormPayments(userIDs, paymentIDs, values) return exp.ParseFormPayments(userIDs, paymentIDs, values)
} }
func expenseFromForm(ctx context.Context, c *gin.Context) (*mod.Expense, error) { func expenseFromForm(ctx context.Context, c *gin.Context) (*mod.Expense, error) {
@@ -94,12 +96,12 @@ func expenseFromForm(ctx context.Context, c *gin.Context) (*mod.Expense, error)
return nil, err return nil, err
} }
typID, err := expenses.ParseID(c.PostForm("newexp-type-dropdown")) typID, err := exp.ParseID(c.PostForm("newexp-type-dropdown"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
catID, err := expenses.ParseID(c.PostForm("newexp-cat-dropdown")) catID, err := exp.ParseID(c.PostForm("newexp-cat-dropdown"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -107,7 +109,7 @@ func expenseFromForm(ctx context.Context, c *gin.Context) (*mod.Expense, error)
// TODO: // TODO:
// Move the names of the dropdowns to a variable that can be passed to the // Move the names of the dropdowns to a variable that can be passed to the
// html page // html page
storeID, err := expenses.ParseID(c.PostForm("newexp-store-dropdown")) storeID, err := exp.ParseID(c.PostForm("newexp-store-dropdown"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -142,3 +144,38 @@ func expenseFromForm(ctx context.Context, c *gin.Context) (*mod.Expense, error)
QRString: newQR, QRString: newQR,
}, nil }, nil
} }
func fetchExpensesData(c *gin.Context) (map[string]any, error) {
ctx, err := getLoggedInUserCTX(c)
if err != nil {
return nil, errors.New(fmt.Sprintf("could not get logged in user - ", err))
}
eFilter := repo.NewExpFilter()
expenses, err := exp.App.GetAllExpenses(ctx, eFilter)
if err != nil {
return nil, errors.New(fmt.Sprintf("could not get expenses - ", err))
}
categories, err := exp.App.GetAllCategories(ctx)
if err != nil {
return nil, errors.New(fmt.Sprintf("could not get categories - ", err))
}
stores, err := exp.App.GetAllStores(ctx)
if err != nil {
return nil, errors.New(fmt.Sprintf("could not get stores - ", err))
}
types, err := exp.App.GetAllTypes(ctx)
if err != nil {
return nil, errors.New(fmt.Sprintf("could not get types - ", err))
}
return map[string]any{
"expenses": expenses,
"categories": categories,
"stores": stores,
"types": types,
}, nil
}
+26 -3
View File
@@ -6,9 +6,32 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func expensesGlobalPagePartial(c *gin.Context) {
data, err := fetchExpensesData(c)
if err != nil {
ServerErrorView(c, err.Error())
return
}
c.HTML(http.StatusOK, "mainPage", data)
}
func expensesGlobalPage(c *gin.Context) {
data, err := fetchExpensesData(c)
if err != nil {
ServerErrorView(c, err.Error())
return
}
data["page"] = "mainPage"
data["renderNavBar"] = true
data["content"] = "mainPage"
c.HTML(http.StatusOK, "terminal", data)
}
// RouteHome routes the home pages. // RouteHome routes the home pages.
func RouteHome(router *gin.RouterGroup) { func RouteHome(router *gin.RouterGroup) {
router.GET("/", func(c *gin.Context) { router.GET("/", expensesGlobalPage)
c.Redirect(http.StatusFound, "/main") router.POST("/", expensesGlobalPagePartial)
})
} }