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

Author: ericahan22

backend/apps/events/migrations/0009_remove_events_events_utc_sta_be5330_idx_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.7 on 2025-10-19 03:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0008_alter_events_raw_json_alter_events_reactions"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="events",
+            name="events_utc_sta_be5330_idx",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="utc_end_ts",
+        ),
+        migrations.RemoveField(
+            model_name="events",
+            name="utc_start_ts",
+        ),
+    ]

backend/apps/events/migrations/0010_events_events_dtstart_89a1ed_idx.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.7 on 2025-10-19 03:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0009_remove_events_events_utc_sta_be5330_idx_and_more"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="events",
+            index=models.Index(
+                fields=["dtstart_utc"], name="events_dtstart_89a1ed_idx"
+            ),
+        ),
+    ]

backend/apps/events/models.py

@@ -60,16 +60,6 @@ class Events(models.Model):
         help_text="'America/New_York'"
     )
 
-    # Canonical UTC timestamps for consistent querying
-    utc_start_ts = models.DateTimeField(
-        null=True, blank=True,
-        help_text="'2024-03-20T14:00:00Z'"
-    )
-    utc_end_ts = models.DateTimeField(
-        null=True, blank=True,
-        help_text="'2024-03-20T22:00:00Z'"
-    )
-
     # Recurrence rules (iCalendar RFC 5545)
     rrule = models.TextField(
         null=True, blank=True,
@@ -169,7 +159,7 @@ class Events(models.Model):
     class Meta:
         db_table = 'events'
         indexes = [
-            models.Index(fields=['utc_start_ts']),
+            models.Index(fields=['dtstart_utc']),
         ]
 
     def __str__(self):

backend/config/settings/base.py

@@ -67,6 +67,13 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
+SECURE_SSL_REDIRECT = True 
+
+# A list of regular expressions that URLs must match to be exempt from SSL redirection
+SECURE_REDIRECT_EXEMPT = [
+    r'^health/?$',  # This will match /health or /health/
+]
+
 # CORS settings
 CORS_ALLOW_ALL_ORIGINS = True  # For development only
 CORS_ALLOW_CREDENTIALS = True
@@ -91,12 +98,6 @@
 
 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
 if os.getenv("PRODUCTION") == "1":

frontend/src/data/staticData.ts

@@ -1,6 +1,6 @@
 import { Event } from "@/features/events/types/events";
 
-export const LAST_UPDATED = "2025-10-19T03:26:06.148036+00:00";
+export const LAST_UPDATED = "2025-10-19T03:31:39.115412+00:00";
 
 export const staticEventsData: Event[] = [
   {
@@ -53,25 +53,26 @@ export const RECOMMENDED_FILTERS: string[] = [
   "networking",
   "brunch",
   "dinner",
+  "WUSA",
   "social event",
   "student meetup",
-  "WUSA",
-  "professional development",
   "food event",
+  "professional development",
   "community gathering",
   "large event",
-  "meet new people",
-  "club activities",
+  "Brampton",
+  "Cambridge",
   "student organizations",
-  "cultural event",
-  "informal networking",
+  "meet new people",
   "career networking",
   "food and drinks",
-  "student engagement",
+  "event planning",
+  "student activities",
   "local events",
-  "peer connection",
-  "event series",
-  "interactive activities",
-  "fun activities",
-  "student life"
+  "club events",
+  "peer connections",
+  "informal gathering",
+  "student engagement",
+  "cultural exchange",
+  "team building"
 ];