From 4111f78431e72ac8d34e2b73973df3067c036823 Mon Sep 17 00:00:00 2001 From: Nafees Nazik <84864519+G3root@users.noreply.github.com> Date: Tue, 23 May 2023 03:24:43 +0530 Subject: [PATCH] feat: make branding hideable in the new booker (#9033) * feat: make branding hideable * fix: typo --- apps/web/pages/new-booker/[user]/[type].tsx | 20 ++++++++++++++++--- .../pages/new-booker/team/[slug]/[type].tsx | 19 +++++++++++++++--- packages/features/bookings/Booker/Booker.tsx | 10 ++++++++-- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/apps/web/pages/new-booker/[user]/[type].tsx b/apps/web/pages/new-booker/[user]/[type].tsx index 807a00cef9..d3003b8afe 100644 --- a/apps/web/pages/new-booker/[user]/[type].tsx +++ b/apps/web/pages/new-booker/[user]/[type].tsx @@ -14,11 +14,22 @@ import PageWrapper from "@components/PageWrapper"; type PageProps = inferSSRProps; -export default function Type({ slug, user, booking, away }: PageProps) { +export default function Type({ slug, user, booking, away, isBrandingHidden }: PageProps) { return (
- - + +
); } @@ -64,6 +75,7 @@ async function getDynamicGroupPageProps(context: GetServerSidePropsContext) { slug, away: false, trpcState: ssr.dehydrate(), + isBrandingHidden: false, }, }; } @@ -80,6 +92,7 @@ async function getUserPageProps(context: GetServerSidePropsContext) { }, select: { away: true, + hideBranding: true, }, }); @@ -103,6 +116,7 @@ async function getUserPageProps(context: GetServerSidePropsContext) { user: username, slug, trpcState: ssr.dehydrate(), + isBrandingHidden: user?.hideBranding, }, }; } diff --git a/apps/web/pages/new-booker/team/[slug]/[type].tsx b/apps/web/pages/new-booker/team/[slug]/[type].tsx index a671cfcbfc..7ebaf2a55a 100644 --- a/apps/web/pages/new-booker/team/[slug]/[type].tsx +++ b/apps/web/pages/new-booker/team/[slug]/[type].tsx @@ -13,11 +13,22 @@ import PageWrapper from "@components/PageWrapper"; type PageProps = inferSSRProps; -export default function Type({ slug, user, booking, away }: PageProps) { +export default function Type({ slug, user, booking, away, isBrandingHidden }: PageProps) { return (
- - + +
); } @@ -41,6 +52,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => }, select: { id: true, + hideBranding: true, }, }); @@ -62,6 +74,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => user: teamSlug, slug: meetingSlug, trpcState: ssr.dehydrate(), + isBrandingHidden: team?.hideBranding, }, }; }; diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx index 835376db3e..a25f9cc4f6 100644 --- a/packages/features/bookings/Booker/Booker.tsx +++ b/packages/features/bookings/Booker/Booker.tsx @@ -29,7 +29,13 @@ const DatePicker = dynamic(() => import("./components/DatePicker").then((mod) => ssr: false, }); -const BookerComponent = ({ username, eventSlug, month, rescheduleBooking }: BookerProps) => { +const BookerComponent = ({ + username, + eventSlug, + month, + rescheduleBooking, + hideBranding = false, +}: BookerProps) => { const { t } = useLocale(); const isMobile = useMediaQuery("(max-width: 768px)"); const isTablet = useMediaQuery("(max-width: 1024px)"); @@ -202,7 +208,7 @@ const BookerComponent = ({ username, eventSlug, month, rescheduleBooking }: Book "mt-auto mb-6 pt-6 [&_img]:h-[15px]", layout === "small_calendar" ? "block" : "hidden" )}> - + {!hideBranding ? : null}