From 9340e7022d95c912db5f1d9fcb0313743ae3cb4a Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Sun, 31 Aug 2025 11:16:59 +0700 Subject: refactor: prepare layout for SPA --- views/layouts/general-page.html | 23 ++++++++++++++--------- views/pages/blog-catalogue.html | 2 +- views/pages/blog-page.html | 2 +- views/partials/general-page-body.html | 1 + views/partials/general-page-footer.html | 7 +++++++ views/partials/general-page-header.html | 8 ++++++++ 6 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 views/partials/general-page-body.html create mode 100644 views/partials/general-page-footer.html create mode 100644 views/partials/general-page-header.html (limited to 'views') diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index a7cf66e..0b020c6 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -166,19 +166,24 @@
-
- -

//

-

{{ .Title }}

-

{{ .PublishedDate }}

+
+
+ +

//

+

{{ .Title }}

+

{{ .PublishedDate }}

+
+ {{ block "header" . }}{{ end }}
- {{ block "header" . }}{{ end }} +
- {{ block "body" . }}{{ end }} +
+ {{ block "body" . }}{{ end }} +
-
+
{{ block "footer" . }}{{ end }}

All the photos on saya.today are licensed under CC BY-SA 4.0 by Saya Andy © {{ .PublishedYear }} diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html index 1d0a2de..1bed1cc 100644 --- a/views/pages/blog-catalogue.html +++ b/views/pages/blog-catalogue.html @@ -1,5 +1,5 @@ {{ define "body" }} -

+
diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index 65ee31d..2f5465c 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -19,7 +19,7 @@ {{ end }} {{ define "body" }} -
+
{{ .ParsedMarkdown }} {{- if .MapLocationX }}
diff --git a/views/partials/general-page-body.html b/views/partials/general-page-body.html new file mode 100644 index 0000000..d697c14 --- /dev/null +++ b/views/partials/general-page-body.html @@ -0,0 +1 @@ +{{ block "body" . }}{{ end }} \ No newline at end of file diff --git a/views/partials/general-page-footer.html b/views/partials/general-page-footer.html new file mode 100644 index 0000000..af6aec9 --- /dev/null +++ b/views/partials/general-page-footer.html @@ -0,0 +1,7 @@ +{{ block "footer" . }}{{ end }} +

+ All the photos on saya.today are licensed under CC BY-SA 4.0 by Saya Andy © {{ .PublishedYear }} +

+CC +BY +SA \ No newline at end of file diff --git a/views/partials/general-page-header.html b/views/partials/general-page-header.html new file mode 100644 index 0000000..66cfecf --- /dev/null +++ b/views/partials/general-page-header.html @@ -0,0 +1,8 @@ +
+ +

//

+

{{ .Title }}

+

{{ .PublishedDate }}

+
+{{ block "header" . }}{{ end }} -- cgit v1.3.1+13 From 3cda48aadae9033f6041e19bbaca4f02ff777d56 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Sun, 31 Aug 2025 11:28:05 +0700 Subject: refactor: move embeds right into general page --- static/input.css | 5 +++ views/layouts/general-page.html | 66 +++++++++++++++++++++++++++++++++- views/pages/blog-catalogue.html | 3 -- views/pages/blog-page.html | 78 ----------------------------------------- 4 files changed, 70 insertions(+), 82 deletions(-) (limited to 'views') diff --git a/static/input.css b/static/input.css index 47e7d16..a64c59d 100644 --- a/static/input.css +++ b/static/input.css @@ -472,6 +472,11 @@ body:has(.lg-container:not([class~="lg-inline"])) #sidebar { } } +.map-container .leaflet-container { + width: 100% !important; + height: 100% !important; +} + body[data-theme~="night"] .leaflet-tile, body[data-theme~="ram"] .leaflet-tile { filter: invert(1) hue-rotate(190deg) contrast(1.1) brightness(1.2) !important; diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 0b020c6..675b6e9 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -9,6 +9,12 @@ {{ block "top-embeds" . }}{{ end }} + + + + {{- if .MapLocationX }} + + {{- end }} @@ -140,6 +146,10 @@ switchTheme(savedTheme); + + @@ -200,6 +210,9 @@
+ + + - {{ block "bottom-embeds" . }}{{ end }} + {{- if .MapLocationX }} + + + + {{- end }} diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html index 1bed1cc..ac2fb7d 100644 --- a/views/pages/blog-catalogue.html +++ b/views/pages/blog-catalogue.html @@ -57,9 +57,7 @@ Loading...
-{{ end }} -{{ define "bottom-embeds" }} - {{ end }} diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index 2f5465c..d8fb118 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -1,23 +1,3 @@ -{{ define "top-embeds" }} - - - -{{- if .MapLocationX }} - -{{- end }} - - - - -{{ end }} - {{ define "body" }}
{{ .ParsedMarkdown }} @@ -32,61 +12,3 @@ {{ define "footer" }}
{{ end }} - -{{ define "bottom-embeds" }} - - - -{{- if .MapLocationX }} - - - -{{- end }} -{{ end }} \ No newline at end of file -- cgit v1.3.1+13 From 5eb7b64b3da54e769cc6e52fd6918e4b465b8c0a Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Sun, 31 Aug 2025 13:16:45 +0700 Subject: feat: integrate partials in page generating --- internal/lightgallery/html_renderer.go | 9 +- internal/router/api-v1-general-page-body.go | 137 ++++++++++++++++++++++++++ internal/router/api-v1-general-page-footer.go | 63 ++++++++++++ internal/router/api-v1-general-page-header.go | 39 +++++++- internal/templatemanager/templatemanager.go | 6 +- main.go | 4 + views/layouts/general-page.html | 55 +++++------ 7 files changed, 276 insertions(+), 37 deletions(-) create mode 100644 internal/router/api-v1-general-page-body.go create mode 100644 internal/router/api-v1-general-page-footer.go (limited to 'views') diff --git a/internal/lightgallery/html_renderer.go b/internal/lightgallery/html_renderer.go index 17a6f2b..21bd049 100644 --- a/internal/lightgallery/html_renderer.go +++ b/internal/lightgallery/html_renderer.go @@ -119,7 +119,14 @@ function createLightGallery%s() { galleryMap.set(inlineGallery, createLightGallery%s); } -document.addEventListener('DOMContentLoaded', createLightGallery%s); +document.addEventListener('htmx:afterRequest', (e) => { + if (e.detail.xhr.status == 404 || e.detail.successful != true) { + return console.error(e); + } + if (e.detail.target.id == 'general-page-body') { + createLightGallery%s(); + } +}); `, galleryID, galleryID, strings.Join(dynamicElements, ","), galleryID, galleryID)) } diff --git a/internal/router/api-v1-general-page-body.go b/internal/router/api-v1-general-page-body.go new file mode 100644 index 0000000..419bad6 --- /dev/null +++ b/internal/router/api-v1-general-page-body.go @@ -0,0 +1,137 @@ +package router + +import ( + "fmt" + "html/template" + "log/slog" + "net/url" + "regexp" + "slices" + "strings" + + "github.com/SayaAndy/saya-today-web/internal/b2" + "github.com/SayaAndy/saya-today-web/locale" + "github.com/gofiber/fiber/v2" + "github.com/yuin/goldmark" +) + +func init() { + tm.Add("general-page-body", "views/partials/general-page-body.html") +} + +func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error { + return func(c *fiber.Ctx) error { + c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) + + referer := c.Get("Referer", "") + if referer == "" { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is empty") + } + urlStruct, err := url.ParseRequestURI(referer) + if err != nil { + return c.Status(fiber.ErrBadRequest.Code).SendString(fmt.Sprintf("'Referer' header is invalid: %s", err.Error())) + } + + path := urlStruct.EscapedPath() + pathParts := strings.Split(strings.Trim(path, "/"), "/") + if len(pathParts) < 2 { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'") + } + + lang := pathParts[0] + if !slices.Contains(langs, lang) { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang)) + } + + values := fiber.Map{ + "L": l[lang], + "Lang": lang, + } + var additionalTemplates []string + + if len(pathParts) == 2 && pathParts[1] == "blog" { + querySort := c.Query("sort") + if querySort == "" { + querySort = "publicationDateDesc" + } + + encodedQuery := c.Request().URI().QueryString() + re, err := regexp.Compile(`tags\[\]=([\w]+)`) + if err != nil { + slog.Warn("failed to generate regex for tags gathering", slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate regex for tags gathering") + } + decodedQuery, _ := url.QueryUnescape(string(encodedQuery)) + matches := re.FindAllStringSubmatch(decodedQuery, -1) + + queryTags := make([]string, 0, len(matches)) + for _, match := range matches { + queryTags = append(queryTags, string(match[1])) + } + + pages, err := b2Client.Scan(lang + "/") + if err != nil { + slog.Warn("failed to scan pages via b2", slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString(fmt.Sprintf("failed to scan pages via b2: %s", slog.String("error", err.Error()))) + } + + tagsMap := make(map[string]int) + for _, page := range pages { + for _, tag := range page.Metadata.Tags { + tagsMap[tag]++ + } + } + slog.Debug("enlist pages for catalogue", slog.Int("tag_count", len(tagsMap)), slog.Int("page_count", len(pages)), slog.String("path", c.Path())) + + type Tag struct { + Name string `json:"Name" yaml:"name"` + Count int `json:"Count" yaml:"count"` + } + + tagsArray := make([]Tag, 0, len(tagsMap)) + for tag, count := range tagsMap { + tagsArray = append(tagsArray, Tag{tag, count}) + } + slices.SortFunc(tagsArray, func(a Tag, b Tag) int { + return strings.Compare(a.Name, b.Name) + }) + + values["Tags"] = tagsArray + values["QuerySort"] = querySort + values["QueryTags"] = strings.Join(queryTags, ",") + + additionalTemplates = append(additionalTemplates, "views/pages/blog-catalogue.html") + } else if len(pathParts) == 3 && pathParts[1] == "blog" { + metadata, parsedMarkdown, err := readBlogPost(md, b2Client, lang+"/"+pathParts[2]) + if err != nil { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("failed to find '%s' post", pathParts[2])) + } + + geolocationParts := strings.Split(metadata.Geolocation, " ") + var x, y, areaError string + if len(geolocationParts) >= 2 { + x = geolocationParts[0] + y = geolocationParts[1] + } + if len(geolocationParts) >= 3 { + areaError = geolocationParts[2] + } + + values["ParsedMarkdown"] = template.HTML(parsedMarkdown) + values["MapLocationX"] = x + values["MapLocationY"] = y + values["MapLocationAreaMeters"] = areaError + + additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html") + } + + content, err := tm.Render("general-page-body", values, additionalTemplates...) + if err != nil { + slog.Warn("failed to generate div", slog.String("path", path), slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") + } + + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(content) + } +} diff --git a/internal/router/api-v1-general-page-footer.go b/internal/router/api-v1-general-page-footer.go new file mode 100644 index 0000000..4c3a35e --- /dev/null +++ b/internal/router/api-v1-general-page-footer.go @@ -0,0 +1,63 @@ +package router + +import ( + "fmt" + "log/slog" + "net/url" + "slices" + "strings" + + "github.com/SayaAndy/saya-today-web/locale" + "github.com/gofiber/fiber/v2" +) + +func init() { + tm.Add("general-page-footer", "views/partials/general-page-footer.html") +} + +func Api_V1_GeneralPage_Footer(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error { + return func(c *fiber.Ctx) error { + c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) + + referer := c.Get("Referer", "") + if referer == "" { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is empty") + } + urlStruct, err := url.ParseRequestURI(referer) + if err != nil { + return c.Status(fiber.ErrBadRequest.Code).SendString(fmt.Sprintf("'Referer' header is invalid: %s", err.Error())) + } + + path := urlStruct.EscapedPath() + pathParts := strings.Split(strings.Trim(path, "/"), "/") + if len(pathParts) < 2 { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'") + } + + lang := pathParts[0] + if !slices.Contains(langs, lang) { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang)) + } + + values := fiber.Map{ + "L": l[lang], + "Lang": lang, + } + var additionalTemplates []string + + if len(pathParts) == 2 && pathParts[1] == "blog" { + additionalTemplates = append(additionalTemplates, "views/pages/blog-catalogue.html") + } else if len(pathParts) == 3 && pathParts[1] == "blog" { + additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html") + } + + content, err := tm.Render("general-page-footer", values, additionalTemplates...) + if err != nil { + slog.Warn("failed to generate div", slog.String("path", path), slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") + } + + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(content) + } +} diff --git a/internal/router/api-v1-general-page-header.go b/internal/router/api-v1-general-page-header.go index 8ac7c03..045ff8b 100644 --- a/internal/router/api-v1-general-page-header.go +++ b/internal/router/api-v1-general-page-header.go @@ -2,15 +2,21 @@ package router import ( "fmt" + "log/slog" "net/url" "slices" "strings" + "github.com/SayaAndy/saya-today-web/internal/b2" "github.com/SayaAndy/saya-today-web/locale" "github.com/gofiber/fiber/v2" ) -func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error { +func init() { + tm.Add("general-page-header", "views/partials/general-page-header.html") +} + +func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error { c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) @@ -24,7 +30,7 @@ func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string } path := urlStruct.EscapedPath() - pathParts := strings.SplitN(strings.Trim(path, "/"), "/", 2) + pathParts := strings.Split(strings.Trim(path, "/"), "/") if len(pathParts) < 2 { return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'") } @@ -34,6 +40,33 @@ func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang)) } - return nil + values := fiber.Map{ + "L": l[lang], + "Lang": lang, + } + var additionalTemplates []string + + if len(pathParts) == 2 && pathParts[1] == "blog" { + values["Title"] = l[lang].BlogSearch.Header + additionalTemplates = append(additionalTemplates, "views/pages/blog-catalogue.html") + } else if len(pathParts) == 3 && pathParts[1] == "blog" { + metadata, _, err := b2Client.ReadFrontmatter(lang + "/" + pathParts[2] + ".md") + if err != nil { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("could not read '%s' for content", path)) + } + values["Title"] = metadata.Title + values["PublishedDate"] = metadata.PublishedTime.Format("2006-01-02 15:04:05 -07:00") + values["ActionDate"] = metadata.ActionDate + additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html") + } + + content, err := tm.Render("general-page-header", values, additionalTemplates...) + if err != nil { + slog.Warn("failed to generate div", slog.String("path", path), slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") + } + + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(content) } } diff --git a/internal/templatemanager/templatemanager.go b/internal/templatemanager/templatemanager.go index 640a706..d8adab6 100644 --- a/internal/templatemanager/templatemanager.go +++ b/internal/templatemanager/templatemanager.go @@ -55,7 +55,11 @@ func (tm *TemplateManager) Render(name string, data any, files ...string) ([]byt if len(files) == 0 { tempTmpl = tmpl.Tmpl } else { - tempTmpl, err = tmpl.Tmpl.ParseFiles(files...) + tempTmpl, err = tmpl.Tmpl.Clone() + if err != nil { + return nil, fmt.Errorf("couldn't clone existing template for rendering: %w", err) + } + tempTmpl, err = tempTmpl.ParseFiles(files...) if err != nil { return nil, fmt.Errorf("couldn't include additional files in template rendering: %w", err) } diff --git a/main.go b/main.go index 020f8ef..ace9916 100644 --- a/main.go +++ b/main.go @@ -124,10 +124,14 @@ func main() { app.Get("/:lang/map", router.Lang_Map(localization, availableLanguages, b2Client)) app.Get("/:lang/blog", router.Lang_Blog(localization, availableLanguages, b2Client)) app.Get("/:lang/blog/:title", router.Lang_Blog_Title(localization, availableLanguages, b2Client, md)) + app.Get("/api/v1/tz", router.Api_V1_TZ()) app.Get("/api/v1/blog-search", router.Api_V1_BlogSearch(localization, availableLanguages, b2Client)) app.Get("/api/v1/like", router.Api_V1_Like_Get(localization, b2Client)) app.Put("/api/v1/like", router.Api_V1_Like_Put(localization, b2Client)) + app.Get("/api/v1/general-page/header", router.Api_V1_GeneralPage_Header(localization, availableLanguages, b2Client)) + app.Get("/api/v1/general-page/body", router.Api_V1_GeneralPage_Body(localization, availableLanguages, b2Client, md)) + app.Get("/api/v1/general-page/footer", router.Api_V1_GeneralPage_Footer(localization, availableLanguages)) app.Static("/", "./static") diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 675b6e9..4e352f4 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -12,9 +12,7 @@ - {{- if .MapLocationX }} - {{- end }} @@ -176,31 +174,18 @@
-
-
- -

//

-

{{ .Title }}

-

{{ .PublishedDate }}

-
- {{ block "header" . }}{{ end }} +
-
- {{ block "body" . }}{{ end }} +
-
- {{ block "footer" . }}{{ end }} -

- All the photos on saya.today are licensed under CC BY-SA 4.0 by Saya Andy © {{ .PublishedYear }} -

- CC - BY - SA +
@@ -213,6 +198,7 @@ + - {{- if .MapLocationX }} - - - {{- end }} -- cgit v1.3.1+13 From 145e7e05f3aa6adbc71a0db5e7da160e626bacd3 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Sun, 31 Aug 2025 18:12:51 +0700 Subject: feat: seamless single page application --- internal/lightgallery/html_renderer.go | 2 +- internal/router/api-v1-general-page-body.go | 8 +- .../router/api-v1-general-page-bottom-embeds.go | 65 +++++++++++++++ internal/router/api-v1-general-page-footer.go | 5 +- internal/router/api-v1-general-page-header.go | 5 +- internal/router/api-v1-general-page-top-embeds.go | 64 +++++++++++++++ internal/router/lang-blog-title.go | 1 + internal/router/lang-blog.go | 1 + main.go | 2 + views/layouts/general-page.html | 94 +++++++--------------- views/pages/blog-catalogue.html | 36 +++++---- views/pages/blog-page.html | 79 ++++++++++++++++++ views/partials/catalogue-blog-cards.html | 5 +- views/partials/general-page-bottom-embeds.html | 1 + views/partials/general-page-header.html | 2 +- views/partials/general-page-top-embeds.html | 1 + 16 files changed, 278 insertions(+), 93 deletions(-) create mode 100644 internal/router/api-v1-general-page-bottom-embeds.go create mode 100644 internal/router/api-v1-general-page-top-embeds.go create mode 100644 views/partials/general-page-bottom-embeds.html create mode 100644 views/partials/general-page-top-embeds.html (limited to 'views') diff --git a/internal/lightgallery/html_renderer.go b/internal/lightgallery/html_renderer.go index 21bd049..c8c1cf0 100644 --- a/internal/lightgallery/html_renderer.go +++ b/internal/lightgallery/html_renderer.go @@ -126,7 +126,7 @@ document.addEventListener('htmx:afterRequest', (e) => { if (e.detail.target.id == 'general-page-body') { createLightGallery%s(); } -}); +}, {once: true}); `, galleryID, galleryID, strings.Join(dynamicElements, ","), galleryID, galleryID)) } diff --git a/internal/router/api-v1-general-page-body.go b/internal/router/api-v1-general-page-body.go index 419bad6..4108a4f 100644 --- a/internal/router/api-v1-general-page-body.go +++ b/internal/router/api-v1-general-page-body.go @@ -44,8 +44,9 @@ func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string, } values := fiber.Map{ - "L": l[lang], - "Lang": lang, + "L": l[lang], + "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), } var additionalTemplates []string @@ -117,10 +118,11 @@ func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string, areaError = geolocationParts[2] } - values["ParsedMarkdown"] = template.HTML(parsedMarkdown) values["MapLocationX"] = x values["MapLocationY"] = y values["MapLocationAreaMeters"] = areaError + values["Title"] = metadata.Title + values["ParsedMarkdown"] = template.HTML(parsedMarkdown) additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html") } diff --git a/internal/router/api-v1-general-page-bottom-embeds.go b/internal/router/api-v1-general-page-bottom-embeds.go new file mode 100644 index 0000000..f0957f3 --- /dev/null +++ b/internal/router/api-v1-general-page-bottom-embeds.go @@ -0,0 +1,65 @@ +package router + +import ( + "fmt" + "log/slog" + "net/url" + "slices" + "strings" + + "github.com/SayaAndy/saya-today-web/internal/b2" + "github.com/SayaAndy/saya-today-web/locale" + "github.com/gofiber/fiber/v2" +) + +func init() { + tm.Add("general-page-bottom-embeds", "views/partials/general-page-bottom-embeds.html") +} + +func Api_V1_GeneralPage_BottomEmbeds(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error { + return func(c *fiber.Ctx) error { + c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) + + referer := c.Get("Referer", "") + if referer == "" { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is empty") + } + urlStruct, err := url.ParseRequestURI(referer) + if err != nil { + return c.Status(fiber.ErrBadRequest.Code).SendString(fmt.Sprintf("'Referer' header is invalid: %s", err.Error())) + } + + path := urlStruct.EscapedPath() + pathParts := strings.Split(strings.Trim(path, "/"), "/") + if len(pathParts) < 2 { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'") + } + + lang := pathParts[0] + if !slices.Contains(langs, lang) { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang)) + } + + values := fiber.Map{ + "L": l[lang], + "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), + } + var additionalTemplates []string + + if len(pathParts) == 2 && pathParts[1] == "blog" { + additionalTemplates = append(additionalTemplates, "views/pages/blog-catalogue.html") + } else if len(pathParts) == 3 && pathParts[1] == "blog" { + additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html") + } + + content, err := tm.Render("general-page-bottom-embeds", values, additionalTemplates...) + if err != nil { + slog.Warn("failed to generate div", slog.String("path", path), slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") + } + + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(content) + } +} diff --git a/internal/router/api-v1-general-page-footer.go b/internal/router/api-v1-general-page-footer.go index 4c3a35e..39b6bea 100644 --- a/internal/router/api-v1-general-page-footer.go +++ b/internal/router/api-v1-general-page-footer.go @@ -40,8 +40,9 @@ func Api_V1_GeneralPage_Footer(l map[string]*locale.LocaleConfig, langs []string } values := fiber.Map{ - "L": l[lang], - "Lang": lang, + "L": l[lang], + "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), } var additionalTemplates []string diff --git a/internal/router/api-v1-general-page-header.go b/internal/router/api-v1-general-page-header.go index 045ff8b..0529ba6 100644 --- a/internal/router/api-v1-general-page-header.go +++ b/internal/router/api-v1-general-page-header.go @@ -41,8 +41,9 @@ func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string } values := fiber.Map{ - "L": l[lang], - "Lang": lang, + "L": l[lang], + "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), } var additionalTemplates []string diff --git a/internal/router/api-v1-general-page-top-embeds.go b/internal/router/api-v1-general-page-top-embeds.go new file mode 100644 index 0000000..090107b --- /dev/null +++ b/internal/router/api-v1-general-page-top-embeds.go @@ -0,0 +1,64 @@ +package router + +import ( + "fmt" + "log/slog" + "net/url" + "slices" + "strings" + + "github.com/SayaAndy/saya-today-web/locale" + "github.com/gofiber/fiber/v2" +) + +func init() { + tm.Add("general-page-top-embeds", "views/partials/general-page-top-embeds.html") +} + +func Api_V1_GeneralPage_TopEmbeds(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error { + return func(c *fiber.Ctx) error { + c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) + + referer := c.Get("Referer", "") + if referer == "" { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is empty") + } + urlStruct, err := url.ParseRequestURI(referer) + if err != nil { + return c.Status(fiber.ErrBadRequest.Code).SendString(fmt.Sprintf("'Referer' header is invalid: %s", err.Error())) + } + + path := urlStruct.EscapedPath() + pathParts := strings.Split(strings.Trim(path, "/"), "/") + if len(pathParts) < 2 { + return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'") + } + + lang := pathParts[0] + if !slices.Contains(langs, lang) { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang)) + } + + values := fiber.Map{ + "L": l[lang], + "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), + } + var additionalTemplates []string + + if len(pathParts) == 2 && pathParts[1] == "blog" { + additionalTemplates = append(additionalTemplates, "views/pages/blog-catalogue.html") + } else if len(pathParts) == 3 && pathParts[1] == "blog" { + additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html") + } + + content, err := tm.Render("general-page-top-embeds", values, additionalTemplates...) + if err != nil { + slog.Warn("failed to generate div", slog.String("path", path), slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") + } + + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(content) + } +} diff --git a/internal/router/lang-blog-title.go b/internal/router/lang-blog-title.go index bafb0d2..d6ca917 100644 --- a/internal/router/lang-blog-title.go +++ b/internal/router/lang-blog-title.go @@ -56,6 +56,7 @@ func Lang_Blog_Title(l map[string]*locale.LocaleConfig, langs []string, b2Client "MapLocationY": y, "MapLocationAreaMeters": areaError, "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), }) if err != nil { slog.Warn("failed to generate page", slog.String("page", "/"+lang+"/blog/"+c.Params("title")), slog.String("error", err.Error())) diff --git a/internal/router/lang-blog.go b/internal/router/lang-blog.go index dd3f079..38a6597 100644 --- a/internal/router/lang-blog.go +++ b/internal/router/lang-blog.go @@ -76,6 +76,7 @@ func Lang_Blog(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B content, err := tm.Render("blog-catalogue", fiber.Map{ "QuerySort": querySort, "QueryTags": strings.Join(queryTags, ","), + "QueryString": string(c.Request().URI().QueryString()), "Tags": tagsArray, "Lang": lang, "L": l[lang], diff --git a/main.go b/main.go index ace9916..72eca3d 100644 --- a/main.go +++ b/main.go @@ -132,6 +132,8 @@ func main() { app.Get("/api/v1/general-page/header", router.Api_V1_GeneralPage_Header(localization, availableLanguages, b2Client)) app.Get("/api/v1/general-page/body", router.Api_V1_GeneralPage_Body(localization, availableLanguages, b2Client, md)) app.Get("/api/v1/general-page/footer", router.Api_V1_GeneralPage_Footer(localization, availableLanguages)) + app.Get("/api/v1/general-page/top-embeds", router.Api_V1_GeneralPage_TopEmbeds(localization, availableLanguages)) + app.Get("/api/v1/general-page/bottom-embeds", router.Api_V1_GeneralPage_BottomEmbeds(localization, availableLanguages, b2Client)) app.Static("/", "./static") diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 4e352f4..e9a6c0f 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -8,7 +8,6 @@ - {{ block "top-embeds" . }}{{ end }} @@ -18,6 +17,16 @@ + + - +
+
+
+
+
+
+ - - diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html index ac2fb7d..a5f5256 100644 --- a/views/pages/blog-catalogue.html +++ b/views/pages/blog-catalogue.html @@ -98,6 +98,7 @@ function cleanHrefParams() { const url = new URL(window.location.href); url.search = ''; + window.history.pushState({}, '', url.toString()); } @@ -137,22 +138,27 @@ window.history.pushState({}, '', url.toString()); } - document.addEventListener('DOMContentLoaded', contextAll); - + document.addEventListener('htmx:afterRequest', (e) => { + if (e.detail.xhr.status == 404 || e.detail.successful != true) { + return console.error(e); + } + if (e.detail.target.id == 'general-page-body') { + contextAll(); - {{ end }} diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html index d8fb118..e68fcab 100644 --- a/views/pages/blog-page.html +++ b/views/pages/blog-page.html @@ -1,3 +1,18 @@ +{{ define "top-embeds" }} + +{{ end }} + {{ define "body" }}
{{ .ParsedMarkdown }} @@ -5,6 +20,43 @@
+ + {{- end }}
{{ end }} @@ -12,3 +64,30 @@ {{ define "footer" }}
{{ end }} + +{{ define "bottom-embeds" }} + +{{ end }} \ No newline at end of file diff --git a/views/partials/catalogue-blog-cards.html b/views/partials/catalogue-blog-cards.html index 35c7ad7..06d99d5 100644 --- a/views/partials/catalogue-blog-cards.html +++ b/views/partials/catalogue-blog-cards.html @@ -1,10 +1,10 @@ {{- range .BlogPages }}
- +
- + {{ .Title }} // {{ .ActionDate }} @@ -12,6 +12,7 @@ {{ .LikeCount }} +

{{ .PublishedTime }}

{{ .ShortDescription }}

diff --git a/views/partials/general-page-bottom-embeds.html b/views/partials/general-page-bottom-embeds.html new file mode 100644 index 0000000..4c36b26 --- /dev/null +++ b/views/partials/general-page-bottom-embeds.html @@ -0,0 +1 @@ +{{ block "bottom-embeds" . }}{{ end }} \ No newline at end of file diff --git a/views/partials/general-page-header.html b/views/partials/general-page-header.html index 66cfecf..63803bd 100644 --- a/views/partials/general-page-header.html +++ b/views/partials/general-page-header.html @@ -1,6 +1,6 @@
- +

//

{{ .Title }}

{{ .PublishedDate }}

diff --git a/views/partials/general-page-top-embeds.html b/views/partials/general-page-top-embeds.html new file mode 100644 index 0000000..1407b50 --- /dev/null +++ b/views/partials/general-page-top-embeds.html @@ -0,0 +1 @@ +{{ block "top-embeds" . }}{{ end }} \ No newline at end of file -- cgit v1.3.1+13 From f174579ef53fb726594a2f7064299b86c8691ea3 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Sun, 31 Aug 2025 18:15:15 +0700 Subject: fix: don't put question mark in url if no params --- views/layouts/general-page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views') diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index e9a6c0f..410e6e7 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -19,10 +19,10 @@ -- cgit v1.3.1+13 From fad8679f7173273e528d626c5c03f90d02010733 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Wed, 3 Sep 2025 17:39:12 +0700 Subject: feat: remove label in like button --- locale/localization.en.yaml | 1 - locale/localization.go | 1 - locale/localization.ru.yaml | 1 - views/partials/blog-page-like-button.html | 3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) (limited to 'views') diff --git a/locale/localization.en.yaml b/locale/localization.en.yaml index 48ef9da..f5ee6c9 100644 --- a/locale/localization.en.yaml +++ b/locale/localization.en.yaml @@ -9,4 +9,3 @@ BlogSearch: ChooseAllTags: 'Choose All' GlobalMap: Header: 'Global Map' -LikeButton: 'Like!' diff --git a/locale/localization.go b/locale/localization.go index b557e08..56b6462 100644 --- a/locale/localization.go +++ b/locale/localization.go @@ -11,7 +11,6 @@ type LocaleConfig struct { TagsLabel string `yaml:"TagsLabel" json:"TagsLabel"` BlogSearch BlogSearchConfig `yaml:"BlogSearch" json:"BlogSearch"` GlobalMap GlobalMapConfig `yaml:"GlobalMap" json:"GlobalMap"` - LikeButton string `yaml:"LikeButton" json:"LikeButton"` } type BlogSearchConfig struct { diff --git a/locale/localization.ru.yaml b/locale/localization.ru.yaml index d6e9fe4..c236d1e 100644 --- a/locale/localization.ru.yaml +++ b/locale/localization.ru.yaml @@ -9,4 +9,3 @@ BlogSearch: ChooseAllTags: 'Выбрать все' GlobalMap: Header: 'Глобальная карта' -LikeButton: 'Нраица!' diff --git a/views/partials/blog-page-like-button.html b/views/partials/blog-page-like-button.html index afc3027..a16e8c0 100644 --- a/views/partials/blog-page-like-button.html +++ b/views/partials/blog-page-like-button.html @@ -1,7 +1,6 @@ \ No newline at end of file -- cgit v1.3.1+13 From 0802dc3a8835bc19cf994f9eb2b462df604d4262 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Thu, 4 Sep 2025 00:51:05 +0700 Subject: feat: reroute general page derivations to general page route feat: always have page body in square aspect ratio feat: change to mobile view on 1.1/1 aspect ratio (instead of 0.8/1) feat: dynamically change title with any new page feat: cache general page template --- internal/router/api-v1-general-page-body.go | 1 + internal/router/api-v1-general-page.go | 52 +++++++++++++++++++++++++++ main.go | 4 +-- static/input.css | 56 +++++++++++++++-------------- views/layouts/general-page.html | 23 ++++++------ views/pages/blog-catalogue.html | 8 ++--- views/pages/blog-page.html | 2 +- views/pages/global-map.html | 18 +++++----- views/partials/general-page-body.html | 1 + 9 files changed, 111 insertions(+), 54 deletions(-) create mode 100644 internal/router/api-v1-general-page.go (limited to 'views') diff --git a/internal/router/api-v1-general-page-body.go b/internal/router/api-v1-general-page-body.go index 2329c4a..cdb558a 100644 --- a/internal/router/api-v1-general-page-body.go +++ b/internal/router/api-v1-general-page-body.go @@ -108,6 +108,7 @@ func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string, values["Tags"] = tagsArray values["QuerySort"] = querySort values["QueryTags"] = strings.Join(queryTags, ",") + values["Title"] = l[lang].BlogSearch.Header additionalTemplates = append(additionalTemplates, "views/pages/blog-catalogue.html") } else if len(pathParts) == 3 && pathParts[1] == "blog" { diff --git a/internal/router/api-v1-general-page.go b/internal/router/api-v1-general-page.go new file mode 100644 index 0000000..8e1387b --- /dev/null +++ b/internal/router/api-v1-general-page.go @@ -0,0 +1,52 @@ +package router + +import ( + "fmt" + "log/slog" + "slices" + "strings" + + "github.com/SayaAndy/saya-today-web/locale" + "github.com/gofiber/fiber/v2" +) + +func init() { + tm.Add("general-page", "views/layouts/general-page.html") +} + +func Api_V1_GeneralPage(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error { + return func(c *fiber.Ctx) error { + c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8) + path := c.Path() + + pathParts := strings.Split(strings.Trim(path, "/"), "/") + if len(pathParts) < 2 { + return c.Status(fiber.ErrBadRequest.Code).SendString("url path is invalid: expect format '/{lang}/...'") + } + + lang := pathParts[0] + if !slices.Contains(langs, lang) { + return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang)) + } + + cacheKey := "general-page." + lang + if val, ok := PCache.Get(cacheKey); val != nil && ok { + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(val) + } + + content, err := tm.Render("general-page", fiber.Map{ + "L": l[lang], + "Lang": lang, + "QueryString": string(c.Request().URI().QueryString()), + }) + if err != nil { + slog.Warn("failed to generate div", slog.String("path", path), slog.String("error", err.Error())) + return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div") + } + + go PCache.Set(cacheKey, content, int64(len(content))) + c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8) + return c.Status(fiber.StatusOK).Type("html").Send(content) + } +} diff --git a/main.go b/main.go index e4e5a45..2f8ef4b 100644 --- a/main.go +++ b/main.go @@ -133,8 +133,8 @@ func main() { app.Get("/", router.Root(cfg.AvailableLanguages)) app.Get("/:lang/map", router.Lang_Map(localization, availableLanguages, b2Client)) - app.Get("/:lang/blog", router.Lang_Blog(localization, availableLanguages, b2Client)) - app.Get("/:lang/blog/:title", router.Lang_Blog_Title(localization, availableLanguages, b2Client, md)) + app.Get("/:lang/blog", router.Api_V1_GeneralPage(localization, availableLanguages)) + app.Get("/:lang/blog/:title", router.Api_V1_GeneralPage(localization, availableLanguages)) app.Get("/api/v1/tz", router.Api_V1_TZ()) app.Get("/api/v1/blog-search", router.Api_V1_BlogSearch(localization, availableLanguages, b2Client)) diff --git a/static/input.css b/static/input.css index a64c59d..261aeb3 100644 --- a/static/input.css +++ b/static/input.css @@ -482,37 +482,41 @@ body[data-theme~="ram"] .leaflet-tile { filter: invert(1) hue-rotate(190deg) contrast(1.1) brightness(1.2) !important; } -@media (min-aspect-ratio: 0.8/1) { - .ar-gt-0\.8\:mr-\[1\.2vmin\] { +@media (min-aspect-ratio: 1.1/1) { + .ar-gt-1\.1\:mr-\[1\.2vmin\] { margin-right: 1.2vmin; } - .ar-gt-0\.8\:w-fit { + .ar-gt-1\.1\:w-fit { width: fit-content; } - .ar-gt-0\.8\:min-w-fit { + .ar-gt-1\.1\:w-\[100vh\] { + width: 100vh; + } + + .ar-gt-1\.1\:min-w-fit { min-width: fit-content; } - .ar-gt-0\.8\:min-w-\[10vh\] { + .ar-gt-1\.1\:min-w-\[10vh\] { min-width: 10vh; } - .ar-gt-0\.8\:max-w-\[20vh\] { + .ar-gt-1\.1\:max-w-\[20vh\] { max-width: 20vh; } - .ar-gt-0\.8\:max-w-\[100vh\] { + .ar-gt-1\.1\:max-w-\[100vh\] { max-width: 100vh; } - .ar-gt-0\.8\:items-center { + .ar-gt-1\.1\:items-center { align-items: center; } } -@media (max-aspect-ratio: 0.8/1) { +@media (max-aspect-ratio: 1.1/1) { .bg-sidebar { background-size: calc(var(--squares-and-triangles-background-width-coef) * 1.6vh) calc(var(--squares-and-triangles-background-height-coef) * 1.6vh); } @@ -542,71 +546,71 @@ body[data-theme~="ram"] .leaflet-tile { background-size: 10vh; } - .ar-lt-0\.8\:grid { + .ar-lt-1\.1\:grid { display: grid; } - .ar-lt-0\.8\:flex-col { + .ar-lt-1\.1\:flex-col { flex-direction: column; } - .ar-lt-0\.8\:flex-row { + .ar-lt-1\.1\:flex-row { flex-direction: row; } - .ar-lt-0\.8\:h-\[8vh\] { + .ar-lt-1\.1\:h-\[8vh\] { height: 8vh; } - .ar-lt-0\.8\:h-\[10vh\] { + .ar-lt-1\.1\:h-\[10vh\] { height: 10vh; } - .ar-lt-0\.8\:h-\[30vh\] { + .ar-lt-1\.1\:h-\[30vh\] { height: 30vh; } - .ar-lt-0\.8\:h-\[90vh\] { + .ar-lt-1\.1\:h-\[90vh\] { height: 90vh; } - .ar-lt-0\.8\:w-\[8vh\] { + .ar-lt-1\.1\:w-\[8vh\] { width: 8vh; } - .ar-lt-0\.8\:w-\[80\%\] { + .ar-lt-1\.1\:w-\[80\%\] { width: 80%; } - .ar-lt-0\.8\:w-\[90vw\] { + .ar-lt-1\.1\:w-\[90vw\] { width: 90vw; } - .ar-lt-0\.8\:w-screen { + .ar-lt-1\.1\:w-screen { width: 100vw; } - .ar-lt-0\.8\:max-h-\[25\%\] { + .ar-lt-1\.1\:max-h-\[25\%\] { max-height: 25%; } - .ar-lt-0\.8\:max-h-\[80\%\] { + .ar-lt-1\.1\:max-h-\[80\%\] { max-height: 80%; } - .ar-lt-0\.8\:max-h-\[calc\(100\%-25vh\)\] { + .ar-lt-1\.1\:max-h-\[calc\(100\%-25vh\)\] { max-height: calc(100% - 25vh); } - .ar-lt-0\.8\:text-\[5vh\] { + .ar-lt-1\.1\:text-\[5vh\] { font-size: 5vh; } - .ar-lt-0\.8\:ml-\[5vw\] { + .ar-lt-1\.1\:ml-\[5vw\] { margin-left: 5vw; } - .ar-lt-0\.8\:hidden { + .ar-lt-1\.1\:hidden { display: none; } } diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 410e6e7..cb85a09 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -3,7 +3,6 @@ - SAYA TODAY // {{ .Title }} @@ -15,7 +14,7 @@ - + -