From 51b3f5c74dc281f4ec36a28b4dadfc7bc255d8f4 Mon Sep 17 00:00:00 2001 From: Pedro Castro Date: Tue, 3 Feb 2026 12:39:46 -0300 Subject: [PATCH] Revert b3430c8efc: fix Atoms build failures on CI (#27575) --- .../admin/apps/[category]/page.tsx | 2 +- .../(admin-layout)/admin/billing/page.tsx | 2 +- .../(admin-layout)/admin/blocklist/page.tsx | 4 +- .../(admin-layout)/admin/flags/page.tsx | 2 +- .../admin/impersonation/page.tsx | 2 +- .../(admin-layout)/admin/lockedSMS/page.tsx | 2 +- .../admin/organizations/[id]/edit/page.tsx | 2 +- .../admin/organizations/page.tsx | 2 +- .../(admin-layout)/admin/playground/page.tsx | 2 +- .../admin/users/[id]/edit/page.tsx | 2 +- .../(admin-layout)/admin/users/add/page.tsx | 2 +- .../(admin-layout)/admin/users/page.tsx | 2 +- .../admin/workspace-platforms/page.tsx | 2 +- .../(settings-layout)/billing/page.tsx | 2 +- .../(org-admin-only)/attributes/page.tsx | 2 +- .../(org-admin-only)/attributes/sync/page.tsx | 2 +- .../(org-admin-only)/billing/page.tsx | 2 +- .../delegation-credential/page.tsx | 2 +- .../(org-admin-only)/dsync/page.tsx | 2 +- .../guest-notifications/page.tsx | 2 +- .../(org-admin-only)/privacy/page.tsx | 2 +- .../(org-admin-only)/sso/page.tsx | 2 +- .../organizations/admin-api/page.tsx | 2 +- .../organizations/general/page.tsx | 2 +- .../organizations/profile/page.tsx | 2 +- .../roles/_components/PbacOptInView.tsx | 2 +- .../organizations/roles/page.tsx | 2 +- .../teams/other/(main-page)/page.tsx | 2 +- .../teams/other/(main-page)/skeleton.tsx | 2 +- .../teams/other/[id]/appearance/page.tsx | 2 +- .../teams/other/[id]/members/page.tsx | 2 +- .../teams/other/[id]/profile/page.tsx | 2 +- .../security/compliance/page.tsx | 2 +- .../security/impersonation/page.tsx | 2 +- .../security/password/page.tsx | 2 +- .../(settings-layout)/security/sso/page.tsx | 2 +- .../security/two-factor-auth/page.tsx | 2 +- .../teams/[id]/appearance/page.tsx | 2 +- .../teams/[id]/members/page.tsx | 2 +- .../teams/[id]/profile/page.tsx | 2 +- .../teams/[id]/roles/page.tsx | 2 +- .../teams/[id]/settings/page.tsx | 2 +- .../(org-user-only)/members/layout.tsx | 2 +- .../components/apps/CalendarListContainer.tsx | 2 +- apps/web/components/dialog/RerouteDialog.tsx | 2 +- .../ConferencingAppsViewWebWrapper.tsx | 6 +- .../components/BookingDetailsSheet.tsx | 2 +- .../components/useJoinableLocation.tsx | 2 +- .../ee/common/components/BrandColorsForm.tsx | 2 +- .../components/CommonSkeletonLoaders.tsx | 2 +- .../modules/ee/organizations/appearance.tsx | 4 +- .../ee/organizations/features-view.tsx | 2 +- apps/web/modules/ee/organizations/general.tsx | 2 +- apps/web/modules/ee/organizations/profile.tsx | 2 +- .../components/InternalNotePresetsView.tsx | 2 +- .../teams/components/RoundRobinSettings.tsx | 2 +- .../ee/teams/views/team-appearance-view.tsx | 4 +- .../ee/teams/views/team-profile-view.tsx | 2 +- .../ee/teams/views/team-settings-view.tsx | 2 +- apps/web/modules/embed/components/Embed.tsx | 8 +-- .../embed/components/EventTypeEmbed.tsx | 4 +- .../embed/components/RoutingFormEmbed.tsx | 4 +- .../modules/embed/hooks/useEmbedCalOrigin.ts | 7 -- .../components/AddMembersWithSwitch.tsx | 2 +- .../__tests__/AddMembersWithSwitch.test.tsx | 2 +- .../tabs/advanced/EventAdvancedTab.tsx | 2 +- .../admin/oauth-clients-admin-view.tsx | 2 +- .../settings/developer/api-keys-skeleton.tsx | 2 +- .../settings/developer/api-keys-view.tsx | 2 +- .../settings/developer/oauth-clients-view.tsx | 2 +- .../settings/license-key/new/new-view.tsx | 2 +- .../my-account/appearance-skeleton.tsx | 4 +- .../settings/my-account/appearance-view.tsx | 8 +-- .../settings/my-account/features-view.tsx | 2 +- .../settings/my-account/general-skeleton.tsx | 2 +- .../settings/my-account/general-view.tsx | 4 +- .../settings/my-account/holidays-view.tsx | 2 +- .../settings/my-account/profile-skeleton.tsx | 2 +- .../settings/my-account/profile-view.tsx | 4 +- .../my-account/push-notifications-view.tsx | 2 +- .../outOfOffice/OutOfOfficeEntriesList.tsx | 2 +- .../settings/security/password-view.tsx | 2 +- .../settings/teams/[id]/features-view.tsx | 2 +- .../webhooks/components/WebhookForm.tsx | 2 +- .../webhooks/views/webhook-edit-view.tsx | 2 +- .../webhooks/views/webhook-new-skeleton.tsx | 2 +- .../webhooks/views/webhook-new-view.tsx | 2 +- .../webhooks/views/webhooks-skeleton.tsx | 2 +- .../modules/webhooks/views/webhooks-view.tsx | 2 +- .../features}/Segment.test.tsx | 2 +- .../features}/Segment.tsx | 0 packages/features/bookings/hooks/index.ts | 2 + .../features}/bookings/hooks/useBookerUrl.ts | 2 +- .../bookings/hooks/useBookingLocation.ts | 0 .../ee/admin/pages/settings/blocklist.tsx | 0 .../blocklist/BulkDeleteBlocklistEntries.tsx | 0 .../settings/blocklist/BulkDismissReports.tsx | 0 .../licensekey/CreateLicenseKeyForm.tsx | 2 +- .../features/embed/lib}/EmbedTabs.tsx | 16 ++--- .../features/embed/lib/hooks/index.tsx | 6 ++ packages/features/embed/types/index.d.ts | 7 +- .../settings}/BookerLayoutSelector.tsx | 2 +- .../settings}/SectionBottomActions.tsx | 0 .../features/settings}/ThemeLabel.tsx | 0 .../settings/appDir}/SettingsHeader.tsx | 0 .../appDir}/SettingsHeaderWithBackButton.tsx | 0 .../ConferencingAppsViewPlatformWrapper.tsx | 71 +++---------------- .../wrappers/EventTypePlatformWrapper.tsx | 2 +- 108 files changed, 139 insertions(+), 188 deletions(-) delete mode 100644 apps/web/modules/embed/hooks/useEmbedCalOrigin.ts rename {apps/web/modules/event-types/components => packages/features}/Segment.test.tsx (98%) rename {apps/web/modules/event-types/components => packages/features}/Segment.tsx (100%) create mode 100644 packages/features/bookings/hooks/index.ts rename {apps/web/modules => packages/features}/bookings/hooks/useBookerUrl.ts (99%) rename {apps/web/modules => packages/features}/bookings/hooks/useBookingLocation.ts (100%) rename {apps/web/modules => packages/features}/ee/admin/pages/settings/blocklist.tsx (100%) rename {apps/web/modules => packages/features}/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx (100%) rename {apps/web/modules => packages/features}/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx (100%) rename {apps/web/modules => packages/features}/ee/deployment/licensekey/CreateLicenseKeyForm.tsx (99%) rename {apps/web/modules/embed/components => packages/features/embed/lib}/EmbedTabs.tsx (94%) rename apps/web/modules/embed/hooks/useEmbedTypes.tsx => packages/features/embed/lib/hooks/index.tsx (98%) rename {apps/web/modules/settings/components => packages/features/settings}/BookerLayoutSelector.tsx (99%) rename {apps/web/modules/settings/components => packages/features/settings}/SectionBottomActions.tsx (100%) rename {apps/web/modules/settings/components => packages/features/settings}/ThemeLabel.tsx (100%) rename {apps/web/modules/settings/components => packages/features/settings/appDir}/SettingsHeader.tsx (100%) rename {apps/web/modules/settings/components => packages/features/settings/appDir}/SettingsHeaderWithBackButton.tsx (100%) diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/[category]/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/[category]/page.tsx index 282487120e..9f8e3d077d 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/[category]/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/apps/[category]/page.tsx @@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; import AdminAppsList from "~/apps/components/AdminAppsList"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async ({ params }: { params: Promise<{ category: string }> }) => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/billing/page.tsx index 3fcd39f9ae..f8590cec25 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/billing/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/billing/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import AdminBillingView from "~/settings/admin/billing-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx index d8465ed6b7..436fb7ef57 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SystemBlocklistView from "@calcom/web/modules/ee/admin/pages/settings/blocklist"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SystemBlocklistView from "@calcom/features/ee/admin/pages/settings/blocklist"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/flags/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/flags/page.tsx index f2137379e6..667786ac02 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/flags/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/flags/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { FlagListingView } from "@calcom/web/modules/feature-flags/views/flag-listing-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/impersonation/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/impersonation/page.tsx index 2cf641dea0..afd59374ce 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/impersonation/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/impersonation/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import ImpersonationView from "~/settings/admin/impersonation-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/lockedSMS/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/lockedSMS/page.tsx index 7de2a0b316..516fef902c 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/lockedSMS/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/lockedSMS/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import LockedSMSView from "~/settings/admin/locked-sms-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx index 878464e7c8..4e5a2368a1 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx @@ -5,7 +5,7 @@ import { z } from "zod"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; import { OrgForm } from "~/ee/organizations/admin/AdminOrgEditPage"; import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; const orgIdSchema = z.object({ id: z.coerce.number() }); diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx index ac51eea321..24a387495f 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx @@ -3,7 +3,7 @@ import { getTranslate } from "app/_utils"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; import AdminOrgTable from "~/ee/organizations/admin/AdminOrgPage"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/playground/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/playground/page.tsx index 09c3320ba2..47d408be7a 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/playground/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/playground/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import Link from "next/link"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { Icon } from "@calcom/ui/components/icon"; const LINKS = [ diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx index bb3c8d4361..80738c57cb 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx @@ -4,7 +4,7 @@ import { z } from "zod"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; import { UsersEditView } from "~/ee/users/views/users-edit-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { UserRepository } from "@calcom/features/users/repositories/UserRepository"; import { prisma } from "@calcom/prisma"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/add/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/add/page.tsx index 3ccbc43efc..aa65dcaad9 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/add/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/add/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import UsersAddView from "~/ee/users/views/users-add-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx index bcb127927f..4b367709a1 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import UsersListingView from "~/ee/users/views/users-listing-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { Button } from "@calcom/ui/components/button"; export const generateMetadata = async () => diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx index 120ab331a4..9bc83137e2 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx @@ -2,7 +2,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; import WorkspacePlatformsPage from "~/ee/organizations/admin/WorkspacePlatformPage"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx index 0e01b741f0..1b5721a5e8 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import BillingView from "~/settings/billing/billing-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx index d047c3b1c8..f1990e8618 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx @@ -3,7 +3,7 @@ import { redirect } from "next/navigation"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import OrgSettingsAttributesPage from "~/ee/organizations/attributes/attributes-list-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/sync/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/sync/page.tsx index 417be0b6df..044dffc939 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/sync/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/sync/page.tsx @@ -2,7 +2,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { getIntegrationAttributeSyncService } from "@calcom/features/ee/integration-attribute-sync/di/IntegrationAttributeSyncService.container"; import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository"; import { prisma } from "@calcom/prisma"; import IntegrationAttributeSyncView from "@calcom/web/modules/integration-attribute-sync/components/IntegrationAttributeSyncView"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/billing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/billing/page.tsx index 1780c4ca09..2e84ad1f13 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/billing/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/billing/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import BillingView from "~/settings/billing/billing-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx index a506d067ca..6277ae93e5 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import DelegationCredentialList from "~/ee/organizations/delegationCredential"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import { validateUserHasOrgPerms } from "../../actions/validateUserHasOrgPerms"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx index 793096d484..f79769cc11 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx @@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import DirectorySyncTeamView from "~/ee/dsync/views/team-dsync-view"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import { validateUserHasOrg } from "../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx index 1263122265..c318dd9d7c 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/guest-notifications/page.tsx @@ -4,7 +4,7 @@ import { redirect } from "next/navigation"; import GuestNotificationsView from "~/ee/organizations/guest-notifications"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import { validateUserHasOrg } from "../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx index 39d6b6251f..29f78083c8 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx @@ -4,7 +4,7 @@ import { redirect } from "next/navigation"; import PrivacyView from "~/ee/organizations/privacy"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import { validateUserHasOrg } from "../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx index 573e8606bc..855222afbb 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx @@ -4,7 +4,7 @@ import { redirect } from "next/navigation"; import OrgSSOView from "~/ee/sso/views/orgs-sso-view"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import { validateUserHasOrg } from "../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx index 084ac594fe..e223d0af22 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/admin-api/page.tsx @@ -1,6 +1,6 @@ import { getTranslate, _generateMetadata } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { AdminAPIView } from "~/ee/organizations/admin-api"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx index dbd24e36dd..73dd47dcd7 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/general/page.tsx @@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LegacyPage from "~/ee/organizations/general"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; import { validateUserHasOrg } from "../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx index fef0b831c3..866e621e63 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/profile/page.tsx @@ -4,7 +4,7 @@ import { redirect } from "next/navigation"; import LegacyPage from "~/ee/organizations/profile"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import type { Membership } from "@calcom/prisma/client"; import { MembershipRole } from "@calcom/prisma/enums"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx index 0799f34ea9..b5031379aa 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/PbacOptInView.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { PbacOptInModal } from "./PbacOptInModal"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx index c3f2fc2b00..5b86ef0248 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/page.tsx @@ -9,7 +9,7 @@ import { PermissionMapper } from "@calcom/features/pbac/domain/mappers/Permissio import { Resource, CrudAction } from "@calcom/features/pbac/domain/types/permission-registry"; import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service"; import { RoleService } from "@calcom/features/pbac/services/role.service"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { prisma } from "@calcom/prisma"; import { validateUserHasOrg } from "../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx index 85121d2697..2f5518a79f 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/page.tsx @@ -3,7 +3,7 @@ import { redirect } from "next/navigation"; import { OtherTeamsListing } from "~/ee/organizations/components/OtherTeamsListing"; import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { validateUserHasOrg } from "../../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx index 4510ab2c49..2de59028ba 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/(main-page)/skeleton.tsx @@ -1,6 +1,6 @@ "use client"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx index 1086fe5933..c788e2988a 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import LegacyPage from "~/ee/teams/views/team-appearance-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx index 48f02d0baa..e3573a7285 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx @@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LegacyPage, { TeamMembersCTA, } from "~/ee/organizations/other-team-members-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { validateUserHasOrg } from "../../../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx index 5d4892f402..8e0214389b 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LegacyPage from "~/ee/organizations/other-team-profile-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { validateUserHasOrg } from "../../../../actions/validateUserHasOrg"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/compliance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/compliance/page.tsx index fa0e372924..f93ed0a43d 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/compliance/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/compliance/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import ComplianceView from "~/settings/security/compliance-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/impersonation/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/impersonation/page.tsx index 7d53c2444d..a67d9f2842 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/impersonation/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/impersonation/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import ProfileImpersonationViewWrapper from "~/settings/security/impersonation-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/password/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/password/page.tsx index 81c539310d..9017cf8f93 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/password/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/password/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import PasswordViewWrapper from "~/settings/security/password-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/sso/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/sso/page.tsx index 74c4703fa3..7042d70891 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/sso/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/sso/page.tsx @@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; import SAMLSSO from "~/ee/sso/views/user-sso-view"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/two-factor-auth/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/two-factor-auth/page.tsx index a025e7d8c8..ad238ee540 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/two-factor-auth/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/security/two-factor-auth/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import TwoFactorAuthView from "~/settings/security/two-factor-auth-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx index 0b721d346d..a88ae44ce9 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import LegacyPage from "~/ee/teams/views/team-appearance-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx index a3d7229624..61763e299a 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx @@ -8,7 +8,7 @@ import { PrismaAttributeRepository } from "@calcom/features/attributes/repositor import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; import { getTeamMemberPermissions } from "@calcom/features/pbac/lib/team-member-permissions"; import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { prisma } from "@calcom/prisma"; import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router"; import { TeamMembersView } from "@calcom/web/modules/ee/teams/views/team-members-view"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx index b0769f4917..3f0a773871 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/profile/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import LegacyPage from "@calcom/web/modules/ee/teams/views/team-profile-view"; export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) => diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx index 079b8d3c47..1568df8f48 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx @@ -11,7 +11,7 @@ import { PermissionMapper } from "@calcom/features/pbac/domain/mappers/Permissio import { Resource, CrudAction, Scope } from "@calcom/features/pbac/domain/types/permission-registry"; import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service"; import { RoleService } from "@calcom/features/pbac/services/role.service"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { prisma } from "@calcom/prisma"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx index 1e2022b2fe..6f3e2afb35 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/settings/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import TeamSettingsView from "@calcom/web/modules/ee/teams/views/team-settings-view"; export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) => diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/layout.tsx index 8e94709357..a0b47de93f 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/layout.tsx @@ -2,7 +2,7 @@ import SettingsLayoutAppDirClient from "app/(use-page-wrapper)/settings/(setting import { getTranslate } from "app/_utils"; import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export default async function Layout({ children }: { children: React.ReactNode }) { const t = await getTranslate(); diff --git a/apps/web/components/apps/CalendarListContainer.tsx b/apps/web/components/apps/CalendarListContainer.tsx index 11211da5a4..b27585e5b2 100644 --- a/apps/web/components/apps/CalendarListContainer.tsx +++ b/apps/web/components/apps/CalendarListContainer.tsx @@ -1,7 +1,7 @@ "use client"; import { InstallAppButton } from "@calcom/app-store/InstallAppButton"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; diff --git a/apps/web/components/dialog/RerouteDialog.tsx b/apps/web/components/dialog/RerouteDialog.tsx index 32182e7f3c..837db6f9a3 100644 --- a/apps/web/components/dialog/RerouteDialog.tsx +++ b/apps/web/components/dialog/RerouteDialog.tsx @@ -15,7 +15,7 @@ import { substituteVariables } from "@calcom/app-store/routing-forms/lib/substit import type { FormResponse, LocalRoute } from "@calcom/app-store/routing-forms/types/types"; import { RouteActionType } from "@calcom/app-store/routing-forms/zod"; import dayjs from "@calcom/dayjs"; -import { useBookerUrl } from "../../modules/bookings/hooks/useBookerUrl"; +import { useBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl"; import { createBooking } from "@calcom/features/bookings/lib/create-booking"; import { Dialog } from "@calcom/features/components/controlled-dialog"; import { getUrlSearchParamsToForwardForReroute } from "@calcom/features/routing-forms/lib/getUrlSearchParamsToForward"; diff --git a/apps/web/modules/apps/components/ConferencingAppsViewWebWrapper.tsx b/apps/web/modules/apps/components/ConferencingAppsViewWebWrapper.tsx index 7bce14d608..9cf76140ee 100644 --- a/apps/web/modules/apps/components/ConferencingAppsViewWebWrapper.tsx +++ b/apps/web/modules/apps/components/ConferencingAppsViewWebWrapper.tsx @@ -2,7 +2,7 @@ import { useReducer } from "react"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import type { RouterOutputs } from "@calcom/trpc/react"; @@ -14,14 +14,14 @@ import { showToast } from "@calcom/ui/components/toast"; import { AppList } from "./AppList"; import DisconnectIntegrationModal from "@calcom/features/apps/components/DisconnectIntegrationModal"; -type UpdateUsersDefaultConferencingAppParams = { +export type UpdateUsersDefaultConferencingAppParams = { appSlug: string; appLink?: string; onSuccessCallback: () => void; onErrorCallback: () => void; }; -type BulkUpdatParams = { eventTypeIds: number[]; callback: () => void }; +export type BulkUpdatParams = { eventTypeIds: number[]; callback: () => void }; type RemoveAppParams = { credentialId: number; teamId?: number; callback: () => void }; export const SkeletonLoader = () => { diff --git a/apps/web/modules/bookings/components/BookingDetailsSheet.tsx b/apps/web/modules/bookings/components/BookingDetailsSheet.tsx index 738670f2e2..5029573d4c 100644 --- a/apps/web/modules/bookings/components/BookingDetailsSheet.tsx +++ b/apps/web/modules/bookings/components/BookingDetailsSheet.tsx @@ -5,7 +5,7 @@ import { useMemo } from "react"; import { z } from "zod"; import dayjs from "@calcom/dayjs"; -import { useBookingLocation } from "@calcom/web/modules/bookings/hooks/useBookingLocation"; +import { useBookingLocation } from "@calcom/features/bookings/hooks"; import { shouldShowFieldInCustomResponses } from "@calcom/lib/bookings/SystemField"; import { formatPrice } from "@calcom/lib/currencyConversions"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; diff --git a/apps/web/modules/bookings/components/useJoinableLocation.tsx b/apps/web/modules/bookings/components/useJoinableLocation.tsx index 21c97a630a..82993c2bec 100644 --- a/apps/web/modules/bookings/components/useJoinableLocation.tsx +++ b/apps/web/modules/bookings/components/useJoinableLocation.tsx @@ -1,7 +1,7 @@ import type { TFunction } from "i18next"; import { useMemo } from "react"; -import { useBookingLocation } from "@calcom/web/modules/bookings/hooks/useBookingLocation"; +import { useBookingLocation } from "@calcom/features/bookings/hooks"; import type { BookingStatus } from "@calcom/prisma/enums"; import { bookingMetadataSchema } from "@calcom/prisma/zod-utils"; diff --git a/apps/web/modules/ee/common/components/BrandColorsForm.tsx b/apps/web/modules/ee/common/components/BrandColorsForm.tsx index 5c564c6aca..91e5dbfc9d 100644 --- a/apps/web/modules/ee/common/components/BrandColorsForm.tsx +++ b/apps/web/modules/ee/common/components/BrandColorsForm.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { Controller, useFormContext } from "react-hook-form"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants"; import { checkWCAGContrastColor } from "@calcom/lib/getBrandColours"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/ee/common/components/CommonSkeletonLoaders.tsx b/apps/web/modules/ee/common/components/CommonSkeletonLoaders.tsx index 48e705d770..0c7c3bc7ad 100644 --- a/apps/web/modules/ee/common/components/CommonSkeletonLoaders.tsx +++ b/apps/web/modules/ee/common/components/CommonSkeletonLoaders.tsx @@ -1,4 +1,4 @@ -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton"; export const AppearanceSkeletonLoader = () => { diff --git a/apps/web/modules/ee/organizations/appearance.tsx b/apps/web/modules/ee/organizations/appearance.tsx index b70a3e1887..69a0b8246f 100644 --- a/apps/web/modules/ee/organizations/appearance.tsx +++ b/apps/web/modules/ee/organizations/appearance.tsx @@ -8,8 +8,8 @@ import { useForm } from "react-hook-form"; import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; import BrandColorsForm from "~/ee/common/components/BrandColorsForm"; import { AppearanceSkeletonLoader } from "~/ee/common/components/CommonSkeletonLoaders"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; -import ThemeLabel from "@calcom/web/modules/settings/components/ThemeLabel"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; +import ThemeLabel from "@calcom/features/settings/ThemeLabel"; import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/ee/organizations/features-view.tsx b/apps/web/modules/ee/organizations/features-view.tsx index e2ac4cfab1..aa12f18722 100644 --- a/apps/web/modules/ee/organizations/features-view.tsx +++ b/apps/web/modules/ee/organizations/features-view.tsx @@ -1,7 +1,7 @@ "use client"; import { FeaturesSettings } from "@calcom/features/feature-opt-in/components/FeaturesSettings"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { ReactElement } from "react"; diff --git a/apps/web/modules/ee/organizations/general.tsx b/apps/web/modules/ee/organizations/general.tsx index f6833ed6c6..30e4e6b608 100644 --- a/apps/web/modules/ee/organizations/general.tsx +++ b/apps/web/modules/ee/organizations/general.tsx @@ -11,7 +11,7 @@ import { DisableAutofillOnBookingPageSwitch } from "~/ee/organizations/component import { DisablePhoneOnlySMSNotificationsSwitch } from "~/ee/organizations/components/DisablePhoneOnlySMSNotificationsSwitch"; import { LockEventTypeSwitch } from "~/ee/organizations/components/LockEventTypeSwitch"; import { NoSlotsNotificationSwitch } from "~/ee/organizations/components/NoSlotsNotificationSwitch"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { nameOfDay } from "@calcom/lib/weekday"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/ee/organizations/profile.tsx b/apps/web/modules/ee/organizations/profile.tsx index 74b4e745d1..14b1599a37 100644 --- a/apps/web/modules/ee/organizations/profile.tsx +++ b/apps/web/modules/ee/organizations/profile.tsx @@ -9,7 +9,7 @@ import { z } from "zod"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider"; import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { md } from "@calcom/lib/markdownIt"; diff --git a/apps/web/modules/ee/teams/components/InternalNotePresetsView.tsx b/apps/web/modules/ee/teams/components/InternalNotePresetsView.tsx index 5166f3e927..f01c4543f0 100644 --- a/apps/web/modules/ee/teams/components/InternalNotePresetsView.tsx +++ b/apps/web/modules/ee/teams/components/InternalNotePresetsView.tsx @@ -5,7 +5,7 @@ import { useMemo } from "react"; import { useForm, useFieldArray, Controller } from "react-hook-form"; import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/ee/teams/components/RoundRobinSettings.tsx b/apps/web/modules/ee/teams/components/RoundRobinSettings.tsx index d547fd9505..d4aead1b67 100644 --- a/apps/web/modules/ee/teams/components/RoundRobinSettings.tsx +++ b/apps/web/modules/ee/teams/components/RoundRobinSettings.tsx @@ -3,7 +3,7 @@ import { useForm } from "react-hook-form"; import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { RRResetInterval, RRTimestampBasis } from "@calcom/prisma/enums"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/ee/teams/views/team-appearance-view.tsx b/apps/web/modules/ee/teams/views/team-appearance-view.tsx index f87bda4914..b4d4f08f87 100644 --- a/apps/web/modules/ee/teams/views/team-appearance-view.tsx +++ b/apps/web/modules/ee/teams/views/team-appearance-view.tsx @@ -7,8 +7,8 @@ import { useForm } from "react-hook-form"; import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; import BrandColorsForm from "~/ee/common/components/BrandColorsForm"; import { AppearanceSkeletonLoader } from "~/ee/common/components/CommonSkeletonLoaders"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; -import ThemeLabel from "@calcom/web/modules/settings/components/ThemeLabel"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; +import ThemeLabel from "@calcom/features/settings/ThemeLabel"; import { APP_NAME } from "@calcom/lib/constants"; import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/ee/teams/views/team-profile-view.tsx b/apps/web/modules/ee/teams/views/team-profile-view.tsx index cb13cc7489..7888552a3d 100644 --- a/apps/web/modules/ee/teams/views/team-profile-view.tsx +++ b/apps/web/modules/ee/teams/views/team-profile-view.tsx @@ -12,7 +12,7 @@ import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; import { Dialog } from "@calcom/features/components/controlled-dialog"; import { getTeamUrlSync } from "@calcom/features/ee/organizations/lib/getTeamUrlSync"; import { trackFormbricksAction } from "@calcom/web/modules/formbricks/lib/trackFormbricksAction"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/ee/teams/views/team-settings-view.tsx b/apps/web/modules/ee/teams/views/team-settings-view.tsx index a4feb4bd6e..49de785508 100644 --- a/apps/web/modules/ee/teams/views/team-settings-view.tsx +++ b/apps/web/modules/ee/teams/views/team-settings-view.tsx @@ -7,7 +7,7 @@ import { useForm, Controller } from "react-hook-form"; import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; import { AppearanceSkeletonLoader } from "~/ee/common/components/CommonSkeletonLoaders"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback"; import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema"; diff --git a/apps/web/modules/embed/components/Embed.tsx b/apps/web/modules/embed/components/Embed.tsx index c0a02e8b83..bd79788fd4 100644 --- a/apps/web/modules/embed/components/Embed.tsx +++ b/apps/web/modules/embed/components/Embed.tsx @@ -54,21 +54,19 @@ import { HorizontalTabs } from "@calcom/ui/components/navigation"; import { showToast } from "@calcom/ui/components/toast"; import { useBookerTime } from "@calcom/features/bookings/Booker/hooks/useBookerTime"; -import { EmbedTabName, type tabs } from "./EmbedTabs"; +import { EmbedTabName } from "@calcom/features/embed/lib/EmbedTabs"; import { buildCssVarsPerTheme } from "@calcom/features/embed/lib/buildCssVarsPerTheme"; import { EmbedTheme } from "@calcom/features/embed/lib/constants"; import { getDimension } from "@calcom/features/embed/lib/getDimension"; import { useEmbedDialogCtx } from "@calcom/features/embed/lib/hooks/useEmbedDialogCtx"; import { useEmbedParams } from "@calcom/features/embed/lib/hooks/useEmbedParams"; import type { + EmbedTabs, EmbedType, + EmbedTypes, PreviewState, EmbedConfig, } from "@calcom/features/embed/types"; -import { useEmbedTypes } from "../hooks/useEmbedTypes"; - -type EmbedTypes = ReturnType; -type EmbedTabs = typeof tabs; type EventType = | RouterOutputs["viewer"]["eventTypes"]["get"]["eventType"] diff --git a/apps/web/modules/embed/components/EventTypeEmbed.tsx b/apps/web/modules/embed/components/EventTypeEmbed.tsx index 9f245bbf6e..3162536195 100644 --- a/apps/web/modules/embed/components/EventTypeEmbed.tsx +++ b/apps/web/modules/embed/components/EventTypeEmbed.tsx @@ -3,8 +3,8 @@ import type { ComponentProps } from "react"; import { trpc } from "@calcom/trpc/react"; import { EmbedButton, EmbedDialog } from "./Embed"; -import { tabs } from "./EmbedTabs"; -import { useEmbedTypes } from "../hooks/useEmbedTypes"; +import { tabs } from "@calcom/features/embed/lib/EmbedTabs"; +import { useEmbedTypes } from "@calcom/features/embed/lib/hooks"; export const EventTypeEmbedDialog = () => { const types = useEmbedTypes(); diff --git a/apps/web/modules/embed/components/RoutingFormEmbed.tsx b/apps/web/modules/embed/components/RoutingFormEmbed.tsx index 066c6c7daa..23dbc75d4f 100644 --- a/apps/web/modules/embed/components/RoutingFormEmbed.tsx +++ b/apps/web/modules/embed/components/RoutingFormEmbed.tsx @@ -5,8 +5,8 @@ import { IS_CALCOM } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; -import { tabs } from "./EmbedTabs"; -import { useEmbedTypes } from "../hooks/useEmbedTypes"; +import { tabs } from "@calcom/features/embed/lib/EmbedTabs"; +import { useEmbedTypes } from "@calcom/features/embed/lib/hooks"; export const RoutingFormEmbedDialog = () => { const types = useEmbedTypes(); diff --git a/apps/web/modules/embed/hooks/useEmbedCalOrigin.ts b/apps/web/modules/embed/hooks/useEmbedCalOrigin.ts deleted file mode 100644 index 9d0bd3bb89..0000000000 --- a/apps/web/modules/embed/hooks/useEmbedCalOrigin.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { useEmbedBookerUrl } from "~/bookings/hooks/useBookerUrl"; - -export const useEmbedCalOrigin = () => { - const bookerUrl = useEmbedBookerUrl(); - return bookerUrl; -}; - \ No newline at end of file diff --git a/apps/web/modules/event-types/components/AddMembersWithSwitch.tsx b/apps/web/modules/event-types/components/AddMembersWithSwitch.tsx index d90fbdad67..68b82fe87e 100644 --- a/apps/web/modules/event-types/components/AddMembersWithSwitch.tsx +++ b/apps/web/modules/event-types/components/AddMembersWithSwitch.tsx @@ -6,7 +6,7 @@ import type { SettingsToggleClassNames, TeamMember, } from "@calcom/features/eventtypes/lib/types"; -import { Segment } from "@calcom/web/modules/event-types/components/Segment"; +import { Segment } from "@calcom/features/Segment"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { AttributesQueryValue } from "@calcom/lib/raqb/types"; import { Label, SettingsToggle } from "@calcom/ui/components/form"; diff --git a/apps/web/modules/event-types/components/__tests__/AddMembersWithSwitch.test.tsx b/apps/web/modules/event-types/components/__tests__/AddMembersWithSwitch.test.tsx index 1e72b81705..a7e7a4ba07 100644 --- a/apps/web/modules/event-types/components/__tests__/AddMembersWithSwitch.test.tsx +++ b/apps/web/modules/event-types/components/__tests__/AddMembersWithSwitch.test.tsx @@ -14,7 +14,7 @@ vi.mock("@formkit/auto-animate/react", () => ({ })); // Mock Segment component -vi.mock("@calcom/web/modules/event-types/components/Segment", () => ({ +vi.mock("@calcom/features/Segment", () => ({ Segment: vi.fn().mockImplementation(({ onQueryValueChange }) => (
diff --git a/apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx b/apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx index a44fb9f3d4..c8359e6007 100644 --- a/apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx +++ b/apps/web/modules/event-types/components/tabs/advanced/EventAdvancedTab.tsx @@ -34,7 +34,7 @@ import type { SettingsToggleClassNames, } from "@calcom/features/eventtypes/lib/types"; import { FormBuilder } from "./FormBuilder"; -import { BookerLayoutSelector } from "@calcom/web/modules/settings/components/BookerLayoutSelector"; +import { BookerLayoutSelector } from "@calcom/features/settings/BookerLayoutSelector"; import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR, diff --git a/apps/web/modules/settings/admin/oauth-clients-admin-view.tsx b/apps/web/modules/settings/admin/oauth-clients-admin-view.tsx index 57bda0d3e3..2eeeaba2cc 100644 --- a/apps/web/modules/settings/admin/oauth-clients-admin-view.tsx +++ b/apps/web/modules/settings/admin/oauth-clients-admin-view.tsx @@ -7,7 +7,7 @@ import { trpc } from "@calcom/trpc/react"; import { OAuthClientsAdminSkeleton } from "./oauth-clients-admin-skeleton"; import { showToast } from "@calcom/ui/components/toast"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import type { OAuthClientCreateFormValues } from "../oauth/create/OAuthClientCreateModal"; import { OAuthClientCreateDialog } from "../oauth/create/OAuthClientCreateModal"; diff --git a/apps/web/modules/settings/developer/api-keys-skeleton.tsx b/apps/web/modules/settings/developer/api-keys-skeleton.tsx index f7ca4b8693..62f5837020 100644 --- a/apps/web/modules/settings/developer/api-keys-skeleton.tsx +++ b/apps/web/modules/settings/developer/api-keys-skeleton.tsx @@ -1,6 +1,6 @@ "use client"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton"; diff --git a/apps/web/modules/settings/developer/api-keys-view.tsx b/apps/web/modules/settings/developer/api-keys-view.tsx index 28252c03f5..7bfde3ba84 100644 --- a/apps/web/modules/settings/developer/api-keys-view.tsx +++ b/apps/web/modules/settings/developer/api-keys-view.tsx @@ -7,7 +7,7 @@ import LicenseRequired from "~/ee/common/components/LicenseRequired"; import { Dialog } from "@calcom/features/components/controlled-dialog"; import ApiKeyDialogForm from "~/ee/api-keys/components/ApiKeyDialogForm"; import ApiKeyListItem from "~/ee/api-keys/components/ApiKeyListItem"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/settings/developer/oauth-clients-view.tsx b/apps/web/modules/settings/developer/oauth-clients-view.tsx index cf4408e4e9..4956dddc3c 100644 --- a/apps/web/modules/settings/developer/oauth-clients-view.tsx +++ b/apps/web/modules/settings/developer/oauth-clients-view.tsx @@ -5,7 +5,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import { EmptyScreen } from "@calcom/ui/components/empty-screen"; import { showToast } from "@calcom/ui/components/toast"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import type { OAuthClientCreateFormValues } from "../oauth/create/OAuthClientCreateModal"; import { OAuthClientCreateDialog } from "../oauth/create/OAuthClientCreateModal"; diff --git a/apps/web/modules/settings/license-key/new/new-view.tsx b/apps/web/modules/settings/license-key/new/new-view.tsx index 98ded851cd..8af08ea415 100644 --- a/apps/web/modules/settings/license-key/new/new-view.tsx +++ b/apps/web/modules/settings/license-key/new/new-view.tsx @@ -1,6 +1,6 @@ "use client"; -import { CreateANewLicenseKeyForm } from "@calcom/web/modules/ee/deployment/licensekey/CreateLicenseKeyForm"; +import { CreateANewLicenseKeyForm } from "@calcom/features/ee/deployment/licensekey/CreateLicenseKeyForm"; import { WizardLayout } from "@calcom/ui/components/layout"; export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => { diff --git a/apps/web/modules/settings/my-account/appearance-skeleton.tsx b/apps/web/modules/settings/my-account/appearance-skeleton.tsx index a62ef7573d..f2ebd0a365 100644 --- a/apps/web/modules/settings/my-account/appearance-skeleton.tsx +++ b/apps/web/modules/settings/my-account/appearance-skeleton.tsx @@ -1,7 +1,7 @@ "use client"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton"; diff --git a/apps/web/modules/settings/my-account/appearance-view.tsx b/apps/web/modules/settings/my-account/appearance-view.tsx index 70d3ddf1bf..2fe7831078 100644 --- a/apps/web/modules/settings/my-account/appearance-view.tsx +++ b/apps/web/modules/settings/my-account/appearance-view.tsx @@ -7,10 +7,10 @@ import { useState } from "react"; import { Controller, useForm } from "react-hook-form"; import type { z } from "zod"; -import { BookerLayoutSelector } from "@calcom/web/modules/settings/components/BookerLayoutSelector"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; -import ThemeLabel from "@calcom/web/modules/settings/components/ThemeLabel"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import { BookerLayoutSelector } from "@calcom/features/settings/BookerLayoutSelector"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; +import ThemeLabel from "@calcom/features/settings/ThemeLabel"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants"; import { checkWCAGContrastColor } from "@calcom/lib/getBrandColours"; diff --git a/apps/web/modules/settings/my-account/features-view.tsx b/apps/web/modules/settings/my-account/features-view.tsx index 174f7bebf6..117a86f32a 100644 --- a/apps/web/modules/settings/my-account/features-view.tsx +++ b/apps/web/modules/settings/my-account/features-view.tsx @@ -1,7 +1,7 @@ "use client"; import { FeaturesSettings } from "@calcom/features/feature-opt-in/components/FeaturesSettings"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { ReactElement } from "react"; diff --git a/apps/web/modules/settings/my-account/general-skeleton.tsx b/apps/web/modules/settings/my-account/general-skeleton.tsx index cba6278e26..d402ab7da1 100644 --- a/apps/web/modules/settings/my-account/general-skeleton.tsx +++ b/apps/web/modules/settings/my-account/general-skeleton.tsx @@ -1,6 +1,6 @@ "use client"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Skeleton } from "@coss/ui/components/skeleton"; diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsx index 78b2835ae3..c124c00a63 100644 --- a/apps/web/modules/settings/my-account/general-view.tsx +++ b/apps/web/modules/settings/my-account/general-view.tsx @@ -6,8 +6,8 @@ import { useState } from "react"; import { Controller, useForm } from "react-hook-form"; import { TimezoneSelect } from "@calcom/web/modules/timezone/components/TimezoneSelect"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { formatLocalizedDateTime } from "@calcom/lib/dayjs"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { localeOptions } from "@calcom/lib/i18n"; diff --git a/apps/web/modules/settings/my-account/holidays-view.tsx b/apps/web/modules/settings/my-account/holidays-view.tsx index 0e23f5ba31..b946fe7a8c 100644 --- a/apps/web/modules/settings/my-account/holidays-view.tsx +++ b/apps/web/modules/settings/my-account/holidays-view.tsx @@ -3,7 +3,7 @@ import { memo, useMemo, useCallback } from "react"; import dayjs from "@calcom/dayjs"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { getHolidayEmoji } from "@calcom/lib/holidays/getHolidayEmoji"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/settings/my-account/profile-skeleton.tsx b/apps/web/modules/settings/my-account/profile-skeleton.tsx index fbad71cf3b..a2a1ab4f4c 100644 --- a/apps/web/modules/settings/my-account/profile-skeleton.tsx +++ b/apps/web/modules/settings/my-account/profile-skeleton.tsx @@ -1,6 +1,6 @@ "use client"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsx index 1e6bafff95..ed36032562 100644 --- a/apps/web/modules/settings/my-account/profile-view.tsx +++ b/apps/web/modules/settings/my-account/profile-view.tsx @@ -13,8 +13,8 @@ import { z } from "zod"; import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode"; import { Dialog } from "@calcom/features/components/controlled-dialog"; import { isCompanyEmail } from "@calcom/features/ee/organizations/lib/utils"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME, FULL_NAME_LENGTH_MAX_LIMIT } from "@calcom/lib/constants"; import { emailSchema } from "@calcom/lib/emailSchema"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; diff --git a/apps/web/modules/settings/my-account/push-notifications-view.tsx b/apps/web/modules/settings/my-account/push-notifications-view.tsx index a4eb3c3b8d..fceb48c783 100644 --- a/apps/web/modules/settings/my-account/push-notifications-view.tsx +++ b/apps/web/modules/settings/my-account/push-notifications-view.tsx @@ -1,7 +1,7 @@ "use client"; import { useWebPush } from "@calcom/web/modules/notifications/hooks/useWebPush"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Button } from "@calcom/ui/components/button"; diff --git a/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx b/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx index 3c8dfbffeb..5a7d5af71a 100644 --- a/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx +++ b/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx @@ -20,7 +20,7 @@ import { } from "@calcom/features/data-table"; import { DataTableWrapper, DataTableToolbar, DataTableFilters, DataTableSegment } from "~/data-table/components"; import { useSegments } from "@calcom/features/data-table/hooks/useSegments"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import ServerTrans from "@calcom/lib/components/ServerTrans"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; diff --git a/apps/web/modules/settings/security/password-view.tsx b/apps/web/modules/settings/security/password-view.tsx index adba6197d6..cff4b55c7c 100644 --- a/apps/web/modules/settings/security/password-view.tsx +++ b/apps/web/modules/settings/security/password-view.tsx @@ -4,7 +4,7 @@ import { signOut, useSession } from "next-auth/react"; import { useState } from "react"; import { useForm } from "react-hook-form"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { IdentityProvider } from "@calcom/prisma/enums"; import { userMetadata as userMetadataSchema } from "@calcom/prisma/zod-utils"; diff --git a/apps/web/modules/settings/teams/[id]/features-view.tsx b/apps/web/modules/settings/teams/[id]/features-view.tsx index a8ee4a9761..c8fb5df99e 100644 --- a/apps/web/modules/settings/teams/[id]/features-view.tsx +++ b/apps/web/modules/settings/teams/[id]/features-view.tsx @@ -1,7 +1,7 @@ "use client"; import { FeaturesSettings } from "@calcom/features/feature-opt-in/components/FeaturesSettings"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { ReactElement } from "react"; diff --git a/apps/web/modules/webhooks/components/WebhookForm.tsx b/apps/web/modules/webhooks/components/WebhookForm.tsx index 198775dcf9..f98f3f42d6 100644 --- a/apps/web/modules/webhooks/components/WebhookForm.tsx +++ b/apps/web/modules/webhooks/components/WebhookForm.tsx @@ -3,7 +3,7 @@ import { useEffect, useState } from "react"; import { Controller, useForm } from "react-hook-form"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import customTemplate, { hasTemplateIntegration } from "@calcom/features/webhooks/lib/integrationTemplate"; import { WebhookVersion } from "@calcom/features/webhooks/lib/interface/IWebhookRepository"; import { WEBAPP_URL } from "@calcom/lib/constants"; diff --git a/apps/web/modules/webhooks/views/webhook-edit-view.tsx b/apps/web/modules/webhooks/views/webhook-edit-view.tsx index ba8ce58ff0..490d16a578 100644 --- a/apps/web/modules/webhooks/views/webhook-edit-view.tsx +++ b/apps/web/modules/webhooks/views/webhook-edit-view.tsx @@ -3,7 +3,7 @@ import Link from "next/link"; import { useRouter } from "next/navigation"; -import SettingsHeaderWithBackButton from "@calcom/web/modules/settings/components/SettingsHeaderWithBackButton"; +import SettingsHeaderWithBackButton from "@calcom/features/settings/appDir/SettingsHeaderWithBackButton"; import { WEBHOOK_VERSION_OPTIONS, getWebhookVersionLabel, diff --git a/apps/web/modules/webhooks/views/webhook-new-skeleton.tsx b/apps/web/modules/webhooks/views/webhook-new-skeleton.tsx index f8b22e10cc..d08852ff3b 100644 --- a/apps/web/modules/webhooks/views/webhook-new-skeleton.tsx +++ b/apps/web/modules/webhooks/views/webhook-new-skeleton.tsx @@ -1,6 +1,6 @@ "use client"; -import SettingsHeaderWithBackButton from "@calcom/web/modules/settings/components/SettingsHeaderWithBackButton"; +import SettingsHeaderWithBackButton from "@calcom/features/settings/appDir/SettingsHeaderWithBackButton"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton"; diff --git a/apps/web/modules/webhooks/views/webhook-new-view.tsx b/apps/web/modules/webhooks/views/webhook-new-view.tsx index 65a4c03a46..bccf105eb1 100644 --- a/apps/web/modules/webhooks/views/webhook-new-view.tsx +++ b/apps/web/modules/webhooks/views/webhook-new-view.tsx @@ -4,7 +4,7 @@ import { useSession } from "next-auth/react"; import Link from "next/link"; import { useRouter } from "next/navigation"; -import SettingsHeaderWithBackButton from "@calcom/web/modules/settings/components/SettingsHeaderWithBackButton"; +import SettingsHeaderWithBackButton from "@calcom/features/settings/appDir/SettingsHeaderWithBackButton"; import { WEBHOOK_VERSION_OPTIONS, getWebhookVersionLabel, diff --git a/apps/web/modules/webhooks/views/webhooks-skeleton.tsx b/apps/web/modules/webhooks/views/webhooks-skeleton.tsx index d273aba485..1e9a71c9ac 100644 --- a/apps/web/modules/webhooks/views/webhooks-skeleton.tsx +++ b/apps/web/modules/webhooks/views/webhooks-skeleton.tsx @@ -1,6 +1,6 @@ "use client"; -import SettingsHeader from "@calcom/web/modules/settings/components/SettingsHeader"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton"; diff --git a/apps/web/modules/webhooks/views/webhooks-view.tsx b/apps/web/modules/webhooks/views/webhooks-view.tsx index d9ef8e65c4..228b3038f4 100644 --- a/apps/web/modules/webhooks/views/webhooks-view.tsx +++ b/apps/web/modules/webhooks/views/webhooks-view.tsx @@ -1,6 +1,6 @@ "use client"; -import { useBookerUrl } from "~/bookings/hooks/useBookerUrl"; +import { useBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl"; import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/event-types/components/Segment.test.tsx b/packages/features/Segment.test.tsx similarity index 98% rename from apps/web/modules/event-types/components/Segment.test.tsx rename to packages/features/Segment.test.tsx index 990124a7a7..85fae73b6d 100644 --- a/apps/web/modules/event-types/components/Segment.test.tsx +++ b/packages/features/Segment.test.tsx @@ -3,7 +3,7 @@ import React from "react"; import { describe, expect, it, vi, beforeEach } from "vitest"; import type { Mock } from "vitest"; -import { Segment } from "@calcom/web/modules/event-types/components/Segment"; +import { Segment } from "@calcom/features/Segment"; import type { AttributesQueryValue } from "@calcom/lib/raqb/types"; import { AttributeType } from "@calcom/prisma/enums"; import { trpc, type RouterOutputs } from "@calcom/trpc/react"; diff --git a/apps/web/modules/event-types/components/Segment.tsx b/packages/features/Segment.tsx similarity index 100% rename from apps/web/modules/event-types/components/Segment.tsx rename to packages/features/Segment.tsx diff --git a/packages/features/bookings/hooks/index.ts b/packages/features/bookings/hooks/index.ts new file mode 100644 index 0000000000..9c6df62032 --- /dev/null +++ b/packages/features/bookings/hooks/index.ts @@ -0,0 +1,2 @@ +export { useBookerUrl, useEmbedBookerUrl } from "./useBookerUrl"; +export { useBookingLocation } from "./useBookingLocation"; diff --git a/apps/web/modules/bookings/hooks/useBookerUrl.ts b/packages/features/bookings/hooks/useBookerUrl.ts similarity index 99% rename from apps/web/modules/bookings/hooks/useBookerUrl.ts rename to packages/features/bookings/hooks/useBookerUrl.ts index 9a44f84f67..d634c4b1d9 100644 --- a/apps/web/modules/bookings/hooks/useBookerUrl.ts +++ b/packages/features/bookings/hooks/useBookerUrl.ts @@ -9,4 +9,4 @@ export const useBookerUrl = () => { export const useEmbedBookerUrl = () => { const orgBranding = useOrgBranding(); return orgBranding?.fullDomain ?? WEBAPP_URL; -}; \ No newline at end of file +}; diff --git a/apps/web/modules/bookings/hooks/useBookingLocation.ts b/packages/features/bookings/hooks/useBookingLocation.ts similarity index 100% rename from apps/web/modules/bookings/hooks/useBookingLocation.ts rename to packages/features/bookings/hooks/useBookingLocation.ts diff --git a/apps/web/modules/ee/admin/pages/settings/blocklist.tsx b/packages/features/ee/admin/pages/settings/blocklist.tsx similarity index 100% rename from apps/web/modules/ee/admin/pages/settings/blocklist.tsx rename to packages/features/ee/admin/pages/settings/blocklist.tsx diff --git a/apps/web/modules/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx b/packages/features/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx similarity index 100% rename from apps/web/modules/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx rename to packages/features/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx diff --git a/apps/web/modules/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx b/packages/features/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx similarity index 100% rename from apps/web/modules/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx rename to packages/features/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx diff --git a/apps/web/modules/ee/deployment/licensekey/CreateLicenseKeyForm.tsx b/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx similarity index 99% rename from apps/web/modules/ee/deployment/licensekey/CreateLicenseKeyForm.tsx rename to packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx index 844c0b196d..62a1f2c1e8 100644 --- a/apps/web/modules/ee/deployment/licensekey/CreateLicenseKeyForm.tsx +++ b/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx @@ -13,7 +13,7 @@ import { Button } from "@calcom/ui/components/button"; import { Label, TextField, ToggleGroup, Form } from "@calcom/ui/components/form"; import { showToast } from "@calcom/ui/components/toast"; -import { UserPermissionRole } from "@calcom/prisma/enums"; +import { UserPermissionRole } from "../../../../prisma/enums"; export const CreateANewLicenseKeyForm = () => { const session = useSession(); diff --git a/apps/web/modules/embed/components/EmbedTabs.tsx b/packages/features/embed/lib/EmbedTabs.tsx similarity index 94% rename from apps/web/modules/embed/components/EmbedTabs.tsx rename to packages/features/embed/lib/EmbedTabs.tsx index f47182fc8e..147d37cd19 100644 --- a/apps/web/modules/embed/components/EmbedTabs.tsx +++ b/packages/features/embed/lib/EmbedTabs.tsx @@ -2,18 +2,18 @@ import type { MutableRefObject } from "react"; import { forwardRef } from "react"; import type { BookerLayout } from "@calcom/features/bookings/Booker/types"; -import { useEmbedBookerUrl } from "../../bookings/hooks/useBookerUrl"; +import { useEmbedBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl"; import { APP_NAME } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { TextArea } from "@calcom/ui/components/form"; -import type { EmbedFramework, EmbedType, PreviewState } from "@calcom/features/embed/types"; -import { Codes } from "@calcom/features/embed/lib/EmbedCodes"; -import { buildCssVarsPerTheme } from "@calcom/features/embed/lib/buildCssVarsPerTheme"; -import { embedLibUrl, EMBED_PREVIEW_HTML_URL } from "@calcom/features/embed/lib/constants"; -import { getApiNameForReactSnippet, getApiNameForVanillaJsSnippet } from "@calcom/features/embed/lib/getApiName"; -import { getDimension } from "@calcom/features/embed/lib/getDimension"; -import { useEmbedCalOrigin } from "../hooks/useEmbedCalOrigin"; +import type { EmbedFramework, EmbedType, PreviewState } from "../types"; +import { Codes } from "./EmbedCodes"; +import { buildCssVarsPerTheme } from "./buildCssVarsPerTheme"; +import { embedLibUrl, EMBED_PREVIEW_HTML_URL } from "./constants"; +import { getApiNameForReactSnippet, getApiNameForVanillaJsSnippet } from "./getApiName"; +import { getDimension } from "./getDimension"; +import { useEmbedCalOrigin } from "./hooks"; export const enum EmbedTabName { HTML = "embed-code", diff --git a/apps/web/modules/embed/hooks/useEmbedTypes.tsx b/packages/features/embed/lib/hooks/index.tsx similarity index 98% rename from apps/web/modules/embed/hooks/useEmbedTypes.tsx rename to packages/features/embed/lib/hooks/index.tsx index 813e050377..d8a3145362 100644 --- a/apps/web/modules/embed/hooks/useEmbedTypes.tsx +++ b/packages/features/embed/lib/hooks/index.tsx @@ -1,3 +1,4 @@ +import { useEmbedBookerUrl } from "@calcom/features/bookings/hooks/useBookerUrl"; import { useLocale } from "@calcom/lib/hooks/useLocale"; export const useEmbedTypes = () => { @@ -316,3 +317,8 @@ export const useEmbedTypes = () => { }, ]; }; + +export const useEmbedCalOrigin = () => { + const bookerUrl = useEmbedBookerUrl(); + return bookerUrl; +}; diff --git a/packages/features/embed/types/index.d.ts b/packages/features/embed/types/index.d.ts index 46dd82f5a5..b567d6c9b8 100644 --- a/packages/features/embed/types/index.d.ts +++ b/packages/features/embed/types/index.d.ts @@ -1,5 +1,8 @@ import type { Brand } from "@calcom/types/utils"; +import type { tabs } from "../lib/EmbedTabs"; +import type { useEmbedTypes } from "../lib/hooks"; + export type EmbedType = "inline" | "floating-popup" | "element-click" | "email" | "headless"; type EmbedConfig = { layout?: BookerLayouts; @@ -51,4 +54,6 @@ export type PreviewState = { layout: BookerLayouts; }; -export type EmbedFramework = "react" | "react-atom" | "HTML"; \ No newline at end of file +export type EmbedFramework = "react" | "react-atom" | "HTML"; +export type EmbedTabs = typeof tabs; +export type EmbedTypes = ReturnType; diff --git a/apps/web/modules/settings/components/BookerLayoutSelector.tsx b/packages/features/settings/BookerLayoutSelector.tsx similarity index 99% rename from apps/web/modules/settings/components/BookerLayoutSelector.tsx rename to packages/features/settings/BookerLayoutSelector.tsx index 21339eca3c..ed491a806b 100644 --- a/apps/web/modules/settings/components/BookerLayoutSelector.tsx +++ b/packages/features/settings/BookerLayoutSelector.tsx @@ -13,7 +13,7 @@ import { Button } from "@calcom/ui/components/button"; import { Label } from "@calcom/ui/components/form"; import { CheckboxField } from "@calcom/ui/components/form"; -import SectionBottomActions from "@calcom/web/modules/settings/components/SectionBottomActions"; +import SectionBottomActions from "./SectionBottomActions"; type BookerLayoutSelectorProps = { title?: string; diff --git a/apps/web/modules/settings/components/SectionBottomActions.tsx b/packages/features/settings/SectionBottomActions.tsx similarity index 100% rename from apps/web/modules/settings/components/SectionBottomActions.tsx rename to packages/features/settings/SectionBottomActions.tsx diff --git a/apps/web/modules/settings/components/ThemeLabel.tsx b/packages/features/settings/ThemeLabel.tsx similarity index 100% rename from apps/web/modules/settings/components/ThemeLabel.tsx rename to packages/features/settings/ThemeLabel.tsx diff --git a/apps/web/modules/settings/components/SettingsHeader.tsx b/packages/features/settings/appDir/SettingsHeader.tsx similarity index 100% rename from apps/web/modules/settings/components/SettingsHeader.tsx rename to packages/features/settings/appDir/SettingsHeader.tsx diff --git a/apps/web/modules/settings/components/SettingsHeaderWithBackButton.tsx b/packages/features/settings/appDir/SettingsHeaderWithBackButton.tsx similarity index 100% rename from apps/web/modules/settings/components/SettingsHeaderWithBackButton.tsx rename to packages/features/settings/appDir/SettingsHeaderWithBackButton.tsx diff --git a/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx b/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx index 857ec5a92b..98de1682ae 100644 --- a/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx +++ b/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx @@ -1,12 +1,12 @@ "use client"; import AccountDialog from "@calcom/app-store/office365video/components/AccountDialog"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { GOOGLE_MEET, OFFICE_365_VIDEO, ZOOM } from "@calcom/platform-constants"; import { QueryCell } from "@calcom/trpc/components/QueryCell"; import type { App } from "@calcom/types/App"; import { Button } from "@calcom/ui/components/button"; -import { Icon } from "@calcom/ui/components/icon"; import { Dropdown, DropdownItem, @@ -17,12 +17,16 @@ import { import { EmptyScreen } from "@calcom/ui/components/empty-screen"; import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton"; import { AppList } from "@calcom/web/modules/apps/components/AppList"; -import DisconnectIntegrationModal from "@calcom/web/modules/apps/components/DisconnectIntegrationModal"; +import DisconnectIntegrationModal from "@calcom/features/apps/components/DisconnectIntegrationModal"; import { useQueryClient } from "@tanstack/react-query"; -import { Suspense, useReducer, useState } from "react"; +import { useReducer, useState } from "react"; import { AtomsWrapper } from "../../src/components/atoms-wrapper"; import { useToast } from "../../src/components/ui/use-toast"; import { cn } from "../../src/lib/utils"; +import type { + BulkUpdatParams, + UpdateUsersDefaultConferencingAppParams, +} from "./ConferencingAppsViewWebWrapper"; import { useAtomBulkUpdateEventTypesToDefaultLocation } from "./hooks/useAtomBulkUpdateEventTypesToDefaultLocation"; import { useAtomGetEventTypes } from "./hooks/useAtomGetEventTypes"; import { @@ -36,7 +40,6 @@ import { useGetDefaultConferencingApp, } from "./hooks/useGetDefaultConferencingApp"; import { useUpdateUserDefaultConferencingApp } from "./hooks/useUpdateUserDefaultConferencingApp"; -import classNames from "@calcom/ui/classNames"; type ConferencingAppSlug = typeof GOOGLE_MEET | typeof ZOOM | typeof OFFICE_365_VIDEO; @@ -67,13 +70,6 @@ type ConferencingAppsViewPlatformWrapperProps = { }; type RemoveAppParams = { callback: () => void; app?: App["slug"] }; -type BulkUpdatParams = { eventTypeIds: number[]; callback: () => void }; -type UpdateUsersDefaultConferencingAppParams = { - appSlug: string; - appLink?: string; - onSuccessCallback: () => void; - onErrorCallback: () => void; -}; const SkeletonLoader = ({ className }: { className?: string }) => { return ( @@ -92,55 +88,6 @@ type ModalState = { app: App["slug"] | null; }; - -function PlatformSettingsHeader({ - children, - title, - description, - CTA, - borderInShellHeader, -}: { - children: React.ReactNode; - title?: string; - description?: string; - CTA?: React.ReactNode; - borderInShellHeader?: boolean; -}) { - const { t } = useLocale(); - - return ( -
-
-
-
-
- {title ? ( -

- {title} -

- ) : ( -
- )} - {description ? ( -

{description}

- ) : ( -
- )} -
-
-
{CTA}
-
-
- }>{children} -
- ); -} - export const ConferencingAppsViewPlatformWrapper = ({ disableToasts = false, returnTo, @@ -326,7 +273,7 @@ export const ConferencingAppsViewPlatformWrapper = ({ return ( - connect(OFFICE_365_VIDEO)} /> - + ); }; diff --git a/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx index 645ca18beb..71eff8e7f8 100644 --- a/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx +++ b/packages/platform/atoms/event-types/wrappers/EventTypePlatformWrapper.tsx @@ -6,7 +6,7 @@ import { useRef, useState, useEffect, forwardRef, useImperativeHandle, useCallba import { BookerStoreProvider } from "@calcom/features/bookings/Booker/BookerStoreProvider"; import type { ChildrenEventType } from "@calcom/web/modules/event-types/components/ChildrenEventTypeSelect"; import { EventType as EventTypeComponent } from "@calcom/web/modules/event-types/components/EventType"; -import ManagedEventTypeDialog from "@calcom/web/modules/event-types/components/dialogs/ManagedEventDialog"; +import ManagedEventTypeDialog from "@calcom/features/eventtypes/components/dialogs/ManagedEventDialog"; import type { EventTypeSetupProps, FormValues,