fix: process trailing slash in url when going upv0.5.2

refactor: put :lang: as first layer of href

5 files changed, 21 insertions, 15 deletions

diff --git a/internal/b2/client.go b/internal/b2/client.go
index 1a97e5f..5322b84 100644
--- a/internal/b2/client.go
+++ b/internal/b2/client.go
@@ -33,6 +33,7 @@ func NewB2Client(cfg *config.B2Config) (*B2Client, error) {
 
 type BlogPage struct {
 	Link     string
+	FileName string
 	Metadata *frontmatter.Metadata
 }
 
@@ -69,10 +70,13 @@ func (c *B2Client) Scan(prefix string) ([]*BlogPage, error) {
 			return nil, fmt.Errorf("failed to parse published time metadata field: %w", err)
 		}
 
-		linkParts := strings.Split(obj.Name(), ".")
+		linkParts := strings.Split(obj.Name(), "/")
+		nameParts := strings.Split(linkParts[len(linkParts)-1], ".")
+		fileName := strings.Join(nameParts[:len(linkParts)-1], ".")
 
 		filePaths = append(filePaths, &BlogPage{
-			Link: strings.Join(linkParts[:len(linkParts)-1], "."),
+			Link:     obj.Name(),
+			FileName: fileName,
 			Metadata: &frontmatter.Metadata{
 				Title:            attrs.Info["title"],
 				ShortDescription: attrs.Info["short-description"],
diff --git a/main.go b/main.go
index 6a36f59..7b8bfd3 100644
--- a/main.go
+++ b/main.go
@@ -93,7 +93,8 @@ func main() {
 
 	app.Use(redirect.New(redirect.Config{
 		Rules: map[string]string{
-			"/blog": "/",
+			"/ru": "/",
+			"/en": "/",
 		},
 		StatusCode: 301,
 	}))
@@ -111,7 +112,7 @@ func main() {
 		return c.Type("html").Send(content)
 	})
 
-	app.Get("/blog/:lang", func(c *fiber.Ctx) error {
+	app.Get("/:lang/blog", func(c *fiber.Ctx) error {
 		lang := c.Params("lang")
 		if !slices.Contains(availableLanguages, lang) {
 			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
@@ -169,7 +170,7 @@ func main() {
 			"Title":         localization[lang].BlogSearch.Header,
 		})
 		if err != nil {
-			slog.Warn("failed to generate page", slog.String("page", "/blog/"+lang), slog.String("error", err.Error()))
+			slog.Warn("failed to generate page", slog.String("page", "/"+lang+"/blog"), slog.String("error", err.Error()))
 			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 			return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate page")
 		}
@@ -177,7 +178,7 @@ func main() {
 		return c.Type("html").Status(status).Send(content)
 	})
 
-	app.Get("/blog/:lang/:title", func(c *fiber.Ctx) error {
+	app.Get("/:lang/blog/:title", func(c *fiber.Ctx) error {
 		lang := c.Params("lang")
 		if !slices.Contains(availableLanguages, lang) {
 			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
@@ -211,7 +212,7 @@ func main() {
 			"Lang":                  lang,
 		})
 		if err != nil {
-			slog.Warn("failed to generate page", slog.String("page", "/blog/"+lang+c.Params("title")), slog.String("error", err.Error()))
+			slog.Warn("failed to generate page", slog.String("page", "/"+lang+"/blog/"+c.Params("title")), slog.String("error", err.Error()))
 			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 			return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate page")
 		}
@@ -255,6 +256,7 @@ func main() {
 				if len(tags) == 0 || slices.Contains(tags, tag) {
 					pageMeta = append(pageMeta, map[string]string{
 						"Link":             page.Link,
+						"ArticleLink":      "/" + lang + "/blog/" + page.FileName,
 						"Title":            page.Metadata.Title,
 						"PublishedTime":    page.Metadata.PublishedTime.Format("2006-01-02 15:04:05 -0700"),
 						"ActionDate":       page.Metadata.ActionDate,
@@ -294,7 +296,7 @@ func main() {
 			"L":         localization[lang],
 		})
 		if err != nil {
-			slog.Warn("failed to generate div", slog.String("page", "/blog/"+lang), slog.String("error", err.Error()))
+			slog.Warn("failed to generate div", slog.String("page", "/"+lang+"/blog"), slog.String("error", err.Error()))
 			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 			return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate div")
 		}
diff --git a/views/index.html b/views/index.html
index 1c57bd1..2b8c937 100644
--- a/views/index.html
+++ b/views/index.html
@@ -106,7 +106,7 @@
         <p class="font-patua mx-auto text-[2.5vmax] mt-[0.8vmin] mb-[0.8vmin]">saya.today</p>
         <div class="menu-inner-body grow bg-background-light flex flex-adaptive mx-auto opacity-100">
             {{- range .AvailableLanguages }}
-            <img onclick="location.href='/blog/{{ .Name }}';" class="object-scale-down cursor-pointer flex-1 rounded-[20%] language-icon mx-auto my-auto relative" src="{{ .Flag }}" alt="{{ .Alt }}">
+            <img onclick="location.href='/{{ .Name }}/blog';" class="object-scale-down cursor-pointer flex-1 rounded-[20%] language-icon mx-auto my-auto relative" src="{{ .Flag }}" alt="{{ .Alt }}">
             {{- end }}
         </div>
         <p class="font-spectral mx-auto text-[1.5vmax] text-secondary mt-[0.8vmin] mb-[0.8vmin]">Choose your language</p>
diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html
index d33aa76..d5146f8 100644
--- a/views/layouts/general-page.html
+++ b/views/layouts/general-page.html
@@ -39,7 +39,7 @@
         </div>
         <div class="text-[3vw] ar-lt-0.8:text-[5vh] text-stroke-(--sidebar-stroke-color) text-stroke-[0.1vw] flex flex-col ar-lt-0.8:flex-row gap-0 relative z-20">
             <i onclick="location.href='/';" class="fas fa-home w-[5vw] ar-lt-0.8:w-[8vh] h-[5vw] ar-lt-0.8:h-[8vh] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 flex rounded-lg"></i>
-            <i onclick="location.href='/blog/{{ .Lang }}';" class="fas fa-search w-[5vw] ar-lt-0.8:w-[8vh] h-[5vw] ar-lt-0.8:h-[8vh] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 flex rounded-lg"></i>
+            <i onclick="location.href='/{{ .Lang }}/blog';" class="fas fa-search w-[5vw] ar-lt-0.8:w-[8vh] h-[5vw] ar-lt-0.8:h-[8vh] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 flex rounded-lg"></i>
             <!-- <i class="fas fa-images w-[5vw] ar-lt-0.8:w-[8vh] h-[5vw] ar-lt-0.8:h-[8vh] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 flex rounded-lg"></i> -->
             <i onclick="switchTheme('')" class="fas fa-swatchbook w-[5vw] ar-lt-0.8:w-[8vh] h-[5vw] ar-lt-0.8:h-[8vh] content-center text-center text-sidebar hover:bg-background-dark cursor-pointer transition-colors duration-300 flex rounded-lg"></i>
         </div>
@@ -50,7 +50,7 @@
 
         <div class="ar-gt-0.8:min-w-fit ar-gt-0.8:max-w-[100vh] flex flex-col bg-background-dark relative mt-[1.6vmin] ml-[1.6vmin] pr-[1.6vmin]">
             <div class="flex flex-row mb-[0.4vmin]">
-                <i onclick="location.pathname+='/../';" class="fas fa-circle-left hover:bg-main-dark hover:bg-opacity-10 cursor-pointer transition-colors duration-300 rounded-md text-[2vmax] mt-auto mb-auto px-[0.8vmin]"></i>
+                <i onclick="location.pathname += location.pathname.endsWith('/') ? '../' : '/../';" class="fas fa-circle-left hover:bg-main-dark hover:bg-opacity-10 cursor-pointer transition-colors duration-300 rounded-md text-[2vmax] mt-auto mb-auto px-[0.8vmin]"></i>
                 <p class="text-[2vmax] font-spectral italic font-extrabold select-none mt-auto pl-[0.8vmin] pr-[1.2vmin]">//</p>
                 <p class="text-[2vmax] font-spectral italic text-left mt-auto">{{ .Title }}</p>
                 {{- if .PublishedDate }}
diff --git a/views/partials/catalogue-blog-cards.html b/views/partials/catalogue-blog-cards.html
index 7cb48f0..36a6184 100644
--- a/views/partials/catalogue-blog-cards.html
+++ b/views/partials/catalogue-blog-cards.html
@@ -1,12 +1,12 @@
 {{- range .BlogPages }}
 <hr class="first-of-type:hidden border-t-[0.3vh] my-[0.8vmin] border-dotted border-main-dark w-[80%] mx-auto">
 <div class="m-[0.4vmin] flex flex-row justify-center justify-items-center">
-    <img onclick="location.href='/blog/{{ .Link }}';" class="cursor-pointer object-cover rounded-[10%] select-none w-[10vmin] h-[10vmin] aspect-square my-[0.4vmin] mr-[0.8vmin]" src="https://f003.backblazeb2.com/file/sayana-photos/thumbnails/{{ .Thumbnail }}.webp">
+    <img onclick="location.href='{{ .ArticleLink }}}';" class="cursor-pointer object-cover rounded-[10%] select-none w-[10vmin] h-[10vmin] aspect-square my-[0.4vmin] mr-[0.8vmin]" src="https://f003.backblazeb2.com/file/sayana-photos/thumbnails/{{ .Thumbnail }}.webp">
     <div class="grow my-[0.4vmin] mx-[0.8vmin] flex flex-col justify-center">
         <div class="flex flex-row">
-            <a href="/blog/{{ .Link }}" class="block text-[1vmax] font-extrabold">{{ .Title }}</a>
-            <a href="/blog/{{ .Link }}" class="block text-[1vmax] font-extrabold pl-[0.4vmin] pr-[0.4vmin] select-none cursor-pointer text-secondary">//</a>
-            <a href="/blog/{{ .Link }}" class="block text-[1vmax] italic text-secondary">{{ .ActionDate }}</a>
+            <a href="{{ .ArticleLink }}" class="block text-[1vmax] font-extrabold">{{ .Title }}</a>
+            <a href="{{ .ArticleLink }}" class="block text-[1vmax] font-extrabold pl-[0.4vmin] pr-[0.4vmin] select-none cursor-pointer text-secondary">//</a>
+            <a href="{{ .ArticleLink }}" class="block text-[1vmax] italic text-secondary">{{ .ActionDate }}</a>
             <p class="text-[1vmax] italic text-secondary text-right grow">{{ .PublishedTime }}</p>
         </div>
         <p class="text-[1vmax] text-main-dark">{{ .ShortDescription }}</p>