From 8e7fa8bcb58e5880809f8e446628f8c78017f1e3 Mon Sep 17 00:00:00 2001
From: "James A. Manon-og" <Jamanon-og@addu.edu.ph>
Date: Sun, 18 Jan 2026 01:47:56 +0800
Subject: [PATCH] refactor: improve event price display logic and update
 EventCard component

---
 app/(main)/events/[id]/page.tsx |  32 +++++-----
 app/(main)/events/page.tsx      |  53 ++++++++++------
 components/EventCard.tsx        | 104 +++++++++++++++-----------------
 lib/utils/event-priceUtils.ts   |  19 ++++++
 4 files changed, 121 insertions(+), 87 deletions(-)
 create mode 100644 lib/utils/event-priceUtils.ts

diff --git a/app/(main)/events/[id]/page.tsx b/app/(main)/events/[id]/page.tsx
index a38239a..670c7f9 100644
--- a/app/(main)/events/[id]/page.tsx
+++ b/app/(main)/events/[id]/page.tsx
@@ -10,6 +10,7 @@ import { format } from "date-fns";
 import Link from "next/link";
 import Image from "next/image";
 import { EventRegistrationModal } from "@/components/EventRegistrationModal";
+import { getEventPriceDisplay } from "@/lib/utils/event-priceUtils";
 
 const EventDetailsPage = ({ params }: { params: { id: string } }) => {
   const { id } = params;
@@ -52,9 +53,12 @@ const EventDetailsPage = ({ params }: { params: { id: string } }) => {
       <div className="min-h-screen bg-white flex items-center justify-center p-4">
         <div className="max-w-md w-full bg-white rounded-lg shadow-lg p-8 text-center">
           <AlertCircle className="h-16 w-16 text-red-500 mx-auto mb-4" />
-          <h2 className="text-2xl font-bold text-gray-900 mb-2">Event Not Found</h2>
+          <h2 className="text-2xl font-bold text-gray-900 mb-2">
+            Event Not Found
+          </h2>
           <p className="text-gray-600 mb-6">
-            The event you&apos;re looking for doesn&apos;t exist or has been removed.
+            The event you&apos;re looking for doesn&apos;t exist or has been
+            removed.
           </p>
           <Button asChild>
             <Link href="/events">
@@ -74,15 +78,8 @@ const EventDetailsPage = ({ params }: { params: { id: string } }) => {
     "hh:mm a"
   )} - ${format(eventEndDate, "hh:mm a")}`;
 
-  // Determine event price (using first ticket category)
-  const eventPrice =
-    event.TicketCategories?.[0]?.price === 0
-      ? "Free"
-      : event.TicketCategories?.[0]?.price
-      ? `₱${event.TicketCategories[0].price}`
-      : "Free";
+  const eventPrice = getEventPriceDisplay(event.TicketCategories);
 
-  // Truncate description for preview (first 400 characters)
   const descriptionPreview =
     event.description?.length > 400 && !showFullDescription
       ? `${event.description.substring(0, 400)}...`
@@ -181,14 +178,18 @@ const EventDetailsPage = ({ params }: { params: { id: string } }) => {
 
             {/* Event Price - Right aligned */}
             <div className="text-right ml-8">
-              <p className="text-sm text-gray-900 font-semibold mb-1">Event Price</p>
-              <p className="text-4xl md:text-5xl font-bold text-gray-900">{eventPrice}</p>
+              <span className="text-xs text-gray-500 uppercase tracking-wide">
+                Price
+              </span>
+              <p className="text-xl font-bold text-gray-900">{eventPrice}</p>
             </div>
           </div>
 
           {/* Event Description */}
           <div className="mt-8 mb-8">
-            <h3 className="text-2xl font-bold text-gray-900 mb-4">Event Description</h3>
+            <h3 className="text-2xl font-bold text-gray-900 mb-4">
+              Event Description
+            </h3>
             <div className="text-gray-700 leading-relaxed text-base whitespace-pre-line">
               {descriptionPreview}
             </div>
@@ -207,7 +208,10 @@ const EventDetailsPage = ({ params }: { params: { id: string } }) => {
             <Button
               size="lg"
               onClick={handleRegisterClick}
-              disabled={!event.isRegistrationOpen || (event.isRegistrationRequired && !event.TicketCategories?.[0])}
+              disabled={
+                !event.isRegistrationOpen ||
+                (event.isRegistrationRequired && !event.TicketCategories?.[0])
+              }
               className="px-16 py-6 text-lg font-semibold rounded-lg bg-blue-600 hover:bg-blue-700"
             >
               {event.isRegistrationOpen ? "Register" : "Registration Closed"}
diff --git a/app/(main)/events/page.tsx b/app/(main)/events/page.tsx
index ea5268a..8622f2a 100644
--- a/app/(main)/events/page.tsx
+++ b/app/(main)/events/page.tsx
@@ -17,10 +17,17 @@ import {
 import { useEffect, useRef, useState, Suspense } from "react";
 import { debounce } from "lodash";
 import { EventCard } from "@/components/EventCard";
-import { Search, Filter, Calendar, ChevronLeft, ChevronRight } from "lucide-react";
+import {
+  Search,
+  Filter,
+  Calendar,
+  ChevronLeft,
+  ChevronRight,
+} from "lucide-react";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Button } from "@/components/ui/button";
 import { useSearchParams } from "next/navigation";
+import { getEventPriceDisplay } from "@/lib/utils/event-priceUtils";
 
 const EventsContent = () => {
   const searchParams = useSearchParams();
@@ -28,7 +35,8 @@ const EventsContent = () => {
   const [filters, setFilters] = useState({
     searchFilter: initialSearchFilter,
   } as EventQueryParams);
-  const { data: organizations, isLoading: isOrganizationsLoading } = useGetOrganizations();
+  const { data: organizations, isLoading: isOrganizationsLoading } =
+    useGetOrganizations();
   const { data: organizationParents, isLoading: isOrganizationParentsLoading } =
     useGetOrganizationParents();
   const { data: events, isLoading: isEventsLoading } = useGetEvents(filters);
@@ -43,11 +51,13 @@ const EventsContent = () => {
     )
   );
 
-  const renderOrganizationOptions = organizations?.data?.map((org: OrganizationParent) => (
-    <SelectItem key={org.id} value={org.id}>
-      {org.name}
-    </SelectItem>
-  ));
+  const renderOrganizationOptions = organizations?.data?.map(
+    (org: OrganizationParent) => (
+      <SelectItem key={org.id} value={org.id}>
+        {org.name}
+      </SelectItem>
+    )
+  );
 
   const handleOrganizationParentFilter = (value: string) => {
     if (value === "all") {
@@ -143,8 +153,8 @@ const EventsContent = () => {
                 </span>
               </h1>
               <p className="text-xl text-gray-600 max-w-2xl mx-auto">
-                Find and join exciting events happening around you. Connect with communities and
-                create memorable experiences.
+                Find and join exciting events happening around you. Connect with
+                communities and create memorable experiences.
               </p>
             </div>
 
@@ -215,7 +225,9 @@ const EventsContent = () => {
                 <h2 className="text-2xl font-bold text-gray-900">
                   {events.data.length} Events Found
                 </h2>
-                <p className="text-gray-600 mt-1">Discover events that match your interests</p>
+                <p className="text-gray-600 mt-1">
+                  Discover events that match your interests
+                </p>
               </div>
             </div>
             <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
@@ -223,13 +235,17 @@ const EventsContent = () => {
                 <EventCard
                   key={event.id}
                   id={event.id}
+                  price={getEventPriceDisplay(event.TicketCategories)}
                   title={event.name}
                   organization={event.org?.name || ""}
-                  dateRange={`${new Date(event.dateStart).toLocaleDateString("en-US", {
-                    month: "short",
-                    day: "numeric",
-                    year: "numeric",
-                  })} to ${new Date(event.dateEnd).toLocaleDateString("en-US", {
+                  dateRange={`${new Date(event.dateStart).toLocaleDateString(
+                    "en-US",
+                    {
+                      month: "short",
+                      day: "numeric",
+                      year: "numeric",
+                    }
+                  )} to ${new Date(event.dateEnd).toLocaleDateString("en-US", {
                     month: "short",
                     day: "numeric",
                     year: "numeric",
@@ -269,9 +285,12 @@ const EventsContent = () => {
               <div className="w-24 h-24 mx-auto mb-6 bg-gray-100 rounded-full flex items-center justify-center">
                 <Calendar className="h-12 w-12 text-gray-400" />
               </div>
-              <h3 className="text-xl font-semibold text-gray-900 mb-2">No events found</h3>
+              <h3 className="text-xl font-semibold text-gray-900 mb-2">
+                No events found
+              </h3>
               <p className="text-gray-600">
-                Try adjusting your search criteria or filters to find more events.
+                Try adjusting your search criteria or filters to find more
+                events.
               </p>
             </div>
           </div>
diff --git a/components/EventCard.tsx b/components/EventCard.tsx
index 045f7d8..387d3c0 100644
--- a/components/EventCard.tsx
+++ b/components/EventCard.tsx
@@ -1,14 +1,12 @@
 "use client";
 
 import * as React from "react";
-import { Calendar, Clock, Users } from "lucide-react";
+import { Calendar, Clock } from "lucide-react";
 import Image from "next/image";
 
 import { cn } from "@/lib/utils";
 import { Card } from "@/components/ui/card";
-import { Badge } from "@/components/ui/badge";
 import { useRouter } from "next/navigation";
-
 interface EventCardProps extends React.HTMLAttributes<HTMLDivElement> {
   id: string;
   title?: string;
@@ -28,6 +26,7 @@ const EventCard = React.forwardRef<HTMLDivElement, EventCardProps>(
       organization,
       dateRange,
       timeRange,
+      price,
       imageUrl,
       ...props
     },
@@ -37,11 +36,12 @@ const EventCard = React.forwardRef<HTMLDivElement, EventCardProps>(
     const handleRedirectToDetails = () => {
       router.push(`/events/${id}`);
     };
+
     return (
       <Card
         ref={ref}
         className={cn(
-          "group w-full overflow-hidden rounded-2xl border-0 shadow-md hover:shadow-xl transition-all duration-300 cursor-pointer bg-white",
+          "group w-full overflow-hidden rounded-2xl border-0 shadow-md hover:shadow-xl transition-all duration-300 cursor-pointer bg-white flex flex-col",
           className
         )}
         {...props}
@@ -66,70 +66,62 @@ const EventCard = React.forwardRef<HTMLDivElement, EventCardProps>(
           )}
 
           <div className="absolute inset-0 bg-gradient-to-t from-black/20 via-transparent to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
-
-          {organization && (
-            <div className="absolute top-4 left-4">
-              <Badge
-                variant="secondary"
-                className="bg-white/90 text-gray-800 backdrop-blur-sm"
-              >
-                {organization}
-              </Badge>
-            </div>
-          )}
         </div>
 
-        <div className="p-6 space-y-4">
-          <div className="space-y-2">
-            <h3 className="text-xl font-bold text-gray-900 line-clamp-2 group-hover:text-blue-600 transition-colors duration-200">
-              {title || "Event Title"}
-            </h3>
-          </div>
-
-          <div className="space-y-3">
-            <div className="flex items-start gap-3 text-sm text-gray-600">
-              <Calendar className="h-4 w-4 text-blue-500 mt-0.5 flex-shrink-0" />
-              <div className="space-y-1">
-                <p className="font-medium text-gray-900">
+        <div className="p-6 flex flex-col flex-grow">
+          <div className="space-y-3 pb-3">
+            <div className="flex items-start gap-4 text-sm text-gray-600">
+              <div className="flex items-start gap-2">
+                <Calendar className="h-4 w-4 text-blue-500 mt-0.5 flex-shrink-0" />
+                <p className="font-medium text-gray-900 text-xs">
                   {dateRange || "DD-MMM-YYYY to DD-MMM-YYYY"}
                 </p>
               </div>
-            </div>
 
-            <div className="flex items-start gap-3 text-sm text-gray-600">
-              <Clock className="h-4 w-4 text-blue-500 mt-0.5 flex-shrink-0" />
-              <div className="space-y-1">
-                <p className="font-medium text-gray-900">
+              <div className="flex items-start gap-2">
+                <Clock className="h-4 w-4 text-blue-500 mt-0.5 flex-shrink-0" />
+                <p className="font-medium text-gray-900 text-xs">
                   {timeRange || "00:00 AM to 00:00 AM"}
                 </p>
               </div>
             </div>
           </div>
 
-          <div className="pt-2 border-t border-gray-100">
-            <div
-              className="flex items-center justify-between"
-              onClick={() => handleRedirectToDetails()}
-            >
-              <div className="flex items-center gap-2 text-sm text-gray-500">
-                <Users className="h-4 w-4" />
-                <span>Join Event</span>
-              </div>
-              <div className="w-8 h-8 rounded-full bg-blue-100 flex items-center justify-center group-hover:bg-blue-500 group-hover:text-white transition-all duration-200">
-                <svg
-                  className="w-4 h-4"
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth={2}
-                    d="M9 5l7 7-7 7"
-                  />
-                </svg>
-              </div>
+          <div className="pt-2 border-t border-gray-100 flex-grow mb-4">
+            <h3 className="text-2xl font-bold text-gray-900 line-clamp-2 group-hover:text-blue-600 transition-colors duration-200">
+              {title || "Event Title"}
+            </h3>
+            <p className="text-sm font-medium text-gray-900 line-clamp-2 group-hover:text-blue-600 transition-colors duration-200">
+              {organization || "Organization Name"}
+            </p>
+          </div>
+
+          <div
+            className="flex items-center justify-between mt-auto "
+            onClick={() => handleRedirectToDetails()}
+          >
+            <div className="flex flex-col gap-0.5">
+              <span className="text-xs text-gray-500 uppercase tracking-wide">
+                Price
+              </span>
+              <span className="text-lg font-bold text-gray-900">
+                {price || "Free"}
+              </span>
+            </div>
+            <div className="w-10 h-10 rounded-full bg-blue-500 flex items-center justify-center group-hover:bg-blue-600 text-white transition-all duration-200 shadow-sm">
+              <svg
+                className="w-5 h-5"
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth={2}
+                  d="M9 5l7 7-7 7"
+                />
+              </svg>
             </div>
           </div>
         </div>
diff --git a/lib/utils/event-priceUtils.ts b/lib/utils/event-priceUtils.ts
new file mode 100644
index 0000000..afc5f61
--- /dev/null
+++ b/lib/utils/event-priceUtils.ts
@@ -0,0 +1,19 @@
+import type { TicketCategory } from "@/client/types/entities";
+
+export const getEventPriceDisplay = (
+  ticketCategories?: TicketCategory[]
+): string => {
+  if (!ticketCategories || ticketCategories.length === 0) return "Free";
+
+  const prices = ticketCategories.map((tc) => tc.price);
+  const minPrice = Math.min(...prices);
+  const maxPrice = Math.max(...prices);
+
+  if (maxPrice === 0) return "Free";
+
+  if (minPrice === maxPrice) return `Php ${minPrice}.00`;
+
+  if (minPrice === 0) return `Free - Php ${maxPrice}.00`;
+
+  return `Php ${minPrice}.00 - ${maxPrice}.00`;
+};