From 9cb9ce2e429cd6e81f90d93a8007af9566d335ee Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:39:29 +0000 Subject: [PATCH] Chor/bulk UI migration (#6367) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Big bulk commit * Switch and settings toggle * Popover Kbar Timezones * Image Uploader * Fix core export * Meta * Swatch * Remove shell * Fix shell imports * Moved ShellSubHeading component to UI, to prevent recursive imports from shell component * Removed shell from ui ts config since shell doesnt have a dependency on shell anymore. Co-authored-by: Jeroen Reumkens Co-authored-by: Omar López --- apps/web/components/SettingsShell.tsx | 3 +- apps/web/components/apps/App.tsx | 3 +- .../components/apps/CalendarListContainer.tsx | 2 +- .../components/apps/layouts/AppsLayout.tsx | 3 +- .../apps/layouts/InstalledAppsLayout.tsx | 3 +- .../components/auth/layouts/AdminLayout.tsx | 3 +- .../eventtype/EventTypeSingleLayout.tsx | 2 +- apps/web/pages/apps/categories/[category].tsx | 3 +- apps/web/pages/apps/categories/index.tsx | 3 +- apps/web/pages/apps/installed/[category].tsx | 2 +- apps/web/pages/availability/[schedule].tsx | 2 +- apps/web/pages/availability/index.tsx | 3 +- apps/web/pages/availability/troubleshoot.tsx | 3 +- apps/web/pages/event-types/index.tsx | 2 +- apps/web/pages/more.tsx | 2 +- apps/web/pages/teams/index.tsx | 3 +- .../routing-forms/components/SingleForm.tsx | 2 +- .../pages/form-edit/[...appPages].tsx | 2 +- .../pages/forms/[...appPages].tsx | 3 +- .../pages/reporting/[...appPages].tsx | 3 +- .../pages/route-builder/[...appPages].tsx | 2 +- .../bookings/layout/BookingLayout.tsx | 3 +- .../features/ee/workflows/pages/index.tsx | 3 +- .../features/ee/workflows/pages/workflow.tsx | 3 +- .../{ui/v2/core => features/kbar}/Kbar.tsx | 3 +- .../settings/layouts/SettingsLayout.tsx | 2 +- .../{ui/v2/core => features/shell}/Shell.tsx | 35 +++--------- .../ui/__WHATSUP_WITH_ALL_THESE_VERSIONS.md | 35 ------------ .../ui/components/apps/SkeletonLoader.tsx | 4 +- .../form => components/card}/FormCard.tsx | 6 +-- packages/ui/components/card/index.ts | 1 + .../form/color-picker}/colorpicker.tsx | 2 +- .../form/dropdown}/Dropdown.tsx | 0 packages/ui/components/form/dropdown/index.ts | 16 ++++++ packages/ui/components/form/index.ts | 20 +++++++ .../form/step}/FormStep.tsx | 0 .../core => components/form/step}/Stepper.tsx | 0 .../core => components/form/step}/Steps.tsx | 0 packages/ui/components/form/step/index.ts | 3 ++ .../form/switch}/SettingsToggle.tsx | 2 +- .../form/switch}/Switch.tsx | 0 packages/ui/components/form/switch/index.ts | 2 + .../form/wizard}/WizardForm.tsx | 2 +- packages/ui/components/form/wizard/index.ts | 1 + .../image-uploader}/ImageUploader.tsx | 2 +- .../ui/components/image-uploader/index.ts | 1 + packages/ui/components/index.ts | 37 +++++++++++-- .../ui/components/layout/ShellSubHeading.tsx | 22 ++++++++ packages/ui/components/layout/index.ts | 1 + .../ui/{v2/core => components/meta}/Meta.tsx | 0 packages/ui/components/meta/index.ts | 1 + .../{index.tsx => AnimatedPopover.tsx} | 0 .../popover}/MeetingTimeInTimezones.tsx | 2 +- packages/ui/components/popover/index.ts | 2 + .../core => components/skeleton}/Loader.tsx | 0 packages/ui/components/skeleton/index.tsx | 1 + .../{v2/core => components/swatch}/Swatch.tsx | 0 packages/ui/components/swatch/index.ts | 1 + packages/ui/index.tsx | 53 +++++++++++-------- packages/ui/v2/core/form/index.ts | 3 -- packages/ui/v2/core/index.ts | 26 --------- packages/ui/v2/index.ts | 2 - 62 files changed, 194 insertions(+), 157 deletions(-) rename packages/{ui/v2/core => features/kbar}/Kbar.tsx (99%) rename packages/{ui/v2/core => features/shell}/Shell.tsx (96%) delete mode 100644 packages/ui/__WHATSUP_WITH_ALL_THESE_VERSIONS.md rename packages/ui/{v2/core/form => components/card}/FormCard.tsx (94%) rename packages/ui/{v2/core => components/form/color-picker}/colorpicker.tsx (98%) rename packages/ui/{v2/core => components/form/dropdown}/Dropdown.tsx (100%) create mode 100644 packages/ui/components/form/dropdown/index.ts rename packages/ui/{v2/core/form => components/form/step}/FormStep.tsx (100%) rename packages/ui/{v2/core => components/form/step}/Stepper.tsx (100%) rename packages/ui/{v2/core => components/form/step}/Steps.tsx (100%) create mode 100644 packages/ui/components/form/step/index.ts rename packages/ui/{v2/core => components/form/switch}/SettingsToggle.tsx (96%) rename packages/ui/{v2/core => components/form/switch}/Switch.tsx (100%) create mode 100644 packages/ui/components/form/switch/index.ts rename packages/ui/{v2/core => components/form/wizard}/WizardForm.tsx (98%) create mode 100644 packages/ui/components/form/wizard/index.ts rename packages/ui/{v2/core => components/image-uploader}/ImageUploader.tsx (99%) create mode 100644 packages/ui/components/image-uploader/index.ts create mode 100644 packages/ui/components/layout/ShellSubHeading.tsx create mode 100644 packages/ui/components/layout/index.ts rename packages/ui/{v2/core => components/meta}/Meta.tsx (100%) create mode 100644 packages/ui/components/meta/index.ts rename packages/ui/components/popover/{index.tsx => AnimatedPopover.tsx} (100%) rename packages/ui/{v2/core => components/popover}/MeetingTimeInTimezones.tsx (98%) create mode 100644 packages/ui/components/popover/index.ts rename packages/ui/{v2/core => components/skeleton}/Loader.tsx (100%) rename packages/ui/{v2/core => components/swatch}/Swatch.tsx (100%) create mode 100644 packages/ui/components/swatch/index.ts delete mode 100644 packages/ui/v2/core/form/index.ts delete mode 100644 packages/ui/v2/core/index.ts delete mode 100644 packages/ui/v2/index.ts diff --git a/apps/web/components/SettingsShell.tsx b/apps/web/components/SettingsShell.tsx index 1599371328..2b23566500 100644 --- a/apps/web/components/SettingsShell.tsx +++ b/apps/web/components/SettingsShell.tsx @@ -1,6 +1,7 @@ import React, { ComponentProps } from "react"; -import { ErrorBoundary, Icon, Shell } from "@calcom/ui"; +import Shell from "@calcom/features/shell/Shell"; +import { ErrorBoundary, Icon } from "@calcom/ui"; import NavTabs from "./NavTabs"; diff --git a/apps/web/components/apps/App.tsx b/apps/web/components/apps/App.tsx index 531e45accc..2dd39a4518 100644 --- a/apps/web/components/apps/App.tsx +++ b/apps/web/components/apps/App.tsx @@ -6,12 +6,13 @@ import useAddAppMutation from "@calcom/app-store/_utils/useAddAppMutation"; import { InstallAppButton } from "@calcom/app-store/components"; import DisconnectIntegration from "@calcom/features/apps/components/DisconnectIntegration"; import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseRequired"; +import Shell from "@calcom/features/shell/Shell"; import classNames from "@calcom/lib/classNames"; import { APP_NAME, COMPANY_NAME, SUPPORT_MAIL_ADDRESS } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import { App as AppType } from "@calcom/types/App"; -import { Button, Icon, Shell, showToast, SkeletonButton, SkeletonText, HeadSeo } from "@calcom/ui"; +import { Button, Icon, showToast, SkeletonButton, SkeletonText, HeadSeo } from "@calcom/ui"; const Component = ({ name, diff --git a/apps/web/components/apps/CalendarListContainer.tsx b/apps/web/components/apps/CalendarListContainer.tsx index f9c29e831e..c2ba087658 100644 --- a/apps/web/components/apps/CalendarListContainer.tsx +++ b/apps/web/components/apps/CalendarListContainer.tsx @@ -13,10 +13,10 @@ import { EmptyScreen, Icon, List, - ShellSubHeading, showToast, AppSkeletonLoader as SkeletonLoader, Switch, + ShellSubHeading, } from "@calcom/ui"; import { QueryCell } from "@lib/QueryCell"; diff --git a/apps/web/components/apps/layouts/AppsLayout.tsx b/apps/web/components/apps/layouts/AppsLayout.tsx index b02dde62ba..3e7ed76181 100644 --- a/apps/web/components/apps/layouts/AppsLayout.tsx +++ b/apps/web/components/apps/layouts/AppsLayout.tsx @@ -2,8 +2,9 @@ import { useSession } from "next-auth/react"; import { useRouter } from "next/router"; import React, { ComponentProps } from "react"; +import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { EmptyScreen, Icon, Shell, HorizontalTabs, HorizontalTabItemProps } from "@calcom/ui"; +import { EmptyScreen, Icon, HorizontalTabs, HorizontalTabItemProps } from "@calcom/ui"; const tabs: HorizontalTabItemProps[] = [ { diff --git a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx index 4d289e9d0e..648817f021 100644 --- a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx +++ b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx @@ -2,8 +2,9 @@ import React, { ComponentProps } from "react"; import AppCategoryNavigation from "@calcom/app-store/_components/AppCategoryNavigation"; import { InstalledAppVariants } from "@calcom/app-store/utils"; +import Shell from "@calcom/features/shell/Shell"; import { trpc } from "@calcom/trpc/react"; -import { Icon, Shell } from "@calcom/ui"; +import { Icon } from "@calcom/ui"; import type { HorizontalTabItemProps, VerticalTabItemProps } from "@calcom/ui"; const tabs: (VerticalTabItemProps | HorizontalTabItemProps)[] = [ diff --git a/apps/web/components/auth/layouts/AdminLayout.tsx b/apps/web/components/auth/layouts/AdminLayout.tsx index 65b2838878..cb2ece4eb3 100644 --- a/apps/web/components/auth/layouts/AdminLayout.tsx +++ b/apps/web/components/auth/layouts/AdminLayout.tsx @@ -3,7 +3,8 @@ import { useRouter } from "next/router"; import React, { ComponentProps, useEffect } from "react"; import SettingsLayout from "@calcom/features/settings/layouts/SettingsLayout"; -import { ErrorBoundary, Shell } from "@calcom/ui"; +import Shell from "@calcom/features/shell/Shell"; +import { ErrorBoundary } from "@calcom/ui"; import { UserPermissionRole } from ".prisma/client"; diff --git a/apps/web/components/eventtype/EventTypeSingleLayout.tsx b/apps/web/components/eventtype/EventTypeSingleLayout.tsx index 32c3fee9f2..2e7364e1e2 100644 --- a/apps/web/components/eventtype/EventTypeSingleLayout.tsx +++ b/apps/web/components/eventtype/EventTypeSingleLayout.tsx @@ -5,6 +5,7 @@ import { useMemo, useState, Suspense } from "react"; import { UseFormReturn } from "react-hook-form"; import { TbWebhook } from "react-icons/tb"; +import Shell from "@calcom/features/shell/Shell"; import { classNames } from "@calcom/lib"; import { CAL_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; @@ -23,7 +24,6 @@ import { HorizontalTabs, Icon, Label, - Shell, showToast, Skeleton, Switch, diff --git a/apps/web/pages/apps/categories/[category].tsx b/apps/web/pages/apps/categories/[category].tsx index 0b5eb99aeb..35cdbb992e 100644 --- a/apps/web/pages/apps/categories/[category].tsx +++ b/apps/web/pages/apps/categories/[category].tsx @@ -4,9 +4,10 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { getAppRegistry } from "@calcom/app-store/_appRegistry"; +import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import prisma from "@calcom/prisma"; -import { AppCard, Shell, SkeletonText } from "@calcom/ui"; +import { AppCard, SkeletonText } from "@calcom/ui"; export default function Apps({ apps }: InferGetStaticPropsType) { const { t, isLocaleReady } = useLocale(); diff --git a/apps/web/pages/apps/categories/index.tsx b/apps/web/pages/apps/categories/index.tsx index 4667fc4d4f..fb9517a174 100644 --- a/apps/web/pages/apps/categories/index.tsx +++ b/apps/web/pages/apps/categories/index.tsx @@ -2,8 +2,9 @@ import { InferGetStaticPropsType } from "next"; import Link from "next/link"; import { getAppRegistry } from "@calcom/app-store/_appRegistry"; +import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Icon, Shell, SkeletonText } from "@calcom/ui"; +import { Icon, SkeletonText } from "@calcom/ui"; export default function Apps({ categories }: InferGetStaticPropsType) { const { t, isLocaleReady } = useLocale(); diff --git a/apps/web/pages/apps/installed/[category].tsx b/apps/web/pages/apps/installed/[category].tsx index 39ad922881..d0503d4a33 100644 --- a/apps/web/pages/apps/installed/[category].tsx +++ b/apps/web/pages/apps/installed/[category].tsx @@ -15,8 +15,8 @@ import { EmptyScreen, Icon, List, - ShellSubHeading, AppSkeletonLoader as SkeletonLoader, + ShellSubHeading, } from "@calcom/ui"; import { QueryCell } from "@lib/QueryCell"; diff --git a/apps/web/pages/availability/[schedule].tsx b/apps/web/pages/availability/[schedule].tsx index 890a1e3cd7..5fb871b000 100644 --- a/apps/web/pages/availability/[schedule].tsx +++ b/apps/web/pages/availability/[schedule].tsx @@ -4,6 +4,7 @@ import { z } from "zod"; import { DateOverrideInputDialog, DateOverrideList } from "@calcom/features/schedules"; import Schedule from "@calcom/features/schedules/components/Schedule"; +import Shell from "@calcom/features/shell/Shell"; import { availabilityAsString } from "@calcom/lib/availability"; import { yyyymmdd } from "@calcom/lib/date-fns"; import { useLocale } from "@calcom/lib/hooks/useLocale"; @@ -16,7 +17,6 @@ import { Form, Icon, Label, - Shell, showToast, Skeleton, SkeletonText, diff --git a/apps/web/pages/availability/index.tsx b/apps/web/pages/availability/index.tsx index 42df6cfab2..75e5fca2cb 100644 --- a/apps/web/pages/availability/index.tsx +++ b/apps/web/pages/availability/index.tsx @@ -2,9 +2,10 @@ import { useAutoAnimate } from "@formkit/auto-animate/react"; import { GetServerSidePropsContext } from "next"; import { NewScheduleButton, ScheduleListItem } from "@calcom/features/schedules"; +import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { RouterOutputs, trpc } from "@calcom/trpc/react"; -import { EmptyScreen, Icon, Shell, showToast } from "@calcom/ui"; +import { EmptyScreen, Icon, showToast } from "@calcom/ui"; import { withQuery } from "@lib/QueryCell"; import { HttpError } from "@lib/core/http/error"; diff --git a/apps/web/pages/availability/troubleshoot.tsx b/apps/web/pages/availability/troubleshoot.tsx index b033bb66e9..ed599bcf4d 100644 --- a/apps/web/pages/availability/troubleshoot.tsx +++ b/apps/web/pages/availability/troubleshoot.tsx @@ -1,7 +1,8 @@ import dayjs from "@calcom/dayjs"; +import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { RouterOutputs, trpc } from "@calcom/trpc/react"; -import { Shell, SkeletonText } from "@calcom/ui"; +import { SkeletonText } from "@calcom/ui"; import useRouterQuery from "@lib/hooks/useRouterQuery"; diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx index 97222443ad..d5e77a4602 100644 --- a/apps/web/pages/event-types/index.tsx +++ b/apps/web/pages/event-types/index.tsx @@ -8,6 +8,7 @@ import { CreateEventTypeButton, EventTypeDescriptionLazy as EventTypeDescription, } from "@calcom/features/eventtypes/components"; +import Shell from "@calcom/features/shell/Shell"; import { APP_NAME, CAL_URL, WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { RouterOutputs, trpc, TRPCClientError } from "@calcom/trpc/react"; @@ -26,7 +27,6 @@ import { DropdownMenuTrigger, EmptyScreen, Icon, - Shell, showToast, Switch, Tooltip, diff --git a/apps/web/pages/more.tsx b/apps/web/pages/more.tsx index a34dbc754b..bf79c40e32 100644 --- a/apps/web/pages/more.tsx +++ b/apps/web/pages/more.tsx @@ -1,5 +1,5 @@ +import Shell, { MobileNavigationMoreItems } from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { MobileNavigationMoreItems, Shell } from "@calcom/ui"; export default function MorePage() { const { t } = useLocale(); diff --git a/apps/web/pages/teams/index.tsx b/apps/web/pages/teams/index.tsx index acd2bdc653..00363b5a64 100644 --- a/apps/web/pages/teams/index.tsx +++ b/apps/web/pages/teams/index.tsx @@ -1,9 +1,10 @@ import { GetServerSidePropsContext } from "next"; import { TeamsListing } from "@calcom/features/ee/teams/components"; +import Shell from "@calcom/features/shell/Shell"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Button, Icon, Shell } from "@calcom/ui"; +import { Button, Icon } from "@calcom/ui"; import { ssrInit } from "@server/lib/ssr"; diff --git a/packages/app-store/ee/routing-forms/components/SingleForm.tsx b/packages/app-store/ee/routing-forms/components/SingleForm.tsx index d0122f6652..41db7dacf0 100644 --- a/packages/app-store/ee/routing-forms/components/SingleForm.tsx +++ b/packages/app-store/ee/routing-forms/components/SingleForm.tsx @@ -3,6 +3,7 @@ import Link from "next/link"; import { useEffect, useState } from "react"; import { Controller, useForm, UseFormReturn } from "react-hook-form"; +import { ShellMain } from "@calcom/features/shell/Shell"; import useApp from "@calcom/lib/hooks/useApp"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; @@ -27,7 +28,6 @@ import { Icon, Meta, SettingsToggle, - ShellMain, showToast, TextAreaField, TextField, diff --git a/packages/app-store/ee/routing-forms/pages/form-edit/[...appPages].tsx b/packages/app-store/ee/routing-forms/pages/form-edit/[...appPages].tsx index 4f28169f2f..3511e3521a 100644 --- a/packages/app-store/ee/routing-forms/pages/form-edit/[...appPages].tsx +++ b/packages/app-store/ee/routing-forms/pages/form-edit/[...appPages].tsx @@ -3,6 +3,7 @@ import { useEffect, useState } from "react"; import { Controller, useFieldArray, UseFormReturn } from "react-hook-form"; import { v4 as uuidv4 } from "uuid"; +import Shell from "@calcom/features/shell/Shell"; import classNames from "@calcom/lib/classNames"; import { BooleanToggleGroupField, @@ -11,7 +12,6 @@ import { FormCard, Icon, SelectField, - Shell, TextAreaField, TextField, } from "@calcom/ui"; diff --git a/packages/app-store/ee/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/ee/routing-forms/pages/forms/[...appPages].tsx index 0507010b75..632984b165 100644 --- a/packages/app-store/ee/routing-forms/pages/forms/[...appPages].tsx +++ b/packages/app-store/ee/routing-forms/pages/forms/[...appPages].tsx @@ -1,6 +1,7 @@ // TODO: i18n import { serverSideTranslations } from "next-i18next/serverSideTranslations"; +import Shell, { ShellMain } from "@calcom/features/shell/Shell"; import useApp from "@calcom/lib/hooks/useApp"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; @@ -13,8 +14,6 @@ import { Icon, List, ListLinkItem, - Shell, - ShellMain, Tooltip, } from "@calcom/ui"; diff --git a/packages/app-store/ee/routing-forms/pages/reporting/[...appPages].tsx b/packages/app-store/ee/routing-forms/pages/reporting/[...appPages].tsx index 2570fab771..2c3616490e 100644 --- a/packages/app-store/ee/routing-forms/pages/reporting/[...appPages].tsx +++ b/packages/app-store/ee/routing-forms/pages/reporting/[...appPages].tsx @@ -10,11 +10,12 @@ import { Utils as QbUtils, } from "react-awesome-query-builder"; +import Shell from "@calcom/features/shell/Shell"; import { classNames } from "@calcom/lib"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import { inferSSRProps } from "@calcom/types/inferSSRProps"; -import { Button, Shell } from "@calcom/ui"; +import { Button } from "@calcom/ui"; import { useInViewObserver } from "@lib/hooks/useInViewObserver"; diff --git a/packages/app-store/ee/routing-forms/pages/route-builder/[...appPages].tsx b/packages/app-store/ee/routing-forms/pages/route-builder/[...appPages].tsx index 6eaaf3e9d8..c3c09a6c58 100644 --- a/packages/app-store/ee/routing-forms/pages/route-builder/[...appPages].tsx +++ b/packages/app-store/ee/routing-forms/pages/route-builder/[...appPages].tsx @@ -5,13 +5,13 @@ import { Query, Builder, Utils as QbUtils } from "react-awesome-query-builder"; // types import { JsonTree, ImmutableTree, BuilderProps } from "react-awesome-query-builder"; +import Shell from "@calcom/features/shell/Shell"; import { trpc } from "@calcom/trpc/react"; import { inferSSRProps } from "@calcom/types/inferSSRProps"; import { SelectField, FormCard, SelectWithValidation as Select, - Shell, TextArea, TextField, Badge, diff --git a/packages/features/bookings/layout/BookingLayout.tsx b/packages/features/bookings/layout/BookingLayout.tsx index e0fc12dac8..b32e05ba24 100644 --- a/packages/features/bookings/layout/BookingLayout.tsx +++ b/packages/features/bookings/layout/BookingLayout.tsx @@ -1,6 +1,7 @@ import React, { ComponentProps } from "react"; -import { HorizontalTabs, Shell } from "@calcom/ui"; +import Shell from "@calcom/features/shell/Shell"; +import { HorizontalTabs } from "@calcom/ui"; import { VerticalTabItemProps, HorizontalTabItemProps } from "@calcom/ui"; import { FiltersContainer } from "../components/FiltersContainer"; diff --git a/packages/features/ee/workflows/pages/index.tsx b/packages/features/ee/workflows/pages/index.tsx index 8f4b596d97..cc4c2ab085 100644 --- a/packages/features/ee/workflows/pages/index.tsx +++ b/packages/features/ee/workflows/pages/index.tsx @@ -1,10 +1,11 @@ import { useSession } from "next-auth/react"; import { useRouter } from "next/router"; +import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { HttpError } from "@calcom/lib/http-error"; import { trpc } from "@calcom/trpc/react"; -import { Button, Icon, Shell, showToast } from "@calcom/ui"; +import { Button, Icon, showToast } from "@calcom/ui"; import LicenseRequired from "../../common/components/v2/LicenseRequired"; import SkeletonLoader from "../components/SkeletonLoaderList"; diff --git a/packages/features/ee/workflows/pages/workflow.tsx b/packages/features/ee/workflows/pages/workflow.tsx index 67f1d9df7e..2af97d9c14 100644 --- a/packages/features/ee/workflows/pages/workflow.tsx +++ b/packages/features/ee/workflows/pages/workflow.tsx @@ -13,13 +13,14 @@ import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { z } from "zod"; +import Shell from "@calcom/features/shell/Shell"; import { classNames } from "@calcom/lib"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { HttpError } from "@calcom/lib/http-error"; import { stringOrNumber } from "@calcom/prisma/zod-utils"; import { trpc } from "@calcom/trpc/react"; import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui"; -import { Alert, Button, Form, Shell, showToast } from "@calcom/ui"; +import { Alert, Button, Form, showToast } from "@calcom/ui"; import LicenseRequired from "../../common/components/v2/LicenseRequired"; import SkeletonLoader from "../components/SkeletonLoaderEdit"; diff --git a/packages/ui/v2/core/Kbar.tsx b/packages/features/kbar/Kbar.tsx similarity index 99% rename from packages/ui/v2/core/Kbar.tsx rename to packages/features/kbar/Kbar.tsx index 8378751456..7eb0427bde 100644 --- a/packages/ui/v2/core/Kbar.tsx +++ b/packages/features/kbar/Kbar.tsx @@ -15,8 +15,7 @@ import { appStoreMetadata } from "@calcom/app-store/apps.metadata.generated"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { isMac } from "@calcom/lib/isMac"; import { RouterOutputs, trpc } from "@calcom/trpc/react"; - -import { Icon, Tooltip } from "../../"; +import { Icon, Tooltip } from "@calcom/ui"; type shortcutArrayType = { shortcuts?: string[]; diff --git a/packages/features/settings/layouts/SettingsLayout.tsx b/packages/features/settings/layouts/SettingsLayout.tsx index e8750ce645..dc327ce11b 100644 --- a/packages/features/settings/layouts/SettingsLayout.tsx +++ b/packages/features/settings/layouts/SettingsLayout.tsx @@ -5,6 +5,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import React, { ComponentProps, useEffect, useState } from "react"; +import Shell from "@calcom/features/shell/Shell"; import { classNames } from "@calcom/lib"; import { HOSTED_CAL_FEATURES, WEBAPP_URL } from "@calcom/lib/constants"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; @@ -17,7 +18,6 @@ import { Icon, VerticalTabItemProps, VerticalTabItem, - Shell, Skeleton, useMeta, } from "@calcom/ui"; diff --git a/packages/ui/v2/core/Shell.tsx b/packages/features/shell/Shell.tsx similarity index 96% rename from packages/ui/v2/core/Shell.tsx rename to packages/features/shell/Shell.tsx index 7aa754bcd6..0577e49020 100644 --- a/packages/ui/v2/core/Shell.tsx +++ b/packages/features/shell/Shell.tsx @@ -12,6 +12,7 @@ import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseReq import ImpersonatingBanner from "@calcom/features/ee/impersonation/components/ImpersonatingBanner"; import HelpMenuItem from "@calcom/features/ee/support/components/HelpMenuItem"; import { TeamsUpgradeBanner } from "@calcom/features/ee/teams/components"; +import { KBarContent, KBarRoot, KBarTrigger } from "@calcom/features/kbar/Kbar"; import TimezoneChangeDialog from "@calcom/features/settings/TimezoneChangeDialog"; import { Tips } from "@calcom/features/tips"; import AdminPasswordBanner from "@calcom/features/users/components/AdminPasswordBanner"; @@ -23,7 +24,6 @@ import useTheme from "@calcom/lib/hooks/useTheme"; import { trpc } from "@calcom/trpc/react"; import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; import { SVGComponent } from "@calcom/types/SVGComponent"; - import { Button, Dropdown, @@ -33,13 +33,13 @@ import { DropdownMenuSeparator, DropdownMenuTrigger, showToast, -} from "../.."; -import { Logo, ErrorBoundary } from "../../components"; -import { Credits } from "../../components/credits"; -import { HeadSeo } from "../../components/head-seo"; -import { Icon } from "../../components/icon"; -import { SkeletonText } from "../../components/skeleton"; -import { KBarContent, KBarRoot, KBarTrigger } from "./Kbar"; + Logo, + ErrorBoundary, + Credits, + HeadSeo, + Icon, + SkeletonText, +} from "@calcom/ui"; /* TODO: Migate this */ @@ -103,25 +103,6 @@ function useRedirectToOnboardingIfNeeded() { }; } -export function ShellSubHeading(props: { - title: ReactNode; - subtitle?: ReactNode; - actions?: ReactNode; - className?: string; -}) { - return ( -
-
-

- {props.title} -

- {props.subtitle &&

{props.subtitle}

} -
- {props.actions &&
{props.actions}
} -
- ); -} - const Layout = (props: LayoutProps) => { const pageTitle = typeof props.heading === "string" && !props.title ? props.heading : props.title; diff --git a/packages/ui/__WHATSUP_WITH_ALL_THESE_VERSIONS.md b/packages/ui/__WHATSUP_WITH_ALL_THESE_VERSIONS.md deleted file mode 100644 index 6131a5edd4..0000000000 --- a/packages/ui/__WHATSUP_WITH_ALL_THESE_VERSIONS.md +++ /dev/null @@ -1,35 +0,0 @@ -# Whatsup with all these version? - -We're currently in the progress of merging multiple versions of our UI library into one new version. - -## Version 1 - -Anything version 1 is in the root, or in the root folders skeleton, form, booker and apps. - -## Version 2 - -Anything version 2 is in the v2 folder - -## New version - -We're currently creating all new components following new standards in the components directory. The /styles directory contains the shared tailwind styles. - -### Adding new components - -For adding new components it is important to take a few patterns into account: - -- All components should be added in /components -- All components should be in a folder, no tsx files directly in the root -- All components should contain stories and MDX documentation (which is why they can't live in the root, since that would result in a lot of duplication) - -### Migration process - -We're currently migrating existing components step by step, this process looks as following: - -- New components only should get added in /components -- Any existing components in v2 are reviewed, updated if needed and then moved to the /components directory -- After v2 is moved, the old v2 component should be deleted, as well as any v1 version of that component. All places in the monorepo where we use this component, should use the newest version by then. - -### End state - -The envisioned end state is a state where only the /components directory exists. In this directory all components should have documentation and stories. diff --git a/packages/ui/components/apps/SkeletonLoader.tsx b/packages/ui/components/apps/SkeletonLoader.tsx index af8cb6ef56..fc194228e8 100644 --- a/packages/ui/components/apps/SkeletonLoader.tsx +++ b/packages/ui/components/apps/SkeletonLoader.tsx @@ -1,5 +1,5 @@ -import Meta from "../../v2/core/Meta"; -import { ShellSubHeading } from "../../v2/core/Shell"; +import { ShellSubHeading } from "../layout"; +import Meta from "../meta/Meta"; import { SkeletonText } from "../skeleton"; export function SkeletonLoader({ diff --git a/packages/ui/v2/core/form/FormCard.tsx b/packages/ui/components/card/FormCard.tsx similarity index 94% rename from packages/ui/v2/core/form/FormCard.tsx rename to packages/ui/components/card/FormCard.tsx index 32c1695c7c..f46d43c6b1 100644 --- a/packages/ui/v2/core/form/FormCard.tsx +++ b/packages/ui/components/card/FormCard.tsx @@ -2,9 +2,9 @@ import Link from "next/link"; import { classNames } from "@calcom/lib"; -import { Icon } from "../../.."; -import { Badge, BadgeProps } from "../../../components"; -import { Divider } from "../../../components/divider"; +import { Badge, BadgeProps } from ".."; +import { Icon } from "../.."; +import { Divider } from "../divider"; type Action = { check: () => boolean; fn: () => void }; export default function FormCard({ diff --git a/packages/ui/components/card/index.ts b/packages/ui/components/card/index.ts index a4319ced5e..3412abfa93 100644 --- a/packages/ui/components/card/index.ts +++ b/packages/ui/components/card/index.ts @@ -1,3 +1,4 @@ export { default as Card } from "./Card"; export type { BaseCardProps } from "./Card"; export { StepCard } from "./StepCard"; +export { default as FormCard } from "./FormCard"; diff --git a/packages/ui/v2/core/colorpicker.tsx b/packages/ui/components/form/color-picker/colorpicker.tsx similarity index 98% rename from packages/ui/v2/core/colorpicker.tsx rename to packages/ui/components/form/color-picker/colorpicker.tsx index ee41ea98ff..93ef5da340 100644 --- a/packages/ui/v2/core/colorpicker.tsx +++ b/packages/ui/components/form/color-picker/colorpicker.tsx @@ -3,7 +3,7 @@ import { HexColorInput, HexColorPicker } from "react-colorful"; import { fallBackHex, isValidHexCode } from "@calcom/lib/CustomBranding"; -import { Swatch } from "../.."; +import { Swatch } from "../../.."; type Handler = (event: MouseEvent | Event) => void; function useEventListener< diff --git a/packages/ui/v2/core/Dropdown.tsx b/packages/ui/components/form/dropdown/Dropdown.tsx similarity index 100% rename from packages/ui/v2/core/Dropdown.tsx rename to packages/ui/components/form/dropdown/Dropdown.tsx diff --git a/packages/ui/components/form/dropdown/index.ts b/packages/ui/components/form/dropdown/index.ts new file mode 100644 index 0000000000..934ddb81c8 --- /dev/null +++ b/packages/ui/components/form/dropdown/index.ts @@ -0,0 +1,16 @@ +export { + Dropdown, + ButtonOrLink, + DropdownItem, + DropdownMenuCheckboxItem, + DropdownMenuContent, + DropdownMenuGroup, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuPortal, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuSeparator, + DropdownMenuTrigger, + DropdownMenuTriggerItem, +} from "./Dropdown"; diff --git a/packages/ui/components/form/index.ts b/packages/ui/components/form/index.ts index a7ac5ef047..29c00ea19e 100644 --- a/packages/ui/components/form/index.ts +++ b/packages/ui/components/form/index.ts @@ -23,3 +23,23 @@ export type { ITimezone, ITimezoneOption } from "./timezone-select"; export { DateRangePickerLazy as DateRangePicker } from "./date-range-picker"; export { BooleanToggleGroup, BooleanToggleGroupField, ToggleGroup, ToggleGroupItem } from "./toggleGroup"; export { DatePicker } from "./datepicker"; +export { FormStep, Steps, Stepper } from "./step"; +export { WizardForm } from "./wizard"; +export { default as ColorPicker } from "./color-picker/colorpicker"; +export { + Dropdown, + ButtonOrLink, + DropdownItem, + DropdownMenuCheckboxItem, + DropdownMenuContent, + DropdownMenuGroup, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuPortal, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuSeparator, + DropdownMenuTrigger, + DropdownMenuTriggerItem, +} from "./dropdown"; +export { SettingsToggle, Switch } from "./switch"; diff --git a/packages/ui/v2/core/form/FormStep.tsx b/packages/ui/components/form/step/FormStep.tsx similarity index 100% rename from packages/ui/v2/core/form/FormStep.tsx rename to packages/ui/components/form/step/FormStep.tsx diff --git a/packages/ui/v2/core/Stepper.tsx b/packages/ui/components/form/step/Stepper.tsx similarity index 100% rename from packages/ui/v2/core/Stepper.tsx rename to packages/ui/components/form/step/Stepper.tsx diff --git a/packages/ui/v2/core/Steps.tsx b/packages/ui/components/form/step/Steps.tsx similarity index 100% rename from packages/ui/v2/core/Steps.tsx rename to packages/ui/components/form/step/Steps.tsx diff --git a/packages/ui/components/form/step/index.ts b/packages/ui/components/form/step/index.ts new file mode 100644 index 0000000000..14316fa07e --- /dev/null +++ b/packages/ui/components/form/step/index.ts @@ -0,0 +1,3 @@ +export { default as FormStep } from "./FormStep"; +export { Steps } from "./Steps"; +export { default as Stepper } from "./Stepper"; diff --git a/packages/ui/v2/core/SettingsToggle.tsx b/packages/ui/components/form/switch/SettingsToggle.tsx similarity index 96% rename from packages/ui/v2/core/SettingsToggle.tsx rename to packages/ui/components/form/switch/SettingsToggle.tsx index f9cd167906..6d61188cb3 100644 --- a/packages/ui/v2/core/SettingsToggle.tsx +++ b/packages/ui/components/form/switch/SettingsToggle.tsx @@ -1,7 +1,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react"; import { ReactNode } from "react"; -import { Label } from "../../components/form"; +import { Label } from ".."; import Switch from "./Switch"; type Props = { diff --git a/packages/ui/v2/core/Switch.tsx b/packages/ui/components/form/switch/Switch.tsx similarity index 100% rename from packages/ui/v2/core/Switch.tsx rename to packages/ui/components/form/switch/Switch.tsx diff --git a/packages/ui/components/form/switch/index.ts b/packages/ui/components/form/switch/index.ts new file mode 100644 index 0000000000..2d20937593 --- /dev/null +++ b/packages/ui/components/form/switch/index.ts @@ -0,0 +1,2 @@ +export { default as SettingsToggle } from "./SettingsToggle"; +export { default as Switch } from "./Switch"; diff --git a/packages/ui/v2/core/WizardForm.tsx b/packages/ui/components/form/wizard/WizardForm.tsx similarity index 98% rename from packages/ui/v2/core/WizardForm.tsx rename to packages/ui/components/form/wizard/WizardForm.tsx index 8279ad21c6..bf20d8c19f 100644 --- a/packages/ui/v2/core/WizardForm.tsx +++ b/packages/ui/components/form/wizard/WizardForm.tsx @@ -3,7 +3,7 @@ import { ComponentProps } from "react"; import classNames from "@calcom/lib/classNames"; -import { Button, Stepper } from "../.."; +import { Button, Stepper } from "../../.."; type DefaultStep = { title: string; diff --git a/packages/ui/components/form/wizard/index.ts b/packages/ui/components/form/wizard/index.ts new file mode 100644 index 0000000000..78965db8d4 --- /dev/null +++ b/packages/ui/components/form/wizard/index.ts @@ -0,0 +1 @@ +export { default as WizardForm } from "./WizardForm"; diff --git a/packages/ui/v2/core/ImageUploader.tsx b/packages/ui/components/image-uploader/ImageUploader.tsx similarity index 99% rename from packages/ui/v2/core/ImageUploader.tsx rename to packages/ui/components/image-uploader/ImageUploader.tsx index a2b9317b93..303381e547 100644 --- a/packages/ui/v2/core/ImageUploader.tsx +++ b/packages/ui/components/image-uploader/ImageUploader.tsx @@ -4,7 +4,7 @@ import Cropper from "react-easy-crop"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Button, Dialog, DialogClose, DialogContent, DialogTrigger } from "../../"; +import { Button, Dialog, DialogClose, DialogContent, DialogTrigger } from "../.."; type ReadAsMethod = "readAsText" | "readAsDataURL" | "readAsArrayBuffer" | "readAsBinaryString"; diff --git a/packages/ui/components/image-uploader/index.ts b/packages/ui/components/image-uploader/index.ts new file mode 100644 index 0000000000..3ac324a4dd --- /dev/null +++ b/packages/ui/components/image-uploader/index.ts @@ -0,0 +1 @@ +export { default as ImageUploader } from "./ImageUploader"; diff --git a/packages/ui/components/index.ts b/packages/ui/components/index.ts index 5effb6eba3..574900288a 100644 --- a/packages/ui/components/index.ts +++ b/packages/ui/components/index.ts @@ -35,6 +35,27 @@ export { ToggleGroup, ToggleGroupItem, getReactSelectProps, + ColorPicker, + FormStep, + Dropdown, + DropdownItem, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuPortal, + DropdownMenuSeparator, + DropdownMenuTrigger, + DropdownMenuCheckboxItem, + DropdownMenuRadioGroup, + ButtonOrLink, + DropdownMenuGroup, + DropdownMenuRadioItem, + DropdownMenuTriggerItem, + Steps, + WizardForm, + SettingsToggle, + Stepper, + Switch, } from "./form"; export type { ITimezone, ITimezoneOption } from "./form"; export { @@ -49,7 +70,7 @@ export { } from "./apps"; export { TopBanner } from "./top-banner"; export type { TopBannerProps } from "./top-banner"; -export { AnimatedPopover } from "./popover/index"; +export { AnimatedPopover, MeetingTimeInTimezones } from "./popover"; export { TableActions, DropdownActions } from "./table/TableActions"; export type { ActionType } from "./table/TableActions"; export { Icon } from "./icon"; @@ -63,10 +84,17 @@ export { EmptyScreen } from "./empty-screen"; export { List, ListItem, ListItemText, ListItemTitle, ListLinkItem } from "./list"; export type { ListItemProps, ListProps } from "./list"; export { HeadSeo } from "./head-seo"; -export { Skeleton, SkeletonAvatar, SkeletonButton, SkeletonContainer, SkeletonText } from "./skeleton"; +export { + Skeleton, + SkeletonAvatar, + SkeletonButton, + SkeletonContainer, + SkeletonText, + Loader, +} from "./skeleton"; export { HorizontalTabs, HorizontalTabItem, VerticalTabs, VerticalTabItem } from "./navigation"; export type { HorizontalTabItemProps, NavTabProps, VerticalTabItemProps } from "./navigation"; -export { Card, StepCard } from "./card"; +export { Card, StepCard, FormCard } from "./card"; export type { BaseCardProps } from "./card"; export { Tooltip } from "./tooltip"; export { Editor, AddVariablesDropdown } from "./editor"; @@ -81,3 +109,6 @@ export { } from "./dialog"; export type { DialogProps, ConfirmationDialogContentProps } from "./dialog"; export { showToast } from "./toast"; // We don't export the toast components as they are only used in local storybook file +export { Meta, MetaProvider, useMeta } from "./meta"; +export { Swatch } from "./swatch"; +export { ShellSubHeading } from "./layout"; diff --git a/packages/ui/components/layout/ShellSubHeading.tsx b/packages/ui/components/layout/ShellSubHeading.tsx new file mode 100644 index 0000000000..7b04298730 --- /dev/null +++ b/packages/ui/components/layout/ShellSubHeading.tsx @@ -0,0 +1,22 @@ +import { ReactNode } from "react"; + +import { classNames } from "@calcom/lib"; + +export function ShellSubHeading(props: { + title: ReactNode; + subtitle?: ReactNode; + actions?: ReactNode; + className?: string; +}) { + return ( +
+
+

+ {props.title} +

+ {props.subtitle &&

{props.subtitle}

} +
+ {props.actions &&
{props.actions}
} +
+ ); +} diff --git a/packages/ui/components/layout/index.ts b/packages/ui/components/layout/index.ts new file mode 100644 index 0000000000..7b46739be2 --- /dev/null +++ b/packages/ui/components/layout/index.ts @@ -0,0 +1 @@ +export { ShellSubHeading } from "./ShellSubHeading"; diff --git a/packages/ui/v2/core/Meta.tsx b/packages/ui/components/meta/Meta.tsx similarity index 100% rename from packages/ui/v2/core/Meta.tsx rename to packages/ui/components/meta/Meta.tsx diff --git a/packages/ui/components/meta/index.ts b/packages/ui/components/meta/index.ts new file mode 100644 index 0000000000..f11468d4e1 --- /dev/null +++ b/packages/ui/components/meta/index.ts @@ -0,0 +1 @@ +export { default as Meta, MetaProvider, useMeta } from "./Meta"; diff --git a/packages/ui/components/popover/index.tsx b/packages/ui/components/popover/AnimatedPopover.tsx similarity index 100% rename from packages/ui/components/popover/index.tsx rename to packages/ui/components/popover/AnimatedPopover.tsx diff --git a/packages/ui/v2/core/MeetingTimeInTimezones.tsx b/packages/ui/components/popover/MeetingTimeInTimezones.tsx similarity index 98% rename from packages/ui/v2/core/MeetingTimeInTimezones.tsx rename to packages/ui/components/popover/MeetingTimeInTimezones.tsx index fc24c60827..b66949df7e 100644 --- a/packages/ui/v2/core/MeetingTimeInTimezones.tsx +++ b/packages/ui/components/popover/MeetingTimeInTimezones.tsx @@ -7,7 +7,7 @@ import { sortByTimezone, } from "@calcom/lib/date-fns"; -import { Icon } from "../../components/icon"; +import { Icon } from "../icon"; import { Attendee } from ".prisma/client"; interface MeetingTimeInTimezonesProps { diff --git a/packages/ui/components/popover/index.ts b/packages/ui/components/popover/index.ts new file mode 100644 index 0000000000..34c4a13876 --- /dev/null +++ b/packages/ui/components/popover/index.ts @@ -0,0 +1,2 @@ +export { AnimatedPopover } from "./AnimatedPopover"; +export { default as MeetingTimeInTimezones } from "./MeetingTimeInTimezones"; diff --git a/packages/ui/v2/core/Loader.tsx b/packages/ui/components/skeleton/Loader.tsx similarity index 100% rename from packages/ui/v2/core/Loader.tsx rename to packages/ui/components/skeleton/Loader.tsx diff --git a/packages/ui/components/skeleton/index.tsx b/packages/ui/components/skeleton/index.tsx index fd599ffd65..a9885c378d 100644 --- a/packages/ui/components/skeleton/index.tsx +++ b/packages/ui/components/skeleton/index.tsx @@ -94,3 +94,4 @@ const SkeletonContainer: React.FC = ({ children, as, classNam }; export { Skeleton, SkeletonAvatar, SkeletonText, SkeletonButton, SkeletonContainer }; +export { default as Loader } from "./Loader"; diff --git a/packages/ui/v2/core/Swatch.tsx b/packages/ui/components/swatch/Swatch.tsx similarity index 100% rename from packages/ui/v2/core/Swatch.tsx rename to packages/ui/components/swatch/Swatch.tsx diff --git a/packages/ui/components/swatch/index.ts b/packages/ui/components/swatch/index.ts new file mode 100644 index 0000000000..c7ce1e2c10 --- /dev/null +++ b/packages/ui/components/swatch/index.ts @@ -0,0 +1 @@ +export { default as Swatch } from "./Swatch"; diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx index 84e36f9e5f..b043447802 100644 --- a/packages/ui/index.tsx +++ b/packages/ui/index.tsx @@ -81,7 +81,36 @@ export { ToggleGroup, ToggleGroupItem, showToast, + ShellSubHeading, DatePicker as DatePickerField, + FormCard, + FormStep, + ColorPicker, + Dropdown, + DropdownItem, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuPortal, + DropdownMenuSeparator, + DropdownMenuTrigger, + DropdownMenuCheckboxItem, + DropdownMenuGroup, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuTriggerItem, + WizardForm, + Stepper, + Steps, + Switch, + SettingsToggle, + MeetingTimeInTimezones, + Loader, + Meta, + MetaProvider, + useMeta, + Swatch, + Logo, } from "./components"; export type { ActionType, @@ -107,22 +136,7 @@ export { default as CheckboxField } from "./components/form/checkbox/Checkbox"; export { default as AddressInput } from "./form/AddressInputLazy"; export { default as PhoneInput } from "./form/PhoneInputLazy"; export { UnstyledSelect } from "./form/Select"; -export { default as Loader } from "./v2/core/Loader"; -export { SettingsToggle, Swatch, Switch } from "./v2"; -export { default as Shell, ShellMain, MobileNavigationMoreItems, ShellSubHeading } from "./v2/core/Shell"; - -export { default as ColorPicker } from "./v2/core/colorpicker"; -export { - Dropdown, - DropdownItem, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuPortal, - DropdownMenuSeparator, - DropdownMenuTrigger, -} from "./v2/core/Dropdown"; export { RadioGroup, /* TODO: solve this conflict -> Select, */ @@ -131,13 +145,6 @@ export { RadioField, } from "./form/radio-area"; -export {} from "./components/form/date-range-picker"; -export { default as FormCard } from "./v2/core/form/FormCard"; export { default as MultiSelectCheckboxes } from "./components/form/checkbox/MultiSelectCheckboxes"; export type { Option as MultiSelectCheckboxesOptionType } from "./components/form/checkbox/MultiSelectCheckboxes"; -export { default as ImageUploader } from "./v2/core/ImageUploader"; -export { default as MeetingTimeInTimezones } from "./v2/core/MeetingTimeInTimezones"; -export { default as Meta, MetaProvider, useMeta } from "./v2/core/Meta"; -export { default as Stepper } from "./v2/core/Stepper"; -export { Steps } from "./v2/core/Steps"; -export { default as WizardForm } from "./v2/core/WizardForm"; +export { default as ImageUploader } from "./components/image-uploader/ImageUploader"; diff --git a/packages/ui/v2/core/form/index.ts b/packages/ui/v2/core/form/index.ts deleted file mode 100644 index 81f2539525..0000000000 --- a/packages/ui/v2/core/form/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { default as Checkbox } from "../../../components/form/checkbox/Checkbox"; - -export { default as FormStep } from "./FormStep"; diff --git a/packages/ui/v2/core/index.ts b/packages/ui/v2/core/index.ts deleted file mode 100644 index 4f0b1b5d03..0000000000 --- a/packages/ui/v2/core/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -export { default as ColorPicker } from "./colorpicker"; -export { - ButtonOrLink, - Dropdown, - DropdownItem, - DropdownMenuCheckboxItem, - DropdownMenuContent, - DropdownMenuGroup, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuPortal, - DropdownMenuRadioGroup, - DropdownMenuRadioItem, - DropdownMenuSeparator, - DropdownMenuTrigger, - DropdownMenuTriggerItem, -} from "./Dropdown"; -export { FormStep } from "./form"; -export { default as Loader } from "./Loader"; -export { default as MeetingTimeInTimezones } from "./MeetingTimeInTimezones"; -export { default as SettingsToggle } from "./SettingsToggle"; -export { default as Shell } from "./Shell"; -export { default as Stepper } from "./Stepper"; -export { default as Swatch } from "./Swatch"; -export { default as Switch } from "./Switch"; -export { default as WizardForm } from "./WizardForm"; diff --git a/packages/ui/v2/index.ts b/packages/ui/v2/index.ts deleted file mode 100644 index 3a8ecd3a9f..0000000000 --- a/packages/ui/v2/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -/* TODO: Make this index explicit */ -export * from "./core";