diff --git a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx index dd2a3f6b..9853a86a 100644 --- a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx +++ b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx @@ -1,4 +1,4 @@ -import { Box, Typography } from "@mui/material"; +import { Box, Typography, useMediaQuery, useTheme } from "@mui/material"; import { CalendarApi, DateSelectArg, EventClickArg } from "@fullcalendar/core"; import { CalendarEvent, RoomSetting } from "../../../../types"; import CalendarEventBlock, { NEW_TITLE_TAG } from "./CalendarEventBlock"; @@ -83,6 +83,9 @@ export default function CalendarVerticalResource({ } = useContext(BookingContext); const ref = useRef(null); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const resources = useMemo( () => rooms.map((room) => ({ @@ -215,7 +218,7 @@ export default function CalendarVerticalResource({ slotMinTime="09:00:00" slotMaxTime="21:00:00" allDaySlot={false} - aspectRatio={1.5} + aspectRatio={isMobile ? 0.5 : 1.5} expandRows={true} stickyHeaderDates={true} ref={ref} diff --git a/booking-app/components/src/client/routes/booking/formPages/BookingFormDetailsPage.tsx b/booking-app/components/src/client/routes/booking/formPages/BookingFormDetailsPage.tsx index 0b5721f6..7709bb8b 100644 --- a/booking-app/components/src/client/routes/booking/formPages/BookingFormDetailsPage.tsx +++ b/booking-app/components/src/client/routes/booking/formPages/BookingFormDetailsPage.tsx @@ -20,7 +20,7 @@ export default function BookingFormDetailsPage({ return ( - + 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 8c663efa..d102132b 100644 --- a/booking-app/components/src/client/routes/booking/formPages/LandingPage.tsx +++ b/booking-app/components/src/client/routes/booking/formPages/LandingPage.tsx @@ -31,7 +31,12 @@ export default function LandingPage() { const router = useRouter(); return ( -
+
370🅙 Media Commons Reservation Form

Thank you for your interest in booking with the Media Commons

diff --git a/booking-app/components/src/client/routes/booking/formPages/SelectRoomPage.tsx b/booking-app/components/src/client/routes/booking/formPages/SelectRoomPage.tsx index 206f1aa8..8d416515 100644 --- a/booking-app/components/src/client/routes/booking/formPages/SelectRoomPage.tsx +++ b/booking-app/components/src/client/routes/booking/formPages/SelectRoomPage.tsx @@ -1,6 +1,6 @@ "use client"; -import { Box, Stack, Typography } from "@mui/material"; +import { Box, Stack, Typography, useMediaQuery, useTheme } from "@mui/material"; import React, { useContext, useMemo, useState } from "react"; import { BookingContext } from "../bookingProvider"; @@ -27,6 +27,8 @@ export default function SelectRoomPage({ const { selectedRooms, setSelectedRooms } = useContext(BookingContext); const [date, setDate] = useState(new Date()); useCheckFormMissingData(); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); const roomsToShow = useMemo(() => { return !isWalkIn @@ -36,9 +38,12 @@ export default function SelectRoomPage({ return ( - - - + + + {!isWalkIn && } Spaces diff --git a/booking-app/components/src/client/routes/booking/formPages/UserRolePage.tsx b/booking-app/components/src/client/routes/booking/formPages/UserRolePage.tsx index d2876aee..4397ae4d 100644 --- a/booking-app/components/src/client/routes/booking/formPages/UserRolePage.tsx +++ b/booking-app/components/src/client/routes/booking/formPages/UserRolePage.tsx @@ -19,7 +19,6 @@ const Center = styled(Box)` `; const Container = styled(Box)(({ theme }) => ({ - width: "50%", display: "flex", flexDirection: "column", alignItems: "center", @@ -60,7 +59,12 @@ export default function UserRolePage({ return (
- + Affiliation ({ border: `1px solid ${theme.palette.custom.border}`, borderCollapse: "separate", borderRadius: "0px 0px 4px 4px", + // overflowX: "scroll", "& tr:last-child td": { borderBottom: "none", @@ -31,6 +36,7 @@ const ShadedHeader = styled(TableHead)(({ theme }) => ({ })); export const TableTopRow = styled(MuiTable)` + width: 100%; height: 48px; border-bottom: none; border-collapse: separate; @@ -69,12 +75,14 @@ export default function Table({ columns, children, topRow, sx }: Props) { - - - {columns} - - {children} - + + + + {columns} + + {children} + + ); } diff --git a/booking-app/components/src/client/routes/components/navBar.tsx b/booking-app/components/src/client/routes/components/navBar.tsx index d5e44e6c..32d5f084 100644 --- a/booking-app/components/src/client/routes/components/navBar.tsx +++ b/booking-app/components/src/client/routes/components/navBar.tsx @@ -7,6 +7,8 @@ import { Select, Toolbar, Typography, + useMediaQuery, + useTheme, } from "@mui/material"; import React, { useContext, useEffect, useMemo, useState } from "react"; import { usePathname, useRouter } from "next/navigation"; @@ -58,6 +60,8 @@ export default function NavBar() { PagePermission.BOOKING ); const pathname = usePathname(); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); const netId = userEmail?.split("@")[0]; @@ -169,7 +173,7 @@ export default function NavBar() {