Merge pull request #258 from gethinode/develop

Menu aliases
Merge branch 'main' into develop
2025-10-08 10:34:26 +00:00 · 2023-05-17 12:05:58 +02:00 · 2023-05-17 11:52:39 +02:00 · 2023-05-17 11:51:32 +02:00 · 2023-05-17 11:50:55 +02:00 · 2023-05-17 09:27:47 +02:00
9 changed files with 116 additions and 57 deletions
--- a/assets/js/menu.js
+++ b/assets/js/menu.js
@@ -0,0 +1,20 @@
+const url = new URL(window.location.href)
+const menu = url.searchParams.get('menu')
+const child = url.searchParams.get('child')
+const menuItems = document.querySelectorAll('[data-nav="main"]')
+
+if (menu !== null) {
+  menuItems.forEach(element => {
+    element.classList.remove('active')
+  })
+
+  const targetMainItems = document.querySelectorAll(`[data-nav-main="${menu}"]:not([data-nav-child])`)
+  targetMainItems.forEach(element => {
+    element.classList.add('active')
+  })
+
+  const targetChildItems = document.querySelectorAll(`[data-nav-main="${menu}"][data-nav-child="${child}"]`)
+  targetChildItems.forEach(element => {
+    element.classList.add('active')
+  })
+}
--- a/config/_default/menus/menus.en.toml
+++ b/config/_default/menus/menus.en.toml
@@ -1,33 +1,33 @@
 [[main]]
  name = "About"
-  url = "/about/"
+  pageRef = "/about/"
  weight = 10

 [[main]]
  name = "Blog"
-  url = "/blog/"
+  pageRef = "/blog/"
  weight = 20

 [[main]]
  name = "Projects"
-  url = "/projects/"
+  pageRef = "/projects/"
  weight = 30

 [[main]]
  name = "Sample project"
-  url = "/projects/sample-project/"
+  pageRef = "/projects/sample-project/"
  parent = "Projects"
  weight = 1

 [[main]]
  name = "Another project"
-  url = "/projects/another-project/"
+  pageRef = "/projects/another-project/"
  parent = "Projects"
  weight = 2

 [[main]]
  name = "Tags"
-  url = "/tags/"
+  pageRef = "/tags/"
  weight = 40

 [[social]]
@@ -51,23 +51,23 @@
 # toml-docs-start sample-navigation
 [[sample]]
  name = "Blog"
-  url = "/blog/"
+  pageRef = "/blog/"
  weight = 10

 [[sample]]
  name = "Projects"
-  url = "/projects/"
+  pageRef = "/projects/"
  weight = 20

 [[sample]]
  name = "Sample project"
-  url = "/projects/sample-project/"
+  pageRef = "/projects/sample-project/"
  parent = "Projects"
  weight = 1

 [[sample]]
  name = "Another project"
-  url = "/projects/another-project/"
+  pageRef = "/projects/another-project/"
  parent = "Projects"
  weight = 2
 # toml-docs-end sample-navigation
--- a/config/_default/menus/menus.nl.toml
+++ b/config/_default/menus/menus.nl.toml
@@ -1,33 +1,33 @@
 [[main]]
  name = "Over mij"
-  url = "/over-mij/"
+  pageRef = "/over-mij/"
  weight = 10

 [[main]]
  name = "Blog"
-  url = "/blog/"
+  pageRef = "/blog/"
  weight = 20

 [[main]]
  name = "Projecten"
-  url = "/projecten/"
+  pageRef = "/projecten/"
  weight = 30

 [[main]]
  name = "Voorbeeldproject"
-  url = "/projecten/voorbeeldproject/"
+  pageRef = "/projecten/voorbeeldproject/"
  parent = "Projecten"
  weight = 1

 [[main]]
  name = "Ander project"
-  url = "/projecten/ander-project/"
+  pageRef = "/projecten/ander-project/"
  parent = "Projecten"
  weight = 2

 [[main]]
  name = "Tags"
-  url = "/tags/"
+  pageRef = "/tags/"
  weight = 40

 [[social]]
@@ -51,23 +51,23 @@
 # toml-docs-start sample-navigation
 [[sample]]
  name = "Blog"
-  url = "/blog/"
+  pageRef = "/blog/"
  weight = 10

 [[sample]]
  name = "Projecten"
-  url = "/projecten/"
+  pageRef = "/projecten/"
  weight = 20

 [[sample]]
  name = "Voorbeeldproject"
-  url = "/projecten/voorbeeldproject/"
+  pageRef = "/projecten/voorbeeldproject/"
  parent = "Projecten"
  weight = 1

 [[sample]]
  name = "Ander project"
-  url = "/projecten/ander-project/"
+  pageRef = "/projecten/ander-project/"
  parent = "Projecten"
  weight = 2
 # toml-docs-end sample-navigation
--- a/layouts/alias.html
+++ b/layouts/alias.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html{{ with site.LanguageCode | default site.Language.Lang }} lang="{{ . }}"{{ end }}>
+  <head>
+    <title>{{ .Permalink }}</title>
+    <link rel="canonical" href="{{ .Permalink }}">
+    <meta name="robots" content="noindex">
+    <meta charset="utf-8">
+    <noscript><meta http-equiv="refresh" content="0; url={{ .Permalink }}"></noscript>
+    <script src="/js/alias.js"></script>
+  </head>
+</html>
--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -0,0 +1,45 @@
+{{- $menu := .menu -}}
+{{- $parent := .parent -}}
+{{- $page := .page -}}
+{{- $class := .class -}}
+
+{{- $menuURL := (or $menu.PageRef $menu.URL) | relLangURL -}}
+{{- $pageURL := $page.RelPermalink | relLangURL -}}
+{{- $isActive := hasPrefix $pageURL $menuURL -}}
+{{- $isAlias := $menu.Params.alias -}}
+
+{{- $url := urls.Parse $menuURL -}}
+{{- $baseURL := urls.Parse $.Site.Params.Baseurl -}}
+{{- $isExternal := ne $url.Host $baseURL.Host -}}
+{{- $externalHref := "" }}
+{{- if $isExternal }}{{ $externalHref = "target=\"_blank\" rel=\"noopener noreferrer\"" }}{{ end -}}
+
+{{- $mainNav := urlize (lower $menu.Name) -}}
+{{- $childNav := "" -}}
+
+{{- $button := "" -}}
+{{- if $parent -}}
+    {{- $mainNav = urlize (lower $parent.Name) -}}
+    {{- $childNav = urlize (lower $menu.Name) -}}
+    {{- $class = printf "dropdown-item %s" $class -}}
+{{- else if $menu.HasChildren -}}
+    {{- $class = printf "nav-link dropdown-toggle %s" $class -}}
+    {{- $button = " role=\"button\" data-bs-toggle=\"dropdown\" aria-expanded=\"false\"" -}}
+{{- else -}}
+    {{- $class = printf "nav-link %s" $class -}}
+{{- end -}}
+{{- $params := "" -}}
+{{- if and $isAlias (not $isExternal) -}}
+    {{- $params = printf "?menu=%s" $mainNav -}}
+    {{- with $childNav }}{{ $params = printf "%s&child=%s" $params . }}{{ end -}}
+{{- end -}}
+
+<a class="{{ $class }}{{ if $isActive }} active{{ end }}" 
+    data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
+    href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
+    
+    {{- with $menu.Pre }}{{ . }}{{ end -}}
+    <span {{ if $isActive }} class="active"{{ end }}>{{ $menu.Name }}</span>
+    {{- with $menu.Post }}{{ . }}{{ end -}}
+    {{- if $isExternal }} {{ partial "assets/icon.html" (dict "icon" "fas up-right-from-square fa-2xs") }}{{ end -}}
+</a>
--- a/layouts/partials/assets/navbar.html
+++ b/layouts/partials/assets/navbar.html
@@ -166,39 +166,19 @@
            <!-- Render top-menu items (maximum depth of 2) -->
            <ul class="navbar-nav ms-auto">
                {{- range $menu := $menus -}}
-                    {{- $menu_item_url := $menu.URL | relLangURL -}}
-                    {{- $page_url:= $page.RelPermalink | relLangURL -}}
-                    {{- $active := hasPrefix $page_url $menu_item_url -}}
-
-                    {{- $url := urls.Parse .URL -}}
-                    {{- $baseurl := urls.Parse $.Site.Params.Baseurl -}}
+                    <li class="nav-item{{ if .HasChildren }} dropdown{{ end }}">
+                        {{- partial "assets/navbar-item.html" (dict "menu" $menu "page" $page) -}}
                        {{- if .HasChildren -}}
-                        <li class="nav-item dropdown">
-                            <a class="nav-link {{ if $active }}active{{ end }} dropdown-toggle" href="{{ .URL | relLangURL  }}" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                {{ if $active }}<span class="active">{{ .Name }}</span>{{ else }}{{ .Name }}{{ end }}
-                            </a>
                            <ul class="dropdown-menu dropdown-menu-end">
                                {{- range .Children -}}
-                                    {{- $child_active := eq $page_url (.URL | relLangURL) -}}
-                                    <li><a class="dropdown-item {{ if $child_active }}active{{ end }}" href="{{ .URL | relLangURL  }}">{{ .Name }}</a></li>
+                                    {{- partial "assets/navbar-item.html" (dict "menu" . "parent" $menu "page" $page) -}}
                                {{- end -}}
                            </ul>
-                        </li>
-                    {{- else -}}
-                        <li class="nav-item">
-                            {{- $external := ne $url.Host $baseurl.Host -}}
-                            <a class="nav-link {{ if $active }}active{{ end }}"
-                                href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if $external }}target="_blank" rel="noopener noreferrer" {{ end }}>
-                                {{- with $pre}}{{ . }}{{ end -}}
-                                <span {{if $active }} class="active"{{end}}>{{ .Name }}</span>
-                                {{- with $post}}{{ . }}{{ end -}}
-                                {{- if $external }} {{ partial "assets/icon.html" (dict "icon" "fas up-right-from-square fa-2xs") }}{{ end -}}
-                            </a>
+                        {{- end -}}
                    </li>
                {{- end -}}
-                {{- end -}}
-

+                <!-- Insert divider if applicable -->
                {{- if or $enableLanguage $enableDarkMode -}}
                    <li class="nav-item py-2 py-md-1 col-12 col-md-auto d-none d-{{ $size }}-block">
                        <div class="vr d-none d-md-flex h-100 mx-md-2"></div>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.13.2",
+  "version": "0.14.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.13.2",
+      "version": "0.14.0",
      "license": "MIT",
      "devDependencies": {
        "@fortawesome/fontawesome-free": "^6.4.0",
@@ -3398,9 +3398,9 @@
      "dev": true
    },
    "node_modules/hugo-bin": {
-      "version": "0.102.0",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.102.0.tgz",
-      "integrity": "sha512-gJeDdC4W0x/+a8rf7pz8L/NheEeHIKrtLIHFwMumX04UAFYUA065A4uQmDjRspsMdQ9muwB9eQfOwTSjqaYyrQ==",
+      "version": "0.102.1",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.102.1.tgz",
+      "integrity": "sha512-PgMcOXM/E9kWlB/H5gwp9yD7f+YwbQvRU2AIl4fD4ZIlb74ABLuqFVPLR7gmlZcZ5zdUkOWHFEDUA8E0vVHHpg==",
      "dev": true,
      "funding": [
        {
@@ -3414,7 +3414,7 @@
        "pkg-conf": "^4.0.0"
      },
      "bin": {
-        "hugo": "cli.js"
+        "hugo": "bin/cli.js"
      },
      "engines": {
        "node": "^14.14.0 || >=16.0.0"
@@ -9592,9 +9592,9 @@
      "dev": true
    },
    "hugo-bin": {
-      "version": "0.102.0",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.102.0.tgz",
-      "integrity": "sha512-gJeDdC4W0x/+a8rf7pz8L/NheEeHIKrtLIHFwMumX04UAFYUA065A4uQmDjRspsMdQ9muwB9eQfOwTSjqaYyrQ==",
+      "version": "0.102.1",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.102.1.tgz",
+      "integrity": "sha512-PgMcOXM/E9kWlB/H5gwp9yD7f+YwbQvRU2AIl4fD4ZIlb74ABLuqFVPLR7gmlZcZ5zdUkOWHFEDUA8E0vVHHpg==",
      "dev": true,
      "requires": {
        "@xhmikosr/bin-wrapper": "^5.0.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.13.2",
+  "version": "0.14.0",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
--- a/static/js/alias.js
+++ b/static/js/alias.js
@@ -0,0 +1,3 @@
+const alias = document.querySelector("link[rel='canonical']").getAttribute('href')
+const params = window.location.search + window.location.hash
+window.location = alias + params
Author	SHA1	Message	Date
Mark Dumay	530fb03d29	Merge pull request #258 from gethinode/develop Menu aliases	2023-05-17 12:05:58 +02:00
Mark Dumay	3e5261bd36	Merge branch 'main' into develop	2023-05-17 11:52:39 +02:00
mark	e2d409baed	Bump package release	2023-05-17 11:51:32 +02:00
mark	d009874ece	Support menu aliases	2023-05-17 11:50:55 +02:00
mark	f8adffc131	Use pageRef instead of url	2023-05-17 09:27:47 +02:00
github-actions[bot]	68a3a3be30	Merge pull request #257 from gethinode/dependabot/npm_and_yarn/hugo-bin-0.102.1 Bump hugo-bin from 0.102.0 to 0.102.1	2023-05-16 14:10:55 +00:00
dependabot[bot]	c077c8b53b	Bump hugo-bin from 0.102.0 to 0.102.1 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.102.0 to 0.102.1. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.102.0...v0.102.1) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-16 14:04:37 +00:00