From 31bea937c436f6662e1f78fbc1fb8adfe30e0f8b Mon Sep 17 00:00:00 2001 From: Subash Date: Fri, 22 Aug 2025 11:15:13 +0545 Subject: [PATCH] feat: Add functions to retrieve previous and upcoming events; update events template to display dynamic event data --- app/Helpers/QueryHelper.php | 27 +++ app/Http/Controllers/WebsiteController.php | 2 + .../raffles/pages/events-template.blade.php | 221 +++--------------- 3 files changed, 61 insertions(+), 189 deletions(-) diff --git a/app/Helpers/QueryHelper.php b/app/Helpers/QueryHelper.php index 919fc83..ab36c44 100644 --- a/app/Helpers/QueryHelper.php +++ b/app/Helpers/QueryHelper.php @@ -4,6 +4,7 @@ use Modules\CCMS\Models\Blog; use Modules\CCMS\Models\Category; use Modules\CCMS\Models\Counter; use Modules\CCMS\Models\Country; +use Modules\CCMS\Models\Event; use Modules\CCMS\Models\Faq; use Modules\CCMS\Models\FaqCategory; use Modules\CCMS\Models\Gallery; @@ -150,6 +151,32 @@ function getServices($limit = null, $order = 'desc') ->get(); } +function previousEvents($limit = null, $order = 'desc') +{ + return Event::query() + ->where('status', 1) + ->where('parent_id', null) + ->where('start_date', '<=', now()) + ->orderBy('order', $order) + ->when($limit, function ($query) use ($limit) { + $query->limit($limit); + }) + ->get(); +} + +function upcomingEvents($limit = null, $order = 'desc') +{ + return Event::query() + ->where('status', 1) + ->where('parent_id', null) + ->where('start_date', '>=', now()) + ->orderBy('order', $order) + ->when($limit, function ($query) use ($limit) { + $query->limit($limit); + }) + ->get(); +} + function getInstitutions($limit = null, $order = 'desc') { return Institution::query() diff --git a/app/Http/Controllers/WebsiteController.php b/app/Http/Controllers/WebsiteController.php index 6836f89..1b05c2d 100644 --- a/app/Http/Controllers/WebsiteController.php +++ b/app/Http/Controllers/WebsiteController.php @@ -52,6 +52,8 @@ class WebsiteController extends Controller $data['successGalleries'] = getGalleriesByCategory(limit: 3, order: 'asc', category: 'voice-of-success'); $data['destinations'] = getDestinations(limit: null, order: 'asc'); $data['services'] = getServices(limit: null, order: 'asc'); + $data['previousEvents'] = previousEvents(limit: null, order: 'asc'); + $data['upcomingEvents'] = upcomingEvents(limit: null, order: 'asc'); $data['classes'] = getClasses(limit: null, order: 'asc'); $data['institutions'] = getInstitutions(limit: null, order: 'asc'); $data['faqs'] = getFAQs(limit: null, order: 'desc'); diff --git a/resources/views/client/raffles/pages/events-template.blade.php b/resources/views/client/raffles/pages/events-template.blade.php index 2df53df..b7226e1 100644 --- a/resources/views/client/raffles/pages/events-template.blade.php +++ b/resources/views/client/raffles/pages/events-template.blade.php @@ -22,101 +22,25 @@
- -
-
- -
-
-
-

Apr

-

14

+ @foreach ($upcomingEvents as $event) +
+
+
+
-
-

Free ilets Class: Raffles Educare Associates

-

Join the free ilets Classes

-

Starting from 5 pm - 7 pm

+
+
+

Start

+

{{ $event->start_date }}

+
+
+

{{ $event->title }}

+

{{ $event->short_description }}

+
-
- -
- -
-
- -
-
-
-

Apr

-

14

-
-
-

Free ilets Class: Raffles Educare Associates

-

Join the free ilets Classes

-

Starting from 5 pm - 7 pm

-
-
-
- -
- -
-
- -
-
-
-

Apr

-

14

-
-
-

Free ilets Class: Raffles Educare Associates

-

Join the free ilets Classes

-

Starting from 5 pm - 7 pm

-
-
-
- -
- -
-
- -
-
-
-

Apr

-

14

-
-
-

Free ilets Class: Raffles Educare Associates

-

Join the free ilets Classes

-

Starting from 5 pm - 7 pm

-
-
-
- -
- -
-
- -
-
-
-

Apr

-

14

-
-
-

Free ilets Class: Raffles Educare Associates

-

Join the free ilets Classes

-

Starting from 5 pm - 7 pm

-
-
-
- -
+ + @endforeach
@@ -137,102 +61,27 @@