organization button onmousedown opens clubs ig in new tab

Author: Tony Qiu

backend/apps/core/views.py

@@ -205,8 +205,10 @@ def login_email(request):
     # Check if user has confirmed their email
     if user.first_name and "|" in user.first_name:
         return Response(
-            {"error": "Please confirm your email before logging in. Check your inbox for a confirmation email."}, 
-            status=status.HTTP_401_UNAUTHORIZED
+            {
+                "error": "Please confirm your email before logging in. Check your inbox for a confirmation email."
+            },
+            status=status.HTTP_401_UNAUTHORIZED,
         )
 
     login(request, user)

backend/apps/events/views.py

@@ -1,9 +1,9 @@
 from django.conf import settings
 from django.db.models import Q
 from django.http import HttpResponse
+from django.shortcuts import get_object_or_404
 from django.utils import timezone
 from django.utils.html import escape
-from django.shortcuts import get_object_or_404
 from ratelimit.decorators import ratelimit
 from rest_framework import status
 from rest_framework.decorators import api_view, permission_classes
@@ -37,29 +37,29 @@ def get_events(request):
 
         if search_term:
             event_ids = set()
-            
+
             # Special handling for "free food" search
             if search_term.lower() == "free food":
                 keyword_events = filtered_queryset.filter(
                     Q(price__isnull=True) | Q(price=0) | Q(price__icontains="free"),
-                    Q(food__isnull=False) & ~Q(food="")
+                    Q(food__isnull=False) & ~Q(food=""),
                 )
             else:
                 keyword_events = filtered_queryset.filter(
-                    Q(title__icontains=search_term) |
-                    Q(location__icontains=search_term) |
-                    Q(description__icontains=search_term) |
-                    Q(food__icontains=search_term) |
-                    Q(club_type__icontains=search_term) |
-                    Q(school__icontains=search_term) |
-                    Q(ig_handle__icontains=search_term) |
-                    Q(discord_handle__icontains=search_term)  |
-                    Q(x_handle__icontains=search_term)|
-                    Q(tiktok_handle__icontains=search_term) |
-                    Q(fb_handle__icontains=search_term)
+                    Q(title__icontains=search_term)
+                    | Q(location__icontains=search_term)
+                    | Q(description__icontains=search_term)
+                    | Q(food__icontains=search_term)
+                    | Q(club_type__icontains=search_term)
+                    | Q(school__icontains=search_term)
+                    | Q(ig_handle__icontains=search_term)
+                    | Q(discord_handle__icontains=search_term)
+                    | Q(x_handle__icontains=search_term)
+                    | Q(tiktok_handle__icontains=search_term)
+                    | Q(fb_handle__icontains=search_term)
                 )
-            
-            event_ids.update(keyword_events.values_list('id', flat=True))
+
+            event_ids.update(keyword_events.values_list("id", flat=True))
 
             # search_embedding = generate_embedding(search_term)
             # dtstart = request.GET.get("dtstart")
@@ -115,7 +115,7 @@ def get_event(request, event_id):
     """Get a single event by ID"""
     try:
         event = get_object_or_404(Events, id=event_id)
-        
+
         fields = [
             "id",
             "title",
@@ -137,10 +137,10 @@ def get_event(request, event_id):
             "tiktok_handle",
             "fb_handle",
         ]
-        
+
         event_data = {field: getattr(event, field) for field in fields}
         event_data["display_handle"] = events_utils.determine_display_handle(event_data)
-        
+
         return Response(event_data)
 
     except Exception as e:

backend/apps/newsletter/models.py

@@ -1,6 +1,7 @@
 import uuid
 
 from django.db import models
+
 from utils.encryption_utils import email_encryption
 
 

backend/config/settings/base.py

@@ -191,7 +191,9 @@
 
 # Email confirmation settings
 BASE_URL = (
-    "https://api.wat2do.ca" if os.getenv("PRODUCTION") == "1" else "http://localhost:8000"
+    "https://api.wat2do.ca"
+    if os.getenv("PRODUCTION") == "1"
+    else "http://localhost:8000"
 )
 FRONTEND_URL = (
     "https://wat2do.ca" if os.getenv("PRODUCTION") == "1" else "http://localhost:5173"

backend/scraping/instagram_feed.py

@@ -25,7 +25,10 @@
 
 from apps.clubs.models import Clubs
 from apps.events.models import Events
-from services.openai_service import extract_events_from_caption, generate_event_embedding
+from services.openai_service import (
+    extract_events_from_caption,
+    generate_event_embedding,
+)
 from services.storage_service import upload_image_from_url
 from utils.embedding_utils import find_similar_events
 from utils.events_utils import tz_compute

backend/services/openai_service.py

@@ -438,4 +438,4 @@ def _get_default_event_structure(
 generate_embedding = openai_service.generate_embedding
 extract_events_from_caption = openai_service.extract_events_from_caption
 generate_recommended_filters = openai_service.generate_recommended_filters
-generate_event_embedding = openai_service.generate_event_embedding
+generate_event_embedding = openai_service.generate_event_embedding

backend/utils/events_utils.py

@@ -32,7 +32,7 @@ def _get(key):
     if social_handles:
         handle = social_handles[0]
         handle_str = str(handle)
-        return handle_str if handle_str.startswith("@") else f"@{handle_str}"
+        return handle_str
     school = _get("school")
     return school or "Wat2Do Event"
 

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

@@ -83,8 +83,17 @@ const OrganizationBadge = ({ event }: { event: Event }) => {
 
   return (
     <BadgeMask variant="bottom-left">
-      <Badge variant="outline" className="font-extrabold">
-        {event.display_handle}
+      <Badge
+        onMouseDown={() =>
+          window.open(
+            `https://www.instagram.com/${event.display_handle}/`,
+            "_blank"
+          )
+        }
+        variant="outline"
+        className="font-extrabold cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-800"
+      >
+        @{event.display_handle}
       </Badge>
     </BadgeMask>
   );

frontend/tsconfig.tsbuildinfo

@@ -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/eventsheader.tsx","./src/features/events/components/eventsstatusbar.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/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/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"}
+{"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/eventsheader.tsx","./src/features/events/components/eventsstatusbar.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/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"}