From f353da625efa91228f3177dffe457e62427eadf0 Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Fri, 2 Sep 2022 21:30:06 +0200 Subject: [PATCH] /booking v2 fixes (#4117) * fixed wipe my cal button * fixed booking buttons * new buttons for request reschedule * removed "yet" from empty screen in booking --- .../components/booking/BookingListItem.tsx | 8 +- .../web/components/booking/SkeletonLoader.tsx | 4 +- .../components/dialog/RescheduleDialog.tsx | 2 +- apps/web/components/ui/TableActions.tsx | 5 +- apps/web/pages/v2/bookings/[status].tsx | 4 +- apps/web/public/static/locales/en/common.json | 5 +- .../components/wipeMyCalActionButton.tsx | 8 +- packages/ui/LogoAnimated.json | 3876 ++++++++++++++++- 8 files changed, 3892 insertions(+), 20 deletions(-) diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx index 283f1fc015..3ed55b9134 100644 --- a/apps/web/components/booking/BookingListItem.tsx +++ b/apps/web/components/booking/BookingListItem.tsx @@ -9,11 +9,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale"; import showToast from "@calcom/lib/notification"; import { getEveryFreqFor } from "@calcom/lib/recurringStrings"; import { inferQueryInput, inferQueryOutput, trpc } from "@calcom/trpc/react"; -import Button from "@calcom/ui/Button"; import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/Dialog"; import { Icon } from "@calcom/ui/Icon"; import { Tooltip } from "@calcom/ui/Tooltip"; import { TextArea } from "@calcom/ui/form/fields"; +import Button from "@calcom/ui/v2/core/Button"; import useMeQuery from "@lib/hooks/useMeQuery"; import { extractRecurringDates } from "@lib/parseDate"; @@ -151,7 +151,7 @@ function BookingListItem(booking: BookingItemProps) { const RequestSentMessage = () => { return ( -
+

{t("reschedule_request_sent")}

@@ -261,7 +261,7 @@ function BookingListItem(booking: BookingItemProps) { - +
{startTime}
@@ -302,7 +302,7 @@ function BookingListItem(booking: BookingItemProps) {
- +
{isPending && {t("unconfirmed")}} diff --git a/apps/web/components/booking/SkeletonLoader.tsx b/apps/web/components/booking/SkeletonLoader.tsx index e38f75a0b3..1123b7fd78 100644 --- a/apps/web/components/booking/SkeletonLoader.tsx +++ b/apps/web/components/booking/SkeletonLoader.tsx @@ -4,7 +4,7 @@ import { SkeletonText } from "@calcom/ui"; function SkeletonLoader() { return ( -
    +
      @@ -16,7 +16,7 @@ export default SkeletonLoader; function SkeletonItem() { return ( -
    • +
    • diff --git a/apps/web/components/dialog/RescheduleDialog.tsx b/apps/web/components/dialog/RescheduleDialog.tsx index 6e556063bc..23285bcaf0 100644 --- a/apps/web/components/dialog/RescheduleDialog.tsx +++ b/apps/web/components/dialog/RescheduleDialog.tsx @@ -5,10 +5,10 @@ import { useMutation } from "react-query"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import showToast from "@calcom/lib/notification"; import { trpc } from "@calcom/trpc/react"; -import Button from "@calcom/ui/Button"; import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/Dialog"; import { Icon } from "@calcom/ui/Icon"; import { TextArea } from "@calcom/ui/form/fields"; +import Button from "@calcom/ui/v2/core/Button"; import * as fetchWrapper from "@lib/core/http/fetch-wrapper"; diff --git a/apps/web/components/ui/TableActions.tsx b/apps/web/components/ui/TableActions.tsx index d1b3d1d5dc..24bb4b052b 100644 --- a/apps/web/components/ui/TableActions.tsx +++ b/apps/web/components/ui/TableActions.tsx @@ -1,8 +1,8 @@ import React, { FC } from "react"; -import Button from "@calcom/ui/Button"; import Dropdown, { DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@calcom/ui/Dropdown"; import { Icon } from "@calcom/ui/Icon"; +import Button from "@calcom/ui/v2/core/Button"; import { SVGComponent } from "@lib/types/SVGComponent"; @@ -48,12 +48,10 @@ const DropdownActions = ({