Merge branch 'main' of https://github.com/ericahan22/Wat2Do

Author: ericahan22

README.md

@@ -65,6 +65,7 @@ source .venv/bin/activate
 pip install -r requirements.txt
 python manage.py makemigrations
 python manage.py migrate
+# PRODUCTION=1 python manage.py migrate
 python manage.py runserver 8000
 ```
 

backend/config/settings/base.py

@@ -91,6 +91,11 @@
 
 WSGI_APPLICATION = "config.wsgi.app"
 
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
+SECURE_REDIRECT_EXEMPT = [
+    r'^health/$',
+]
 
 # Database
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases

backend/utils/filters.py

@@ -1,13 +1,13 @@
-from django_filters import CharFilter, DateFilter, FilterSet, NumberFilter
+from django_filters import CharFilter, DateFilter, DateTimeFilter, FilterSet, NumberFilter
 
 from apps.events.models import Events
 
 
 class EventFilter(FilterSet):
     """Filter for Event queryset"""
 
-    dtstart = DateFilter(field_name="dtstart", lookup_expr="gte")
-    dtend = DateFilter(field_name="dtstart", lookup_expr="lte")
+    dtstart = DateTimeFilter(field_name="dtstart", lookup_expr="gte")
+    dtend = DateTimeFilter(field_name="dtstart", lookup_expr="lte")
     min_price = NumberFilter(field_name="price", lookup_expr="gte")
     max_price = NumberFilter(field_name="price", lookup_expr="lte")
     club_type = CharFilter(field_name="club_type")

frontend/src/features/admin/pages/AdminPage.tsx

@@ -83,10 +83,10 @@ function AdminPage() {
   };
 
   const handleEventSelect = (eventId: string) => {
-    const event = events.find((e: Event) => e.id === eventId);
+    const event = events.find((e: Event) => e.id.toString() === eventId);
     if (event) {
       setSelectedEventId(eventId);
-      setSelectedEventName(event.name);
+      setSelectedEventName(event.title);
     }
   };
 
@@ -203,8 +203,8 @@ function AdminPage() {
                     </SelectTrigger>
                     <SelectContent>
                       {events.map((event: Event) => (
-                        <SelectItem key={event.id} value={event.id}>
-                          {event.name} (ID: {event.id})
+                        <SelectItem key={event.id} value={event.id.toString()}>
+                          {event.title} (ID: {event.id})
                         </SelectItem>
                       ))}
                     </SelectContent>
@@ -321,16 +321,16 @@ function AdminPage() {
                       <Card
                         key={event.id}
                         className="cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors"
-                        onClick={() => handleEventSelect(event.id)}
+                        onClick={() => handleEventSelect(event.id.toString())}
                       >
                         <CardContent className="pt-6">
                           <div className="flex justify-between items-start">
                             <div className="flex-1">
                               <h3 className="font-medium ">
-                                {event.name}
+                                {event.title}
                               </h3>
                               <p className="text-sm ">
-                                {new Date(event.date).toLocaleDateString()} at{" "}
+                                {new Date(event.dtstart).toLocaleDateString()} at{" "}
                                 {event.location}
                               </p>
                             </div>

frontend/src/features/admin/types/promotion.ts

@@ -25,15 +25,14 @@ export interface EventPromotion {
  * Event with embedded promotion data
  */
 export interface PromotedEvent {
-  id: string;
-  name: string;
-  date: string;
-  start_time: string;
-  end_time: string;
+  id: number;
+  title: string;
+  dtstart: string;
+  dtend: string | null;
   location: string;
   description: string | null;
-  image_url: string | null;
-  club_handle: string | null;
+  source_image_url: string | null;
+  display_handle: string;
   promotion: EventPromotion;
 }
 

frontend/src/features/events/components/EventsStatusBar.tsx

@@ -17,14 +17,26 @@ const EventsStatusBar: React.FC<EventsStatusBarProps> = ({
     if (isLoading) return "Loading..."; 
 
     if (searchTerm) {
-      return `${totalCount} found events`;
+      return (
+        <>
+          <span className="font-bold">{totalCount}</span> found events
+        </>
+      );
     }
 
     if (isShowingPastEvents) {
-      return `${totalCount} total events`;
+      return (
+        <>
+          <span className="font-bold">{totalCount}</span> total events
+        </>
+      );
     }
 
-    return `${totalCount} upcoming events`;
+    return (
+      <>
+        <span className="font-bold">{totalCount}</span> upcoming events
+      </>
+    );
   };
 
   return <p className="text-sm">{getStatusText()}</p>;