bugfixing

ndeblauw · Nov 26, 2024 · af44dd0 · af44dd0
1 parent 5943a3a
commit af44dd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/resources/views/layouts/flux/layout.blade.php b/resources/views/layouts/flux/layout.blade.php
@@ -94,7 +94,7 @@
         @endif
 
         <div class="flex-1 max-md:pt-6 self-stretch mb-6">
-            {{implode(',', $sidebar)}}
+            {{ is_array($sidebar) ? implode(',', $sidebar) : $sidebar }}
 
             @if($titleShow && $title)
                 <flux:heading size="xl" level="1">{{$title}}</flux:heading>

diff --git a/src/View/Components/Adminlayout/AdminLayout.php b/src/View/Components/Adminlayout/AdminLayout.php
@@ -41,15 +41,21 @@ private function findActiveTopLevelMenuItem()
         $this->current_route = Route::current()->uri;
         $routename = Route::currentRouteName();
 
+        dump($this->current_route);
+        dump($routename);
+
         $fake_index_routename = str($routename)->replace(['show', 'create', 'edit'], 'index')->toString();
         $current_route = Route::has($fake_index_routename)
             ? str(route($fake_index_routename))->replace(config('app.url').'/','')->toString()
             : Route::current()->uri;
 
+        dump($current_route);
+
         // Check if it was one of the top level routes
         $top_routes = collect(config('blue-admin.fluxmenu.top'))->map( fn($item) => $item['link'])->filter(fn($item) => $current_route == $item);
 
         if( $top_routes->isNotEmpty()){
+            dump('returning CURRENT_ROUTE');
             return $current_route;
         }
 
@@ -69,6 +75,8 @@ private function findActiveTopLevelMenuItem()
             return $element['topmenu'];
         }
 
+        dump('NOTHING FOUNT');
+
         return null;
     }
 }