Skip to content

Commit

Permalink
Add A.S. funded food field to event form (#269)
Browse files Browse the repository at this point in the history
* Add A.S. funded food field to event form

* Make food items nullable

* Make food items nullable in apiRequests.ts as well

Mostly out of laIziness (idk if backend truly would enjoy receiving a null) but it's in line with Discord events
  • Loading branch information
SheepTester authored Oct 25, 2024
1 parent f2a8736 commit 0e0876a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/components/admin/event/EventDetailsForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const EventDetailsForm = (props: IProps) => {
cover: defaultData?.cover,
uuid: defaultData?.uuid,
eventLink: defaultData?.eventLink,
foodItems: defaultData?.foodItems,
};

const {
Expand Down Expand Up @@ -271,7 +272,12 @@ const EventDetailsForm = (props: IProps) => {
/>
</DetailsFormItem>

<label htmlFor="description">Event Link</label>
<label htmlFor="foodItems">Food (if A.S. Funded)</label>
<DetailsFormItem error={errors.foodItems?.message}>
<input type="text" id="foodItems" {...register('foodItems')} />
</DetailsFormItem>

<label htmlFor="eventLink">Event Link</label>
<DetailsFormItem error={errors.eventLink?.message}>
<input type="text" id="eventLink" {...register('eventLink')} />
</DetailsFormItem>
Expand Down
3 changes: 3 additions & 0 deletions src/components/onboarding/AnnotatedSite/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/lib/types/apiRequests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export interface OptionalEventProperties {
requiresStaff?: boolean;
staffPointBonus?: number;
discordEvent: string | null;
foodItems?: string | null;
}

export interface Event extends OptionalEventProperties {
Expand Down
1 change: 1 addition & 0 deletions src/lib/types/apiResponses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ export interface PublicEvent {
requiresStaff: boolean;
staffPointBonus: number;
discordEvent: string | null;
foodItems: string | null;
}

export interface GetPastEventsResponse extends ApiResponse {
Expand Down

0 comments on commit 0e0876a

Please sign in to comment.