Merge pull request #1000 from gethinode/develop

Add support for subfolder deployment to sidebar
Refine base path
2025-10-07 10:04:22 +00:00 · 2024-06-19 08:41:53 +02:00 · 2024-06-19 08:30:14 +02:00 · 2024-06-18 07:44:13 +02:00 · 2024-06-18 07:43:45 +02:00 · 2024-06-16 10:08:05 +02:00
6 changed files with 17 additions and 10 deletions
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/gethinode/mod-katex v1.1.0 // indirect
 	github.com/gethinode/mod-leaflet v1.1.0 // indirect
 	github.com/gethinode/mod-lottie v1.5.4 // indirect
-	github.com/gethinode/mod-utils/v2 v2.3.7 // indirect
+	github.com/gethinode/mod-utils/v2 v2.3.8 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -222,6 +222,8 @@ github.com/gethinode/mod-utils/v2 v2.3.6 h1:Ta+WKc83sK9ZROKmUwS4pA32Qm0bQqoMmWHE
 github.com/gethinode/mod-utils/v2 v2.3.6/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
 github.com/gethinode/mod-utils/v2 v2.3.7 h1:FFsUPO7NBp9Bhjovf0Ki5hnDGfeMKV/3RNz1Qpv7+oQ=
 github.com/gethinode/mod-utils/v2 v2.3.7/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.3.8 h1:zAiDRCb3SsP9z6PUkCaiRLHOpqFhVf0xVhVOoTZNmAI=
+github.com/gethinode/mod-utils/v2 v2.3.8/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=
--- a/layouts/partials/assets/sidebar.html
+++ b/layouts/partials/assets/sidebar.html
@@ -26,8 +26,8 @@
    {{- $group := .group -}}
    {{- $data := .menu -}}

-    {{- $doc_slug := urls.JoinPath  $baseURL ($group.title | urlize) -}}
-    {{- $href := or $group.link (partial "utilities/GetStaticURL" (dict "url" $doc_slug)) -}}
+    {{- $doc_slug := urls.JoinPath $baseURL ($group.title | urlize) -}}
+    {{- $href := or $group.link $doc_slug -}}
    {{- $collapsed := strings.HasPrefix $page.RelPermalink $href -}}

    <li class="mb-1">
@@ -75,9 +75,13 @@
    {{ $href := "" }}

    {{ with .href }}
-        {{- $href = (partial "utilities/GetStaticURL" (dict "url" (urls.JoinPath $baseURL .))) -}}
+        {{ if hasPrefix . "http" }}
+            {{ $href = . }}
+        {{ else }}
+            {{- $href = urls.JoinPath $baseURL . -}}
+        {{ end }}
    {{ else }}
-        {{- $href =  partial "utilities/GetStaticURL" (dict "url" (urls.JoinPath $baseURL ($title | urlize))) -}}
+        {{- $href = urls.JoinPath $baseURL ($title | urlize) -}}
    {{ end }}
    {{- $active := eq (strings.TrimSuffix "/" $page.RelPermalink) (strings.TrimSuffix "/" $href) -}}

@@ -117,7 +121,8 @@
    <nav class="sidebar flex-shrink-0 ps-1 pt-3" aria-label="{{ (strings.FirstUpper $section) }} navigation">
        {{- $sectionBreak := false -}}
        {{- $level := 0 -}}
-        {{- $baseURL := relLangURL (path.Join $section $version) }}
+        {{ $baseURL := $page.Scratch.Get "baseURL" | default "/" -}}
+        {{ $baseURL = urls.JoinPath "/" (strings.TrimPrefix $baseURL (urls.JoinPath $section $version | relLangURL)) }}

        <ul class="list-unstyled ps-0">
        {{- range $index, $item := $data -}}
--- a/layouts/partials/head/seo.html
+++ b/layouts/partials/head/seo.html
@@ -14,7 +14,7 @@
 {{ $.Scratch.Set "description" $description -}}

 {{- $thumbnail := (or (and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.url) .Params.Thumbnail) -}}
-{{ with $thumbnail -}}
+{{ if $thumbnail -}}
    {{ $imgURL := index (partial "assets/helpers/image-dimension.html" (dict "url" $thumbnail "width" 1280 "height" 640 "page" .)) "target" }}
    {{ $.Scratch.Set "thumbnail" ($imgURL | absURL) -}}
 {{ else -}}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.3",
+  "version": "0.24.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.24.3",
+      "version": "0.24.6",
      "license": "MIT",
      "dependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.3",
+  "version": "0.24.6",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	f42722c526	Merge pull request #1000 from gethinode/develop Add support for subfolder deployment to sidebar	2024-06-19 08:41:53 +02:00
Mark Dumay	4d02900162	Refine base path	2024-06-19 08:30:14 +02:00
Mark Dumay	3ca8bdd0a5	Merge branch 'main' into develop	2024-06-18 07:44:13 +02:00
Mark Dumay	371b054302	Add support for subfolder deployment to sidebar	2024-06-18 07:43:45 +02:00
Mark Dumay	055614e6ee	Merge pull request #999 from gethinode/develop Fix SEO thumbnail handling	2024-06-16 10:08:05 +02:00
Mark Dumay	7d712b13fe	Merge branch 'main' into develop	2024-06-16 10:01:18 +02:00
Mark Dumay	5ee8383868	Fix SEO thumbnail handling	2024-06-16 10:00:31 +02:00
Mark Dumay	54f012f5be	Merge pull request #998 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-06-16 08:14:19 +02:00
markdumay	d28a642283	fix: update Hugo module dependencies	2024-06-16 05:57:29 +00:00
Mark Dumay	91becdeeb5	Merge pull request #997 from gethinode/develop Fix handling of external links in sidebar	2024-06-16 07:56:40 +02:00
Mark Dumay	b7c5b8a47e	Bump package release	2024-06-16 07:45:31 +02:00
Mark Dumay	776aad8427	Fix #996	2024-06-16 07:44:26 +02:00