fix: font in like button on smartphone screens

feat: some margin-left for medley title
refactor: explicit highlight query for blog search api

4 files changed, 11 insertions, 15 deletions

diff --git a/internal/router/handlers/api-v1-blog-search.go b/internal/router/handlers/api-v1-blog-search.go
index c48b40a..b59f09a 100644
--- a/internal/router/handlers/api-v1-blog-search.go
+++ b/internal/router/handlers/api-v1-blog-search.go
@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"regexp"
 	"slices"
-	"strings"
 	"time"
 
 	"github.com/SayaAndy/saya-today-web/internal/blog"
@@ -53,12 +52,7 @@ func (r *BlogSearchHandler) Render(c *fiber.Ctx, supplements *router.Supplements
 	sort := c.Query("sort")
 	tz := c.Query("tz")
 	medley := c.Query("medley")
-	referer := c.Get("Referer")
-	refererParts := strings.Split(referer, "/")
-	refererPage := ""
-	if len(refererParts) >= 1 {
-		refererPage = refererParts[len(refererParts)-1]
-	}
+	highlight := c.Query("highlight")
 	hideTags := c.QueryBool("hideTags", false)
 	hidePublishedTime := c.QueryBool("hidePublishedTime", false)
 
@@ -111,7 +105,7 @@ func (r *BlogSearchHandler) Render(c *fiber.Ctx, supplements *router.Supplements
 						"Viewed":           supplements.ClientCache.GetViewStatus(c.IP(), page.FileName),
 						"Medley":           page.Metadata.Medley,
 						"MedleyPart":       page.Metadata.MedleyPart,
-						"ToHighlight":      page.FileName == refererPage,
+						"ToHighlight":      page.FileName == highlight,
 					})
 					break
 				}
diff --git a/internal/router/handlers/lang-blog-title.go b/internal/router/handlers/lang-blog-title.go
index f7cd019..eac317a 100644
--- a/internal/router/handlers/lang-blog-title.go
+++ b/internal/router/handlers/lang-blog-title.go
@@ -102,10 +102,11 @@ func (r *BlogPageHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplemen
 	if err != nil {
 		return fiber.StatusBadRequest, fmt.Errorf("failed to get path from referer: %w", err)
 	}
+	title := pathParts[2]
 
-	metadata, parsedMarkdown, err := readBlogPost(supplements.MarkdownRenderer, supplements.BlogClient, lang+"/"+pathParts[2])
+	metadata, parsedMarkdown, err := readBlogPost(supplements.MarkdownRenderer, supplements.BlogClient, lang+"/"+title)
 	if err != nil {
-		return fiber.StatusNotFound, fmt.Errorf("failed to find '%s' post: %w", pathParts[2], err)
+		return fiber.StatusNotFound, fmt.Errorf("failed to find '%s' post: %w", title, err)
 	}
 
 	geolocationParts := strings.Split(metadata.Geolocation, " ")
@@ -122,6 +123,7 @@ func (r *BlogPageHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplemen
 	templateMap["MapLocationY"] = y
 	templateMap["MapLocationAreaMeters"] = areaError
 	templateMap["Title"] = metadata.Title
+	templateMap["Codename"] = title
 	templateMap["ParsedMarkdown"] = template.HTML(parsedMarkdown)
 	templateMap["PublishedDate"] = metadata.PublishedTime.Format("2006-01-02 15:04:05 -07:00")
 	templateMap["ActionDate"] = metadata.ActionDate
@@ -129,7 +131,7 @@ func (r *BlogPageHandler) RenderBody(c *fiber.Ctx, supplements *router.Supplemen
 	templateMap["Thumbnail"] = metadata.Thumbnail
 	templateMap["Medley"] = metadata.Medley
 
-	go supplements.ClientCache.View(c.IP(), pathParts[2])
+	go supplements.ClientCache.View(c.IP(), title)
 
 	return fiber.StatusOK, nil
 }
diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html
index dd716fb..2a1d5d4 100644
--- a/views/pages/blog-page.html
+++ b/views/pages/blog-page.html
@@ -23,11 +23,11 @@
         <hr class="block sm:hidden border-t-3 bg-paper bg-background-dark border-dotted border-main-hard w-full">
         {{- if .Medley }}
         <div class="overflow-y-auto grow-2 shrink-0 flex-1 bg-paper bg-background-dark shadow-elevation-2 -mr-8 sm:-mt-4 max-sm:-ml-8 z-2">
-            <h2 class="text-2xl font-gentium font-extrabold text-main-hard tracking-[.0125rem]">
+            <h2 class="text-2xl font-gentium font-extrabold text-main-hard tracking-[.0125rem] ml-2">
                 {{ .Medley }}
             </h2>
             <hr class="block border-t-2 my-1 border-dotted border-main-hard w-full">
-            <div hx-get="/api/v1/blog-search" hx-vals='js:{lang: "{{ .Lang }}", tz: clientTimeZone, medley: "{{ .Medley }}", sort: "medley", hideTags: true, hidePublishedTime: true}' hx-target="this" hx-swap="innerHTML" hx-trigger="load"
+            <div hx-get="/api/v1/blog-search" hx-vals='js:{lang: "{{ .Lang }}", tz: clientTimeZone, medley: "{{ .Medley }}", sort: "medley", hideTags: true, hidePublishedTime: true, highlight: "{{ .Codename }}"}' hx-target="this" hx-swap="innerHTML" hx-trigger="load"
                 class="grow flex flex-col pr-2">
                 Loading...
             </div>
diff --git a/views/partials/blog-page-like-button.html b/views/partials/blog-page-like-button.html
index 54b2914..af668e6 100644
--- a/views/partials/blog-page-like-button.html
+++ b/views/partials/blog-page-like-button.html
@@ -12,7 +12,7 @@
             <path d="M13.94 4.33a2.57 2.57 0 0 1 1.43 0.88 4.52 4.52 0 0 1 1 1.54 0.57 0.57 0 0 0 0.56 0.37 0.57 0.57 0 0 0 0.53 -0.41 2.81 2.81 0 0 1 1 -1.41 6.9 6.9 0 0 1 1.69 -1 0.49 0.49 0 0 0 0.31 -0.43 0.5 0.5 0 0 0 -0.24 -0.47 8.18 8.18 0 0 1 -2.26 -1.47 2.39 2.39 0 0 1 -0.71 -1.46 0.34 0.34 0 0 0 -0.34 -0.34 0.35 0.35 0 0 0 -0.34 0.35 0.29 0.29 0 0 0 -0.27 0.23 4.41 4.41 0 0 1 -1 1.63 3.53 3.53 0 0 1 -1.48 1 0.47 0.47 0 0 0 -0.32 0.5 0.48 0.48 0 0 0 0.44 0.49Zm2 -1.47a5.53 5.53 0 0 0 0.82 -1.44 3.34 3.34 0 0 0 0.59 1 6.91 6.91 0 0 0 1.53 1.3 5.93 5.93 0 0 0 -1.48 1 6.91 6.91 0 0 0 -0.51 0.57 4.8 4.8 0 0 0 -0.7 -0.85 4 4 0 0 0 -1 -0.74 5.76 5.76 0 0 0 0.71 -0.84Z" fill="var(--color-accent-deep)" fill-rule="evenodd" stroke-width="1"></path>
         </g>
     </svg>
-    <div class="ml-auto bg-accent-light rounded-full w-6 h-6 text-main">{{ .LikedCount }}</div>
+    <div class="ml-auto bg-accent-light rounded-full w-6 h-6 text-main! font-m-plus! font-normal! tracking-normal! not-italic! text-lg!">{{ .LikedCount }}</div>
     {{ else }}
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Like-Hand--Streamline-Freehand" class="h-10">
         <desc>
@@ -23,6 +23,6 @@
             <path d="M3.53 9.34a2.22 2.22 0 0 0 -1.24 -0.88 5.37 5.37 0 0 0 -2 -0.26 0.3 0.3 0 0 0 -0.29 0.31 0.3 0.3 0 0 0 0.32 0.29 4.36 4.36 0 0 1 1.44 0.25 1.74 1.74 0 0 1 1 0.69A9.16 9.16 0 0 1 3 11.8c0 0.64 0.06 1.38 0.09 2.14 0 1.07 0.08 2.2 0.11 3.22s0.06 2.19 0 2.84c0 0.23 -0.12 0.45 -0.07 0.51A2.7 2.7 0 0 1 2 21a3.34 3.34 0 0 1 -1.49 0 0.34 0.34 0 0 0 -0.22 0.65 4.22 4.22 0 0 0 1.82 0.13 3.37 3.37 0 0 0 1.79 -0.69 1.82 1.82 0 0 0 0.26 -0.82 37.13 37.13 0 0 0 0.14 -5.13c0 -1 -0.1 -2 -0.19 -2.83a12.48 12.48 0 0 0 -0.58 -2.97Z" fill="var(--color-accent-deep)" fill-rule="evenodd" stroke-width="1"></path>
         </g>
     </svg>
-    <div class="ml-auto bg-accent-deep rounded-full w-6 h-6 text-background">{{ .LikedCount }}</div>
+    <div class="ml-auto bg-accent-deep rounded-full w-6 h-6 text-background! font-m-plus! font-normal! tracking-normal! not-italic! text-lg!">{{ .LikedCount }}</div>
     {{ end }}
 </button>