From e33962686e596cb23196955e22dee9eb72d6ceef Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Thu, 30 Sep 2021 20:59:34 +0100 Subject: [PATCH] minor changes to booking page and navtabs (#832) --- components/BookingsShell.tsx | 15 +++---- components/EmptyScreen.tsx | 2 +- components/NavTabs.tsx | 59 ++++++++++++++------------ components/SettingsShell.tsx | 10 ++--- components/Shell.tsx | 4 +- components/booking/BookingListItem.tsx | 8 ++-- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/components/BookingsShell.tsx b/components/BookingsShell.tsx index 2457a25a..dd5e4019 100644 --- a/components/BookingsShell.tsx +++ b/components/BookingsShell.tsx @@ -1,6 +1,8 @@ +import React from "react"; + import NavTabs from "./NavTabs"; -export default function BookingsShell(props) { +export default function BookingsShell({ children }: { children: React.ReactNode }) { const tabs = [ { name: "Upcoming", @@ -17,12 +19,9 @@ export default function BookingsShell(props) { ]; return ( -
-
- -
-
-
{props.children}
-
+ <> + +
{children}
+ ); } diff --git a/components/EmptyScreen.tsx b/components/EmptyScreen.tsx index c249d377..32456ff2 100644 --- a/components/EmptyScreen.tsx +++ b/components/EmptyScreen.tsx @@ -13,7 +13,7 @@ export default function EmptyScreen({ }) { return ( <> -
+
diff --git a/components/NavTabs.tsx b/components/NavTabs.tsx index 81e2c883..5f320a47 100644 --- a/components/NavTabs.tsx +++ b/components/NavTabs.tsx @@ -16,34 +16,37 @@ interface Props { const NavTabs: FC = ({ tabs, linkProps }) => { const router = useRouter(); return ( - + <> + +
+ ); }; diff --git a/components/SettingsShell.tsx b/components/SettingsShell.tsx index b8e7af3e..64a72b0b 100644 --- a/components/SettingsShell.tsx +++ b/components/SettingsShell.tsx @@ -1,8 +1,9 @@ import { CodeIcon, CreditCardIcon, KeyIcon, UserGroupIcon, UserIcon } from "@heroicons/react/solid"; +import React from "react"; import NavTabs from "./NavTabs"; -export default function SettingsShell(props) { +export default function SettingsShell({ children }: { children: React.ReactNode }) { const tabs = [ { name: "Profile", @@ -28,12 +29,11 @@ export default function SettingsShell(props) { ]; return ( -
+ <>
-
-
{props.children}
-
+
{children}
+ ); } diff --git a/components/Shell.tsx b/components/Shell.tsx index f13fe436..e5686235 100644 --- a/components/Shell.tsx +++ b/components/Shell.tsx @@ -176,7 +176,7 @@ export default function Shell(props: {
-
+
{/* show top navigation for md and smaller (tablet and phones) */}
-
+

{props.heading}

{props.subtitle}

diff --git a/components/booking/BookingListItem.tsx b/components/booking/BookingListItem.tsx index 851330a0..52e2cd03 100644 --- a/components/booking/BookingListItem.tsx +++ b/components/booking/BookingListItem.tsx @@ -73,17 +73,15 @@ function BookingListItem(booking: BookingItem) {
{startTime}
+
+ {dayjs(booking.startTime).format("HH:mm")} - {dayjs(booking.endTime).format("HH:mm")} +
{!booking.confirmed && !booking.rejected && ( Unconfirmed )} - -
- {dayjs(booking.startTime).format("HH:mm")} - {dayjs(booking.endTime).format("HH:mm")} -
-
{!booking.confirmed && !booking.rejected && (