maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: merge order of calendar freebusy (#4438) (#4475) 

Co-authored-by: chengcheng.frontend <chengcheng.frontend@bytedance.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Co-authored-by: Cheng CHENG <c.cheng@live.cn>
Co-authored-by: chengcheng.frontend <chengcheng.frontend@bytedance.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Joe Au-Yeung 2022-09-14 14:38:18 -04:00 committed by GitHub
parent 6c4a372121
commit ba4bd83abe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/web/components/booking/pages/AvailabilityPage.tsx
View File

@ -169,7 +169,7 @@ const SlotPicker = ({
timeZone, timeZone,
}); });
const slots = useMemo(() => ({ ..._1, ..._2 }), [_1, _2]); const slots = useMemo(() => ({ ..._2, ..._1 }), [_1, _2]);
return ( return (
<> <>
@ -178,7 +178,7 @@ const SlotPicker = ({
className={classNames( className={classNames(
"mt-8 w-full px-4 sm:mt-0 sm:min-w-[455px] md:px-5", "mt-8 w-full px-4 sm:mt-0 sm:min-w-[455px] md:px-5",
selectedDate selectedDate
? "sm:dark:border-darkgray-200 border-gray-200 sm:w-1/2 sm:border-r sm:p-4 sm:pr-6 md:w-1/3 " ? "sm:dark:border-darkgray-200 border-gray-200 sm:w-1/2 sm:border-r sm:p-4 sm:pr-6 md:w-1/3"
: "sm:p-4" : "sm:p-4"
)} )}
includedDates={Object.keys(slots).filter((k) => slots[k].length > 0)} includedDates={Object.keys(slots).filter((k) => slots[k].length > 0)}
@ -247,9 +247,9 @@ function TimezoneDropdown({
<Icon.FiGlobe className="mr-[10px] ml-[2px] -mt-[2px] inline-block h-4 w-4" /> <Icon.FiGlobe className="mr-[10px] ml-[2px] -mt-[2px] inline-block h-4 w-4" />
{timeZone} {timeZone}
{isTimeOptionsOpen ? ( {isTimeOptionsOpen ? (
<Icon.FiChevronUp className="ml-1 inline-block h-4 w-4 " /> <Icon.FiChevronUp className="ml-1 inline-block h-4 w-4" />
) : ( ) : (
<Icon.FiChevronDown className="ml-1 inline-block h-4 w-4 " /> <Icon.FiChevronDown className="ml-1 inline-block h-4 w-4" />
)} )}
</p> </p>
</Collapsible.Trigger> </Collapsible.Trigger>
@ -425,7 +425,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
</div> </div>
)} )}
{eventType?.requiresConfirmation && ( {eventType?.requiresConfirmation && (
<p className="dark:text-darkgray-600 dark:text-darkgray-600 text-gray-600"> <p className="dark:text-darkgray-600 text-gray-600">
<Icon.FiCheckSquare className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" /> <Icon.FiCheckSquare className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" />
{t("requires_confirmation")} {t("requires_confirmation")}
</p> </p>
@ -464,7 +464,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
setRecurringEventCount(parseInt(event?.target.value)); setRecurringEventCount(parseInt(event?.target.value));
}} }}
/> />
<p className="dark:text-darkgray-600 inline text-gray-600 "> <p className="dark:text-darkgray-600 inline text-gray-600">
{t("occurrence", { {t("occurrence", {
count: recurringEventCount, count: recurringEventCount,
})} })}
@ -512,12 +512,12 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
<h2 className="break-words text-sm font-medium text-gray-600 dark:text-gray-300 lg:mt-2"> <h2 className="break-words text-sm font-medium text-gray-600 dark:text-gray-300 lg:mt-2">
{profile.name} {profile.name}
</h2> </h2>
<h1 className="font-cal dark:text-darkgray-900 mb-6 break-words text-2xl text-gray-900 "> <h1 className="font-cal dark:text-darkgray-900 mb-6 break-words text-2xl text-gray-900">
{eventType.title} {eventType.title}
</h1> </h1>
<div className="dark:text-darkgray-600 flex flex-col space-y-3 text-sm font-medium text-gray-600"> <div className="dark:text-darkgray-600 flex flex-col space-y-3 text-sm font-medium text-gray-600">
{eventType?.description && ( {eventType?.description && (
<div className="flex "> <div className="flex">
<div> <div>
<Icon.FiInfo className="mr-[10px] ml-[2px] inline-block h-4 w-4" /> <Icon.FiInfo className="mr-[10px] ml-[2px] inline-block h-4 w-4" />
</div> </div>
@ -563,7 +563,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
</div> </div>
)} )}
{eventType.price > 0 && ( {eventType.price > 0 && (
<p className="-ml-2 px-2 text-sm font-medium "> <p className="-ml-2 px-2 text-sm font-medium">
<Icon.FiCreditCard className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" /> <Icon.FiCreditCard className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" />
<IntlProvider locale="en"> <IntlProvider locale="en">
<FormattedNumber <FormattedNumber