app/model/Navigation: Simplify active route logic

3 files changed, 3 insertions, 17 deletions

diff --git a/app/model/Navigation.php b/app/model/Navigation.php
index d32546b..055c3ce 100644
--- a/app/model/Navigation.php
+++ b/app/model/Navigation.php
@@ -7,13 +7,8 @@ class Navigation
         return (bool) (strpos($_SERVER['REQUEST_URI'], $route) !== false);
     }
 
-    public function isActiveHome()
-    {
-        return (bool) (strlen(strtok($_SERVER['REQUEST_URI'], '?')) === 1);
-    }
-
     public function isActive($route)
     {
-        return (bool) ($_SERVER['REQUEST_URI'] === $route || $this->requestContains($route));
+        return (bool) (ltrim(Request::uri(), "/") === ltrim($route, "/") || $this->requestContains(ltrim($route, "/")));
     }
 }
diff --git a/app/views/components/navigator.link.dropdown.php b/app/views/components/navigator.link.dropdown.php
index be937f8..0657bc6 100644
--- a/app/views/components/navigator.link.dropdown.php
+++ b/app/views/components/navigator.link.dropdown.php
@@ -1,10 +1,5 @@
 <a href="<?php echo $route ?? null; ?>"
-   class="
-    <?php
-    echo $check = ($label === 'Home')
-      ? ($navigation->isActiveHome() ? ' navbar__active' : '')
-      : ($navigation->isActive($route ?? null) ? ' navbar__active' : '');
-    ?> navbar-item"
+   class="<?php if ($navigation->isActive($route ?? null)) { echo ' navbar__active'; } ?> navbar-item"
    title="<?php echo $label ?? null; ?>"
 >
   <?php echo $label ?? null; ?>
diff --git a/app/views/components/navigator.link.php b/app/views/components/navigator.link.php
index a129acf..3b57d62 100644
--- a/app/views/components/navigator.link.php
+++ b/app/views/components/navigator.link.php
@@ -1,12 +1,8 @@
 <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' : '');
+    if ($navigation->isActive($route ?? null)) { echo ' navbar__active'; }
   ?>
 ">
   <div class="has-text-centered">