feat: highlight the blog page visited earlier in blog catalogue

6 files changed, 9 insertions, 6 deletions

diff --git a/internal/router/handlers/lang-blog.go b/internal/router/handlers/lang-blog.go
index 79ec9f3..9f7947b 100644
--- a/internal/router/handlers/lang-blog.go
+++ b/internal/router/handlers/lang-blog.go
@@ -65,10 +65,8 @@ func (r *CatalogueHandler) AddMeta(c *fiber.Ctx, supplements *router.Supplements
 }
 
 func (r *CatalogueHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplements, lang string, templateMap fiber.Map) (statusCode int, err error) {
-	querySort := c.Query("sort")
-	if querySort == "" {
-		querySort = "publicationDateDesc"
-	}
+	querySort := c.Query("sort", "publicationDateDesc")
+	previousBlogPage := c.Query("codename")
 
 	encodedQuery := c.Request().URI().QueryString()
 	decodedQuery, _ := url.QueryUnescape(string(encodedQuery))
@@ -88,6 +86,7 @@ func (r *CatalogueHandler) RenderBody(c *fiber.Ctx, supplements *router.Suppleme
 	templateMap["QuerySort"] = querySort
 	templateMap["QueryTags"] = strings.Join(queryTags, ",")
 	templateMap["Title"] = supplements.Localization[lang].BlogSearch.Header
+	templateMap["PreviousBlogPage"] = previousBlogPage
 
 	return fiber.StatusOK, nil
 }
diff --git a/internal/router/router.go b/internal/router/router.go
index 7f3511a..a1208e0 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -576,11 +576,12 @@ func (r *Router) generalPageSegment(c *fiber.Ctx, part string) error {
 
 	cacheKey := ""
 	trimmedPath := strings.Trim(path, "/")
+	requestQuery := string(c.Request().URI().QueryString())
 	switch route.ToCache() {
 	case ByUrlOnly:
 		cacheKey = fmt.Sprintf("%s.%s.%s", method, part, trimmedPath)
 	case ByUrlAndQuery:
-		cacheKey = fmt.Sprintf("%s.%s.%s.%s", method, part, trimmedPath, queryString)
+		cacheKey = fmt.Sprintf("%s.%s.%s.%s.%s", method, part, trimmedPath, queryString, requestQuery)
 	}
 
 	if route.ToCache() != Disabled {
diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html
index 491c652..3392ff7 100644
--- a/views/layouts/general-page.html
+++ b/views/layouts/general-page.html
@@ -659,6 +659,7 @@
                         hx-trigger="popstate from:window"
                         hx-target="#general-page-body"
                         hx-swap="innerHTML"
+                        hx-include="#general-page-body .htmx-exit-trigger"
                     ></div>
 
                     <footer
diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html
index 4a7d9bf..97917d6 100644
--- a/views/pages/blog-catalogue.html
+++ b/views/pages/blog-catalogue.html
@@ -128,7 +128,7 @@
 
     <div class="relative flex grow h-full">
         <div class="absolute w-full h-full inset-0 inset-shadow-[0_0_0.4rem_black] pointer-events-none z-20"></div>
-        <div hx-get="/api/v1/blog-search" hx-vals='js:{lang: "{{ .Lang }}", tz: clientTimeZone}' hx-target="this" hx-swap="innerHTML" hx-trigger="load" hx-include=".tags-list"
+        <div hx-get="/api/v1/blog-search" hx-vals='js:{lang: "{{ .Lang }}", tz: clientTimeZone, highlight: "{{ .PreviousBlogPage }}"}' hx-target="this" hx-swap="innerHTML" hx-trigger="load" hx-include=".tags-list"
             class="blog-cards relative grow flex flex-col overflow-y-auto bg-paper bg-background-light pr-2">
             Loading...
         </div>
diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html
index 2a1d5d4..a14d85c 100644
--- a/views/pages/blog-page.html
+++ b/views/pages/blog-page.html
@@ -1,4 +1,5 @@
 {{ define "body" }}
+<input class="htmx-exit-trigger" type="hidden" name="codename" value="{{ .Codename }}">
 <div class="sticky top-0 left-0 w-full h-[100cqb] -mb-[100cqb] inset-shadow-[0_0_0.4rem_black] pointer-events-none z-20"></div>
 <article class="relative bg-paper bg-background-light flex flex-col px-8 py-4 overflow-y-auto">
     <div class="flex flex-col sm:flex-row h-[30cqb] sm:h-[15cqb]">
diff --git a/views/partials/general-page-body.html b/views/partials/general-page-body.html
index d697c14..b71a0d1 100644
--- a/views/partials/general-page-body.html
+++ b/views/partials/general-page-body.html
@@ -1 +1,2 @@
+<input class="htmx-exit-trigger" type="hidden" name="dummy" value="">
 {{ block "body" . }}{{ end }}
\ No newline at end of file