Merge pull request #660 from gethinode/develop

Add support for absolute paths

README.md

@@ -9,32 +9,32 @@
 
 <!-- Badges -->
 <p align="center">
-    <a href="https://gohugo.io" alt="Hugo website">
-        <img src="https://img.shields.io/badge/generator-hugo-brightgreen">
+    <a href="https://gohugo.io">
+        <img src="https://img.shields.io/badge/generator-hugo-brightgreen" alt="Hugo website">
     </a>
-    <a href="https://gethinode.com" alt="Hinode theme">
-        <img src="https://img.shields.io/badge/theme-hinode-blue">
+    <a href="https://gethinode.com">
+        <img src="https://img.shields.io/badge/theme-hinode-blue" alt="Hinode theme">
     </a>
-    <a href="https://www.npmjs.com/package/%40gethinode/hinode" alt="npm package">
-        <img src="https://img.shields.io/npm/v/%40gethinode/hinode">
+    <a href="https://www.npmjs.com/package/%40gethinode/hinode">
+        <img src="https://img.shields.io/npm/v/%40gethinode/hinode" alt="npm package">
     </a>
-    <a href="https://app.netlify.com/sites/gethinode-demo/deploys" alt="Netlify Status">
-        <img src="https://img.shields.io/netlify/0ad42e3e-fdfa-4d37-8e26-58badd429a67">
+    <a href="https://app.netlify.com/sites/gethinode-demo/deploys">
+        <img src="https://img.shields.io/netlify/0ad42e3e-fdfa-4d37-8e26-58badd429a67"  alt="Netlify Status">
     </a>
-    <a href="https://stats.uptimerobot.com/xyGVYhLJmV" alt="UptimeRobot Status">
-        <img src="https://img.shields.io/uptimerobot/status/m791334689-73d9dfc82030f4f955b2d6bb">
+    <a href="https://stats.uptimerobot.com/xyGVYhLJmV">
+        <img src="https://img.shields.io/uptimerobot/status/m791334689-73d9dfc82030f4f955b2d6bb" alt="UptimeRobot Status">
     </a>
-    <a href="https://github.com/gethinode/hinode/commits/main" alt="Last commit">
-        <img src="https://img.shields.io/github/last-commit/gethinode/hinode.svg">
+    <a href="https://github.com/gethinode/hinode/commits/main">
+        <img src="https://img.shields.io/github/last-commit/gethinode/hinode.svg" alt="Last commit">
     </a>
-    <a href="https://github.com/gethinode/hinode/issues" alt="Issues">
-        <img src="https://img.shields.io/github/issues/gethinode/hinode.svg">
+    <a href="https://github.com/gethinode/hinode/issues">
+        <img src="https://img.shields.io/github/issues/gethinode/hinode.svg" alt="Issues">
     </a>
-    <a href="https://github.com/gethinode/hinode/pulls" alt="Pulls">
-        <img src="https://img.shields.io/github/issues-pr-raw/gethinode/hinode.svg">
+    <a href="https://github.com/gethinode/hinode/pulls">
+        <img src="https://img.shields.io/github/issues-pr-raw/gethinode/hinode.svg" alt="Pulls">
     </a>
-    <a href="https://github.com/gethinode/hinode/blob/main/LICENSE" alt="License">
-        <img src="https://img.shields.io/github/license/gethinode/hinode">
+    <a href="https://github.com/gethinode/hinode/blob/main/LICENSE">
+        <img src="https://img.shields.io/github/license/gethinode/hinode" alt="License">
     </a>
 </p>
 

config/_default/hugo.toml

@@ -104,6 +104,9 @@ home = ["HTML", "RSS", "REDIR"]
   [[module.mounts]]
     source = "content"
     target = "content"
+  [[module.mounts]]
+    source = "data"
+    target = "data"
   [[module.mounts]]
     source = "i18n"
     target = "i18n"

exampleSite/content/en/blog/fourth-post.md

@@ -1,9 +1,10 @@
 ---
 author: Mark Dumay
-title: Fourth post
+title: Fourth post (excluded from search)
 date: 2023-01-01
-description: This is my fourth blog post.
+description: This is my fourth blog post. It is excluded from the search index.
 tags: ["blog"]
+searchExclude: true
 thumbnail:
   url: img/flowers.jpg
   author: Arvee Marie

exampleSite/go.sum

@@ -18,6 +18,10 @@ github.com/gethinode/mod-flexsearch v1.5.1 h1:9fYlnHgiEXckL0EoC0zlSNO7BWZf5yiOro
 github.com/gethinode/mod-flexsearch v1.5.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.6.0 h1:Rjx+GLOByFLmaWD9hZXwmuKN8A89te6BZAIq2c9QBKg=
 github.com/gethinode/mod-flexsearch v1.6.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.7.0 h1:VFTf6iUyT9b47jTDAxh8nVHU1eUBrdxlykaC90lTfqk=
+github.com/gethinode/mod-flexsearch v1.7.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.7.1 h1:f4rjKkhleDVzqwUmwP1xZdhjru5VQ9g0MRDz0G6oLyY=
+github.com/gethinode/mod-flexsearch v1.7.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-fontawesome v1.2.4 h1:SqE3CQ+boaBIhrVh3MPu4nz0uoHPfEH5t60nNY1CfsI=
 github.com/gethinode/mod-fontawesome v1.2.4/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.2.5 h1:RqkLRj6+s+gM4nKd0IwNMMDA8cRmxfp0fxkVH4FdAGU=
@@ -34,6 +38,8 @@ github.com/gethinode/mod-fontawesome v1.5.0 h1:3mW5dnWauuF9wSWXNIY+PPgTNPlc/xQOQ
 github.com/gethinode/mod-fontawesome v1.5.0/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.5.1 h1:C7goQY4HrEua/lpjC++laydNKBuYo1+307ngn5tyXeM=
 github.com/gethinode/mod-fontawesome v1.5.1/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
+github.com/gethinode/mod-fontawesome v1.6.1 h1:iqOgDGdw7Bs4hnzjF/8JsUn10omyKQZTglLqNenT1K0=
+github.com/gethinode/mod-fontawesome v1.6.1/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-katex v1.0.1/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPKdAXk=
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=

go.mod

@@ -5,8 +5,8 @@ go 1.19
 require (
 	github.com/airbnb/lottie-web v5.12.2+incompatible // indirect
 	github.com/gethinode/mod-bootstrap v1.2.2 // indirect
-	github.com/gethinode/mod-flexsearch v1.6.0 // indirect
-	github.com/gethinode/mod-fontawesome v1.5.1 // indirect
+	github.com/gethinode/mod-flexsearch v1.7.1 // indirect
+	github.com/gethinode/mod-fontawesome v1.6.1 // indirect
 	github.com/gethinode/mod-katex v1.0.4 // indirect
 	github.com/gethinode/mod-leaflet v0.3.5 // indirect
 	github.com/gethinode/mod-lottie v1.3.0 // indirect

go.sum

@@ -36,6 +36,10 @@ github.com/gethinode/mod-flexsearch v1.5.1 h1:9fYlnHgiEXckL0EoC0zlSNO7BWZf5yiOro
 github.com/gethinode/mod-flexsearch v1.5.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.6.0 h1:Rjx+GLOByFLmaWD9hZXwmuKN8A89te6BZAIq2c9QBKg=
 github.com/gethinode/mod-flexsearch v1.6.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.7.0 h1:VFTf6iUyT9b47jTDAxh8nVHU1eUBrdxlykaC90lTfqk=
+github.com/gethinode/mod-flexsearch v1.7.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.7.1 h1:f4rjKkhleDVzqwUmwP1xZdhjru5VQ9g0MRDz0G6oLyY=
+github.com/gethinode/mod-flexsearch v1.7.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-fontawesome v1.0.2 h1:ZSK6D20/w4y5GnfYfTBB58uHD0ChIfkpKfRGwioS9rg=
 github.com/gethinode/mod-fontawesome v1.0.2/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.1.0 h1:rsDzUI+3ZlS/do2ff3ne8/z3KwHeysmuA+WsXlumXXk=
@@ -64,6 +68,8 @@ github.com/gethinode/mod-fontawesome v1.5.0 h1:3mW5dnWauuF9wSWXNIY+PPgTNPlc/xQOQ
 github.com/gethinode/mod-fontawesome v1.5.0/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.5.1 h1:C7goQY4HrEua/lpjC++laydNKBuYo1+307ngn5tyXeM=
 github.com/gethinode/mod-fontawesome v1.5.1/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
+github.com/gethinode/mod-fontawesome v1.6.1 h1:iqOgDGdw7Bs4hnzjF/8JsUn10omyKQZTglLqNenT1K0=
+github.com/gethinode/mod-fontawesome v1.6.1/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-katex v1.0.0 h1:me/3dIIZBkfk1mRIFt8QiAGYwYDoSG5bc2hHRtIutFc=
 github.com/gethinode/mod-katex v1.0.0/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.1 h1:809QUztxmKgMNchU+v03iMO7Ma+ISc3ZzhXYauc21rs=

hugo_stats.json

@@ -45,8 +45,10 @@
       "col-12",
       "col-6",
       "col-md-2",
+      "col-md-3",
       "col-md-4",
       "col-md-8",
+      "col-md-9",
       "col-sm-12",
       "collapse",
       "collapsed",
@@ -147,7 +149,6 @@
       "row-cols-1",
       "row-cols-2",
       "row-cols-md-2",
-      "row-cols-sm-2",
       "row-cols-sm-3",
       "search",
       "search-input",

i18n/de.yaml

@@ -30,9 +30,9 @@
 - id: shareSystem
   translation: "Betriebssystem"
 - id: copyToClipboard
-  translation: "In Zwischenablage kopieren"
+  translation: "In die Zwischenablage kopieren"
 - id: copiedToClipboard
-  translation: "Der Text befindet sich in die Zwischenablage"
+  translation: "befindet sich in der Zwischenablage"
 - id: link
   translation: "Link zur Webseite"
 - id: code

layouts/partials/assets/card-group.html

@@ -67,7 +67,7 @@
 {{ range $index, $element := $pages }}
     {{ $params := dict }}
     <!-- regular page -->
-    {{- if $element.RelPermalink -}}
+    {{- if and $element.RelPermalink $element.File -}}
         {{- $params = merge $params (dict "path" $element.File.Path) -}}
     <!-- headless page -->
     {{- else -}}

layouts/partials/assets/section-list.html

@@ -44,7 +44,7 @@
     {{- with index . "sectionHeader" }}{{ $sectionHeader = . }}{{ end -}}
     {{- with index . "sort" }}{{ $sort = . }}{{ end -}}
     {{- if (index . "reverse") }}{{ $order = "desc" }}{{ else }}{{ $order = "asc" }}{{ end -}}
-    {{- if $home }}{{- if (isset . "nested") }}{{ $nested = (index . "nested") }}{{ end -}}{{ end -}}
+    {{- if (isset . "nested") }}{{ $nested = (index . "nested") }}{{ end -}}
     {{- if (index . "separator") }}{{ $separator = true }}{{ else }}{{ $separator = false }}{{ end -}}
     {{- with index . "orientation" }}{{ $orientation = . }}{{ end -}}
     {{- with index . "cols" }}{{ $cols = . }}{{ end -}}
@@ -64,6 +64,10 @@
     {{- with index . "ratio" }}{{ $ratio = . }}{{ end -}}
     {{- with index . "wrap" }}{{ $wrap = . }}{{ end -}}
 {{- end -}}
+
+{{ if isset $page.Params "nested" }}
+    {{ $nested = $page.Params.nested }}
+{{ end }}
 {{ if ne (printf "%T" $nested) "bool" }}
     {{ errorf "partial [assets/section-list.html] - Invalid value for param 'nested'"}}
 {{ end }}
@@ -84,15 +88,19 @@
         {{ $opts := dict "namedSlices" (slice $keywords) }}
         {{ $list = site.RegularPages.Related $opts }}
     {{ end }}
-{{ else if $page.IsSection }}
-    {{ $list = $page.Pages }}
-{{ else if $nested }}
-    {{ $list = where site.RegularPages "Type" "in" $section }}
 {{ else if $home }}
     {{ $sectionPage := site.GetPage "section" $section }}
-    {{ $list = $sectionPage.RegularPages }}
+    {{ if $nested }}
+        {{ $list = $sectionPage.RegularPagesRecursive }}
     {{ else }}
-    {{ $list = $page.RegularPages }}
+        {{ $list = $sectionPage.Pages }}
+    {{ end }}
+{{ else }}
+    {{ if $nested }}
+        {{ $list = $page.RegularPagesRecursive }}
+    {{ else }}
+        {{ $list = $page.Pages }}
+    {{ end }}
 {{ end }}
 
 {{ $max := (len $list) -}}

layouts/partials/utilities/GetResource.html

@@ -1,13 +1,28 @@
 <!-- 
     Retrieve a local or remote resource. If the url starts with 'http', the resource is retrieved from an external
-    location. Else, the url is matched with a page resource and site asset (in that order). The partial returns nil if
-    the resource cannot be found. The partial supports the following arguments:
+    location. Else, the url is matched with a page resource and site asset (in that order). 
+    
+    This partial supports both relative and absolute paths. Hugo has different methods to retrieve page bundle assets
+    and site assets. Absolute paths are converted to a relative path to make them compatible with Hugo's methods. The
+    prefix of an absolute path is truncated if it matches either with the page bundle folder (starting with "/content/")
+    or the assets folder ("/assets/"). 
+    
+    The partial returns nil if the resource cannot be found. The partial supports the following arguments:
     "url"           Required path or url of the resource, e.g. "img/example.jpg" or "https://example.com/img.jpg"
     "page"          Optional page context, used to retrieve a resource from page resources.
 -->
 
 {{ $url := .url -}}
 {{ $page := .page -}}
+{{ if hasPrefix $url "/" }}
+    {{ $pageContext := (path.Join "/content" $page.File.Dir) -}}
+    {{ if hasPrefix $url $pageContext }}
+        {{ $url = strings.TrimPrefix $pageContext $url -}}
+    {{ else if hasPrefix $url "/assets/" }}
+        {{ $url = strings.TrimPrefix "/assets/" $url -}}
+    {{ end }}
+    {{ $url = strings.TrimPrefix "/" $url -}}
+{{ end }}
 
 {{ $res := "" }}
 {{ $remote := hasPrefix (lower $url) "http" }}

layouts/partials/utilities/GetSections.html

@@ -62,7 +62,6 @@
         "section" $section 
         "home" $page.IsHome
         "simple" (eq (len $sections) 1)
-        "nested" (and $page.IsHome (eq $section $page.Section))
         "thumbnail" $thumbnail
         "icon" $icon
         "content" $content

layouts/tags/list.html

@@ -2,10 +2,11 @@
     {{- $page := . -}}
     {{- $layout := $page.Params.layout -}}
     {{- $breakpoint := $.Scratch.Get "breakpoint" -}}
+    {{- $hasSidebar := site.Params.navigation.sidebar | default true -}}
 
     <div class="container-xxl flex-fill p-4 px-xxl-0">
-        <div class="row row-cols-1 row-cols-{{ $breakpoint.prev }}-3">
-            <div class="col col-{{ $breakpoint.current }}-2 d-none d-{{ $breakpoint.current }}-block"></div>
+        <div class="row row-cols-1 row-cols-{{ $breakpoint.prev }}-{{ if $hasSidebar }}3{{ else }}2{{ end }}">
+            {{ if $hasSidebar }}<div class="col col-{{ $breakpoint.current }}-2 d-none d-{{ $breakpoint.current }}-block"></div>{{ end }}
             <div class="col col-{{ $breakpoint.prev }}-12 col-{{ $breakpoint.current }}-8">
                 {{- if ne $layout "featured" -}}
                     {{ if and (not $page.IsHome) site.Params.navigation.breadcrumb }}

netlify.toml

@@ -5,11 +5,11 @@
 
 [build.environment]
     DART_SASS_VERSION = "1.69.5"
-    HUGO_VERSION = "0.120.3"
+    HUGO_VERSION = "0.121.0"
     HUGO_ENV = "production"
     HUGO_ENABLEGITINFO = "true"
-    NODE_VERSION = "18.18.2"
-    NPM_VERSION = "9.8.1"
+    NODE_VERSION = "18.19.0"
+    NPM_VERSION = "10.2.3"
 # toml-docs-end netlify
 
 [[headers]]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.21.7",
+  "version": "0.21.11",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -71,18 +71,18 @@
     "@gethinode/netlify-plugin-dartsass": "^0.2.0",
     "@netlify/plugin-lighthouse": "^5.0.0",
     "autoprefixer": "^10.4.16",
-    "cssnano": "^6.0.1",
-    "cssnano-preset-advanced": "^6.0.1",
-    "eslint": "^8.53.0",
+    "cssnano": "^6.0.2",
+    "cssnano-preset-advanced": "^6.0.2",
+    "eslint": "^8.55.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.3.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-promise": "^6.1.1",
-    "hugo-bin": "^0.116.4",
-    "markdownlint-cli2": "^0.10.0",
+    "hugo-bin": "^0.117.1",
+    "markdownlint-cli2": "^0.11.0",
     "netlify-plugin-hugo-cache-resources": "^0.2.1",
     "npm-run-all": "^4.1.5",
-    "postcss-cli": "^10.1.0",
+    "postcss-cli": "^11.0.0",
     "purgecss-whitelister": "^2.4.0",
     "replace-in-files-cli": "^2.2.0",
     "rimraf": "^5.0.5",