diff --git a/internal/default.go b/internal/default.go index de0a339..9d3bba3 100644 --- a/internal/default.go +++ b/internal/default.go @@ -119,7 +119,7 @@ func createHandler(d *sqlx.DB, serverSettings *types.Settings) http.Handler { dashboardService := service.NewDashboard(d) render := handler.NewRender() - indexHandler := handler.NewIndex(render, dashboardService) + indexHandler := handler.NewIndex(render, dashboardService, clockService) authHandler := handler.NewAuth(authService, render) accountHandler := handler.NewAccount(accountService, render) treasureChestHandler := handler.NewTreasureChest(treasureChestService, transactionRecurringService, render) diff --git a/internal/handler/root_and_404.go b/internal/handler/root_and_404.go index 2430f6e..3f314e1 100644 --- a/internal/handler/root_and_404.go +++ b/internal/handler/root_and_404.go @@ -22,12 +22,14 @@ type Index interface { type IndexImpl struct { r *Render d *service.Dashboard + c service.Clock } -func NewIndex(r *Render, d *service.Dashboard) Index { +func NewIndex(r *Render, d *service.Dashboard, c service.Clock) Index { return IndexImpl{ r: r, d: d, + c: c, } } @@ -81,7 +83,7 @@ func (handler IndexImpl) dashboard(user *types.User, htmx bool, r *http.Request) return nil, fmt.Errorf("could not parse timestamp: %w", service.ErrBadRequest) } } else { - month = time.Now() + month = handler.c.Now() } summary, err := handler.d.Summary(r.Context(), user, month) diff --git a/internal/service/clock.go b/internal/service/clock.go index cfbfd2a..8944dc7 100644 --- a/internal/service/clock.go +++ b/internal/service/clock.go @@ -13,5 +13,5 @@ func NewClock() Clock { } func (c *ClockImpl) Now() time.Time { - return time.Now() + return time.Now().UTC() } diff --git a/internal/service/dashboard.go b/internal/service/dashboard.go index ec896e9..1d69649 100644 --- a/internal/service/dashboard.go +++ b/internal/service/dashboard.go @@ -2,7 +2,6 @@ package service import ( "context" - "log/slog" "spend-sparrow/internal/db" "spend-sparrow/internal/types" "time" @@ -82,7 +81,5 @@ func (s Dashboard) Summary(ctx context.Context, user *types.User, month time.Tim summary.Total = summary.Income + summary.Expenses summary.Month = month - slog.Info("Dashboard summary", "summary", summary) - return &summary, nil } diff --git a/internal/template/dashboard/dashboard.templ b/internal/template/dashboard/dashboard.templ index 3997ec7..f69f88c 100644 --- a/internal/template/dashboard/dashboard.templ +++ b/internal/template/dashboard/dashboard.templ @@ -9,7 +9,7 @@ templ Dashboard(summary *types.DashboardMonthlySummary) { diff --git a/static/js/time.js b/static/js/time.js index 3023997..1adeebd 100644 --- a/static/js/time.js +++ b/static/js/time.js @@ -17,6 +17,7 @@ function updateTime() { const newDate = value.includes("UTC") ? new Date(value) : value; el.valueAsDate = newDate; } + el.classList.remove("datetime"); }) }