Skip to content

Commit deb6a2d

Browse files
committed
fix linting
1 parent 676d5cf commit deb6a2d

File tree

5 files changed

+37
-229
lines changed

5 files changed

+37
-229
lines changed

backend/apps/events/views.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def get_event(request, event_id):
200200
"source_url", "ig_handle", "discord_handle", "x_handle",
201201
"tiktok_handle", "fb_handle", "other_handle"
202202
]
203-
203+
204204
event_data = Events.objects.filter(id=event_id).values(*fields).first()
205205
if not event_data:
206206
return Response({"error": "Event not found"}, status=status.HTTP_404_NOT_FOUND)
@@ -644,30 +644,30 @@ def submit_event(request):
644644

645645
# CRITICAL: Force status to PENDING regardless of user input
646646
# This prevents users from bypassing the approval process
647-
cleaned["status"] = "PENDING"
647+
cleaned["status"] = "PENDING"
648648

649649
# CRITICAL: Force school to University of Waterloo for user submissions
650650
cleaned["school"] = "University of Waterloo"
651651

652652
# Use atomic transaction to prevent orphaned records
653653
with transaction.atomic():
654654
# Create event
655-
event = Events.objects.create(**cleaned)
656-
657-
# Set source_url to the event detail page
658-
source_url = f"https://wat2do.ca/events/{event.id}"
659-
event.source_url = source_url
660-
event.save()
655+
event = Events.objects.create(**cleaned)
656+
657+
# Set source_url to the event detail page
658+
source_url = f"https://wat2do.ca/events/{event.id}"
659+
event.source_url = source_url
660+
event.save()
661661

662662
# Create linked submission
663-
submission = EventSubmission.objects.create(
664-
screenshot_url=screenshot_url,
665-
source_url=source_url,
666-
status="pending",
667-
submitted_by=clerk_user_id,
668-
created_event=event,
663+
submission = EventSubmission.objects.create(
664+
screenshot_url=screenshot_url,
665+
source_url=source_url,
666+
status="pending",
667+
submitted_by=clerk_user_id,
668+
created_event=event,
669669
extracted_data=[sanitized_data] if sanitized_data else [],
670-
)
670+
)
671671

672672
return Response(
673673
{
@@ -778,7 +778,7 @@ def review_submission(request, submission_id):
778778
# No edited data, just approve with existing data
779779
event = submission.created_event
780780
event.status = "CONFIRMED"
781-
event.save()
781+
event.save()
782782

783783
submission.status = "approved"
784784
submission.reviewed_at = timezone.now()

backend/scripts/send_newsletter.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# Import Django modules after setup
2020
from apps.newsletter.models import NewsletterSubscriber # noqa: E402
21-
from services.clerk_email_service import clerk_email_service # noqa: E402
21+
from services.email_service import email_service # noqa: E402
2222

2323

2424
def send_newsletter_to_all():
@@ -46,7 +46,8 @@ def send_to_subscriber(subscriber):
4646
if not email_address:
4747
return False, "Failed to decrypt email address"
4848

49-
email_sent = clerk_email_service.send_newsletter_email(
49+
# Use Resend-backed newsletter email service
50+
email_sent = email_service.send_newsletter_email(
5051
email_address, str(subscriber.unsubscribe_token)
5152
)
5253
return email_sent, None

backend/services/clerk_email_service.py

Lines changed: 0 additions & 192 deletions
This file was deleted.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function EventDetailPage() {
102102
const { data: event, isLoading, error } = useQuery({
103103
queryKey: ["event", eventId],
104104
queryFn: async () => {
105-
const token = await getToken();
105+
const token = await getToken();
106106
return fetchEvent(eventId!, token);
107107
},
108108
enabled: !!eventId,
@@ -291,7 +291,7 @@ function EventDetailPage() {
291291
<Label htmlFor="description" className="text-sm font-medium">
292292
Description
293293
</Label>
294-
<Textarea
294+
<Textarea
295295
id="description"
296296
value={editedData.description || ''}
297297
onChange={(e) => handleFieldChange('description', e.target.value)}
@@ -382,7 +382,7 @@ function EventDetailPage() {
382382
onChange={(e) => handleFieldChange('price', e.target.value ? parseFloat(e.target.value) : null)}
383383
placeholder="0.00"
384384
disabled={updateEventMutation.isPending}
385-
/>
385+
/>
386386
<p className="text-xs text-gray-500 dark:text-gray-400">
387387
Leave empty for free events
388388
</p>
@@ -538,7 +538,7 @@ function EventDetailPage() {
538538
{formatEventDate(event.dtstart_utc)}
539539
</p>
540540
<p className="text-sm text-gray-600 dark:text-gray-400">
541-
{formatEventTimeRange(event.dtstart_utc, event.dtend_utc)}
541+
{formatEventTimeRange(event.dtstart_utc, event.dtend_utc)}
542542
</p>
543543
</div>
544544
</div>
@@ -565,19 +565,19 @@ function EventDetailPage() {
565565
locationLower.includes("zoom") ||
566566
locationLower.includes("google meet");
567567
return !isVirtual && (
568-
<div className="w-full h-64 rounded-lg overflow-hidden">
569-
<iframe
570-
width="100%"
571-
height="100%"
572-
style={{ border: 0 }}
573-
loading="lazy"
574-
allowFullScreen
575-
referrerPolicy="no-referrer-when-downgrade"
576-
src={`https://www.google.com/maps/embed/v1/place?key=${
577-
import.meta.env.VITE_GOOGLE_MAPS_API_KEY || ""
578-
}&q=${encodeURIComponent(`${event.location}, ${event.school || ""}`)}`}
579-
></iframe>
580-
</div>
568+
<div className="w-full h-64 rounded-lg overflow-hidden">
569+
<iframe
570+
width="100%"
571+
height="100%"
572+
style={{ border: 0 }}
573+
loading="lazy"
574+
allowFullScreen
575+
referrerPolicy="no-referrer-when-downgrade"
576+
src={`https://www.google.com/maps/embed/v1/place?key=${
577+
import.meta.env.VITE_GOOGLE_MAPS_API_KEY || ""
578+
}&q=${encodeURIComponent(`${event.location}, ${event.school || ""}`)}`}
579+
></iframe>
580+
</div>
581581
);
582582
})()}
583583
</div>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
formatRelativeDateTime,
1717
FilterButton,
1818
} from "@/shared";
19-
import { Calendar, History, LayoutGrid, Sparkles, Heart } from "lucide-react";
19+
import { Calendar, LayoutGrid, Sparkles, Heart } from "lucide-react";
2020
import SearchInput from "@/features/search/components/SearchInput";
2121
import NumberFlow from "@number-flow/react";
2222
import { LAST_UPDATED, EVENT_CATEGORIES } from "@/data/staticData";
@@ -52,7 +52,6 @@ function EventsPage() {
5252
showInterested,
5353
searchTerm,
5454
categories,
55-
handleToggleStartDate,
5655
handleToggleNewEvents,
5756
handleToggleInterested,
5857
fetchNextPage,

0 commit comments

Comments
 (0)