Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing Merge Between Main and Kai Dev #441

Merged
merged 3 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default function BookingFormMediaServices(props: Props) {
<div style={{ marginBottom: 8 }}>
<Label htmlFor={id}>Media Services</Label>
<p style={{ fontSize: "0.75rem" }}>
Check out equipment, request a technician, etc.
Check out equipment, use DMX lighting grid, request a technician, etc.
</p>
{toggle}
{showMediaServices && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export default function BookingStatusBar({ formContext, ...props }: Props) {
</Alert>
)}
</Grid>
<Grid sx={{ marginLeft: "24px" }}>
<Grid sx={{ marginLeft: "auto" }}>
{!props.hideNextButton && (
<Tooltip title={disabledMessage}>
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,21 +278,53 @@ export default function FormInput({ calendarEventId, formContext }: Props) {
</Section>
)}

<BookingFormTextField
id="sponsorEmail"
label="Sponsor Email"
description="“An NYU faculty or staff member related to your request. Ex: your thesis teacher if you have a thesis-related reservation request.”
Must be an nyu.edu email address"
required={watch("role") === Role.STUDENT}
pattern={{
value: /^[A-Z0-9._%+-]+@nyu.edu$/i,
message: "Invalid email address",
}}
validate={validateSponsorEmail}
{...{ control, errors, trigger }}
/>
</Section>
)}
<Section title="Reservation Details">
<BookingFormTextField
id="title"
label="Reservation Title"
validate={validateTitleLength}
{...{ control, errors, trigger }}
/>
<BookingFormTextField
id="description"
label="Reservation Description"
{...{ control, errors, trigger }}
/>
<BookingFormDropdown
id="bookingType"
label="Booking Type"
options={settings.bookingTypes
.map((x) => x.bookingType)
.sort((a, b) => a.localeCompare(b))}
{...{ control, errors, trigger }}
/>
<BookingFormTextField
id="expectedAttendance"
label="Expected Attendance"
validate={validateExpectedAttendance}
{...{ control, errors, trigger }}
/>
<BookingFormDropdown
id="attendeeAffiliation"
label="Attendee Affiliation(s)"
options={Object.values(AttendeeAffiliation)}
description={
<p>
Non-NYU guests will need to be sponsored through JRNY. For more
information about visitor, vendor, and affiliate access,
<a
href="https://www.nyu.edu/about/visitor-information/sponsoring-visitors.html"
className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
target="_blank"
>
click here
</a>
.
</p>
}
{...{ control, errors, trigger }}
/>
</Section>

<Section title="Services">
{!isWalkIn && (
Expand Down Expand Up @@ -320,144 +352,17 @@ Must be an nyu.edu email address"
}
{...{ control, errors, trigger }}
/>
</Section>

<Section title="Services">
{!isWalkIn && (
<div style={{ marginBottom: 32 }}>
<BookingFormSwitch
id="roomSetup"
label="Room Setup Needed?"
required={false}
description={
<p>
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.
</p>
}
{...{ control, errors, trigger }}
/>
{watch("roomSetup") === "yes" && (
<>
<BookingFormTextField
id="setupDetails"
label="Room Setup Details"
description="If you requested Room Setup and are not using rooms 233 or 1201, please explain your needs including # of chairs, # tables, and formation."
{...{ control, errors, trigger }}
/>
<BookingFormTextField
id="chartFieldForRoomSetup"
label="ChartField for Room Setup"
{...{ control, errors, trigger }}
/>
</>
)}
</div>
)}
<div style={{ marginBottom: 32 }}>
<BookingFormMediaServices
id="mediaServices"
{...{
control,
trigger,
showMediaServices,
setShowMediaServices,
isWalkIn,
}}
/>
{watch("mediaServices") !== undefined &&
watch("mediaServices").length > 0 && (
<BookingFormTextField
id="mediaServicesDetails"
label="Media Services Details"
description={
<p>
If you selected any of the Media Services above, please
describe your needs in detail.
<br />
If you need to check out equipment, you can check our
inventory and include your request below. (Ie. 2x Small
Mocap Suits)
<br />-{" "}
<a
href="https://docs.google.com/document/d/1oRtvZ0SR52Mq_ykoNXelwqat4JFgdado5JDY6A746VY/edit#heading=h.iv9c7z15bn0t"
target="_blank"
className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
>
Inventory for Black Box 220 and Ballrooms 221-224
</a>
<br />-{" "}
<a
href="https://docs.google.com/spreadsheets/d/1fziyVrzeytQJyZ8585Wtqxer-PBt6L-u-Z0LHVavK5k/edit#gid=870626522"
target="_blank"
className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
>
Inventory for Garage 103
</a>
<br />
</p>
}
{...{ control, errors, trigger }}
/>
)}
</div>
{!isWalkIn && (
<div style={{ marginBottom: 32 }}>
<BookingFormSwitch
id="catering"
label="Catering?"
description={
<p>
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.
</p>
}
required={false}
{watch("roomSetup") === "yes" && (
<>
<BookingFormTextField
id="setupDetails"
label="Room Setup Details"
description="If you requested Room Setup and are not using rooms 233 or 1201, please explain your needs including # of chairs, # tables, and formation."
{...{ control, errors, trigger }}
/>
{watch("catering") === "yes" && (
<>
<BookingFormDropdown
id="cateringService"
label="Catering Information"
options={["Outside Catering", "NYU Plated"]}
{...{ control, errors, trigger }}
/>
<BookingFormTextField
id="chartFieldForCatering"
label="ChartField for CBS Cleaning Services"
{...{ control, errors, trigger }}
/>
</>
)}
</div>
)}
{!isWalkIn && (
<div style={{ marginBottom: 32 }}>
<BookingFormSwitch
id="hireSecurity"
label="Hire Security?"
required={false}
description={
<p>
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.
<a
href="https://www.nyu.edu/life/safety-health-wellness/campus-safety.html"
target="_blank"
className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
>
Click for Campus Safety Form
</a>
</p>
}
<BookingFormTextField
id="chartFieldForRoomSetup"
label="ChartField for Room Setup"
{...{ control, errors, trigger }}
/>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,17 @@ export default function LandingPage() {
<p>Thank you for your interest in booking with the Media Commons</p>
<Modal padding={4}>
<Typography fontWeight={500}>
Please read our policy for using the 370J Media Commons
Please read our Policy for using the 370 Jay Street Shared Spaces
</Typography>
<Typography fontWeight={700} marginTop={3}>
Booking Confirmation
</Typography>
<p>
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 (
<a href="mailto:mediacommons.reservations@nyu.edu">
mediacommons.reservations@nyu.edu
</a>
Expand All @@ -60,12 +61,12 @@ export default function LandingPage() {
Cancellation Policy
</Typography>
<p>
To cancel a reservation please email the Media Commons Team (
To cancel reservations please email the Media Commons Team (
<a href="mailto:mediacommons.reservations@nyu.edu">
mediacommons.reservations@nyu.edu
</a>
) 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.
</p>
<Button
variant="contained"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function BookMoreButton() {
width: "100%",
}}
>
<Add /> Request a Reservation
<Add /> Book More
</Button>
</TableCell>
</TableRow>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const Container = styled(Box)`
export default function MyBookingsPage() {
return (
<Center>
<Box width="65%" margin={6}>
<Typography variant="h6">Welcome to the Media Commons booking tool!</Typography>
<Bookings isUserView={true} />
<Box width={{ xs: "90%", md: "65%" }} margin={6}>
<Typography variant="h6">Welcome</Typography>
<Bookings pageContext={PageContextLevel.USER} />
</Box>
</Center>
);
Expand Down
14 changes: 6 additions & 8 deletions booking-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading