refactor!: add about in reorderNavItems (#371)

Author: g1eny0ung

docs/pages/custom-nav-items.mdx

@@ -25,7 +25,7 @@ Dream will find them and append them to the navbar by default.
 You can also reorder custom items with the default items by setting the `reorderNavItems` parameter in your `hugo.toml`:
 
 ```toml
-reorderNavItems = ["github", "search", "rss", "posts", "categories", "tags", "series"]
+reorderNavItems = ["github", "about", "search", "rss", "posts", "categories", "tags", "series"]
 ```
 
 The same goes for `collapseNavItems`, you can also collapse custom items to a dropdown menu:

docs/pages/params-configurations.mdx

@@ -249,7 +249,7 @@ Reorder the navigation items.
 This parameter is **an array of strings**, the default value is:
 
 ```toml
-reorderNavItems = ["search", "rss", "posts", "categories", "tags"]
+reorderNavItems = ["about", "search", "rss", "posts", "categories", "tags"]
 ```
 
 <Callout type="info">
@@ -260,10 +260,11 @@ reorderNavItems = ["search", "rss", "posts", "categories", "tags"]
 This parameter also allows you to remove the default navigation items.
 For example, if you don't want to show the `rss` item, you can set the value as:
 
-`reorderNavItems = ["search", "posts", "categories", "tags"]`
+`reorderNavItems = ["about", "search", "posts", "categories", "tags"]`
+
 </Callout>
 
-For reordering custom navigation items, see [Custom Navbar Items](custom-nav-items.md).
+For reordering custom navigation items, see [Custom Navbar Items](custom-nav-items.mdx).
 
 ### collapseNavItems
 

hugo.example.toml

@@ -49,7 +49,7 @@ siteStartYear = 2016
 
 # options
 # stickyNav = true
-# reorderNavItems = ["search", "rss", "posts", "categories", "tags"]
+# reorderNavItems = ["about", "search", "rss", "posts", "categories", "tags"]
 # collapseNavItems = ["posts", "categories", "tags"]
 # noDefaultSummaryCover = true
 # showTableOfContents = true

layouts/partials/nav.html

@@ -41,20 +41,7 @@
       </ul>
     </div>
     <section class="hidden sm:flex sm:items-center sm:gap-2 md:gap-4">
-      {{ with site.GetPage "/about" }}
-      {{ $aboutPages := .Resources.ByType "page" }}
-      {{ if gt (len $aboutPages) 0 }}
-      <div role="link" tabindex="0"
-        class="text-sm font-semibold cursor-pointer hover:underline"
-        @click="flip = !flip"
-        title="{{ T "about" }}"
-      >
-        {{- T "about" -}}
-      </div>
-      {{ end }}
-      {{ end }}
-
-      {{ $navItems := slice "search" "rss" "posts" "categories" "tags" }}
+      {{ $navItems := slice "about" "search" "rss" "posts" "categories" "tags" }}
       {{ if site.Params.reorderNavItems }}
         {{ $navItems = site.Params.reorderNavItems }}
       {{ end }}

layouts/partials/navMobileMenu.html

@@ -1,15 +1,3 @@
-{{ with site.GetPage "/about" }}
-{{ $aboutPages := .Resources.ByType "page" }}
-{{ if gt (len $aboutPages) 0 }}
-<li>
-  <div role="link" tabindex="0" class="inline-flex items-center p-2 cursor-pointer" @click="flip = !flip" title="{{ T "about" }}">
-    <ion-icon name="information-circle"></ion-icon>
-    {{- T "about" -}}
-  </div>
-</li>
-{{ end }}
-{{ end }}
-
 {{ $navItems := slice "search" "rss" "posts" "categories" "tags" }}
 {{ if site.Params.reorderNavItems }}
 {{ $navItems = site.Params.reorderNavItems }}

layouts/partials/renderMobileNavItem.html

@@ -1,4 +1,18 @@
-{{ if and (eq . "search") (gt (len (where site.Pages "Type" "search")) 0) }}
+{{ if (eq . "about") }}
+
+{{ with site.GetPage "/about" }}
+{{ $aboutPages := .Resources.ByType "page" }}
+{{ if gt (len $aboutPages) 0 }}
+<li>
+  <div role="link" tabindex="0" class="inline-flex items-center p-2 cursor-pointer" @click="flip = !flip" title="{{ T "about" }}">
+    <ion-icon name="information-circle"></ion-icon>
+    {{- T "about" -}}
+  </div>
+</li>
+{{ end }}
+{{ end }}
+
+{{ else if and (eq . "search") (gt (len (where site.Pages "Type" "search")) 0) }}
 <li>
   <a class="group inline-flex items-center p-2 cursor-pointer" href="{{ "search" | relLangURL }}" title="{{ T "search" }}">
     <ion-icon name="search"></ion-icon>

layouts/partials/renderNavItem.html

@@ -1,4 +1,15 @@
-{{ if and (eq . "search") (gt (len (where site.Pages "Type" "search")) 0) }}
+{{ if and (eq . "about") }}
+
+{{ with site.GetPage "/about" }}
+{{ $aboutPages := .Resources.ByType "page" }}
+{{ if gt (len $aboutPages) 0 }}
+<div role="link" tabindex="0" class="text-sm font-semibold cursor-pointer hover:underline" @click="flip = !flip" title="{{ T "about" }}">
+  {{- T "about" -}}
+</div>
+{{ end }}
+{{ end }}
+
+{{ else if and (eq . "search") (gt (len (where site.Pages "Type" "search")) 0) }}
 <a class="group inline-flex items-center p-2 rounded-full cursor-pointer hover:bg-primary" href="{{ "search" | relLangURL }}" title="{{ T "search" }}">
   <ion-icon class="group-hover:text-primary-content" name="search"></ion-icon>
 </a>