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

Author: Tony Qiu

backend/apps/events/migrations/0011_alter_events_dtstamp.py

@@ -1,11 +1,10 @@
 # Generated by Django 4.2.7 on 2025-10-25 17:26
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0010_events_events_dtstart_89a1ed_idx"),
     ]

backend/apps/events/views.py

@@ -346,7 +346,9 @@ def get_google_calendar_urls(request):
             # Format dates for Google Calendar (YYYYMMDDTHHMMSSZ for UTC)
             start_date = event.dtstart_utc.strftime("%Y%m%d")
             start_time = event.dtstart_utc.strftime("%H%M%S")
-            end_time = event.dtend_utc.strftime("%H%M%S") if event.dtend_utc else start_time
+            end_time = (
+                event.dtend_utc.strftime("%H%M%S") if event.dtend_utc else start_time
+            )
 
             start_datetime = f"{start_date}T{start_time}Z"
             end_datetime = f"{start_date}T{end_time}Z"

backend/scraping/generate_static_data.py

@@ -156,9 +156,7 @@ def main():
                     "export const RECOMMENDED_FILTERS: [string, string, string][] = [];\n"
                 )
 
-        logger.info(
-            "Successfully updated staticData.ts with recommended filters"
-        )
+        logger.info("Successfully updated staticData.ts with recommended filters")
 
         # --- Static RSS file ---
         try:

backend/scraping/instagram_feed.py

@@ -240,7 +240,7 @@ def insert_event_to_db(event_data, ig_handle, source_url):
         "ig_handle": ig_handle,
         "title": title,
         "source_url": source_url,
-        "dtstamp": timezone.now(),  
+        "dtstamp": timezone.now(),
         "dtstart": dtstart,
         "dtstart_utc": dtstart_utc,
         "dtend": dtend or None,

backend/scripts/generate_recommended_filters.py

@@ -10,7 +10,6 @@
 
 import logging
 import os
-import re
 import sys
 from datetime import date
 from pathlib import Path
@@ -51,7 +50,7 @@ def fetch_upcoming_events():
 def update_static_data_file(recommended_filters):
     """Update the staticData.ts file with new recommended filters"""
     from datetime import datetime, timezone
-    
+
     # Find the frontend staticData.ts file
     frontend_dir = Path(__file__).resolve().parent.parent.parent / "frontend"
     static_data_path = frontend_dir / "src" / "data" / "staticData.ts"

backend/services/openai_service.py

@@ -78,14 +78,18 @@ def generate_event_embedding(self, event) -> list[float]:
         return self.generate_embedding(enhanced_text)
 
     def extract_events_from_caption(
-        self, caption_text: str, source_image_url: str | None = None, post_created_at: datetime | None = None, school: str = "University of Waterloo"
+        self,
+        caption_text: str,
+        source_image_url: str | None = None,
+        post_created_at: datetime | None = None,
+        school: str = "University of Waterloo",
     ) -> list[dict[str, str | bool | float | None]]:
         """Extract event information from Instagram caption text and optional image"""
         # Get current date and day of week for context
         now = datetime.now()
         current_date = now.strftime("%Y-%m-%d")
         current_day_of_week = now.strftime("%A")
-        
+
         # Use post creation time if provided, otherwise use current time
         context_datetime = post_created_at if post_created_at else now
         context_date = context_datetime.strftime("%Y-%m-%d")

frontend/public/rss.xml

@@ -3,17 +3,17 @@ export const LAST_UPDATED = "2025-10-24T20:43:36.891387+00:00";
 export const RECOMMENDED_FILTERS: [string, string, string][] = [
   ["Food%20and%20Drink", "Pizza", "free food"],
   ["Food%20and%20Drink", "Pizza", "Pizza"],
-  ["Food%20and%20Drink", "Cookie", "Cookies"],
-  ["Food%20and%20Drink", "Hot%20Dog", "Hot dogs"],
-  ["Food%20and%20Drink", "Bubble%20Tea", "Bubble tea"],
-  ["Food%20and%20Drink", "Dango", "Dumplings"],
-  ["Activity", "Jack%20O%20Lantern", "Pumpkin Carving"],
-  ["Activity", "Fireworks", "Bonfire"],
-  ["Activity", "Magic%20Wand", "Halloween"],
-  ["Activity", "Confetti%20Ball", "Costume Contest"],
-  ["Activity", "Soccer%20Ball", "Sports"],
+  ["Food%20and%20Drink", "Cookie", "cookies"],
+  ["Food%20and%20Drink", "Bubble%20Tea", "bubble tea"],
+  ["Food%20and%20Drink", "Hot%20Dog", "hot dogs"],
+  ["Food%20and%20Drink", "Doughnut", "donuts"],
+  ["Food%20and%20Drink", "Chocolate%20Bar", "chocolate"],
+  ["Food%20and%20Drink", "Cupcake", "snacks"],
+  ["Food%20and%20Drink", "Beverage%20Box", "drinks"],
+  ["Activity", "Jack%20O%20Lantern", "pumpkin carving"],
+  ["Activity", "Fireworks", "bonfire"],
+  ["Activity", "Party%20Popper", "party"],
+  ["Activity", "Video%20Game", "games night"],
   ["Smileys", "Ghost", "Halloween"],
-  ["People", "Clapping%20Hands", "Open Mic"],
-  ["Smileys", "Smiling%20Face", "Wellness"],
-  ["Smileys", "Smiling%20Face%20With%20Hearts", "Community"]
+  ["Smileys", "Grinning%20Face", "murder mystery"]
 ];

frontend/src/data/staticData.ts

@@ -1 +1 @@
-{"root":["./src/vite-env.d.ts","./src/app/app.tsx","./src/app/main.tsx","./src/data/staticdata.ts","./src/features/admin/index.ts","./src/features/admin/components/adminlogin.tsx","./src/features/admin/components/promoteeventform.tsx","./src/features/admin/hooks/useeventpromotion.ts","./src/features/admin/pages/adminpage.tsx","./src/features/admin/types/promotion.ts","./src/features/auth/index.ts","./src/features/auth/components/emailverification.tsx","./src/features/auth/pages/authpage.tsx","./src/features/auth/pages/dashboardpage.tsx","./src/features/auth/pages/verifyemailpage.tsx","./src/features/auth/schemas/authschemas.ts","./src/features/clubs/index.ts","./src/features/clubs/components/clubsgrid.tsx","./src/features/clubs/hooks/useclubs.ts","./src/features/clubs/pages/clubspage.tsx","./src/features/clubs/types/clubs.ts","./src/features/events/index.ts","./src/features/events/components/eventlegend.tsx","./src/features/events/components/eventscalendar.tsx","./src/features/events/components/eventscontent.tsx","./src/features/events/components/eventsgrid.tsx","./src/features/events/components/quickfilters.tsx","./src/features/events/constants/events.ts","./src/features/events/hooks/useeventselection.ts","./src/features/events/hooks/useevents.ts","./src/features/events/hooks/usequickfilters.ts","./src/features/events/pages/eventdetailpage.tsx","./src/features/events/pages/eventspage.tsx","./src/features/events/types/events.ts","./src/features/newsletter/index.ts","./src/features/newsletter/components/unsubscribeform.tsx","./src/features/newsletter/hooks/usenewslettersubscribe.ts","./src/features/newsletter/hooks/useunsubscribe.ts","./src/features/newsletter/pages/unsubscribepage.tsx","./src/features/newsletter/types/newsletter.ts","./src/features/search/index.ts","./src/features/search/components/searchinput.tsx","./src/features/search/hooks/usesearchstate.ts","./src/features/search/types/search.ts","./src/shared/index.ts","./src/shared/api/auth.ts","./src/shared/components/protectedroute.tsx","./src/shared/components/seohead.tsx","./src/shared/components/common/floatingeventexportbar.tsx","./src/shared/components/layout/aboutpage.tsx","./src/shared/components/layout/contactpage.tsx","./src/shared/components/layout/footer.tsx","./src/shared/components/layout/githublink.tsx","./src/shared/components/layout/navbar.tsx","./src/shared/components/layout/notfoundpage.tsx","./src/shared/components/layout/topbanner.tsx","./src/shared/components/ui/badge-mask.tsx","./src/shared/components/ui/badge.tsx","./src/shared/components/ui/button-variants.ts","./src/shared/components/ui/button.tsx","./src/shared/components/ui/card.tsx","./src/shared/components/ui/filter-button.tsx","./src/shared/components/ui/form.tsx","./src/shared/components/ui/icon-button.tsx","./src/shared/components/ui/index.ts","./src/shared/components/ui/input.tsx","./src/shared/components/ui/label.tsx","./src/shared/components/ui/loading.tsx","./src/shared/components/ui/pagination.tsx","./src/shared/components/ui/select.tsx","./src/shared/components/ui/tabs.tsx","./src/shared/components/ui/textarea.tsx","./src/shared/components/ui/tooltip.tsx","./src/shared/components/ui/useformfield.ts","./src/shared/constants/api.ts","./src/shared/hooks/index.ts","./src/shared/hooks/useauth.ts","./src/shared/hooks/useauthredirect.ts","./src/shared/hooks/usecategoryparam.ts","./src/shared/hooks/usedocumenttitle.ts","./src/shared/hooks/usenavbar.ts","./src/shared/hooks/usetheme.ts","./src/shared/lib/clubtypecolors.ts","./src/shared/lib/dateutils.ts","./src/shared/lib/emojiutils.ts","./src/shared/lib/eventutils.ts","./src/shared/lib/theme.tsx","./src/shared/lib/utils.ts","./src/shared/stores/authstore.ts","./src/shared/types/common.ts"],"errors":true,"version":"5.8.3"}
+{"root":["./src/vite-env.d.ts","./src/app/app.tsx","./src/app/main.tsx","./src/data/staticdata.ts","./src/features/admin/index.ts","./src/features/admin/components/adminlogin.tsx","./src/features/admin/components/promoteeventform.tsx","./src/features/admin/hooks/useeventpromotion.ts","./src/features/admin/pages/adminpage.tsx","./src/features/admin/types/promotion.ts","./src/features/auth/index.ts","./src/features/auth/components/emailverification.tsx","./src/features/auth/pages/authpage.tsx","./src/features/auth/pages/dashboardpage.tsx","./src/features/auth/pages/verifyemailpage.tsx","./src/features/auth/schemas/authschemas.ts","./src/features/clubs/index.ts","./src/features/clubs/components/clubsgrid.tsx","./src/features/clubs/hooks/useclubs.ts","./src/features/clubs/pages/clubspage.tsx","./src/features/clubs/types/clubs.ts","./src/features/events/index.ts","./src/features/events/components/eventlegend.tsx","./src/features/events/components/eventscalendar.tsx","./src/features/events/components/eventscontent.tsx","./src/features/events/components/eventsgrid.tsx","./src/features/events/components/quickfilters.tsx","./src/features/events/constants/events.ts","./src/features/events/hooks/useeventselection.ts","./src/features/events/hooks/useevents.ts","./src/features/events/hooks/usequickfilters.ts","./src/features/events/pages/eventdetailpage.tsx","./src/features/events/pages/eventspage.tsx","./src/features/events/types/events.ts","./src/features/newsletter/index.ts","./src/features/newsletter/components/unsubscribeform.tsx","./src/features/newsletter/hooks/usenewslettersubscribe.ts","./src/features/newsletter/hooks/useunsubscribe.ts","./src/features/newsletter/pages/unsubscribepage.tsx","./src/features/newsletter/types/newsletter.ts","./src/features/search/index.ts","./src/features/search/components/searchinput.tsx","./src/features/search/hooks/usesearchstate.ts","./src/features/search/types/search.ts","./src/shared/index.ts","./src/shared/api/auth.ts","./src/shared/components/protectedroute.tsx","./src/shared/components/seohead.tsx","./src/shared/components/common/floatingeventexportbar.tsx","./src/shared/components/layout/aboutpage.tsx","./src/shared/components/layout/contactpage.tsx","./src/shared/components/layout/footer.tsx","./src/shared/components/layout/githublink.tsx","./src/shared/components/layout/navbar.tsx","./src/shared/components/layout/notfoundpage.tsx","./src/shared/components/layout/topbanner.tsx","./src/shared/components/ui/badge-mask.tsx","./src/shared/components/ui/badge.tsx","./src/shared/components/ui/button-variants.ts","./src/shared/components/ui/button.tsx","./src/shared/components/ui/card.tsx","./src/shared/components/ui/filter-button.tsx","./src/shared/components/ui/form.tsx","./src/shared/components/ui/icon-button.tsx","./src/shared/components/ui/index.ts","./src/shared/components/ui/input.tsx","./src/shared/components/ui/label.tsx","./src/shared/components/ui/loading.tsx","./src/shared/components/ui/pagination.tsx","./src/shared/components/ui/select.tsx","./src/shared/components/ui/tabs.tsx","./src/shared/components/ui/textarea.tsx","./src/shared/components/ui/tooltip.tsx","./src/shared/components/ui/useformfield.ts","./src/shared/constants/api.ts","./src/shared/hooks/index.ts","./src/shared/hooks/useauth.ts","./src/shared/hooks/useauthredirect.ts","./src/shared/hooks/usecategoryparam.ts","./src/shared/hooks/usedocumenttitle.ts","./src/shared/hooks/usenavbar.ts","./src/shared/hooks/usetheme.ts","./src/shared/lib/clubtypecolors.ts","./src/shared/lib/dateutils.ts","./src/shared/lib/emojiutils.ts","./src/shared/lib/eventutils.ts","./src/shared/lib/theme.tsx","./src/shared/lib/utils.ts","./src/shared/stores/authstore.ts","./src/shared/types/common.ts"],"version":"5.8.3"}