app/views/partials/navigator: Unify

5 files changed, 73 insertions, 27 deletions

diff --git a/app/views/components/context-menu.php b/app/views/components/context-menu.php
deleted file mode 100644
index 882bb60..0000000
--- a/app/views/components/context-menu.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="dropdown <?php echo $type ?? null ?>">
-  <input
-    class="is-hidden dropdown-input"
-    type="checkbox"
-    id="dropdown-menu__<?php echo $id ?? null ?>"
-  />
-
-  <label class="dropdown-label" for="dropdown-menu__<?php echo $id ?? null ?>">
-    <?php echo $label ?? null ?>
-  </label>
-
-  <div class="dropdown-menu">
-    <div class="dropdown-content">
-       <?php
-        echo $content ?? null;
-        if ($links ?? null  === true) {
-            include views('partials', 'navigator.links');
-            $formClass = 'theme-toggle';
-            $buttonClass ='theme-toggle-button button is-text has-text-left is-block';
-            include views('components', 'theme-toggle');
-        }
-        ?>
-    </div>
-  </div>
-</div>
diff --git a/app/views/components/context.menu.php b/app/views/components/context.menu.php
new file mode 100644
index 0000000..59f6610
--- /dev/null
+++ b/app/views/components/context.menu.php
@@ -0,0 +1,38 @@
+<div class="dropdown <?php echo $type ?? null ?>">
+  <input
+    class="is-hidden dropdown-input"
+    type="checkbox"
+    id="dropdown-menu__<?php echo $id ?? null ?>"
+  />
+
+  <label class="dropdown-label" for="dropdown-menu__<?php echo $id ?? 'none' ?>">
+    <?php echo $label ?? null ?>
+  </label>
+
+  <div class="dropdown-menu">
+    <div class="dropdown-content">
+     <?php
+
+        echo $content ?? null;
+
+        if ($links ?? null  === true) {
+
+          $route = '/';                             $label = 'Home';       include views('components', 'navigator.link.dropdown');
+          $route = '/posts/';                       $label = 'Posts';      include views('components', 'navigator.link.dropdown');
+          $route = '/projects/';                    $label = 'Projects';   include views('components', 'navigator.link.dropdown');
+          $route = '/about/';                       $label = 'Profile';    include views('components', 'navigator.link.dropdown');
+          $route = '/contact/';                     $label = 'Contact';    include views('components', 'navigator.link.dropdown');
+          $route = '/git/';                         $label = 'Repository'; include views('components', 'navigator.link.dropdown');
+          $route = 'https://ko-fi.com/thedroneely'; $label = 'Coffee';     include views('components', 'navigator.link.dropdown');
+
+          $formClass = 'theme-toggle';
+          $iconClass = 'is-hidden';
+          $buttonClass ='navbar-item button theme-toggle-button is-text has-text-left';
+          include views('components', 'theme.toggle');
+        }
+        ?>
+    </div>
+  </div>
+</div>
+
+<?php $type = $id = $label = $content = $links = null; ?>
diff --git a/app/views/components/navigator.link.dropdown.php b/app/views/components/navigator.link.dropdown.php
new file mode 100644
index 0000000..be937f8
--- /dev/null
+++ b/app/views/components/navigator.link.dropdown.php
@@ -0,0 +1,13 @@
+<a href="<?php echo $route ?? null; ?>"
+   class="
+    <?php
+    echo $check = ($label === 'Home')
+      ? ($navigation->isActiveHome() ? ' navbar__active' : '')
+      : ($navigation->isActive($route ?? null) ? ' navbar__active' : '');
+    ?> navbar-item"
+   title="<?php echo $label ?? null; ?>"
+>
+  <?php echo $label ?? null; ?>
+</a>
+
+<?php $route = $label = null; ?>
diff --git a/app/views/components/navigator.link.php b/app/views/components/navigator.link.php
new file mode 100644
index 0000000..a129acf
--- /dev/null
+++ b/app/views/components/navigator.link.php
@@ -0,0 +1,18 @@
+<a href="<?php echo $route ?? null; ?>" class="navbar-item navbar__icon has-text-centered
+  <?php
+
+    $hiddenLabels = [ 'Profile' ];
+    if (in_array($label, $hiddenLabels)) { echo ' navbar__icon__hidden'; }
+
+    echo $check = ($label === 'Home')
+      ? ($navigation->isActiveHome() ? ' navbar__active' : '')
+      : ($navigation->isActive($route ?? null) ? ' navbar__active' : '');
+  ?>
+">
+  <div class="has-text-centered">
+    <?php echo icon($icon ?? null); ?>
+    <p title="<?php echo $label ?? null; ?>" class="navbar__icon__label"><?php echo $label ?? null; ?></p>
+  </div>
+</a>
+
+<?php $route = $label = $icon = null; ?>
diff --git a/app/views/components/theme-toggle.php b/app/views/components/theme.toggle.php
index cfaf193..3b2d15b 100644
--- a/app/views/components/theme-toggle.php
+++ b/app/views/components/theme.toggle.php
@@ -12,7 +12,7 @@
     type="submit"
     value="light"
   >
-    <?php echo icon('sun', 'is-hidden-mobile'); ?>
+    <?php echo icon('sun', $iconClass ?? null); ?>
     <span>Light</span>
   </button>
 
@@ -25,9 +25,11 @@
     type="submit"
     value="dark"
   >
-    <?php echo icon('moon', 'is-hidden-mobile'); ?>
+    <?php echo icon('moon', $iconClass ?? null); ?>
     <span>Dark</span>
   </button>
 
   <?php } ?>
 </form>
+
+<?php $formClass = $buttonClass = $iconClass = null; ?>