Skip to content

Commit e961caf

Browse files
ericahan22ericahan22
committed
Merge branch 'main' of https://github.com/ericahan22/Wat2Do 
2 parents bba16cb + 046bb29 commit e961caf

File tree

2 files changed

+109
-51
lines changed

2 files changed

+109
-51
lines changed

‎backend/config/settings/base.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@
6767
"django.middleware.clickjacking.XFrameOptionsMiddleware",
6868
]
6969

70-
SECURE_SSL_REDIRECT = True
71-
72-
# A list of regular expressions that URLs must match to be exempt from SSL redirection
73-
SECURE_REDIRECT_EXEMPT = [
74-
r'^health/?$', # This will match /health or /health/
75-
]
76-
7770
# CORS settings
7871
CORS_ALLOW_ALL_ORIGINS = True # For development only
7972
CORS_ALLOW_CREDENTIALS = True

‎frontend/src/data/staticData.ts‎

Lines changed: 109 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,143 @@
11
import { Event } from "@/features/events/types/events";
22

3-
export const LAST_UPDATED = "2025-10-19T03:31:39.115412+00:00";
3+
export const LAST_UPDATED = "2025-10-19T03:45:34.559297+00:00";
44

55
export const staticEventsData: Event[] = [
66
{
7-
id: 415,
8-
ig_handle: "kc_waterloo",
9-
source_url: "https://www.instagram.com/p/DPz6q9DEUys/",
10-
title: "Fall Retreat",
11-
dtstart: "2025-10-18T09:30:00+00:00",
12-
dtend: "2025-10-18T19:30:00+00:00",
13-
location: "Forward Church, Cambridge",
7+
id: 417,
8+
ig_handle: "uwmsa",
9+
source_url: "https://www.instagram.com/p/DPZgSg-kcyq/",
10+
title: "Taqwa Academy Qur'an Symposium",
11+
dtstart: "2025-10-19T09:00:00+00:00",
12+
dtend: "2025-10-19T21:00:00+00:00",
13+
location: "LH 3094 (Lazaridis Hall, WLU)",
1414
price: null,
15-
food: "Brunch, Dinner",
15+
food: null,
1616
registration: true,
17-
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/19145701-6959-4b3c-9c0d-ac0310fada68.jpg",
17+
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/c2fca6e4-e401-4d8f-b993-decda6dc9d64.jpg",
1818
club_type: "WUSA",
19-
added_at: "2025-10-17T16:54:55.941038+00:00",
20-
description: "WW FAMILY WE ARE SO BACK 🎉🙌 The countdown is on… 2 days till our retreat! 🏕️ If you’ve got any questions (or last-minute FOMO 👀), your Servant Team’s got you covered!! We’re here to serve YOU and our beautiful campus’, just DM us 💛 Retreat Details: 📧 Check your inbox! An important email was sent to the address you indicated in registration. 📍 Make sure your GPS says Forward Church CAMBRIDGE- NOT the Kitchener site 😆 We’re so hyped for this retreat and can’t wait to see you all there!! Lots of luv- your STs 💕",
19+
added_at: "2025-10-05T11:27:04.102068+00:00",
20+
description: "Full-day Qur’anic Tafseer symposium with research papers and panels.",
2121
school: null,
2222
discord_handle: null,
2323
x_handle: null,
2424
tiktok_handle: null,
2525
fb_handle: null,
26-
display_handle: "@kc_waterloo",
26+
display_handle: "@uwmsa",
2727
},
2828
{
29-
id: 416,
30-
ig_handle: "waterloolaurierssa",
31-
source_url: "https://www.instagram.com/p/DPgyTBEiFkj/",
32-
title: "WSO X OSSA Roundtable",
33-
dtstart: "2025-10-18T13:00:00+00:00",
34-
dtend: "2025-10-18T16:00:00+00:00",
35-
location: "Brampton, ON",
29+
id: 418,
30+
ig_handle: "wloowomensfootball",
31+
source_url: "https://www.instagram.com/p/DP2FUbvkUwr/",
32+
title: "Qualifier Tournament",
33+
dtstart: "2025-10-19T09:30:00+00:00",
34+
dtend: "2025-10-19T16:30:00+00:00",
35+
location: "Sheridan College, Oakville, ON",
3636
price: null,
3737
food: null,
38+
registration: false,
39+
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/0c536960-b618-4ce6-8de8-f3cd7af70d47.jpg",
40+
club_type: "Athletics",
41+
added_at: "2025-10-16T21:14:41+00:00",
42+
description: "Mark your calendars Warriors—we’re back this weekend for our second qualifier tournament! Come support the Waterloo Women’s Football team in Oakville! 🏈💛🖤\n\n🗓️ Sunday, October 19th\n📍 Sheridan College - Oakville, ON\n\n#WomensFootball #GoBlackGoGold #GoWarriorsGo",
43+
school: null,
44+
discord_handle: null,
45+
x_handle: null,
46+
tiktok_handle: null,
47+
fb_handle: null,
48+
display_handle: "@wloowomensfootball",
49+
},
50+
{
51+
id: 419,
52+
ig_handle: "uwpmclub",
53+
source_url: "https://www.instagram.com/p/DPppMnBDmx_/",
54+
title: "MATH 147 Midterm Review",
55+
dtstart: "2025-10-19T12:00:00+00:00",
56+
dtend: "2025-10-19T16:00:00+00:00",
57+
location: "MC 2034/2035",
58+
price: null,
59+
food: null,
60+
registration: false,
61+
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/0c4f3791-eeb5-415e-8951-3a1ae1517db2.jpg",
62+
club_type: "Student Society",
63+
added_at: "2025-10-11T15:01:34.126565+00:00",
64+
description: "Join us for our MATH 147 Midterm Review session!\nSunday, October 19th, 12:00 PM - 4:00 PM\nMC 2034 and MC 2035",
65+
school: null,
66+
discord_handle: null,
67+
x_handle: null,
68+
tiktok_handle: null,
69+
fb_handle: null,
70+
display_handle: "@uwpmclub",
71+
},
72+
{
73+
id: 420,
74+
ig_handle: "neurodivers_uw",
75+
source_url: "https://www.instagram.com/p/DP1K4PqkXTQ/",
76+
title: "Study Night",
77+
dtstart: "2025-10-19T16:00:00+00:00",
78+
dtend: "2025-10-19T18:00:00+00:00",
79+
location: "B2 350",
80+
price: null,
81+
food: "Pizza",
3882
registration: true,
39-
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/c5b81251-da36-4f44-991b-a8e29d6482d1.jpg",
83+
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/16fbcdb2-124d-4bd0-8fc1-b685aa728eb3.jpg",
4084
club_type: "WUSA",
41-
added_at: "2025-10-17T16:54:56.011290+00:00",
42-
description: "Calling all Sikh Students in Ontario!\n\nWe’re excited to host our third WSO roundtable in collaboration with OSSA, and we want to hear from YOU! This is your chance to connect with WSO and fellow Sikh students from across Ontario to chat about issues that matter, from human rights to community advocacy. Also use this opportunity to apply for our WSO grant, available for all SSAs!\n\nCome share your thoughts, make new connections, and be part of the conversation. Email parmindersingh@worldsikh.org to register!",
85+
added_at: "2025-10-15T17:32:31.363610+00:00",
86+
description: "#uwaterloo #uwaterloolife #uw #uwlife #inclusivecommunity #empowermentforall #wusa2025 #neurodivergent #neurodivers #neurodiversity #mentalhealth #studymotivation #studying\nPanicking about midterms? Recovering from an over-energetic reading week? Join us for a group study session and some pizza!\nIf you want pizza, please fill out this form (also linked in bio) so we know what to order.\nThis form is completely anonymous. No personal information is collected.",
4387
school: null,
4488
discord_handle: null,
4589
x_handle: null,
4690
tiktok_handle: null,
4791
fb_handle: null,
48-
display_handle: "@waterloolaurierssa",
92+
display_handle: "@neurodivers_uw",
93+
},
94+
{
95+
id: 421,
96+
ig_handle: "uw.bmlt",
97+
source_url: "https://www.instagram.com/p/DPuaPWIgS1Y/",
98+
title: "CASPer Crash Course",
99+
dtstart: "2025-10-19T16:00:00+00:00",
100+
dtend: "2025-10-19T16:45:00+00:00",
101+
location: "TBD",
102+
price: null,
103+
food: "Snacks, drinks",
104+
registration: true,
105+
source_image_url: "https://bug-free-octo-spork.s3.us-east-2.amazonaws.com/events/9e6ac031-8c38-440a-9a3a-1e6a37e22aa4.jpg",
106+
club_type: "WUSA",
107+
added_at: "2025-10-13T04:30:57.862150+00:00",
108+
description: "Curious about the CASPer test? 🤔 Join our CASPer Crash Course Q&A hosted by Munira, a Waterloo PharmD student! 🩺\n\n📅 October 19 | 4 PM\n⏱ 30–45 min\n📍TBD\n\nEnjoy Sweet Lou’s, + snacks & drinks while you learn and get your CASPer questions answered! 🍪🥤\n\nRegister through our bio and submit the questions you’d like answered — don’t miss out! 🌟",
109+
school: null,
110+
discord_handle: null,
111+
x_handle: null,
112+
tiktok_handle: null,
113+
fb_handle: null,
114+
display_handle: "@uw.bmlt",
49115
}
50116
];
51117

52118
export const RECOMMENDED_FILTERS: string[] = [
53-
"networking",
54-
"brunch",
55-
"dinner",
56119
"WUSA",
120+
"Athletics",
121+
"student society",
122+
"networking",
57123
"social event",
58-
"student meetup",
59-
"food event",
60124
"professional development",
61-
"community gathering",
125+
"pizza",
126+
"snacks",
127+
"drinks",
128+
"meet people",
62129
"large event",
63-
"Brampton",
64-
"Cambridge",
65-
"student organizations",
66-
"meet new people",
67-
"career networking",
68-
"food and drinks",
69-
"event planning",
70-
"student activities",
71-
"local events",
72-
"club events",
73-
"peer connections",
74-
"informal gathering",
130+
"club meeting",
131+
"food event",
132+
"community gathering",
133+
"team building",
75134
"student engagement",
76-
"cultural exchange",
77-
"team building"
135+
"informal meetup",
136+
"workshop",
137+
"recreational",
138+
"fitness",
139+
"academic support",
140+
"cultural event",
141+
"mentorship",
142+
"volunteering"
78143
];

0 commit comments

Comments
 (0)