diff --git a/internal/server/server.go b/internal/server/server.go index 9d643d9..aaf3d76 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -14,10 +14,10 @@ import ( "ruben/inventory2/internal/domains/raw_events" "ruben/inventory2/internal/logging" "ruben/inventory2/internal/server/api" - templates_api "ruben/inventory2/internal/server/api/templates" "ruben/inventory2/internal/server/middleware" "ruben/inventory2/internal/server/response" "ruben/inventory2/internal/server/sse" + "ruben/inventory2/internal/server/ui" ) type Router struct { @@ -53,11 +53,10 @@ func NewRouter( c.Redirect(http.StatusMovedPermanently, "/ui") }) - templates_api.SetupRoutes( - logger.WithGroup("templates"), + ui.Routes( + logger.WithGroup("ui"), r.Group("/ui"), "/ui", - contentDir, rawEvents, accts, etsy, diff --git a/internal/server/api/templates/router.go b/internal/server/ui/router.go similarity index 91% rename from internal/server/api/templates/router.go rename to internal/server/ui/router.go index 26e122c..2c71892 100644 --- a/internal/server/api/templates/router.go +++ b/internal/server/ui/router.go @@ -1,4 +1,4 @@ -package templates +package ui import ( "encoding/json" @@ -23,13 +23,12 @@ import ( type ( webpageRouter struct { - log *logging.Logger - uiPath string - contentDir string - templater *templater.Templater - rawEvents *raw_events.Store - accts *accounts.Store - etsy *etsy_platform.Platform + log *logging.Logger + uiPath string + templater *templater.Templater + rawEvents *raw_events.Store + accts *accounts.Store + etsy *etsy_platform.Platform } // ErrTemplateNotFound is returned if the reason the template failed to compile @@ -39,11 +38,10 @@ type ( } ) -func SetupRoutes( +func Routes( logger *logging.Logger, r gin.IRoutes, uiPath string, - contentDir string, rawEvents *raw_events.Store, accts *accounts.Store, etsy *etsy_platform.Platform, @@ -51,10 +49,8 @@ func SetupRoutes( ) { s := &webpageRouter{ - log: logger, - uiPath: uiPath, - contentDir: contentDir, - // TODO: clean up the references to the templates dir throughout as well (should only be referred to in the 'main' package + log: logger, + uiPath: uiPath, templater: new(templater.Templater).With(templater.Config{ Funcs: func(name string, props map[string]any) template.FuncMap { return template.FuncMap{ @@ -231,7 +227,6 @@ func authorizeByMatchingAccountID(r *http.Request, acctIDPathPosition int) error return nil } -// TODO: is this error type even needed anymore? func (e ErrTemplateNotFound) Error() string { if e.err != nil { return fmt.Sprintf("template not found: %v", e.err)