From 5f7cf312507d3ebf4b2e0913c9449c70823179d0 Mon Sep 17 00:00:00 2001 From: Leo Giovanetti Date: Tue, 7 Jun 2022 18:23:04 -0300 Subject: [PATCH 1/3] Tweaks requested --- apps/web/components/AdditionalCalendarSelector.tsx | 8 +++++++- apps/web/components/App.tsx | 6 +++--- apps/web/components/DestinationCalendarSelector.tsx | 8 +++++++- .../web/components/integrations/CalendarListContainer.tsx | 3 +++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/apps/web/components/AdditionalCalendarSelector.tsx b/apps/web/components/AdditionalCalendarSelector.tsx index 11cc6f6223de54..42f82f27435af1 100644 --- a/apps/web/components/AdditionalCalendarSelector.tsx +++ b/apps/web/components/AdditionalCalendarSelector.tsx @@ -61,9 +61,15 @@ const AdditionalCalendarSelector = ({ isLoading }: AdditionalCalendarSelectorPro marginLeft: "3px", }; }, + control: (defaultStyles) => { + return { + ...defaultStyles, + borderRadius: "2px", + }; + }, }} isSearchable={false} - className="mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-md border-gray-300 font-medium text-gray-700 sm:text-sm" + className="mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-sm border-gray-300 font-medium text-gray-700 sm:text-sm" isLoading={isLoading} components={{ Option: ImageOption }} /> diff --git a/apps/web/components/App.tsx b/apps/web/components/App.tsx index f78ad887e9ffa2..f35f0b44c8cc77 100644 --- a/apps/web/components/App.tsx +++ b/apps/web/components/App.tsx @@ -93,7 +93,7 @@ export default function App({ <>
-
+
{t("browse_apps")} @@ -103,7 +103,7 @@ export default function App({
{ // eslint-disable-next-line @next/next/no-img-element - {name} + {name} }

{name}

@@ -158,7 +158,7 @@ export default function App({ */}
-
+
{body}

{t("categories")}

diff --git a/apps/web/components/DestinationCalendarSelector.tsx b/apps/web/components/DestinationCalendarSelector.tsx index 722fe6d6c3e545..414073918c2a58 100644 --- a/apps/web/components/DestinationCalendarSelector.tsx +++ b/apps/web/components/DestinationCalendarSelector.tsx @@ -85,10 +85,16 @@ const DestinationCalendarSelector = ({ ? "var(--brand-color-dark-mode)" : "var(--brand-text-color)", }), + control: (defaultStyles) => { + return { + ...defaultStyles, + borderRadius: "2px", + }; + }, }} isSearchable={false} className={classNames( - "mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-md border-gray-300 sm:text-sm", + "mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-sm border-gray-300 sm:text-sm", !hidePlaceholder && "font-medium" )} onChange={(option) => { diff --git a/apps/web/components/integrations/CalendarListContainer.tsx b/apps/web/components/integrations/CalendarListContainer.tsx index e5fa09b9cab59b..43d181ecdb89ae 100644 --- a/apps/web/components/integrations/CalendarListContainer.tsx +++ b/apps/web/components/integrations/CalendarListContainer.tsx @@ -125,6 +125,9 @@ function ConnectedCalendarsList(props: Props) { onOpenChange={props.onChanged} /> }> +

+ Toggle the calendar(s) you want to check for conflicts to prevent double bookings. +

    {item.calendars.map((cal) => ( Date: Tue, 7 Jun 2022 18:51:07 -0300 Subject: [PATCH 2/3] Missing recurring event details in mobile view --- .../booking/pages/AvailabilityPage.tsx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/apps/web/components/booking/pages/AvailabilityPage.tsx b/apps/web/components/booking/pages/AvailabilityPage.tsx index 8d54dd5ed0806a..6d06e6d7ec5294 100644 --- a/apps/web/components/booking/pages/AvailabilityPage.tsx +++ b/apps/web/components/booking/pages/AvailabilityPage.tsx @@ -295,6 +295,36 @@ const AvailabilityPage = ({ profile, plan, eventType, workingHours, previousPage
)} + {!rescheduleUid && eventType.recurringEvent?.count && eventType.recurringEvent?.freq && ( +
+ +

+ {t("every_for_freq", { + freq: t( + `${RRuleFrequency[eventType.recurringEvent.freq].toString().toLowerCase()}` + ), + })} +

+ { + setRecurringEventCount(parseInt(event?.target.value)); + }} + /> +

+ {t( + `${RRuleFrequency[eventType.recurringEvent.freq].toString().toLowerCase()}`, + { + count: recurringEventCount, + } + )} +

+
+ )}
{booking?.startTime && rescheduleUid && (
From 6310f87e2dcba48a469d30f4f487a112ef6236da Mon Sep 17 00:00:00 2001 From: Leo Giovanetti Date: Thu, 9 Jun 2022 17:27:08 -0300 Subject: [PATCH 3/3] Removing bg-white --- apps/web/components/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/components/App.tsx b/apps/web/components/App.tsx index f35f0b44c8cc77..fb8912b49db15c 100644 --- a/apps/web/components/App.tsx +++ b/apps/web/components/App.tsx @@ -103,7 +103,7 @@ export default function App({
{ // eslint-disable-next-line @next/next/no-img-element - {name} + {name} }

{name}