From 53923cf49f46041c82bbb0cbc155e4bdcc9e1a5d Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Tue, 19 Aug 2025 01:54:14 +0700 Subject: refactor: move template manager definition to router package --- internal/router/api-v1-blog-search.go | 7 +++++-- internal/router/lang-blog-title.go | 7 +++++-- internal/router/lang-blog.go | 7 +++++-- internal/router/lang-map.go | 7 +++++-- internal/router/root.go | 7 +++++-- internal/router/tm.go | 18 ++++++++++++++++++ 6 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 internal/router/tm.go (limited to 'internal/router') diff --git a/internal/router/api-v1-blog-search.go b/internal/router/api-v1-blog-search.go index 2997407..51ace85 100644 --- a/internal/router/api-v1-blog-search.go +++ b/internal/router/api-v1-blog-search.go @@ -10,12 +10,15 @@ import ( "time" "github.com/SayaAndy/saya-today-web/internal/b2" - "github.com/SayaAndy/saya-today-web/internal/templatemanager" "github.com/SayaAndy/saya-today-web/locale" "github.com/gofiber/fiber/v2" ) -func Api_V1_BlogSearch(tm *templatemanager.TemplateManager, l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { +func init() { + tm.Add("catalogue-blog-cards", "views/partials/catalogue-blog-cards.html", "views/partials/catalogue-blog-card-tags.html") +} + +func Api_V1_BlogSearch(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { sort := c.Query("sort") lang := c.Query("lang") diff --git a/internal/router/lang-blog-title.go b/internal/router/lang-blog-title.go index 39d4252..b7b5d7e 100644 --- a/internal/router/lang-blog-title.go +++ b/internal/router/lang-blog-title.go @@ -11,13 +11,16 @@ import ( "github.com/SayaAndy/saya-today-web/internal/b2" "github.com/SayaAndy/saya-today-web/internal/frontmatter" - "github.com/SayaAndy/saya-today-web/internal/templatemanager" "github.com/SayaAndy/saya-today-web/locale" "github.com/gofiber/fiber/v2" "github.com/yuin/goldmark" ) -func Lang_Blog_Title(tm *templatemanager.TemplateManager, l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error { +func init() { + tm.Add("blog-page", "views/layouts/general-page.html", "views/pages/blog-page.html") +} + +func Lang_Blog_Title(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { lang := c.Params("lang") if !slices.Contains(langs, lang) { diff --git a/internal/router/lang-blog.go b/internal/router/lang-blog.go index 1a7cbca..650c4b1 100644 --- a/internal/router/lang-blog.go +++ b/internal/router/lang-blog.go @@ -9,12 +9,15 @@ import ( "strings" "github.com/SayaAndy/saya-today-web/internal/b2" - "github.com/SayaAndy/saya-today-web/internal/templatemanager" "github.com/SayaAndy/saya-today-web/locale" "github.com/gofiber/fiber/v2" ) -func Lang_Blog(tm *templatemanager.TemplateManager, l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { +func init() { + tm.Add("blog-catalogue", "views/layouts/general-page.html", "views/pages/blog-catalogue.html") +} + +func Lang_Blog(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { lang := c.Params("lang") if !slices.Contains(langs, lang) { diff --git a/internal/router/lang-map.go b/internal/router/lang-map.go index 8cc070a..e94d756 100644 --- a/internal/router/lang-map.go +++ b/internal/router/lang-map.go @@ -8,12 +8,15 @@ import ( "strings" "github.com/SayaAndy/saya-today-web/internal/b2" - "github.com/SayaAndy/saya-today-web/internal/templatemanager" "github.com/SayaAndy/saya-today-web/locale" "github.com/gofiber/fiber/v2" ) -func Lang_Map(tm *templatemanager.TemplateManager, l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { +func init() { + tm.Add("global-map", "views/pages/global-map.html") +} + +func Lang_Map(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { lang := c.Params("lang") if !slices.Contains(langs, lang) { diff --git a/internal/router/root.go b/internal/router/root.go index f5be6cb..f4a0692 100644 --- a/internal/router/root.go +++ b/internal/router/root.go @@ -4,11 +4,14 @@ import ( "log/slog" "github.com/SayaAndy/saya-today-web/config" - "github.com/SayaAndy/saya-today-web/internal/templatemanager" "github.com/gofiber/fiber/v2" ) -func Root(tm *templatemanager.TemplateManager, localeCfg []config.AvailableLanguageConfig) func(c *fiber.Ctx) error { +func init() { + tm.Add("index", "views/index.html") +} + +func Root(localeCfg []config.AvailableLanguageConfig) func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { content, err := tm.Render("index", fiber.Map{ "AvailableLanguages": localeCfg, diff --git a/internal/router/tm.go b/internal/router/tm.go new file mode 100644 index 0000000..e8095ee --- /dev/null +++ b/internal/router/tm.go @@ -0,0 +1,18 @@ +package router + +import ( + "log/slog" + "os" + + "github.com/SayaAndy/saya-today-web/internal/templatemanager" +) + +var tm = assert(templatemanager.NewTemplateManager()) + +func assert[T any](t T, err error) T { + if err != nil { + slog.Error("fail to initialize template manager", slog.String("error", err.Error())) + os.Exit(1) + } + return t +} -- cgit v1.3.1+13