Merge pull request #63 from Hasban-Fardani/fix/sector-detail

fix: issue on sector detail and image
Hasban-Fardani · Aug 30, 2024 · 18c744e · 18c744e
2 parents df2b203 + e0a5738
commit 18c744e
Show file tree

Hide file tree

Showing 39 changed files with 357 additions and 172 deletions.
diff --git a/app/Http/Controllers/AboutController.php b/app/Http/Controllers/AboutController.php
@@ -2,12 +2,17 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Report;
 use Illuminate\Http\Request;
 
 class AboutController extends Controller
 {
     public function __invoke()
     {
-        return view('livewire.about');
+        $reports = Report::orderBy('created_at', 'DESC')->take(4)->get();
+
+        return view('livewire.about', [
+            'reports' => $reports
+        ]);
     }
 }
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
@@ -8,10 +8,10 @@ class ActivityController extends Controller
 {
     public function index()
     {
-        $activities = Activity::where('is_draft', false);
+        $activities = Activity::where('is_draft', false)->get();
 
         return view('livewire.activity', [
-            'activities' => $activities->paginate(8)
+            'activities' => $activities
         ]);
     }
 

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -12,7 +12,7 @@ public function __invoke()
     {
         $activities = Activity::where('is_draft', false)->orderBy('created_at', 'DESC')->take(4)->get();
 
-        $reports = Report::all();
+        $reports = Report::orderBy('created_at', 'DESC')->take(4)->get();
 
         return view('livewire.home', [
             'activities' => $activities,

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
@@ -11,11 +11,9 @@ class ProjectController extends Controller
     public function show($id)
     {
         $projects = Project::withAggregate('subdistrict', 'name')->withAggregate('sectorProgram', 'name')->findOrFail($id);
-        $images = ProjectImage::where('project_id', $id)->get();
 
         return view('livewire.project', [
             'projects' => $projects,
-            'images' => $images
         ]);
     }
 }
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Project;
+use App\Models\Report;
+use Illuminate\Http\Request;
+
+class ReportController extends Controller
+{
+    public function index()
+    {
+        $reports = Report::paginate(8);
+
+        return view('livewire.report', [
+            'reports' => $reports
+        ]);
+    }
+
+    public function show($id)
+    {
+        $report = Report::find($id);
+
+        return view('livewire.detail-report', [
+            'report' => $report
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/SectorController.php b/app/Http/Controllers/SectorController.php
@@ -12,7 +12,7 @@ class SectorController extends Controller
     public function index()
     {
         $sectors = Sector::paginate(8);
-        $projects = Project::withAggregate('subdistrict', 'name')->withAggregate('sectorProgram', 'name');
+        $projects = Project::withAggregate('subdistrict', 'name')->withAggregate('sectorProgram', 'name')->orderBy('created_at', 'DESC');
 
         return view('livewire.sector', [
             'sectors' => $sectors,
@@ -24,9 +24,9 @@ public function show($id)
     {
         $sectors = Sector::findOrFail($id);
         $programs = SectorProgram::withCount('project')->where('sector_id', $id)->get();
-        $projects = Project::withAggregate('subdistrict', 'name')->where('sector_program_id', $id)->get();
 
-        // dd($projects);
+        $projects = SectorProgram::where('sector_id', $id)->first();
+        $projects->load('project');
 
         return view('livewire.detail-sector', [
             'sectors' => $sectors,

diff --git a/app/Livewire/Components/Banner.php b/app/Livewire/Components/Banner.php
@@ -12,6 +12,8 @@ class Banner extends Component
     public $position;
     public $breadcrumbs;
 
+    public $tags;
+
     public function mount($title, $subtitle, $breadcrumbs, $position): void
     {
         $this->title = $title;

diff --git a/app/Livewire/Components/ProjectTable.php b/app/Livewire/Components/ProjectTable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire\Components;
+
+use Livewire\Component;
+
+class ProjectTable extends Component
+{
+    public function render()
+    {
+        return view('livewire.components.project-table');
+    }
+}
diff --git a/app/Livewire/Components/Tags.php b/app/Livewire/Components/Tags.php
@@ -7,6 +7,7 @@
 class Tags extends Component
 {
     public $tag;
+    public $class;
 
     public function mount($tag): void
     {

diff --git a/app/Livewire/DetailReport.php b/app/Livewire/DetailReport.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire;
+
+use Livewire\Component;
+
+class DetailReport extends Component
+{
+    public function render()
+    {
+        return view('livewire.detail-report');
+    }
+}
diff --git a/app/Livewire/Report.php b/app/Livewire/Report.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire;
+
+use Livewire\Component;
+
+class Report extends Component
+{
+    public function render()
+    {
+        return view('livewire.report');
+    }
+}