summaryrefslogtreecommitdiff
path: root/internal/router
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'internal/router')
-rw-r--r--internal/router/api-v1-blog-search.go7
-rw-r--r--internal/router/lang-blog-title.go7
-rw-r--r--internal/router/lang-blog.go7
-rw-r--r--internal/router/lang-map.go7
-rw-r--r--internal/router/root.go7
-rw-r--r--internal/router/tm.go18
6 files changed, 10 insertions, 43 deletions
diff --git a/internal/router/api-v1-blog-search.go b/internal/router/api-v1-blog-search.go
index 51ace85..2997407 100644
--- a/internal/router/api-v1-blog-search.go
+++ b/internal/router/api-v1-blog-search.go
@@ -10,15 +10,12 @@ 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 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 {
+func Api_V1_BlogSearch(tm *templatemanager.TemplateManager, 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 b7b5d7e..39d4252 100644
--- a/internal/router/lang-blog-title.go
+++ b/internal/router/lang-blog-title.go
@@ -11,16 +11,13 @@ 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 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 {
+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 {
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 650c4b1..1a7cbca 100644
--- a/internal/router/lang-blog.go
+++ b/internal/router/lang-blog.go
@@ -9,15 +9,12 @@ 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 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 {
+func Lang_Blog(tm *templatemanager.TemplateManager, 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 e94d756..8cc070a 100644
--- a/internal/router/lang-map.go
+++ b/internal/router/lang-map.go
@@ -8,15 +8,12 @@ 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 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 {
+func Lang_Map(tm *templatemanager.TemplateManager, 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 f4a0692..f5be6cb 100644
--- a/internal/router/root.go
+++ b/internal/router/root.go
@@ -4,14 +4,11 @@ import (
"log/slog"
"github.com/SayaAndy/saya-today-web/config"
+ "github.com/SayaAndy/saya-today-web/internal/templatemanager"
"github.com/gofiber/fiber/v2"
)
-func init() {
- tm.Add("index", "views/index.html")
-}
-
-func Root(localeCfg []config.AvailableLanguageConfig) func(c *fiber.Ctx) error {
+func Root(tm *templatemanager.TemplateManager, 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
deleted file mode 100644
index e8095ee..0000000
--- a/internal/router/tm.go
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-}