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

Database refactor to main #468

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6e14a5a
Merge pull request #161 from ITPNYU/staging
rlho Apr 4, 2024
c43f907
Merge branch 'staging' into prod
lucia-gomez Apr 6, 2024
b91dc6e
Merge pull request #169 from ITPNYU/staging
rlho Apr 11, 2024
ad24c2b
Merge pull request #180 from ITPNYU/staging
nopivnick Apr 12, 2024
007642d
Merge branch 'lucia/dev' into prod
lucia-gomez Apr 15, 2024
504b608
Merge pull request #190 from ITPNYU/staging
rlho Apr 16, 2024
eb847f8
Merge pull request #202 from ITPNYU/staging
rlho Apr 25, 2024
29aed19
Merge branch 'staging' into prod
lucia-gomez May 2, 2024
65240d5
Merge branch 'staging' into prod
lucia-gomez May 14, 2024
5919914
Merge pull request #225 from ITPNYU/staging
nopivnick Jun 21, 2024
3ccd850
Merge pull request #239 from ITPNYU/main
nopivnick Jun 26, 2024
2bbb54f
Merge pull request #249 from ITPNYU/main
rlho Jul 1, 2024
d9b6d90
Merge pull request #252 from ITPNYU/main
rlho Jul 8, 2024
36869ef
Merge pull request #393 from ITPNYU/main
rlho Sep 2, 2024
10f15f1
Merge pull request #396 from ITPNYU/main
rlho Sep 3, 2024
5b55b50
Merge pull request #406 from ITPNYU/main
rlho Sep 9, 2024
d180c2d
Merge branch 'prod' of https://github.com/ITPNYU/booking-app into prod
lucia-gomez Sep 16, 2024
0638add
Merge branch 'main' into prod
lucia-gomez Sep 16, 2024
27da72b
Merge branch 'main' into prod
lucia-gomez Sep 17, 2024
143909b
Merge branch 'main' into prod
lucia-gomez Sep 17, 2024
3813f3d
Merge branch 'main' into prod
lucia-gomez Sep 17, 2024
9757918
delete old media_commons directory
lucia-gomez Sep 18, 2024
48df33c
Merge branch 'main' into prod
lucia-gomez Sep 18, 2024
7f68654
Merge branch 'main' into prod
lucia-gomez Sep 21, 2024
01d1088
Merge pull request #422 from ITPNYU/main
rlho Sep 25, 2024
3656b90
Merge pull request #424 from ITPNYU/main
rlho Sep 25, 2024
9392264
Merge pull request #430 from ITPNYU/main
rlho Sep 26, 2024
6f44d66
Merge pull request #432 from ITPNYU/main
rlho Sep 30, 2024
c98b6b1
block form if no calendar events loaded
lucia-gomez Oct 1, 2024
450a3cc
don't fetch calendar events until roomSettings load
lucia-gomez Oct 2, 2024
038222a
Merge pull request #444 from ITPNYU/main
rlho Oct 4, 2024
1d5e518
Merge pull request #449 from ITPNYU/main
rlho Oct 7, 2024
8ab6ea6
Merge pull request #451 from ITPNYU/main
rlho Oct 7, 2024
efdfe36
Merge pull request #452 from ITPNYU/main
rlho Oct 7, 2024
3b8698e
Merge pull request #453 from ITPNYU/main
rlho Oct 7, 2024
b9ec792
Update EditLandingPage.tsx
ss12430 Oct 10, 2024
c2a729b
Merge branch 'main' into prod
lucia-gomez Oct 11, 2024
c0b2a5f
Merge pull request #467 from ITPNYU/main
rlho Oct 16, 2024
c184f90
Update FormInput.tsx
ss12430 Oct 23, 2024
16e54f8
usersLiaisons --> usersApprovers
lucia-gomez Oct 11, 2024
33fdd7e
database scripts
lucia-gomez Oct 12, 2024
612c5de
add staging dbRefactor script + button
lucia-gomez Oct 16, 2024
8e76687
fix db refactor duplicated bookings
lucia-gomez Oct 16, 2024
8ef8c2b
refactor bookingStatuses --> bookings
lucia-gomez Oct 12, 2024
b0b58ce
update table names enum to reflect refactor
lucia-gomez Oct 16, 2024
14b3d3a
final approver email setting uses new db structure
lucia-gomez Oct 13, 2024
8eb9885
remove db refactor button
lucia-gomez Oct 24, 2024
1bb4ff2
Merge branch 'staging' into prod
lucia-gomez Oct 28, 2024
d8e8458
remove merge text
lucia-gomez Oct 28, 2024
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 @@ -257,6 +257,7 @@ export default function FormInput({ calendarEventId, formContext }: Props) {
<BookingFormTextField
id="sponsorFirstName"
label="Sponsor First Name"
description="A faculty or staff member related to your request."
required={watch("role") === Role.STUDENT}
{...{ control, errors, trigger }}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function EditLandingPage({ calendarEventId }: Props) {

return (
<Center sx={{ width: "100vw", height: "90vh" }}>
<Title as="h1">370🅙 Media Commons Reservation Form</Title>
<Title as="h1">370J Media Commons Reservation Form</Title>
<Modal padding={4}>
<Typography fontWeight={700}>
Please read our Policy for editing an existing reservation
Expand Down
Loading