updated search and added past workshop page

app/Http/Controllers/SearchController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Post;
+use App\Models\Workshop;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+
+class SearchController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request)
+    {
+        $search = $request->get('q', '');
+        $search_words = explode(' ', $search); // Split the search query into words[1]
+
+        $workshopQuery = Workshop::query()->where('status', '!=', 'draft');
+
+        $workshopQuery->where(function ($query) use ($search_words) {
+            foreach ($search_words as $word) {
+                $query->orWhere(function ($subQuery) use ($word) {
+                    $subQuery->where('title', 'like', '%' . $word . '%')
+                        ->orWhere('content', 'like', '%' . $word . '%')
+                        ->orWhereHas('location', function ($locationQuery) use ($word) {
+                            $locationQuery->where('name', 'like', '%' . $word . '%');
+                        });
+                });
+            }
+        });
+
+        $workshops = $workshopQuery->orderBy('starts_at', 'desc')
+            ->paginate(6, ['*'], 'workshop');
+
+        $postQuery = Post::query()->where('status', 'published');
+        $postQuery->where(function ($query) use ($search_words) {
+            foreach ($search_words as $word) {
+                $query->where(function ($subQuery) use ($word) {
+                    $subQuery->where('title', 'like', '%' . $word . '%')
+                        ->orWhere('content', 'like', '%' . $word . '%');
+                });
+            }
+        });
+
+        $posts = $postQuery->orderBy('created_at', 'desc')
+            ->paginate(6, ['*'], 'post')
+            ->onEachSide(1);
+
+        return view('search', [
+            'workshops' => $workshops,
+            'posts'     => $posts,
+            'search'    => $search,
+        ]);
+    }
+}

app/Http/Controllers/WorkshopController.php

@@ -11,93 +11,30 @@ class WorkshopController extends Controller
     /**
      * Display a listing of the resource.
      */
-    public function index(Request $request)
+    public function index()
     {
-        $homeView = true;
-        $search = $request->get('search', '');
-
         $query = Workshop::query();
-
-        if(!auth()->user()?->admin) {
-            $query = $query->where('status', '!=', 'draft');
-        }
-
-        if($request->has('search') && $request->search !== '') {
-            $homeView = false;
-            $query = $query->where(function ($query) use ($request) {
-                $query->where('title', 'like', '%' . $request->search . '%')
-                    ->orWhere('content', 'like', '%' . $request->search . '%');
-            });
-        }
-
-        if($request->has('location') && $request->location !== '') {
-            $homeView = false;
-            $query = $query->whereHas('location', function ($query) use ($request) {
-                $query->where('name', 'like', '%' . $request->location . '%');
-            });
-        }
-
-        if($request->has('date') && $request->date !== '') {
-            $homeView = false;
-            $dates = explode('-', $request->date);
-            $dates = array_map('trim', $dates);
-            $dates = array_map(function($date) {
-                $date = trim($date);
-
-                if(preg_match('/^\d{4}-\d{2}-\d{2}$/', $date)) {
-                    return $date;
-                }
-                if(preg_match('/^(\d{2})-(\d{2})-(\d{2})$/', $date, $matches)) {
-                    return '20' . $matches[1] . '-' . $matches[2] . '-' . $matches[3];
-                }
-                if(preg_match('/^\d{4}-\d{2}$/', $date)) {
-                    return $date . '-01';
-                }
-                if(preg_match('/^\d{4}$/', $date)) {
-                    return $date . '-01-01';
-                }
-                if(preg_match('/^(\d{2})\/(\d{2})\/(\d{2})$/', $date, $matches)) {
-                    return '20' . $matches[3] . '-' . $matches[2] . '-' . $matches[1];
-                }
-                if(preg_match('/^(\d{2})\/(\d{2})\/(\d{4})$/', $date, $matches)) {
-                    return $matches[3] . '-' . $matches[2] . '-' . $matches[1];
-                }
-
-                return '';
-            }, $dates);
-
-            if(count($dates) == 2) {
-                // If there are two dates, filter between starts_at and ends_at
-                $query = $query->whereDate('starts_at', '>=', $dates[0])
-                    ->whereDate('ends_at', '<=', $dates[1]);
-            } else {
-                // If there is one date, filter starts_at that date or newer
-                $query = $query->whereDate('starts_at', '>=', $dates[0]);
-            }
-        }
-
-        if($homeView) {
-            $query = $query->where('starts_at', '>=', Carbon::now()->subDays(8))
-                ->orderBy('starts_at', 'asc');
-        } else {
-            $query = $query->orderBy('starts_at', 'asc');
-        }
+        $query = $query->where('starts_at', '>=', Carbon::now()->subDays(8))
+            ->orderBy('starts_at', 'asc');
 
         $workshops = $query->paginate(12);
         return view('workshop.index', [
-            'workshops' => $workshops,
-            'search' => $search,
+            'workshops' => $workshops
         ]);
     }
 
     /**
      * Display a listing of the resource.
      */
-    public function past_index(Request $request)
+    public function past_index()
     {
+        $query = Workshop::query();
+        $query = $query->where('starts_at', '<', Carbon::now())
+            ->orderBy('starts_at', 'desc');
+
+        $workshops = $query->paginate(12);
         return view('workshop.index', [
-            'workshops' => [],
-//            'search' => $search,
+            'workshops' => $workshops
         ]);
     }