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

Author: ericahan22

.github/workflows/update-events-data.yml

@@ -124,7 +124,7 @@ jobs:
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add frontend/src/data/staticData.ts
+          git add frontend/src/data/staticData.ts frontend/public/rss.xml
           git commit -m "chore: update static data from DB" || echo "No changes to commit"
           git pull --rebase && git push
 

README.md

@@ -25,39 +25,15 @@ Waterloo, scraped directly from Instagram.
 - **Club directory:** Explore all clubs with links to their website/Instagram
 - **Email newsletter:** Subscribe to get the latest events in your inbox, once daily
 
-**How It Works:**  
-Events are automatically collected from club Instagram posts, using the OpenAI API to extract details from captions and images. Data is refreshed daily.
-
-## 🛠️ Project Structure
-
-```
-.
-├── backend/
-│   ├── manage.py
-│   ├── requirements.txt
-│   ├── apps/               # Django apps (events, clubs, newsletter, etc.)
-│   ├── scraping/           # Instagram scraping scripts
-│   └── config/             # Settings and URLs
-├── frontend/
-│   ├── src/
-│   │   ├── app/
-│   │   │   └── App.tsx
-│   │   ├── features/
-│   │   └── shared/
-│   │       ├── components/
-│   │       └── hooks/
-│   ├── package.json
-│   └── public/
-```
-
 ### Environment Setup
 
 #### Database
 ```bash
 docker compose up --build
 ```
 
-#### Backend (expose PRODUCTION=1 in /backend/.env for supabase db, else defaults to local postgres db)
+#### Backend 
+# (expose PRODUCTION=1 in /backend/.env for supabase db, else defaults to local postgres db)
 ```bash
 cd backend
 python -m venv .venv

backend/apps/clubs/views.py

@@ -4,17 +4,17 @@
 
 import json
 from rest_framework import status
-from rest_framework.decorators import api_view, permission_classes, throttle_classes
+from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
-from rest_framework.throttling import AnonRateThrottle
+from ratelimit.decorators import ratelimit
 
 from .models import Clubs
 
 
 @api_view(["GET"])
 @permission_classes([AllowAny])
-@throttle_classes([AnonRateThrottle])
+@ratelimit(key='ip', rate='60/hr', block=True)
 def get_clubs(request):
     """Get all clubs from database (no pagination)"""
     try:

backend/apps/core/urls.py

@@ -8,8 +8,13 @@
 
 urlpatterns = [
     path("", views.home, name="home"),
-    path("auth/signup/", views.signup_view, name="signup"),
-    path("auth/login/", views.login_email_view, name="login"),
-    path("auth/me/", views.me_view, name="me"),
-    path("auth/logout/", views.logout_view, name="logout"),
+    path("auth/signup/", views.signup, name="signup"),
+    path("auth/login/", views.login_email, name="login"),
+    path("auth/me/", views.user_info, name="me"),
+    path("auth/logout/", views.logout, name="logout"),
+    path("auth/confirm/<str:token>/", views.confirm_email, name="confirm_email"),
+    path("auth/resend-confirmation/", views.resend_confirmation, name="resend_confirmation"),
+    path("auth/forgot-password/", views.forgot_password, name="forgot_password"),
+    path("auth/reset-password/<str:token>/", views.reset_password, name="reset_password"),
+    path("protected/", views.protected_view, name="protected"),
 ]