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

Author: ericahan22

backend/apps/events/migrations/0015_events_other_handle_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.7 on 2025-10-29 21:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0014_alter_eventsubmission_submitted_by"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="events",
+            name="other_handle",
+            field=models.CharField(
+                blank=True,
+                help_text="Other social media handle",
+                max_length=100,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="eventsubmission",
+            name="created_event",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="submission",
+                to="events.events",
+            ),
+        ),
+    ]

backend/apps/events/models.py

@@ -124,6 +124,9 @@ class Events(models.Model):
     fb_handle = models.CharField(
         max_length=100, blank=True, null=True, help_text="'uwcareercenter'"
     )
+    other_handle = models.CharField(
+        max_length=100, blank=True, null=True, help_text="Other social media handle"
+    )
 
     class Meta:
         db_table = "events"

backend/apps/events/views.py

@@ -30,7 +30,7 @@ def get_events(request):
     try:
         search_term = request.GET.get("search", "").strip()
 
-        queryset = Events.objects.all().order_by("dtstart")
+        queryset = Events.objects.filter(status__iexact="CONFIRMED").order_by("dtstart")
         filterset = EventFilter(request.GET, queryset=queryset)
         if not filterset.is_valid():
             return Response(
@@ -50,27 +50,19 @@ def get_events(request):
             # Build OR query: match any of the search terms in any field
             or_queries = Q()
             for term in search_terms:
-                # Special handling for "free food" search
-                if term.lower() == "free food":
-                    term_query = Q(
-                        (Q(price__isnull=True) | Q(price=0) | Q(price__icontains="free"))
-                        & Q(food__isnull=False)
-                        & ~Q(food="")
-                    )
-                else:
-                    term_query = (
-                        Q(title__icontains=term)
-                        | Q(location__icontains=term)
-                        | Q(description__icontains=term)
-                        | Q(food__icontains=term)
-                        | Q(club_type__icontains=term)
-                        | Q(school__icontains=term)
-                        | Q(ig_handle__icontains=term)
-                        | Q(discord_handle__icontains=term)
-                        | Q(x_handle__icontains=term)
-                        | Q(tiktok_handle__icontains=term)
-                        | Q(fb_handle__icontains=term)
-                    )
+                term_query = (
+                    Q(title__icontains=term)
+                    | Q(location__icontains=term)
+                    | Q(description__icontains=term)
+                    | Q(food__icontains=term)
+                    | Q(club_type__icontains=term)
+                    | Q(school__icontains=term)
+                    | Q(ig_handle__icontains=term)
+                    | Q(discord_handle__icontains=term)
+                    | Q(x_handle__icontains=term)
+                    | Q(tiktok_handle__icontains=term)
+                    | Q(fb_handle__icontains=term)
+                )
                 or_queries |= term_query
 
             keyword_events = filtered_queryset.filter(or_queries)
@@ -111,6 +103,7 @@ def get_events(request):
             "x_handle",
             "tiktok_handle",
             "fb_handle",
+            "other_handle",
         ]
         results = list(filtered_queryset.values(*fields))
 
@@ -449,13 +442,14 @@ def rss_feed(request):
 
 
 @api_view(["POST"])
-@permission_classes([AllowAny])
+@permission_classes([ClerkAuthenticated])
 @ratelimit(key="ip", rate="5/hr", block=True)
 def submit_event(request):
     """Submit event for review - accepts screenshot file and source URL, runs extraction, creates Event and links submission"""
     try:
         screenshot = request.FILES.get("screenshot")
         source_url = request.data.get("source_url")
+        other_handle = request.data.get("other_handle")
 
         if not screenshot or not source_url:
             return Response(
@@ -483,8 +477,12 @@ def submit_event(request):
         if isinstance(event_data, dict):
             event_data["source_url"] = source_url
             event_data["source_image_url"] = event_data.get("source_image_url") or screenshot_url
+            if other_handle:
+                event_data["other_handle"] = other_handle
         else:
             event_data = {"source_url": source_url, "source_image_url": screenshot_url}
+            if other_handle:
+                event_data["other_handle"] = other_handle
 
         # Create Event immediately and link submission
         allowed_fields = {f.name for f in Events._meta.get_fields()}
@@ -502,6 +500,9 @@ def submit_event(request):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        # Create event with pending status by default
+        if "status" not in cleaned or not cleaned.get("status"):
+            cleaned["status"] = "PENDING"
         event = Events.objects.create(**cleaned)
 
         # Attempt to capture submitting user if available (optional for anonymous)

frontend/public/rss.xml

@@ -5,7 +5,7 @@
     <link>https://wat2do.ca</link>
     <atom:link href="https://wat2do.ca/rss.xml" rel="self" type="application/rss+xml" />
     <description>Upcoming events at the University of Waterloo</description>
-    <lastBuildDate>Wed, 29 Oct 2025 22:08:56 GMT</lastBuildDate>
+    <lastBuildDate>Wed, 29 Oct 2025 22:29:48 GMT</lastBuildDate>
     <ttl>10</ttl>
   <item>
     <title>Future City Hackathon</title>

frontend/src/app/App.tsx

@@ -29,7 +29,14 @@ function App() {
           <Route path="/" element={<EventsPage />} />
           <Route path="/events" element={<EventsPage />} />
           <Route path="/events/:eventId" element={<EventDetailPage />} />
-          <Route path="/submit" element={<SubmitEventPage />} />
+          <Route
+            path="/submit"
+            element={
+              <ProtectedRoute>
+                <SubmitEventPage />
+              </ProtectedRoute>
+            }
+          />
           <Route path="/clubs" element={<ClubsPage />} />
           <Route path="/about" element={<AboutPage />} />
           <Route path="/contact" element={<ContactPage />} />

frontend/src/data/staticData.ts

@@ -1,19 +1,19 @@
-export const LAST_UPDATED = "2025-10-29T22:08:56.280095+00:00";
+export const LAST_UPDATED = "2025-10-29T22:29:48.066807+00:00";
 
 export const RECOMMENDED_FILTERS: [string, string, string][] = [
   ["Food%20and%20Drink", "Pizza", "Pizza"],
   ["Food%20and%20Drink", "Cookie", "Cookies"],
+  ["Food%20and%20Drink", "Beverage%20Box", "free food"],
   ["Smileys", "Ghost", "Halloween"],
+  ["Activity", "Ticket", "event"],
+  ["People", "Family%20Man%20Woman%20Girl%20Boy", "family"],
+  ["Food%20and%20Drink", "Doughnut", "treats"],
   ["Smileys", "Smiling%20Face%20With%20Hearts", "wellness"],
-  ["Activity", "Ticket", "workshop"],
-  ["Activity", "Basketball", "basketball"],
-  ["People", "Clapping%20Hands", "networking"],
-  ["Food%20and%20Drink", "Beverage%20Box", "drinks"],
-  ["Food%20and%20Drink", "Cupcake", "baked treats"],
-  ["Smileys", "Smiling%20Face%20With%20Halo", "community"],
-  ["Smileys", "Face%20With%20Tears%20Of%20Joy", "fun"],
-  ["Activity", "Sparkler", "festivities"],
   ["Activity", "Confetti%20Ball", "celebration"],
-  ["Activity", "Fireworks", "event"],
-  ["Objects", "Microphone", "open mic"]
+  ["Smileys", "Grinning%20Face", "games"],
+  ["Smileys", "Hugging%20Face", "community"],
+  ["Activity", "Trophy", "competition"],
+  ["Smileys", "Beaming%20Face%20With%20Smiling%20Eyes", "fun"],
+  ["Food%20and%20Drink", "Chocolate%20Bar", "snacks"],
+  ["Smileys", "Winking%20Face", "social"]
 ];

frontend/src/features/clubs/pages/ClubsPage.tsx

@@ -1,4 +1,5 @@
 import { useMemo, useRef } from "react";
+import NumberFlow from "@number-flow/react";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, useDocumentTitle, useCategoryParam, SEOHead } from "@/shared";
 import { useClubs, ClubsGrid } from "@/features/clubs";
 import SearchInput from "@/features/search/components/SearchInput";
@@ -44,14 +45,11 @@ function ClubsPage() {
           'campus groups'
         ]}
       />
-      {/* Header */}
       <div className="sm:text-left">
-        <h1 className="text-3xl font-bold text-gray-900 dark:text-white mb-2">
-          Clubs
+        <h1 className="sm:text-3xl text-2xl font-bold mb-2">
+          <NumberFlow value={data.length} suffix={" clubs"} />
         </h1>
-        <p className="text-gray-600 dark:text-gray-400">
-          Explore student clubs and organizations
-        </p>
+        <p className="text-gray-600 dark:text-gray-400">Explore student clubs and organizations</p>
       </div>
 
       {/* Filters */}

frontend/src/features/events/hooks/useUserSubmissions.ts

@@ -13,8 +13,8 @@ export const useUserSubmissions = () => {
     queryKey: ['user-submissions', userId],
     queryFn: () => events.getUserSubmissions(),
     enabled: isSignedIn && !!userId,
-    staleTime: 30 * 1000, // 30 seconds - submissions don't change often
-    gcTime: 5 * 60 * 1000, // 5 minutes
+    staleTime: 30 * 1000,  
+    gcTime: 5 * 60 * 1000,  
   });
 
   // Delete a submission owned by the current user

frontend/src/features/events/pages/MySubmissionsPage.tsx

@@ -19,6 +19,7 @@ import {
 import { formatPrettyDate } from "@/shared/lib/dateUtils";
 import type { EventSubmission } from "@/features/events/types/submission";
 import { useNavigate } from "react-router-dom";
+import { useClerk } from "@clerk/clerk-react";
 
 export function MySubmissionsPage() {
   const {
@@ -28,6 +29,7 @@ export function MySubmissionsPage() {
     isDeleting,
   } = useUserSubmissions();
   const navigate = useNavigate();
+  const { signOut } = useClerk();
   // Type assertion to fix TypeScript issues
   const submissionsArray = submissions as EventSubmission[];
 
@@ -76,13 +78,16 @@ export function MySubmissionsPage() {
     <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12 px-4 sm:px-6 lg:px-8">
       <div className="max-w-6xl mx-auto">
         {/* Header */}
-        <div className="mb-8">
-          <h1 className="text-3xl font-bold text-gray-900 dark:text-gray-100">
-            My Event Submissions
-          </h1>
-          <p className="text-gray-600 dark:text-gray-400 mt-2">
-            Track the status of your submitted events
-          </p>
+        <div className="mb-8 flex items-start justify-between gap-4">
+          <div>
+            <h1 className="text-3xl font-bold text-gray-900 dark:text-gray-100">
+              My Event Submissions
+            </h1>
+            <p className="text-gray-600 dark:text-gray-400 mt-2">
+              Track the status of your submitted events
+            </p>
+          </div>
+          <Button variant="outline" onMouseDown={() => signOut()}>Logout</Button>
         </div>
 
         {/* Submissions Grid */}

frontend/src/features/events/pages/SubmitEventPage.tsx

@@ -114,7 +114,7 @@ export function SubmitEventPage() {
                 <div className="space-y-3">
                   <Label className="text-base font-medium flex items-center gap-2">
                     <ImageIcon className="h-4 w-4" />
-                    Event Screenshot
+                    Event Screenshot*
                   </Label>
                   <DragDropFileUpload
                     onFileSelect={handleFileSelect}
@@ -127,11 +127,10 @@ export function SubmitEventPage() {
                   />
                 </div>
 
-                {/* Source URL */}
                 <div className="space-y-3">
                   <Label htmlFor="source_url" className="text-base font-medium flex items-center gap-2">
                     <Link className="h-4 w-4" />
-                    Event Source URL
+                    Event Source URL*
                   </Label>
                   <Input
                     id="source_url"
@@ -149,6 +148,24 @@ export function SubmitEventPage() {
                   </p>
                 </div>
 
+                {/* Organizer link / other handle (optional) */}
+                <div className="space-y-3">
+                <Label htmlFor="source_url" className="text-base font-medium flex items-center gap-2">
+                    Where can people find more events from you?
+                  </Label>
+                  <Input
+                    id="other_handle"
+                    type="url"
+                    placeholder="https://instagram.com/yourclub or https://discord.gg/yourinvite"
+                    className="h-12 text-base"
+                    {...register('other_handle')}
+                    disabled={isLoading}
+                  />
+                  {errors.other_handle && (
+                    <p className="text-sm text-red-500 mt-1">{errors.other_handle.message as string}</p>
+                  )}
+                </div>
+
                 {/* Submit Button */}
                 <Button 
                   type="submit"