From 69f5410cb6e722ba59aa817821e1697782277616 Mon Sep 17 00:00:00 2001
From: hossainemruz <hossainemruz@gmail.com>
Date: Sun, 2 May 2021 05:00:55 +0600
Subject: [PATCH] Refactor separator logic in navbar

Signed-off-by: hossainemruz <hossainemruz@gmail.com>
---
 .../helpers/add-navbar-separator.html         | 25 +++++++++++++++++++
 layouts/partials/navigators/navbar.html       | 25 +++++++++++++------
 2 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 layouts/partials/helpers/add-navbar-separator.html

diff --git a/layouts/partials/helpers/add-navbar-separator.html b/layouts/partials/helpers/add-navbar-separator.html
new file mode 100644
index 0000000..6fb280e
--- /dev/null
+++ b/layouts/partials/helpers/add-navbar-separator.html
@@ -0,0 +1,25 @@
+{{ $addNavbarSeparator:= false }}
+
+{{/*  If "blog" feature is enabled, then add navbar separator  */}}
+{{ if site.Params.features.blog.enable }}
+    {{ $addNavbarSeparator = true }}
+{{ end }}
+
+{{/*  If "notes" feature is enabled, then add navbar separator  */}}
+{{ if site.Params.features.notes.enable }}
+    {{ $addNavbarSeparator = true }}
+{{ end }}
+
+{{/*  If site has custom menus, then add navbar separator  */}}
+{{ $customMenus := site.Params.customMenus }}
+{{ if (index site.Data site.Language.Lang).site.customMenus }}
+  {{ $customMenus = (index site.Data site.Language.Lang).site.customMenus }}
+{{ end }}
+
+{{ if $customMenus }}
+    {{ if gt (len $customMenus) 0 }}
+        {{ $addNavbarSeparator = true }}
+    {{ end }}
+{{ end }}
+
+{{ return $addNavbarSeparator }}
diff --git a/layouts/partials/navigators/navbar.html b/layouts/partials/navigators/navbar.html
index 2daae09..df29cdc 100644
--- a/layouts/partials/navigators/navbar.html
+++ b/layouts/partials/navigators/navbar.html
@@ -1,3 +1,12 @@
+{{/*  variables for enabling/disabling various features  */}}
+{{ $blogEnabled   := site.Params.features.blog.enable   | default false }}
+{{ $notesEnabled  := site.Params.features.notes.enable  | default false }}
+
+{{/*  keep backward compatibility for blog post  */}}
+{{ if site.Params.enableBlogPost }}
+  {{ $blogEnabled = true }}
+{{ end }}
+
 {{/*  default logos  */}}
 {{ $mainLogo := "/images/main-logo.png" }}
 {{ $invertedLogo := "/images/inverted-logo.png" }}
@@ -84,20 +93,20 @@
             </li>
           {{ end }}
         {{- end }}
-        {{ $hasCustomMenus:= false }}
-        {{ if $customMenus }}
-          {{ if gt (len $customMenus) 0 }}
-            {{ $hasCustomMenus = true }}
-          {{ end }}
-        {{ end }}
-        {{ if (or site.Params.enableBlogPost $hasCustomMenus) }}
+        {{ $shouldAddSeparator:= partial "helpers/add-navbar-separator.html" . }}
+        {{ if $shouldAddSeparator }}
           <div class="dropdown-divider" id="top-navbar-divider"></div>
         {{ end }}
-        {{ if site.Params.enableBlogPost }}
+        {{ if $blogEnabled }}
           <li class="nav-item">
             <a class="nav-link" id="blog-link" href="{{ "/posts" | relLangURL }}">{{ i18n "posts" }}</a>
           </li>
         {{ end }}
+        {{ if $notesEnabled }}
+          <li class="nav-item">
+            <a class="nav-link" id="note-link" href="{{ "/notes" | relLangURL }}">{{ i18n "notes" }}</a>
+          </li>
+        {{ end }}
         {{ range $customMenus }}
           <li class="nav-item">
             <a class="nav-link" href="{{ .url }}">{{ .name }}</a>