diff --git a/packages/features/blocklist/components/BlockedEntriesColumns.tsx b/apps/web/modules/blocklist/components/BlockedEntriesColumns.tsx similarity index 98% rename from packages/features/blocklist/components/BlockedEntriesColumns.tsx rename to apps/web/modules/blocklist/components/BlockedEntriesColumns.tsx index 41a762740d..354dec97b1 100644 --- a/packages/features/blocklist/components/BlockedEntriesColumns.tsx +++ b/apps/web/modules/blocklist/components/BlockedEntriesColumns.tsx @@ -14,7 +14,7 @@ import { } from "@calcom/ui/components/dropdown"; import { Checkbox } from "@calcom/ui/components/form"; -import type { BlocklistEntry, BlocklistScope } from "../types"; +import type { BlocklistEntry, BlocklistScope } from "@calcom/features/blocklist/types"; interface UseBlockedEntriesColumnsProps { t: (key: string) => string; diff --git a/packages/features/blocklist/components/BlockedEntriesTable.tsx b/apps/web/modules/blocklist/components/BlockedEntriesTable.tsx similarity index 97% rename from packages/features/blocklist/components/BlockedEntriesTable.tsx rename to apps/web/modules/blocklist/components/BlockedEntriesTable.tsx index 9aa7e42b27..df366f7c7e 100644 --- a/packages/features/blocklist/components/BlockedEntriesTable.tsx +++ b/apps/web/modules/blocklist/components/BlockedEntriesTable.tsx @@ -5,14 +5,14 @@ import { getCoreRowModel, getSortedRowModel, useReactTable } from "@tanstack/rea import type { ReactNode } from "react"; import { useMemo, useState } from "react"; -import { DataTableSelectionBar, DataTableWrapper } from "~/data-table/components"; +import { DataTableSelectionBar, DataTableWrapper } from "@calcom/web/modules/data-table/components"; import { IS_CALCOM } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Button } from "@calcom/ui/components/button"; import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog"; import { EmptyScreen } from "@calcom/ui/components/empty-screen"; -import type { BlocklistEntry, BlocklistPermissions, BlocklistScope } from "../types"; +import type { BlocklistEntry, BlocklistPermissions, BlocklistScope } from "@calcom/features/blocklist/types"; import { useBlockedEntriesColumns } from "./BlockedEntriesColumns"; import { BlocklistEntryDetailsSheet } from "./BlocklistEntryDetailsSheet"; diff --git a/packages/features/blocklist/components/BlocklistEntryDetailsSheet.tsx b/apps/web/modules/blocklist/components/BlocklistEntryDetailsSheet.tsx similarity index 99% rename from packages/features/blocklist/components/BlocklistEntryDetailsSheet.tsx rename to apps/web/modules/blocklist/components/BlocklistEntryDetailsSheet.tsx index e043af5e48..cc4548244c 100644 --- a/packages/features/blocklist/components/BlocklistEntryDetailsSheet.tsx +++ b/apps/web/modules/blocklist/components/BlocklistEntryDetailsSheet.tsx @@ -17,7 +17,7 @@ import { } from "@calcom/ui/components/sheet"; import { SkeletonText } from "@calcom/ui/components/skeleton"; -import type { BlocklistEntry, BlocklistEntryDetails, BlocklistScope } from "../types"; +import type { BlocklistEntry, BlocklistEntryDetails, BlocklistScope } from "@calcom/features/blocklist/types"; export interface BlocklistEntryDetailsSheetProps { scope: BlocklistScope; diff --git a/packages/features/blocklist/components/BookingReportDetailsModal.tsx b/apps/web/modules/blocklist/components/BookingReportDetailsModal.tsx similarity index 98% rename from packages/features/blocklist/components/BookingReportDetailsModal.tsx rename to apps/web/modules/blocklist/components/BookingReportDetailsModal.tsx index eb07bfba49..64f530743d 100644 --- a/packages/features/blocklist/components/BookingReportDetailsModal.tsx +++ b/apps/web/modules/blocklist/components/BookingReportDetailsModal.tsx @@ -10,7 +10,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/co import { ToggleGroup } from "@calcom/ui/components/form"; import { Icon } from "@calcom/ui/components/icon"; -import type { GroupedBookingReport, BlocklistScope } from "../types"; +import type { GroupedBookingReport, BlocklistScope } from "@calcom/features/blocklist/types"; interface FormData { blockType: WatchlistType; diff --git a/packages/features/blocklist/components/CreateBlocklistEntryModal.tsx b/apps/web/modules/blocklist/components/CreateBlocklistEntryModal.tsx similarity index 99% rename from packages/features/blocklist/components/CreateBlocklistEntryModal.tsx rename to apps/web/modules/blocklist/components/CreateBlocklistEntryModal.tsx index 327202975a..a215cee9cf 100644 --- a/packages/features/blocklist/components/CreateBlocklistEntryModal.tsx +++ b/apps/web/modules/blocklist/components/CreateBlocklistEntryModal.tsx @@ -12,7 +12,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/co import { Input, Label, TextArea, ToggleGroup } from "@calcom/ui/components/form"; import { Icon } from "@calcom/ui/components/icon"; -import type { BlocklistScope, CreateBlocklistEntryFormData } from "../types"; +import type { BlocklistScope, CreateBlocklistEntryFormData } from "@calcom/features/blocklist/types"; export interface CreateBlocklistEntryModalProps { isOpen: boolean; diff --git a/packages/features/blocklist/components/PendingReportsBadge.tsx b/apps/web/modules/blocklist/components/PendingReportsBadge.tsx similarity index 100% rename from packages/features/blocklist/components/PendingReportsBadge.tsx rename to apps/web/modules/blocklist/components/PendingReportsBadge.tsx diff --git a/packages/features/blocklist/components/PendingReportsColumns.tsx b/apps/web/modules/blocklist/components/PendingReportsColumns.tsx similarity index 97% rename from packages/features/blocklist/components/PendingReportsColumns.tsx rename to apps/web/modules/blocklist/components/PendingReportsColumns.tsx index f37d25d58e..ebc20a4c6c 100644 --- a/packages/features/blocklist/components/PendingReportsColumns.tsx +++ b/apps/web/modules/blocklist/components/PendingReportsColumns.tsx @@ -14,7 +14,7 @@ import { } from "@calcom/ui/components/dropdown"; import { Checkbox } from "@calcom/ui/components/form"; -import type { GroupedBookingReport, BlocklistScope } from "../types"; +import type { GroupedBookingReport, BlocklistScope } from "@calcom/features/blocklist/types"; interface UsePendingReportsColumnsProps { t: (key: string) => string; diff --git a/packages/features/blocklist/components/PendingReportsTable.tsx b/apps/web/modules/blocklist/components/PendingReportsTable.tsx similarity index 95% rename from packages/features/blocklist/components/PendingReportsTable.tsx rename to apps/web/modules/blocklist/components/PendingReportsTable.tsx index 2791218a7a..3fd605f1a3 100644 --- a/packages/features/blocklist/components/PendingReportsTable.tsx +++ b/apps/web/modules/blocklist/components/PendingReportsTable.tsx @@ -5,12 +5,12 @@ import { getCoreRowModel, getSortedRowModel, useReactTable } from "@tanstack/rea import type { ReactNode } from "react"; import { useMemo, useState } from "react"; -import { DataTableSelectionBar, DataTableWrapper } from "~/data-table/components"; +import { DataTableSelectionBar, DataTableWrapper } from "@calcom/web/modules/data-table/components"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { WatchlistType } from "@calcom/prisma/enums"; import { EmptyScreen } from "@calcom/ui/components/empty-screen"; -import type { GroupedBookingReport, BlocklistScope } from "../types"; +import type { GroupedBookingReport, BlocklistScope } from "@calcom/features/blocklist/types"; import { BookingReportDetailsModal } from "./BookingReportDetailsModal"; import { usePendingReportsColumns } from "./PendingReportsColumns"; diff --git a/packages/features/blocklist/index.ts b/apps/web/modules/blocklist/index.ts similarity index 94% rename from packages/features/blocklist/index.ts rename to apps/web/modules/blocklist/index.ts index 30e88479f2..57a5ca59d5 100644 --- a/packages/features/blocklist/index.ts +++ b/apps/web/modules/blocklist/index.ts @@ -1,4 +1,3 @@ -export * from "./types"; export * from "./components/CreateBlocklistEntryModal"; export * from "./components/BlockedEntriesTable"; export * from "./components/BlockedEntriesColumns"; diff --git a/apps/web/modules/bookings/components/AvailableTimeSlots.tsx b/apps/web/modules/bookings/components/AvailableTimeSlots.tsx index 73724d7cc9..56d602517b 100644 --- a/apps/web/modules/bookings/components/AvailableTimeSlots.tsx +++ b/apps/web/modules/bookings/components/AvailableTimeSlots.tsx @@ -17,7 +17,7 @@ import { BookerLayouts } from "@calcom/prisma/zod-utils"; import classNames from "@calcom/ui/classNames"; import { AvailableTimesHeader } from "@calcom/web/modules/bookings/components/AvailableTimesHeader"; -import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event"; +import type { useScheduleForEventReturnType } from "@calcom/web/modules/schedules/hooks/useEvent"; import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param"; type AvailableTimeSlotsProps = { diff --git a/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx b/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx index 5758360a47..3c132c69e3 100644 --- a/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx +++ b/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx @@ -11,7 +11,7 @@ import { DialogContent } from "@calcom/ui/components/dialog"; import { getDurationFormatted } from "../event-meta/Duration"; import { FromTime } from "@calcom/features/bookings/Booker/utils/dates"; -import { useEvent } from "@calcom/features/bookings/Booker/utils/event"; +import { useEvent } from "@calcom/web/modules/schedules/hooks/useEvent"; import { useBookerTime } from "@calcom/features/bookings/Booker/hooks/useBookerTime"; const BookEventFormWrapper = ({ children, onCancel }: { onCancel: () => void; children: ReactNode }) => { diff --git a/apps/web/modules/bookings/components/BookerWebWrapper.tsx b/apps/web/modules/bookings/components/BookerWebWrapper.tsx index a7718987d5..009de9fc35 100644 --- a/apps/web/modules/bookings/components/BookerWebWrapper.tsx +++ b/apps/web/modules/bookings/components/BookerWebWrapper.tsx @@ -16,7 +16,7 @@ import { useSlots } from "../hooks/useSlots"; import { useVerifyCode } from "../hooks/useVerifyCode"; import { useVerifyEmail } from "../hooks/useVerifyEmail"; import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store"; -import { useEvent, useScheduleForEvent } from "@calcom/features/bookings/Booker/utils/event"; +import { useEvent, useScheduleForEvent } from "@calcom/web/modules/schedules/hooks/useEvent"; import { useBrandColors } from "@calcom/features/bookings/Booker/utils/use-brand-colors"; import type { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent"; import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR, WEBAPP_URL } from "@calcom/lib/constants"; diff --git a/apps/web/modules/bookings/components/LargeCalendar.tsx b/apps/web/modules/bookings/components/LargeCalendar.tsx index 26ae9e9e3b..557609e7cc 100644 --- a/apps/web/modules/bookings/components/LargeCalendar.tsx +++ b/apps/web/modules/bookings/components/LargeCalendar.tsx @@ -9,7 +9,7 @@ import { Calendar } from "@calcom/web/modules/calendars/weeklyview/components/Ca import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events"; import { localStorage } from "@calcom/lib/webstorage"; -import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event"; +import type { useScheduleForEventReturnType } from "@calcom/web/modules/schedules/hooks/useEvent"; import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param"; import { useOverlayCalendarStore } from "@calcom/features/bookings/Booker/components/OverlayCalendar/store"; diff --git a/apps/web/modules/bookings/types.ts b/apps/web/modules/bookings/types.ts index 07ebe90537..b654b0aecf 100644 --- a/apps/web/modules/bookings/types.ts +++ b/apps/web/modules/bookings/types.ts @@ -1,7 +1,7 @@ import type { DataTableRow } from "@calcom/features/data-table/lib/separator"; import type { RouterOutputs } from "@calcom/trpc/react"; import type { BookerEventQuery } from "@calcom/features/bookings/types"; -import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event"; +import type { useScheduleForEventReturnType } from "@calcom/web/modules/schedules/hooks/useEvent"; import type { ToggledConnectedCalendars, CustomClassNames } from "@calcom/features/bookings/Booker/types"; import type { EventBusyDate } from "@calcom/types/Calendar"; diff --git a/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx b/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx index 6b3f4204c8..5b28c21975 100644 --- a/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx +++ b/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx @@ -10,7 +10,7 @@ import { PendingReportsBadge, PendingReportsTable, type SortByOption, -} from "@calcom/features/blocklist"; +} from "@calcom/web/modules/blocklist"; import { DataTableProvider, useDataTable } from "@calcom/features/data-table"; import { DataTableToolbar } from "~/data-table/components"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx b/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx index 8f8cb0c951..9d2e666271 100644 --- a/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx +++ b/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx @@ -9,7 +9,7 @@ import { PendingReportsBadge, PendingReportsTable, type SortByOption, -} from "@calcom/features/blocklist"; +} from "@calcom/web/modules/blocklist"; import { useDataTable } from "@calcom/features/data-table"; import { DataTableToolbar } from "~/data-table/components"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/embed/components/Embed.tsx b/apps/web/modules/embed/components/Embed.tsx index 982d27a904..7e5a0350db 100644 --- a/apps/web/modules/embed/components/Embed.tsx +++ b/apps/web/modules/embed/components/Embed.tsx @@ -21,7 +21,7 @@ import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store import { useEvent, useScheduleForEvent, -} from "@calcom/features/bookings/Booker/utils/event"; +} from "@calcom/web/modules/schedules/hooks/useEvent"; import DatePicker from "@calcom/features/calendars/components/DatePicker"; import { Dialog } from "@calcom/features/components/controlled-dialog"; import { TimezoneSelect } from "@calcom/web/modules/timezone/components/TimezoneSelect"; diff --git a/packages/features/bookings/Booker/utils/event.ts b/apps/web/modules/schedules/hooks/useEvent.ts similarity index 97% rename from packages/features/bookings/Booker/utils/event.ts rename to apps/web/modules/schedules/hooks/useEvent.ts index 0b86b7d4fd..b91671eded 100644 --- a/packages/features/bookings/Booker/utils/event.ts +++ b/apps/web/modules/schedules/hooks/useEvent.ts @@ -1,7 +1,7 @@ import { shallow } from "zustand/shallow"; import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider"; -import { useSchedule } from "~/schedules/hooks/useSchedule"; +import { useSchedule } from "@calcom/web/modules/schedules/hooks/useSchedule"; import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; import { trpc } from "@calcom/trpc/react"; diff --git a/packages/features/bookings/Booker/types.ts b/packages/features/bookings/Booker/types.ts index 60ed3c984a..b55999f18a 100644 --- a/packages/features/bookings/Booker/types.ts +++ b/packages/features/bookings/Booker/types.ts @@ -1,8 +1,4 @@ -import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event"; -import type { BookerEventQuery } from "@calcom/features/bookings/types"; import type { IntlSupportedTimeZones } from "@calcom/lib/timeZones"; -import type { EventBusyDate } from "@calcom/types/Calendar"; -import type { TIsAvailableOutputSchema } from "@calcom/trpc/server/routers/viewer/slots/isAvailable.schema"; import type React from "react"; import type { GetBookingType } from "../lib/get-booking";