diff --git a/booking-app/components/src/client/routes/booking/components/BookingFormMediaServices.tsx b/booking-app/components/src/client/routes/booking/components/BookingFormMediaServices.tsx index 4b6c9523..58c70d88 100644 --- a/booking-app/components/src/client/routes/booking/components/BookingFormMediaServices.tsx +++ b/booking-app/components/src/client/routes/booking/components/BookingFormMediaServices.tsx @@ -107,7 +107,7 @@ export default function BookingFormMediaServices(props: Props) {

- Check out equipment, request a technician, etc. + Check out equipment, use DMX lighting grid, request a technician, etc.

{toggle} {showMediaServices && ( diff --git a/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx b/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx index c330c014..1878d427 100644 --- a/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx +++ b/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx @@ -158,7 +158,7 @@ export default function BookingStatusBar({ formContext, ...props }: Props) { )} - + {!props.hideNextButton && ( diff --git a/booking-app/components/src/client/routes/booking/components/FormInput.tsx b/booking-app/components/src/client/routes/booking/components/FormInput.tsx index f140780d..47e39559 100644 --- a/booking-app/components/src/client/routes/booking/components/FormInput.tsx +++ b/booking-app/components/src/client/routes/booking/components/FormInput.tsx @@ -278,21 +278,53 @@ export default function FormInput({ calendarEventId, formContext }: Props) { )} - - - )} +
+ + + x.bookingType) + .sort((a, b) => a.localeCompare(b))} + {...{ control, errors, trigger }} + /> + + + Non-NYU guests will need to be sponsored through JRNY. For more + information about visitor, vendor, and affiliate access, + + click here + + . +

+ } + {...{ control, errors, trigger }} + /> +
{!isWalkIn && ( @@ -320,144 +352,17 @@ Must be an nyu.edu email address" } {...{ control, errors, trigger }} /> -
- -
- {!isWalkIn && ( -
- - If your event needs a specific room setup with tables and chairs, - please provide a description below. In the description please include - # of chairs, # of tables, and formation. Depending on the scope, it may - be required to hire CBS services for the room set up which comes at a cost. - The Media Commons Team will procure the services needed for the Room Setup. - Please provide the chartfield below. -

- } - {...{ control, errors, trigger }} - /> - {watch("roomSetup") === "yes" && ( - <> - - - - )} -
- )} -
- - {watch("mediaServices") !== undefined && - watch("mediaServices").length > 0 && ( - - If you selected any of the Media Services above, please - describe your needs in detail. -
- If you need to check out equipment, you can check our - inventory and include your request below. (Ie. 2x Small - Mocap Suits) -
-{" "} - - Inventory for Black Box 220 and Ballrooms 221-224 - -
-{" "} - - Inventory for Garage 103 - -
-

- } - {...{ control, errors, trigger }} - /> - )} -
- {!isWalkIn && ( -
- - If the event includes catering, it is required for the - reservation holder to provide a chartfield so that the - Media Commons Team can obtain CBS Cleaning Services. -

- } - required={false} + {watch("roomSetup") === "yes" && ( + <> + - {watch("catering") === "yes" && ( - <> - - - - )} -
- )} - {!isWalkIn && ( -
- - Only for large events with 75+ attendees, and bookings in The Garage where - the Willoughby entrance will be in use. It is required for the reservation - holder to provide a chartfield so that the Media Commons Team can obtain - Campus Safety Security Services. - - Click for Campus Safety Form - -

- } + diff --git a/booking-app/components/src/client/routes/booking/formPages/LandingPage.tsx b/booking-app/components/src/client/routes/booking/formPages/LandingPage.tsx index 40ed3c5e..d102132b 100644 --- a/booking-app/components/src/client/routes/booking/formPages/LandingPage.tsx +++ b/booking-app/components/src/client/routes/booking/formPages/LandingPage.tsx @@ -41,16 +41,17 @@ export default function LandingPage() {

Thank you for your interest in booking with the Media Commons

- Please read our policy for using the 370J Media Commons + Please read our Policy for using the 370 Jay Street Shared Spaces Booking Confirmation

- You will receive an email response from the Media Commons Team and a calendar - invite once your request has been reviewed and processed. Please allow a minimum - of 3 days for your request to be approved. If you do not hear back about your request, - please contact the Media Commons Team ( + You will receive an email response from the 370J Operations team and a + calendar invite once your request has been reviewed and processed. + Please allow a minimum of 3 days for your request to be approved. If + you do not hear back about your request within 48 hours, you can + contact the Media Commons Team ( mediacommons.reservations@nyu.edu @@ -60,12 +61,12 @@ export default function LandingPage() { Cancellation Policy

- To cancel a reservation please email the Media Commons Team ( + To cancel reservations please email the Media Commons Team ( mediacommons.reservations@nyu.edu - ) at least 24 hours before the date of the event. - Failure to cancel may result in restricted use of the Media Commons. + ) at least 24 hours before the date of the event. Failure to cancel + may result in restricted use of event spaces.

diff --git a/booking-app/components/src/client/routes/myBookings/myBookingsPage.tsx b/booking-app/components/src/client/routes/myBookings/myBookingsPage.tsx index f0441cc3..03d8f755 100644 --- a/booking-app/components/src/client/routes/myBookings/myBookingsPage.tsx +++ b/booking-app/components/src/client/routes/myBookings/myBookingsPage.tsx @@ -19,9 +19,9 @@ const Container = styled(Box)` export default function MyBookingsPage() { return (
- - Welcome to the Media Commons booking tool! - + + Welcome +
); diff --git a/booking-app/package-lock.json b/booking-app/package-lock.json index a5fec6a2..95842cf0 100644 --- a/booking-app/package-lock.json +++ b/booking-app/package-lock.json @@ -4874,10 +4874,9 @@ } }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "license": "MIT", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -8547,10 +8546,9 @@ } }, "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "license": "MIT", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" diff --git a/booking-app/public/mediaCommonsLogo.svg b/booking-app/public/mediaCommonsLogo.svg index 838d4f74..f97f174a 100644 --- a/booking-app/public/mediaCommonsLogo.svg +++ b/booking-app/public/mediaCommonsLogo.svg @@ -1,1425 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file