From efb92ea5b1d8e6ab2feb80a224dde5ae527b56bf Mon Sep 17 00:00:00 2001
From: Al Imran Ahmed <al.imran.cse@gmail.com>
Date: Wed, 11 Sep 2024 01:43:35 +0200
Subject: [PATCH] Fixed the issue of not showing menubar in the dashboard

---
 .../Backend/DashboardController.php           |  9 +--
 app/Livewire/Backend/Dashboard.php            | 24 +++++++
 resources/views/backend/dashboard.blade.php   | 72 +------------------
 .../livewire/backend/dashboard.blade.php      | 71 ++++++++++++++++++
 .../Backend/DashboardControllerTest.php       |  5 +-
 .../Controllers/HomeControllerTest.php        |  5 +-
 .../Livewire/Backend/DashboardTest.php        | 20 ++++++
 7 files changed, 119 insertions(+), 87 deletions(-)
 create mode 100644 app/Livewire/Backend/Dashboard.php
 create mode 100644 resources/views/livewire/backend/dashboard.blade.php
 create mode 100644 tests/Feature/Livewire/Backend/DashboardTest.php

diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php
index f002b1d1..7a009f1f 100644
--- a/app/Http/Controllers/Backend/DashboardController.php
+++ b/app/Http/Controllers/Backend/DashboardController.php
@@ -3,19 +3,12 @@
 namespace App\Http\Controllers\Backend;
 
 use App\Http\Controllers\Controller;
-use App\Models\Category;
-use App\Models\Comment;
-use App\Models\Feedback;
 use Illuminate\Contracts\View\View;
 
 class DashboardController extends Controller
 {
     public function index(): View
     {
-        $categories = Category::query()->withCount('articles')->get()->sortByDesc('articles_count');
-        $latestComments = Comment::query()->with('user')->latest()->take(3)->get();
-        $latestFeedbacks = Feedback::query()->where('is_closed', 0)->take(3)->get();
-
-        return view('backend.dashboard', compact('categories', 'latestComments', 'latestFeedbacks'));
+        return view('backend.dashboard');
     }
 }
diff --git a/app/Livewire/Backend/Dashboard.php b/app/Livewire/Backend/Dashboard.php
new file mode 100644
index 00000000..f4bbeb02
--- /dev/null
+++ b/app/Livewire/Backend/Dashboard.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Livewire\Backend;
+
+use App\Models\Category;
+use App\Models\Comment;
+use App\Models\Feedback;
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+class Dashboard extends Component
+{
+    public function render(): View
+    {
+        $categories = Category::query()->withCount('articles')->get()->sortByDesc('articles_count');
+        $latestComments = Comment::query()->with('user')->latest()->take(3)->get();
+        $latestFeedbacks = Feedback::query()->where('is_closed', 0)->take(3)->get();
+
+        return view(
+            'livewire.backend.dashboard',
+            compact('categories', 'latestComments', 'latestFeedbacks')
+        );
+    }
+}
diff --git a/resources/views/backend/dashboard.blade.php b/resources/views/backend/dashboard.blade.php
index 28c648db..91426e00 100644
--- a/resources/views/backend/dashboard.blade.php
+++ b/resources/views/backend/dashboard.blade.php
@@ -1,73 +1,3 @@
 <x-backend>
-    <div class="flex flex-row">
-        <div class="basis-1/3">
-            <x-backend.table>
-                <x-slot name="head">
-                    <tr>
-                        <x-backend.table.th class="text-center">Latest Comments</x-backend.table.th>
-                    </tr>
-                </x-slot>
-
-                <x-slot name="body">
-                    @forelse($latestComments as $comment)
-                        <tr>
-                            <x-backend.table.td class="text-gray-600">
-                                <span class="font-medium">{{$comment->user->name}}</span><br>
-                                <span class="text-slate-400">{{$comment->createdAtHumanDiff}}</span><br>
-                                {{$comment->content}}
-                            </x-backend.table.td>
-                        </tr>
-                    @empty
-                    @endforelse
-                </x-slot>
-            </x-backend.table>
-        </div>
-        <div class="basis-1/3">
-            <x-backend.table>
-                <x-slot name="head">
-                    <tr>
-                        <x-backend.table.th class="text-center">Latest Feedback</x-backend.table.th>
-                    </tr>
-                </x-slot>
-
-                <x-slot name="body">
-                    @forelse($latestFeedbacks as $feedback)
-                        <tr>
-                            <x-backend.table.td class="text-gray-600">
-                                <span class="font-medium">{{$feedback->name}}</span><br>
-                                <span class="text-slate-400">{{$feedback->createdAtHumanDiff}}</span><br>
-                                {{$feedback->content}}
-                            </x-backend.table.td>
-                        </tr>
-                    @empty
-                        <x-backend.table.td colspan="100" class="text-gray-400 text-center">No new feedback</x-backend.table.td>
-                    @endforelse
-                </x-slot>
-            </x-backend.table>
-        </div>
-        <div class="basis-1/3">
-            <x-backend.table>
-                <x-slot name="head">
-                    <tr>
-                        <x-backend.table.th class="text-center" colspan="100">Articles Categories</x-backend.table.th>
-                    </tr>
-                </x-slot>
-
-                <x-slot name="body">
-                    @forelse($categories as $category)
-                        <tr>
-                            <x-backend.table.td class="text-gray-600">
-                                <span class="font-medium">{{$category->name}}</span>
-                            </x-backend.table.td>
-                            <x-backend.table.td class="text-gray-600">
-                                <span class="text-slate-400">{{$category->articles_count}}</span><br>
-                            </x-backend.table.td>
-                        </tr>
-                    @empty
-                        <x-backend.table.td colspan="100" class="text-gray-400 text-center">No new feedback</x-backend.table.td>
-                    @endforelse
-                </x-slot>
-            </x-backend.table>
-        </div>
-    </div>
+    <livewire:backend.dashboard/>
 </x-backend>
diff --git a/resources/views/livewire/backend/dashboard.blade.php b/resources/views/livewire/backend/dashboard.blade.php
new file mode 100644
index 00000000..99abde6f
--- /dev/null
+++ b/resources/views/livewire/backend/dashboard.blade.php
@@ -0,0 +1,71 @@
+<div class="flex flex-row">
+    <div class="basis-1/3">
+        <x-backend.table>
+            <x-slot name="head">
+                <tr>
+                    <x-backend.table.th class="text-center">Latest Comments</x-backend.table.th>
+                </tr>
+            </x-slot>
+
+            <x-slot name="body">
+                @forelse($latestComments as $comment)
+                    <tr>
+                        <x-backend.table.td class="text-gray-600">
+                            <span class="font-medium">{{$comment->user->name}}</span><br>
+                            <span class="text-slate-400">{{$comment->createdAtHumanDiff}}</span><br>
+                            {{$comment->content}}
+                        </x-backend.table.td>
+                    </tr>
+                @empty
+                @endforelse
+            </x-slot>
+        </x-backend.table>
+    </div>
+    <div class="basis-1/3">
+        <x-backend.table>
+            <x-slot name="head">
+                <tr>
+                    <x-backend.table.th class="text-center">Latest Feedback</x-backend.table.th>
+                </tr>
+            </x-slot>
+
+            <x-slot name="body">
+                @forelse($latestFeedbacks as $feedback)
+                    <tr>
+                        <x-backend.table.td class="text-gray-600">
+                            <span class="font-medium">{{$feedback->name}}</span><br>
+                            <span class="text-slate-400">{{$feedback->createdAtHumanDiff}}</span><br>
+                            {{$feedback->content}}
+                        </x-backend.table.td>
+                    </tr>
+                @empty
+                    <x-backend.table.td colspan="100" class="text-gray-400 text-center">No new feedback</x-backend.table.td>
+                @endforelse
+            </x-slot>
+        </x-backend.table>
+    </div>
+    <div class="basis-1/3">
+        <x-backend.table>
+            <x-slot name="head">
+                <tr>
+                    <x-backend.table.th class="text-center" colspan="100">Articles Categories</x-backend.table.th>
+                </tr>
+            </x-slot>
+
+            <x-slot name="body">
+                @forelse($categories as $category)
+                    <tr>
+                        <x-backend.table.td class="text-gray-600">
+                            <span class="font-medium">{{$category->name}}</span>
+                        </x-backend.table.td>
+                        <x-backend.table.td class="text-gray-600">
+                            <span class="text-slate-400">{{$category->articles_count}}</span><br>
+                        </x-backend.table.td>
+                    </tr>
+                @empty
+                    <x-backend.table.td colspan="100" class="text-gray-400 text-center">No new feedback</x-backend.table.td>
+                @endforelse
+            </x-slot>
+        </x-backend.table>
+    </div>
+</div>
diff --git a/tests/Feature/Controllers/Backend/DashboardControllerTest.php b/tests/Feature/Controllers/Backend/DashboardControllerTest.php
index a6f4574a..a9c0a2dd 100644
--- a/tests/Feature/Controllers/Backend/DashboardControllerTest.php
+++ b/tests/Feature/Controllers/Backend/DashboardControllerTest.php
@@ -23,9 +23,6 @@ public function testIndex()
     {
         $this->actingAs($this->user)->get('/admin/dashboard')
             ->assertStatus(Response::HTTP_OK)
-            ->assertViewIs('backend.dashboard')
-            ->assertViewHas('categories')
-            ->assertViewHas('latestComments')
-            ->assertViewHas('latestFeedbacks');
+            ->assertViewIs('backend.dashboard');
     }
 }
diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php
index c6c23d15..8ea17cbd 100644
--- a/tests/Feature/Controllers/HomeControllerTest.php
+++ b/tests/Feature/Controllers/HomeControllerTest.php
@@ -56,10 +56,7 @@ public function testAdminDashboard()
 
         $this->actingAs($user)
             ->get('/')
-            ->assertViewIs('backend.dashboard')
-            ->assertViewHas('categories')
-            ->assertViewHas('latestComments')
-            ->assertViewHas('latestFeedbacks');
+            ->assertViewIs('backend.dashboard');
     }
 
     public function testGetMessage()
diff --git a/tests/Feature/Livewire/Backend/DashboardTest.php b/tests/Feature/Livewire/Backend/DashboardTest.php
new file mode 100644
index 00000000..2d576216
--- /dev/null
+++ b/tests/Feature/Livewire/Backend/DashboardTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Feature\Livewire\Backend;
+
+use App\Livewire\Backend\Dashboard;
+use Livewire\Livewire;
+use Tests\TestCase;
+
+class DashboardTest extends TestCase
+{
+    public function testRender()
+    {
+        Livewire::test(Dashboard::class)
+            ->assertOk()
+            ->assertViewIs('livewire.backend.dashboard')
+            ->assertViewHas('categories')
+            ->assertViewHas('latestComments')
+            ->assertViewHas('latestFeedbacks');
+    }
+}