From 94c31b1ff4d12b34a5c475a763015f01ef764611 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Tue, 17 Apr 2018 18:52:44 -0400
Subject: [PATCH] Organize the dashboard menu a bit better and include both
 form submission view pages under the same menu item

---
 app/Models/DashboardMenu.php                   | 18 ++++++++++++++++--
 resources/views/dashboard/home.blade.php       | 12 ++++++------
 .../views/dashboard/sections/menu.blade.php    | 12 ------------
 .../views/dashboard/sections/nav.blade.php     | 12 ++++++------
 4 files changed, 28 insertions(+), 26 deletions(-)
 delete mode 100644 resources/views/dashboard/sections/menu.blade.php

diff --git a/app/Models/DashboardMenu.php b/app/Models/DashboardMenu.php
index be94d27..cf1deb1 100644
--- a/app/Models/DashboardMenu.php
+++ b/app/Models/DashboardMenu.php
@@ -10,7 +10,21 @@ class DashboardMenu
      * @return array
      */
     public static $menu = [
-        [ 'Contact', 'contact' ],
-        [ 'Subscriptions', 'subscriptions' ]
+        [
+            'title' => 'Submissions',
+
+            'submenu' => [
+                [
+                    'title' => 'Contact',
+                    'type' => 'view',
+                    'model' => 'contact'
+                ],
+                [
+                    'title' => 'Subscriptions',
+                    'type' => 'view',
+                    'model' => 'subscriptions'
+                ]
+            ]
+        ]
     ];
 }
diff --git a/resources/views/dashboard/home.blade.php b/resources/views/dashboard/home.blade.php
index a54994d..79e5a1c 100644
--- a/resources/views/dashboard/home.blade.php
+++ b/resources/views/dashboard/home.blade.php
@@ -3,24 +3,24 @@
 @section('dashboard-body')
     <div class="list-group menu-list">
         @foreach(App\Models\DashboardMenu::$menu as $menu_item)
-            @if(is_array($menu_item[1]))
-                @foreach($menu_item[1] as $submenu_item)
+            @if(array_key_exists('submenu', $menu_item))
+                @foreach($menu_item['submenu'] as $submenu_item)
                     <li class="list-group-item">
-                        {{ $menu_item[0] }}: {{ $submenu_item[0] }}
+                        {{ $menu_item['title'] }}: {{ $submenu_item['title'] }}
 
                         <a
                             class="list-group-item-link"
-                            href="{{ url('/dashboard/' . $submenu_item[1]) }}">
+                            href="{{ url('/dashboard/' . $submenu_item['type'] . '/' . $submenu_item['model']) }}">
                         </a>
                     </li>
                 @endforeach
             @else
                 <li class="list-group-item">
-                    {{ $menu_item[0] }}
+                    {{ $menu_item['title'] }}
 
                     <a
                         class="list-group-item-link"
-                        href="{{ url('/dashboard/' . $menu_item[1]) }}">
+                        href="{{ url('/dashboard/' . $menu_item['type'] . '/' . $menu_item['model']) }}">
                     </a>
                 </li>
             @endif
diff --git a/resources/views/dashboard/sections/menu.blade.php b/resources/views/dashboard/sections/menu.blade.php
deleted file mode 100644
index 62f12d3..0000000
--- a/resources/views/dashboard/sections/menu.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-@set('menu', [
-    [ 'Contact', 'contact' ],
-    [ 'Subscriptions', 'subscriptions' ]
-])
-
-@foreach($menu as $menu_item)
-    <li class="{{ $menu_class }}">
-        <a href="{{ url('/dashboard/' . $menu_item[1]) }}">
-            {{ $menu_item[0] }}
-        </a>
-    </li>
-@endforeach
diff --git a/resources/views/dashboard/sections/nav.blade.php b/resources/views/dashboard/sections/nav.blade.php
index b70e6f4..3c5986b 100644
--- a/resources/views/dashboard/sections/nav.blade.php
+++ b/resources/views/dashboard/sections/nav.blade.php
@@ -19,22 +19,22 @@
                 @endif
             @else
                 @foreach(App\Models\DashboardMenu::$menu as $menu_item)
-                    @if(is_array($menu_item[1]))
+                    @if(array_key_exists('submenu', $menu_item))
                         <li class="nav-item dropdown">
                             <a id="menu-dropdown" class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                {{ $menu_item[0] }} <span class="caret"></span>
+                                {{ $menu_item['title'] }} <span class="caret"></span>
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="menu-dropdown">
-                                @foreach($menu_item[1] as $submenu_item)
-                                    <a class="dropdown-item" href="{{ url('/dashboard/' . $submenu_item[1]) }}">{{ $submenu_item[0] }}</a>
+                                @foreach($menu_item['submenu'] as $submenu_item)
+                                    <a class="dropdown-item" href="{{ url('/dashboard/' . $submenu_item['type'] . '/' . $submenu_item['model']) }}">{{ $submenu_item['title'] }}</a>
                                 @endforeach
                             </div>
                         </li>
                     @else
                         <li class="nav-item">
-                            <a class="nav-link {{ $current_page == $menu_item[1] ? 'active' : '' }}" href="{{ url('/dashboard/' . $menu_item[1]) }}">
-                                {{ $menu_item[0] }}
+                            <a class="nav-link {{ $current_page == $menu_item['model'] ? 'active' : '' }}" href="{{ url('/dashboard/' . $menu_item['type'] . '/' . $menu_item['model']) }}">
+                                {{ $menu_item['title'] }}
                             </a>
                         </li>
                     @endif