diff --git a/src/components/admin/event/EventDetailsForm/index.tsx b/src/components/admin/event/EventDetailsForm/index.tsx
index 8b9c3a7f..73b0efc5 100644
--- a/src/components/admin/event/EventDetailsForm/index.tsx
+++ b/src/components/admin/event/EventDetailsForm/index.tsx
@@ -38,6 +38,7 @@ const EventDetailsForm = (props: IProps) => {
cover: defaultData?.cover,
uuid: defaultData?.uuid,
eventLink: defaultData?.eventLink,
+ foodItems: defaultData?.foodItems,
};
const {
@@ -271,7 +272,12 @@ const EventDetailsForm = (props: IProps) => {
/>
-
+
+
+
+
+
+
diff --git a/src/components/onboarding/AnnotatedSite/index.tsx b/src/components/onboarding/AnnotatedSite/index.tsx
index 637af933..3381491e 100644
--- a/src/components/onboarding/AnnotatedSite/index.tsx
+++ b/src/components/onboarding/AnnotatedSite/index.tsx
@@ -18,6 +18,7 @@ const dummyEvents: PublicEvent[] = [
"ACM at UCSD is UC San Diego's largest computer science organization, with over 1,500 members and over 200 technical, professional, and social events year-round. We’re not just computer science, though — we bring together anyone and everyone who shares our love of technology, design, and innovation! Join us to find out how you can engage in our community for the Fall Quarter through socials, live coding workshops, tech talks, and much more. We welcome people of all backgrounds and skill levels, whether you’re an entry-level UI designer or a machine learning expert. Come be a part of our rapidly growing community of friends at the first kickoff of the year!",
location: 'PC West Ballroom',
eventLink: 'acmurl.com/kickoff-F24',
+ foodItems: '',
start: '2024-10-01T01:00:00.000Z',
end: '2024-10-01T04:00:00.000Z',
pointValue: 10,
@@ -37,6 +38,7 @@ const dummyEvents: PublicEvent[] = [
"Wanna learn how to pick locks? Ever gotten locked out of your dorm? \n\nCome and join ACM Cyber at Lockpicking 101! We'll be demonstrating the core theory of breaking the security of locks, including techniques such as bumping, raking, single-pin picking, and impressioning! We will also be providing practice locks and picks for YOU🫵 to hone your picking skills. Become a lockpicking virtuoso 🤩✨✨",
location: 'SME ASML Room',
eventLink: 'acmurl.com/lockpicking',
+ foodItems: '',
start: '2024-04-13T01:30:00.000Z',
end: '2024-04-13T03:30:00.000Z',
pointValue: 10,
@@ -56,6 +58,7 @@ const dummyEvents: PublicEvent[] = [
"Come learn about AI tools and models at ACM AI's third spring quarter technical workshop!",
location: 'DIB 202/208',
eventLink: 'acmurl.com/ai-sp-ws3',
+ foodItems: '',
start: '2023-06-03T01:00:00.000Z',
end: '2023-06-03T03:00:00.000Z',
pointValue: 10,
diff --git a/src/lib/types/apiRequests.ts b/src/lib/types/apiRequests.ts
index 273e5744..a62efc8b 100644
--- a/src/lib/types/apiRequests.ts
+++ b/src/lib/types/apiRequests.ts
@@ -165,6 +165,7 @@ export interface OptionalEventProperties {
requiresStaff?: boolean;
staffPointBonus?: number;
discordEvent: string | null;
+ foodItems?: string | null;
}
export interface Event extends OptionalEventProperties {
diff --git a/src/lib/types/apiResponses.ts b/src/lib/types/apiResponses.ts
index f176b679..7d822f29 100644
--- a/src/lib/types/apiResponses.ts
+++ b/src/lib/types/apiResponses.ts
@@ -133,6 +133,7 @@ export interface PublicEvent {
requiresStaff: boolean;
staffPointBonus: number;
discordEvent: string | null;
+ foodItems: string | null;
}
export interface GetPastEventsResponse extends ApiResponse {
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 9bddf62c..664c6c6c 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -98,6 +98,10 @@ const PortalHomePage = ({
// Start onboarding after checking in
// TEMP: This should be saved server-side in the future
+ // Do not start onboarding if user already attended other events
+ if (attendance.length > 1) {
+ return;
+ }
const onboardingState = localStorage.getItem(config.tempLocalOnboardingKey);
if (onboardingState === 'onboarded') {
return;