From 07679aa376a89d91dd5643db29e3a37af58c0f16 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 18 May 2022 08:40:37 -0700
Subject: [PATCH 1/8] settings treeview won't stay active. still experimenting
 with potential solutions

---
 resources/views/layouts/default.blade.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 115a59c9b..77134aad8 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -386,7 +386,7 @@
        <!-- Sidebar toggle button-->
       </header>
 
-      <!-- Left side column. contains the logo and sidebar -->
+
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
@@ -584,7 +584,11 @@
             @endcan
 
             @can('backend.interact')
-                <li class="treeview">
+{{--                not only does settings* not work in the request but it would seem none of the
+                    links in this tree apply the active class after being clicked. Nothing i've tried has worked yet.
+                    Will con't later--}}
+
+                <li class="treeview{{ (Request::is('settings*')? ' active' : '') }}">
                     <a href="#">
                         <i class="fas fa-cog" aria-hidden="true"></i>
                         <span>{{ trans('general.settings') }}</span>

From cfc4c58da361e1e141474923b43e4d1eed7e001e Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 18 May 2022 13:06:06 -0700
Subject: [PATCH 2/8] fixes the Settings Tree menu to remain active when opened

---
 app/Helpers/Helper.php                    |  8 +++++++
 resources/views/layouts/default.blade.php | 26 +++++++++++------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index b8a34ed8c..d8f4ca10a 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use App\Http\Requests\Request;
 use App\Models\Accessory;
 use App\Models\Component;
 use App\Models\Consumable;
@@ -1089,4 +1090,11 @@ class Helper
 
         return $bytes;
     }
+    public static function SettingUrls(){
+        $settings=['#','fields.index', 'statuslabels.index', 'models.index', 'categories.index', 'manufacturers.index', 'suppliers.index', 'departments.index', 'locations.index', 'companies.index', 'depreciations.index'];
+
+
+            return $settings;
+        }
+
 }
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 77134aad8..07d2f4876 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -588,8 +588,8 @@
                     links in this tree apply the active class after being clicked. Nothing i've tried has worked yet.
                     Will con't later--}}
 
-                <li class="treeview{{ (Request::is('settings*')? ' active' : '') }}">
-                    <a href="#">
+                <li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
+                    <a href="#" id="settings" class="">
                         <i class="fas fa-cog" aria-hidden="true"></i>
                         <span>{{ trans('general.settings') }}</span>
                         <i class="fa fa-angle-left pull-right"></i>
@@ -597,15 +597,15 @@
 
                     <ul class="treeview-menu">
                         @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
-                            <li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
-                                <a href="{{ route('fields.index') }}">
+                            <li {!!Request::route()->getName() == 'fields.index'? ' active': ''!!}>
+                                <a href="{{ route('fields.index') }}" class="{!! Request::is(route('fields.index') ? ' class="active"' : '') !!}">
                                     {{ trans('admin/custom_fields/general.custom_fields') }}
                                 </a>
                             </li>
                         @endif
 
                         @can('view', \App\Models\Statuslabel::class)
-                            <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
+                            <li >
                                 <a href="{{ route('statuslabels.index') }}">
                                     {{ trans('general.status_labels') }}
                                 </a>
@@ -614,7 +614,7 @@
 
                         @can('view', \App\Models\AssetModel::class)
                             <li>
-                                <a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }}>
+                                <a href="{{ route('models.index') }}">
                                     {{ trans('general.asset_models') }}
                                 </a>
                             </li>
@@ -623,7 +623,7 @@
 
                         @can('view', \App\Models\Category::class)
                             <li>
-                                <a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }}>
+                                <a href="{{ route('categories.index') }}">
                                     {{ trans('general.categories') }}
                                 </a>
                             </li>
@@ -631,7 +631,7 @@
 
                         @can('view', \App\Models\Manufacturer::class)
                             <li>
-                                <a href="{{ route('manufacturers.index') }}" {{ (Request::is('/manufacturers') ? ' class="active"' : '') }}>
+                                <a href="{{ route('manufacturers.index') }}">
                                     {{ trans('general.manufacturers') }}
                                 </a>
                             </li>
@@ -639,7 +639,7 @@
 
                         @can('view', \App\Models\Supplier::class)
                             <li>
-                                <a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }}>
+                                <a href="{{ route('suppliers.index') }}">
                                     {{ trans('general.suppliers') }}
                                 </a>
                             </li>
@@ -647,7 +647,7 @@
 
                         @can('view', \App\Models\Department::class)
                             <li>
-                                <a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }}>
+                                <a href="{{ route('departments.index') }}">
                                     {{ trans('general.departments') }}
                                 </a>
                             </li>
@@ -655,7 +655,7 @@
 
                         @can('view', \App\Models\Location::class)
                             <li>
-                                <a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }}>
+                                <a href="{{ route('locations.index') }}">
                                     {{ trans('general.locations') }}
                                 </a>
                             </li>
@@ -663,7 +663,7 @@
 
                         @can('view', \App\Models\Company::class)
                             <li>
-                                <a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }}>
+                                <a href="{{ route('companies.index') }}">
                                     {{ trans('general.companies') }}
                                 </a>
                             </li>
@@ -671,7 +671,7 @@
 
                         @can('view', \App\Models\Depreciation::class)
                             <li>
-                                <a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }}>
+                                <a href="{{ route('depreciations.index') }}">
                                     {{ trans('general.depreciation') }}
                                 </a>
                             </li>

From 23891054dc41e16ac2ce896789a4b619ca40ee0c Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 18 May 2022 13:11:20 -0700
Subject: [PATCH 3/8] removed dead space and unused namespace

---
 app/Helpers/Helper.php                    |  2 --
 resources/views/layouts/default.blade.php | 20 ++------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index d8f4ca10a..03a995d10 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1,8 +1,6 @@
 <?php
 
 namespace App\Helpers;
-
-use App\Http\Requests\Request;
 use App\Models\Accessory;
 use App\Models\Component;
 use App\Models\Consumable;
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 07d2f4876..2567bffe1 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -385,8 +385,6 @@
       </a>
        <!-- Sidebar toggle button-->
       </header>
-
-
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
@@ -584,10 +582,6 @@
             @endcan
 
             @can('backend.interact')
-{{--                not only does settings* not work in the request but it would seem none of the
-                    links in this tree apply the active class after being clicked. Nothing i've tried has worked yet.
-                    Will con't later--}}
-
                 <li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
                     <a href="#" id="settings" class="">
                         <i class="fas fa-cog" aria-hidden="true"></i>
@@ -597,8 +591,8 @@
 
                     <ul class="treeview-menu">
                         @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
-                            <li {!!Request::route()->getName() == 'fields.index'? ' active': ''!!}>
-                                <a href="{{ route('fields.index') }}" class="{!! Request::is(route('fields.index') ? ' class="active"' : '') !!}">
+                            <li>
+                                <a href="{{ route('fields.index') }}">
                                     {{ trans('admin/custom_fields/general.custom_fields') }}
                                 </a>
                             </li>
@@ -619,8 +613,6 @@
                                 </a>
                             </li>
                         @endcan
-
-
                         @can('view', \App\Models\Category::class)
                             <li>
                                 <a href="{{ route('categories.index') }}">
@@ -628,7 +620,6 @@
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\Manufacturer::class)
                             <li>
                                 <a href="{{ route('manufacturers.index') }}">
@@ -636,7 +627,6 @@
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\Supplier::class)
                             <li>
                                 <a href="{{ route('suppliers.index') }}">
@@ -644,7 +634,6 @@
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\Department::class)
                             <li>
                                 <a href="{{ route('departments.index') }}">
@@ -652,7 +641,6 @@
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\Location::class)
                             <li>
                                 <a href="{{ route('locations.index') }}">
@@ -660,7 +648,6 @@
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\Company::class)
                             <li>
                                 <a href="{{ route('companies.index') }}">
@@ -668,7 +655,6 @@
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\Depreciation::class)
                             <li>
                                 <a href="{{ route('depreciations.index') }}">
@@ -676,9 +662,7 @@
                                 </a>
                             </li>
                         @endcan
-
                     </ul>
-
                 </li>
             @endcan
 

From eaeb74c5761a09f633c72c302db982f26b17d9b7 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 18 May 2022 13:13:38 -0700
Subject: [PATCH 4/8] readded comment

---
 resources/views/layouts/default.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 2567bffe1..80a37b124 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -385,6 +385,7 @@
       </a>
        <!-- Sidebar toggle button-->
       </header>
+        <!-- Left side column. contains the logo and sidebar -->
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">

From 877b1bd0a3220606987e8c75361ad210a02dfd61 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 18 May 2022 14:31:03 -0700
Subject: [PATCH 5/8] re-adds Request::is to setting categories

---
 resources/views/layouts/default.blade.php | 27 +++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 80a37b124..33b2b9267 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -385,7 +385,8 @@
       </a>
        <!-- Sidebar toggle button-->
       </header>
-        <!-- Left side column. contains the logo and sidebar -->
+
+
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
@@ -589,81 +590,79 @@
                         <span>{{ trans('general.settings') }}</span>
                         <i class="fa fa-angle-left pull-right"></i>
                     </a>
-
                     <ul class="treeview-menu">
                         @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
                             <li>
-                                <a href="{{ route('fields.index') }}">
+                                <a href="{{ route('fields.index') }}" class="{!! Request::is(route('fields.index') ? ' class="active"' : '') !!}">
                                     {{ trans('admin/custom_fields/general.custom_fields') }}
                                 </a>
                             </li>
                         @endif
-
                         @can('view', \App\Models\Statuslabel::class)
-                            <li >
+                            <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('statuslabels.index') }}">
                                     {{ trans('general.status_labels') }}
                                 </a>
                             </li>
                         @endcan
-
                         @can('view', \App\Models\AssetModel::class)
                             <li>
-                                <a href="{{ route('models.index') }}">
+                                <a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }}>
                                     {{ trans('general.asset_models') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Category::class)
                             <li>
-                                <a href="{{ route('categories.index') }}">
+                                <a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }}>
                                     {{ trans('general.categories') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Manufacturer::class)
                             <li>
-                                <a href="{{ route('manufacturers.index') }}">
+                                <a href="{{ route('manufacturers.index') }}" {{ (Request::is('/manufacturers') ? ' class="active"' : '') }}>
                                     {{ trans('general.manufacturers') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Supplier::class)
                             <li>
-                                <a href="{{ route('suppliers.index') }}">
+                                <a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }}>
                                     {{ trans('general.suppliers') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Department::class)
                             <li>
-                                <a href="{{ route('departments.index') }}">
+                                <a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }}>
                                     {{ trans('general.departments') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Location::class)
                             <li>
-                                <a href="{{ route('locations.index') }}">
+                                <a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }}>
                                     {{ trans('general.locations') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Company::class)
                             <li>
-                                <a href="{{ route('companies.index') }}">
+                                <a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }}>
                                     {{ trans('general.companies') }}
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Depreciation::class)
                             <li>
-                                <a href="{{ route('depreciations.index') }}">
+                                <a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }}>
                                     {{ trans('general.depreciation') }}
                                 </a>
                             </li>
                         @endcan
                     </ul>
+
                 </li>
             @endcan
 

From ab23e04c651530079ebc44ad7eec812539f1c904 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 18 May 2022 14:33:41 -0700
Subject: [PATCH 6/8] re-adds Request::is to setting categories

---
 resources/views/layouts/default.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 33b2b9267..e52ba9f9a 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -592,8 +592,8 @@
                     </a>
                     <ul class="treeview-menu">
                         @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
-                            <li>
-                                <a href="{{ route('fields.index') }}" class="{!! Request::is(route('fields.index') ? ' class="active"' : '') !!}">
+                            <li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('fields.index') }}">
                                     {{ trans('admin/custom_fields/general.custom_fields') }}
                                 </a>
                             </li>

From 160a147a580bd21ce79a89cfa35189a627d33c97 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 23 May 2022 09:35:19 -0700
Subject: [PATCH 7/8] removed line breaks and deadspace

---
 app/Helpers/Helper.php                    |  3 +--
 resources/views/layouts/default.blade.php | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 03a995d10..227ec6e20 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1091,8 +1091,7 @@ class Helper
     public static function SettingUrls(){
         $settings=['#','fields.index', 'statuslabels.index', 'models.index', 'categories.index', 'manufacturers.index', 'suppliers.index', 'departments.index', 'locations.index', 'companies.index', 'depreciations.index'];
 
-
-            return $settings;
+        return $settings;
         }
 
 }
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index e52ba9f9a..3115c7d26 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -386,7 +386,7 @@
        <!-- Sidebar toggle button-->
       </header>
 
-
+        <!-- Left side column. contains the logo and sidebar -->
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
@@ -399,6 +399,7 @@
               </a>
             </li>
             @endcan
+
             @can('index', \App\Models\Asset::class)
             <li class="treeview{{ (Request::is('hardware*') ? ' active' : '') }}">
                 <a href="#"><i class="fas fa-barcode" aria-hidden="true"></i>
@@ -590,6 +591,7 @@
                         <span>{{ trans('general.settings') }}</span>
                         <i class="fa fa-angle-left pull-right"></i>
                     </a>
+
                     <ul class="treeview-menu">
                         @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
                             <li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
@@ -598,6 +600,7 @@
                                 </a>
                             </li>
                         @endif
+
                         @can('view', \App\Models\Statuslabel::class)
                             <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('statuslabels.index') }}">
@@ -605,6 +608,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\AssetModel::class)
                             <li>
                                 <a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }}>
@@ -612,6 +616,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Category::class)
                             <li>
                                 <a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }}>
@@ -619,6 +624,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Manufacturer::class)
                             <li>
                                 <a href="{{ route('manufacturers.index') }}" {{ (Request::is('/manufacturers') ? ' class="active"' : '') }}>
@@ -626,6 +632,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Supplier::class)
                             <li>
                                 <a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }}>
@@ -633,6 +640,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Department::class)
                             <li>
                                 <a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }}>
@@ -640,6 +648,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Location::class)
                             <li>
                                 <a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }}>
@@ -647,6 +656,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Company::class)
                             <li>
                                 <a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }}>
@@ -654,6 +664,7 @@
                                 </a>
                             </li>
                         @endcan
+
                         @can('view', \App\Models\Depreciation::class)
                             <li>
                                 <a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }}>

From 4adb990a5d085c44166b114828cadfa61420e2c2 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 23 May 2022 09:37:20 -0700
Subject: [PATCH 8/8] removed line breaks and deadspace

---
 resources/views/layouts/default.blade.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 3115c7d26..28218b320 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -399,7 +399,6 @@
               </a>
             </li>
             @endcan
-
             @can('index', \App\Models\Asset::class)
             <li class="treeview{{ (Request::is('hardware*') ? ' active' : '') }}">
                 <a href="#"><i class="fas fa-barcode" aria-hidden="true"></i>
@@ -673,7 +672,6 @@
                             </li>
                         @endcan
                     </ul>
-
                 </li>
             @endcan