refactor: simplify code structure

lxndrblz · May 13, 2022 · f646f16 · f646f16
1 parent 4804436
commit f646f16
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
@@ -15,19 +15,16 @@
   <nav class="nav">
     <ul class="nav__list" id="navMenu">
       {{ $url := .RelPermalink }}
-      {{ $current := . }}
-      {{ $menuId := 0}}
-      {{ range .Site.Menus.main }}
-        {{ $active := eq $url .URL }}        
-        {{ $menuId = add $menuId 1 }}
-        {{ if .HasChildren }}
+      {{ range $menuId, $menuItem := .Site.Menus.main }}
+        {{ $active := eq $url $menuItem.URL }}        
+        {{ if $menuItem.HasChildren }}
 
           <li class="nav__list-item">
             <div class="optionswitch">
               <input class="optionswitch__picker" type="checkbox" id="{{ $menuId }}" hidden />
 
               {{ $labelClass := "optionswitch__label" }}
-              {{ range .Children }}
+              {{ range $menuItem.Children }}
                 {{ if eq $url .URL }}
                   {{ $labelClass = "optionswitch__label nav__link--active" }}
 
@@ -36,12 +33,12 @@
               {{ end }}
 
               <label class="{{ $labelClass }}" for="{{ $menuId }}"
-                >{{ .Name }} <i class="fa fa-angle-down" aria-hidden="true"></i
+                >{{ $menuItem.Name }} <i class="fa fa-angle-down" aria-hidden="true"></i
               ></label>
 
               <div class="optionswitch__triangle"></div>
               <ul class="optionswitch__list">
-                {{ range .Children }}
+                {{ range $menuItem.Children }}
                   <li class="optionswitch__list-item">
                     <a
                       href="{{ .URL }}"
@@ -72,7 +69,7 @@
 
               {{ end }}
               title="{{ .Title }}"
-              >{{ .Name }}</a
+              >{{ $menuItem.Name }}</a
             >
           </li>