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

Author: ericahan22

backend/apps/events/views.py

@@ -51,9 +51,12 @@ def get_events(request):
         if not dtstart_utc_param:
             now = timezone.now()
             ninety_minutes_ago = now - timedelta(minutes=90)
-            # Filter events that have at least one upcoming date
+            # Filter events that are either:
+            # 1. Have no end time and started within last 90 minutes
+            # 2. Have end time and are currently happening (between start and end)
             events_queryset = events_queryset.filter(
-                event_dates__dtstart_utc__gte=ninety_minutes_ago
+                Q(event_dates__dtend_utc__isnull=True, event_dates__dtstart_utc__gte=ninety_minutes_ago)
+                | Q(event_dates__dtend_utc__isnull=False, event_dates__dtstart_utc__lte=now, event_dates__dtend_utc__gte=now)
             ).distinct()
 
         filterset = EventFilter(request.GET, queryset=events_queryset)
@@ -148,9 +151,13 @@ def get_events(request):
         for event in events_list:
             # Get all event dates and filter for upcoming ones
             all_dates = list(event.event_dates.all())
-            # Filter to only upcoming dates (>= ninety_minutes_ago to match the filter logic)
+            # Filter to only upcoming/live dates matching the query logic:
+            # 1. No end time and started within last 90 minutes
+            # 2. Has end time and currently happening (between start and end)
             upcoming_dates = [
-                date for date in all_dates if date.dtstart_utc >= ninety_minutes_ago
+                date for date in all_dates
+                if (date.dtend_utc is None and date.dtstart_utc >= ninety_minutes_ago)
+                or (date.dtend_utc is not None and date.dtstart_utc <= now and date.dtend_utc >= now)
             ]
             # Select the most recent upcoming date (first one since they're ordered by dtstart_utc)
             # If no upcoming dates, fall back to the earliest date overall

backend/scraping/generate_static_data.py

@@ -109,6 +109,26 @@ def main():
             current_time = datetime.now(timezone.utc).isoformat()
             f.write(f'export const LAST_UPDATED = "{current_time}";\n\n')
 
+            # Write event emoji categories
+            f.write("export const EVENT_EMOJIS_CATEGORIES: [string, string, string][] = [\n")
+            emoji_categories = [
+                ["Objects", "Graduation%20Cap", "Academic"],
+                ["Objects", "Briefcase", "Career & Networking"],
+                ["Activity", "Video%20Game", "Social & Games"],
+                ["Activity", "Soccer%20Ball", "Athletics"],
+                ["Activity", "Artist%20Palette", "Creative Arts"],
+                ["Travel%20and%20Places", "Classical%20Building", "Cultural"],
+                ["Animals%20and%20Nature", "Dove", "Religious"],
+                ["Objects", "Megaphone", "Advocacy & Causes"],
+                ["Objects", "Chart%20Increasing", "Sales & Fundraising"]
+            ]
+            for i, (group, emoji, category) in enumerate(emoji_categories):
+                f.write(f'  ["{group}", "{emoji}", "{category}"]')
+                if i < len(emoji_categories) - 1:
+                    f.write(",")
+                f.write("\n")
+            f.write("];\n\n")
+
             # Write event categories
             f.write("export const EVENT_CATEGORIES = [\n")
             categories = [

frontend/package-lock.json

@@ -13,6 +13,10 @@
   "dependencies": {
     "@clerk/clerk-react": "^5.53.3",
     "@clerk/themes": "^2.4.30",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.38.7",
     "@hookform/resolvers": "^5.2.2",
     "@number-flow/react": "^0.5.10",
     "@radix-ui/react-checkbox": "^1.3.3",
@@ -30,6 +34,7 @@
     "axios": "^1.7.7",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "codemirror": "^6.0.2",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
     "framer-motion": "^12.23.24",

frontend/package.json

@@ -1,5 +1,17 @@
 export const LAST_UPDATED = "2025-11-15T16:57:42.276863+00:00";
 
+export const EVENT_EMOJIS_CATEGORIES: [string, string, string][] = [
+  ["Objects", "Graduation%20Cap", "Academic"],
+  ["Objects", "Briefcase", "Career & Networking"],
+  ["Activity", "Video%20Game", "Social & Games"],
+  ["Activity", "Soccer%20Ball", "Athletics"],
+  ["Activity", "Artist%20Palette", "Creative Arts"],
+  ["Travel%20and%20Places", "Classical%20Building", "Cultural"],
+  ["Animals%20and%20Nature", "Dove", "Religious"],
+  ["Objects", "Megaphone", "Advocacy & Causes"],
+  ["Objects", "Chart%20Increasing", "Sales & Fundraising"]
+];
+
 export const EVENT_CATEGORIES = [
   "Academic",
   "Career & Networking",
@@ -10,4 +22,4 @@ export const EVENT_CATEGORIES = [
   "Religious",
   "Advocacy & Causes",
   "Sales & Fundraising"
-];
+];

frontend/src/data/staticData.ts

@@ -15,6 +15,7 @@ import {
   FloatingEventExportBar,
   formatRelativeDateTime,
   FilterButton,
+  // JSONEditor,
 } from "@/shared";
 import { Calendar, LayoutGrid, Sparkles, Heart, Clock } from "lucide-react";
 import SearchInput from "@/features/search/components/SearchInput";
@@ -103,6 +104,7 @@ function EventsPage() {
           "campus activities",
         ]}
       />
+      {/* <JSONEditor /> */}
       <div className="flex flex-col gap-4">
         <div className="sm:text-left">
           <h1 className="sm:text-3xl text-2xl font-bold mb-2 -mt-3 sm:mt-0">