From 0e583d408c6144eac0119a46a4f9f095c5e6a2d5 Mon Sep 17 00:00:00 2001
From: Niisse <niisse@protonmail.com>
Date: Mon, 4 Mar 2024 15:57:18 +0100
Subject: [PATCH] navbar active route theming, move sidebar

---
 app/Http/Controllers/PhotoController.php     |  4 +-
 resources/views/home.blade.php               |  8 ++--
 resources/views/home/blog-partial.blade.php  |  2 +-
 resources/views/home/photo-partial.blade.php |  2 +-
 resources/views/layouts/app.blade.php        |  2 +-
 resources/views/layouts/sidebar.blade.php    | 10 +++++
 resources/views/navbar.blade.php             | 43 +++-----------------
 routes/web.php                               |  2 +
 8 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/app/Http/Controllers/PhotoController.php b/app/Http/Controllers/PhotoController.php
index 312343b..65066ac 100644
--- a/app/Http/Controllers/PhotoController.php
+++ b/app/Http/Controllers/PhotoController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Photo;
+use App\Models\Tag;
 use Illuminate\Http\Request;
 
 class PhotoController extends Controller
@@ -10,7 +11,8 @@ class PhotoController extends Controller
     public function index()
     {
         return view('photos.index', [
-            'photos' => Photo::all()
+            'photos' => Photo::all(),
+            'tags' => Tag::limit(5)->get()
         ]);
     }
 }
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 5e1d697..6155080 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -3,13 +3,13 @@
 @section('content')
     <div class="col-md-9 px-4">
 
-        @include('home.photo-partial', ['tags' => $tags])
+{{--        @include('home.photo-partial', ['tags' => $tags])--}}
 
         @include('home.blog-partial')
 
         @foreach($posts as $post)
 
-            <h2 class="mt-3">{{$post->title}}</h2>
+            <h2 class="mt-0!">{{$post->title}}</h2>
 
             <div class="mt-3 pr-2">
                 <x-markdown>
@@ -37,11 +37,13 @@
                     </div>
                 </div>
 
-                <div class="pt-2">
+                <div class="pt-3 pb-1">
                     <hr>
                 </div>
             </div>
         @endforeach
     </div>
 
+    @include('layouts.sidebar')
+
 @endsection
diff --git a/resources/views/home/blog-partial.blade.php b/resources/views/home/blog-partial.blade.php
index 62e4bc0..c03add1 100644
--- a/resources/views/home/blog-partial.blade.php
+++ b/resources/views/home/blog-partial.blade.php
@@ -1,4 +1,4 @@
-<h2 class="mt-3">A Blog Entry</h2>
+<h2 class="mt-0">A Blog Entry</h2>
 
 <div class="mt-3 pr-2">
     <x-markdown>
diff --git a/resources/views/home/photo-partial.blade.php b/resources/views/home/photo-partial.blade.php
index f73ffc2..5184ab2 100644
--- a/resources/views/home/photo-partial.blade.php
+++ b/resources/views/home/photo-partial.blade.php
@@ -25,7 +25,7 @@
         </div>
     </div>
 
-    <div class="pt-2">
+    <div class="pt-3 pb-1">
         <hr>
     </div>
 </div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 2f5c05d..94106d4 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -26,7 +26,7 @@
             <div class="row">
                 @yield('content')
 
-                @include('layouts.sidebar')
+{{--                @include('layouts.sidebar')--}}
             </div>
         </div>
 
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 5c71307..671a740 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -1,5 +1,15 @@
 <div class="col-md-3 px-4">
     <div class="d-flex flex-column gap-3 px-2 pb-1">
+
+        <div>
+            <h5>Recent Posts</h5>
+            <ol>
+                <li>Something</li>
+                <li>Other thing</li>
+                <li>A photo, perhaps</li>
+            </ol>
+        </div>
+
         <div>
             <h5>Categories</h5>
             <div class="d-flex flex-column px-2 mb-3">
diff --git a/resources/views/navbar.blade.php b/resources/views/navbar.blade.php
index dcec47c..4ba9165 100644
--- a/resources/views/navbar.blade.php
+++ b/resources/views/navbar.blade.php
@@ -19,57 +19,24 @@
             <ul class="navbar-nav ms-auto">
 
                 <li class="nav-item">
-                    <a href="" class="nav-link active">Home</a>
+                    <a href="{{route('home')}}" class="nav-link @if(request()->routeIs('home')) active @endif">Home</a>
                 </li>
 
                 <li class="nav-item">
-                    <a href="" class="nav-link">Blog</a>
+                    <a href="" class="nav-link @if(request()->routeIs('blog')) active @endif">Blog</a>
                 </li>
 
                 <li class="nav-item">
-                    <a href="" class="nav-link">Photography</a>
+                    <a href="{{route('photos')}}" class="nav-link @if(request()->routeIs('photos')) active @endif">Photography</a>
                 </li>
 
                 <li class="nav-item">
-                    <a href="" class="nav-link disabled">Music</a>
+                    <a href="" class="nav-link @if(request()->routeIs('music')) active @endif">Music</a>
                 </li>
 
                 <li class="nav-item">
-                    <a href="" class="nav-link">About</a>
+                    <a href="" class="nav-link @if(request()->routeIs('about')) active @endif">About</a>
                 </li>
-                <!-- Authentication Links -->
-                {{--                        @guest--}}
-                {{--                            @if (Route::has('login'))--}}
-                {{--                                <li class="nav-item">--}}
-                {{--                                    <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>--}}
-                {{--                                </li>--}}
-                {{--                            @endif--}}
-
-                {{--                            @if (Route::has('register'))--}}
-                {{--                                <li class="nav-item">--}}
-                {{--                                    <a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>--}}
-                {{--                                </li>--}}
-
-                {{--                            @endif--}}
-                {{--                        @else--}}
-                {{--                            <li class="nav-item dropdown">--}}
-                {{--                                <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>--}}
-                {{--                                    {{ Auth::user()->name }}--}}
-                {{--                                </a>--}}
-
-                {{--                                <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">--}}
-                {{--                                    <a class="dropdown-item" href="{{ route('logout') }}"--}}
-                {{--                                       onclick="event.preventDefault();--}}
-                {{--                                                     document.getElementById('logout-form').submit();">--}}
-                {{--                                        {{ __('Logout') }}--}}
-                {{--                                    </a>--}}
-
-                {{--                                    <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">--}}
-                {{--                                        @csrf--}}
-                {{--                                    </form>--}}
-                {{--                                </div>--}}
-                {{--                            </li>--}}
-                {{--                        @endguest--}}
             </ul>
         </div>
     </div>
diff --git a/routes/web.php b/routes/web.php
index 1bd7a16..9623ec1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\HomeController;
+use App\Http\Controllers\PhotoController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -19,3 +20,4 @@ use Illuminate\Support\Facades\Route;
 //Auth::routes();
 
 Route::get('/', [HomeController::class, 'index'])->name('home');
+Route::get('/photos', [PhotoController::class, 'index'])->name('photos');