From 4ac0eaa27a3f9f9011dcf8ed20c55eec8c977b27 Mon Sep 17 00:00:00 2001
From: Daniel Legt <contact@danlegt.com>
Date: Mon, 19 Feb 2024 17:40:50 +0200
Subject: [PATCH] Started implementing Navbar v2 - Removed old navbar from
 pages + Added navbar_v2 in pages + Added pork navbar v2 + Added beef navbar
 v2

TODO: Implement navbar_v2 for poultry
TODO: Implement navbar_v2 for lamb
TODO: Completely delete old navbar and replace with new navbar
---
 package-lock.json                             |   2 +-
 resources/views/beef.blade.php                |   4 -
 resources/views/layout.blade.php              |  11 +-
 resources/views/partials/sidebar.blade.php    | 154 +-----------------
 resources/views/partials/sidebar_v2.blade.php |  18 ++
 resources/views/pork.blade.php                |   5 +-
 routes/web.php                                |  82 +++++++++-
 7 files changed, 107 insertions(+), 169 deletions(-)
 create mode 100644 resources/views/partials/sidebar_v2.blade.php

diff --git a/package-lock.json b/package-lock.json
index 6a218bd..d226166 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-    "name": "my-website",
+    "name": "my-website-2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/resources/views/beef.blade.php b/resources/views/beef.blade.php
index f37dbbd..5b62643 100644
--- a/resources/views/beef.blade.php
+++ b/resources/views/beef.blade.php
@@ -1,8 +1,4 @@
 @extends('layout')
 
-@section('sidebar')
-    @include('partials.sidebar',['type' => 'beef'])
-@endsection
-
 @section('content')
 @endsection
\ No newline at end of file
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index 0f476bc..2e9a78a 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -15,13 +15,14 @@
         <div class="flex-grow">
             <div class="grid grid-cols-6 min-h-screen">    
                 <!-- Sidebar -->
-                <aside class="col-span-1">
-                    {{--@include('partials.sidebar')--}}
-                    @yield('sidebar')
-                </aside>
+                @include('partials.sidebar_v2')
 
                 <!-- Main content area -->
-                <div class="col-span-5">
+                @if ( empty($sidebarContent) )
+                    <div class="col-span-6">
+                @else
+                    <div class="col-span-5">
+                @endif
                     @yield('content')
                 </div>
             </div>
diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php
index 9487e0d..248343f 100644
--- a/resources/views/partials/sidebar.blade.php
+++ b/resources/views/partials/sidebar.blade.php
@@ -5,95 +5,7 @@
     
 <aside>
     {{--Check type of content to display correct sidebar--}}
-    @if($type === 'beef') <!-- Type 'Beef' sidebar -->
-        <div class="flex h-full flex-col justify-between border-e bg-white">
-            <div class="px-4 py-6">
-
-                <ul class="mt-6 space-y-1">
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Ribeye
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Sirloin
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            T-Bone
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Filet Mignon
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Brisket
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Chuck
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Round
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Flank
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Skirt
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Short Ribs
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    @elseif($type === 'poultry') <!-- Type 'Poultry' sidebar -->
+    @if($type === 'poultry') <!-- Type 'Poultry' sidebar -->
         <div class="flex h-full flex-col justify-between border-e bg-white">
             <div class="px-4 py-6">
 
@@ -173,70 +85,6 @@
                 </ul>
             </div>
         </div>
-    @elseif($type === 'pork') <!-- Type 'Pork' sidebar -->
-        <div class="flex h-full flex-col justify-between border-e bg-white">
-            <div class="px-4 py-6">
-                
-                <ul class="mt-6 space-y-1">
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Pork Shoulder (Boston Butt)
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Pork Belly
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Pork Chops
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Pork Loin
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Pork Ribs (Spareribs and Baby Back Ribs)
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Ham
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href="#"
-                            class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700"
-                        >
-                            Pork Tenderloin
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
     @elseif($type === 'lamb') <!-- Type 'Lamb' sidebar -->
         <div class="flex h-full flex-col justify-between border-e bg-white">
             <div class="px-4 py-6">
diff --git a/resources/views/partials/sidebar_v2.blade.php b/resources/views/partials/sidebar_v2.blade.php
new file mode 100644
index 0000000..d362c33
--- /dev/null
+++ b/resources/views/partials/sidebar_v2.blade.php
@@ -0,0 +1,18 @@
+@if ( !empty($sidebarContent) )
+    <aside class="col-span-1">
+        <div class="flex h-full flex-col justify-between border-e bg-white">
+            <div class="px-4 py-6">
+        
+                <ul class="mt-6 space-y-1">
+                    @foreach ($sidebarContent as $item)
+                        <li>
+                            <a href="/{{ $item['href'] }}" class="block rounded-lg bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700">
+                                {{ $item['name'] }}
+                            </a>
+                        </li>
+                    @endforeach
+                </ul>
+            </div>
+        </div>
+    </aside>
+@endif
diff --git a/resources/views/pork.blade.php b/resources/views/pork.blade.php
index 18736c1..e6676c2 100644
--- a/resources/views/pork.blade.php
+++ b/resources/views/pork.blade.php
@@ -1,8 +1,5 @@
 @extends('layout')
 
-@section('sidebar')
-    @include('partials.sidebar',['type' => 'pork'])
-@endsection
-
 @section('content')
+    
 @endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 6badd9f..d9f4df4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,7 +22,52 @@ Route::get('/about', function () {
 });
 
 Route::get('/beef', function() {
-    return view('beef');
+
+    return view('beef', [
+        "sidebarContent" => [
+            [
+                "name" => "Ribeye",
+                "href" => "ribeye",
+            ],
+            [
+                "name" => "Sirloin",
+                "href" => "sirloin",
+            ],
+            [
+                "name" => "T-Bone",
+                "href" => "tbone",
+            ],
+            [
+                "name" => "Filet Mignon",
+                "href" => "filetmignon",
+            ],
+            [
+                "name" => "Brisket",
+                "href" => "brisket",
+            ],
+            [
+                "name" => "Chuck",
+                "href" => "chuck",
+            ],
+            [
+                "name" => "Round",
+                "href" => "round",
+            ],
+            [
+                "name" => "Flank",
+                "href" => "flank",
+            ],
+            [
+                "name" => "Skirt",
+                "href" => "skirt",
+            ],
+            [
+                "name" => "Short Ribs",
+                "href" => "short-ribs",
+            ],
+        ],
+    ]);
+
 });
 
 Route::get('/poultry', function() {
@@ -30,7 +75,40 @@ Route::get('/poultry', function() {
 });
 
 Route::get('/pork', function() {
-    return view('pork');
+
+    return view('pork', [
+        "sidebarContent" => [
+            [
+                "name" => "Pork Shoulder (Boston Butt)",
+                "href" => "pork-shoulder",
+            ],
+            [
+                "name" => "Pork Belly",
+                "href" => "pork-belly",
+            ],
+            [
+                "name" => "Pork Chops",
+                "href" => "pork-chops",
+            ],
+            [
+                "name" => "Pork Loin",
+                "href" => "pork-loin",
+            ],
+            [
+                "name" => "Pork Ribs (Spareribs and Bay Back Ribs)",
+                "href" => "pork-ribs",
+            ],
+            [
+                "name" => "Ham",
+                "href" => "ham",
+            ],
+            [
+                "name" => "Pork Tenderloin",
+                "href" => "pork-tenderloin",
+            ],
+        ]
+    ]);
+
 });
 
 Route::get('/lamb', function() {