From 7f9b0ef09a47690a8e068d1cb80f97ca823f97e2 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Wed, 18 Apr 2018 00:47:14 -0400
Subject: [PATCH] Fix active nav link logic

---
 resources/assets/sass/dashboard.scss             | 2 +-
 resources/views/dashboard/sections/nav.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss
index e1bf5b5..e150305 100644
--- a/resources/assets/sass/dashboard.scss
+++ b/resources/assets/sass/dashboard.scss
@@ -137,7 +137,7 @@ body {
                 padding-left: 8px;
             }
 
-            &:hover, &:focus, &:active {
+            &.active, &:hover, &:focus, &:active {
                 background-color: fade-out(#000, 0.95);
                 color: $c-text;
             }
diff --git a/resources/views/dashboard/sections/nav.blade.php b/resources/views/dashboard/sections/nav.blade.php
index e0de067..39eccbd 100644
--- a/resources/views/dashboard/sections/nav.blade.php
+++ b/resources/views/dashboard/sections/nav.blade.php
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-lg">
-    @set('current_page', preg_replace([ '/^.*\/dashboard\/?/', '/\/.*/' ], [ '', '' ], Request::url()))
+    @set('current_page', preg_replace([ '/^.*\//', '/\/.*/' ], [ '', '' ], Request::url()))
 
     <a class="navbar-brand" href="{{ url('/dashboard') }}">
         {{ env('APP_NAME') }} Dashboard
@@ -33,7 +33,7 @@
 
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="menu-dropdown-{{ $dropdown_id }}">
                                 @foreach($menu_item['submenu'] as $submenu_item)
-                                    <a class="dropdown-item" href="{{ url('/dashboard/' . $submenu_item['type'] . '/' . $submenu_item['model']) }}">{{ $submenu_item['title'] }}</a>
+                                    <a class="dropdown-item {{ $current_page == $submenu_item['model'] ? 'active' : '' }}" href="{{ url('/dashboard/' . $submenu_item['type'] . '/' . $submenu_item['model']) }}">{{ $submenu_item['title'] }}</a>
                                 @endforeach
                             </div>
                         </li>