diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx index 7ec25f0ef5..8c09fb5bb5 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx @@ -1,7 +1,7 @@ import { ShellMainAppDirBackButton } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton"; import classNames from "classnames"; -import type { LayoutProps } from "@calcom/features/shell/Shell"; +import type { LayoutProps } from "~/shell/Shell"; // Copied from `ShellMain` but with a different `ShellMainAppDirBackButton` import // for client/server component separation diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx index c1c78baa91..24475525d5 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx @@ -2,9 +2,10 @@ import { useRouter } from "next/navigation"; -import type { LayoutProps } from "@calcom/features/shell/Shell"; import { Button } from "@calcom/ui/components/button"; +import type { LayoutProps } from "~/shell/Shell"; + export const ShellMainAppDirBackButton = ({ backPath }: { backPath: LayoutProps["backPath"] }) => { const router = useRouter(); return ( diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx index 703ec3b492..f82d9bc7cd 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx @@ -8,10 +8,10 @@ import { redirect } from "next/navigation"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container"; import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service"; -import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable"; import { getScheduleListItemData } from "@calcom/lib/schedules/transformers/getScheduleListItemData"; import { MembershipRole } from "@calcom/prisma/enums"; import { availabilityRouter } from "@calcom/trpc/server/routers/viewer/availability/_router"; +import { AvailabilitySliderTable } from "@calcom/web/modules/timezone-buddy/components/AvailabilitySliderTable"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; @@ -64,8 +64,8 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => { const organizationRepository = getOrganizationRepository(); const isOrgPrivate = organizationId ? await organizationRepository.checkIfPrivate({ - orgId: organizationId, - }) + orgId: organizationId, + }) : false; const permissionService = new PermissionCheckService(); @@ -80,9 +80,7 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => { - }> + CTA={}> {searchParams?.type === "team" && canViewTeamAvailability ? ( ) : ( diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx index b32accc62a..b63dc289c9 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/layout.tsx @@ -3,10 +3,11 @@ import { cookies, headers } from "next/headers"; import React from "react"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; -import Shell from "@calcom/features/shell/Shell"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; +import Shell from "~/shell/Shell"; + const Layout = async ({ children }: { children: React.ReactNode }) => { const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) }); if (session?.user?.id) SentrySetUser({ id: session.user.id }); diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx index dfd12eee5c..f37447c20b 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx @@ -2,7 +2,6 @@ import type { SearchParams } from "app/_types"; import type { Session } from "next-auth"; import { unstable_cache } from "next/cache"; -import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing"; import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository"; import { TeamService } from "@calcom/features/ee/teams/services/teamService"; import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service"; @@ -10,6 +9,8 @@ import { ErrorWithCode } from "@calcom/lib/errors"; import prisma from "@calcom/prisma"; import { MembershipRole } from "@calcom/prisma/enums"; +import { TeamsListing } from "~/ee/teams/components/TeamsListing"; + import { TeamsCTA } from "./CTA"; const getCachedTeams = unstable_cache( diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx index c66a5c0d51..757da4ada5 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/skeleton.tsx @@ -3,9 +3,10 @@ import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDir"; import { TeamsCTA } from "app/(use-page-wrapper)/(main-nav)/teams/CTA"; -import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList"; + export const TeamsListSkeleton = () => { const { t } = useLocale(); return ( diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx index d19c52a597..a186fde67b 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx @@ -1,21 +1,16 @@ "use client"; import { useAutoAnimate } from "@formkit/auto-animate/react"; +import posthog from "posthog-js"; import { useEffect, useState } from "react"; import { useFormContext } from "react-hook-form"; -import posthog from "posthog-js"; import { isFallbackRoute } from "@calcom/app-store/routing-forms/lib/isFallbackRoute"; import type { RoutingFormWithResponseCount } from "@calcom/app-store/routing-forms/types/types"; -import { useHasPaidPlan } from "@calcom/features/billing/hooks/useHasPaidPlan"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList"; -import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList"; import { FilterResults } from "@calcom/features/filters/components/FilterResults"; import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter"; import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; -import { ShellMain } from "@calcom/features/shell/Shell"; -import { UpgradeTip } from "@calcom/features/tips"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; @@ -39,6 +34,12 @@ import { FormActionsProvider, } from "@calcom/web/components/apps/routing-forms/FormActions"; +import { useHasPaidPlan } from "~/billing/hooks/useHasPaidPlan"; +import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList"; +import { CreateButtonWithTeamsList } from "~/ee/teams/components/createButton/CreateButtonWithTeamsList"; +import { ShellMain } from "~/shell/Shell"; +import { UpgradeTip } from "~/shell/UpgradeTip"; + function NewFormButton({ setNewFormDialogState }: { setNewFormDialogState: SetNewFormDialogState }) { const { t } = useLocale(); return ( diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx index 8954344d81..ae63d68cb7 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx @@ -3,10 +3,11 @@ import { redirect } from "next/navigation"; import type { ReactNode } from "react"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; -import Shell from "@calcom/features/shell/Shell"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; +import Shell from "~/shell/Shell"; + import FormProvider from "../[...pages]/FormProvider"; export default async function Layout({ children }: { children: ReactNode }) { diff --git a/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx b/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx index e49bbde887..126be37323 100644 --- a/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx +++ b/apps/web/app/(use-page-wrapper)/availability/[schedule]/skeleton.tsx @@ -1,8 +1,9 @@ "use client"; -import Shell from "@calcom/features/shell/Shell"; import { SkeletonText, SkeletonContainer, SkeletonButton } from "@calcom/ui/components/skeleton"; +import Shell from "~/shell/Shell"; + export function AvailabilityScheduleSkeleton() { return ( @@ -106,7 +107,7 @@ export function AvailabilityScheduleSkeleton() { {/* Sidebar - only visible on desktop */} -
+
{/* Timezone */} diff --git a/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx b/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx index 0951beed67..d3ce75e67b 100644 --- a/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx +++ b/apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx @@ -1,9 +1,10 @@ "use client"; -import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Alert } from "@calcom/ui/components/alert"; +import Shell from "~/shell/Shell"; + export default function Error() { const { t } = useLocale(); return ( diff --git a/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx b/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx index 57e7f4304f..9575f41fa5 100644 --- a/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx +++ b/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx @@ -1,6 +1,5 @@ "use client"; -import Shell from "@calcom/features/shell/Shell"; import { SkeletonButton, SkeletonContainer, @@ -8,6 +7,8 @@ import { SkeletonAvatar, } from "@calcom/ui/components/skeleton"; +import Shell from "~/shell/Shell"; + export const EventTypeEditPageSkeleton = () => { const backButtonSkeleton = (
@@ -33,7 +34,7 @@ export const EventTypeEditPageSkeleton = () => {
-
+
{/* Tab navigation items */} {Array.from({ length: 8 }).map((_, index) => (
{
-
+
{/* Form fields */} -
+
-
+
@@ -73,12 +74,12 @@ export const EventTypeEditPageSkeleton = () => {
-
+
-
+
@@ -86,7 +87,7 @@ export const EventTypeEditPageSkeleton = () => {
-
+
diff --git a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx index dec69eb3c0..ab8d9dc1e0 100644 --- a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx +++ b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx @@ -2,13 +2,14 @@ import { useSession } from "next-auth/react"; -import { UpgradeTip } from "@calcom/features/tips"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Button } from "@calcom/ui/components/button"; import { ButtonGroup } from "@calcom/ui/components/buttonGroup"; import { Icon } from "@calcom/ui/components/icon"; +import { UpgradeTip } from "~/shell/UpgradeTip"; + export default function UpgradeTipWrapper({ children }: { children: React.ReactNode }) { const { t } = useLocale(); const session = useSession(); diff --git a/apps/web/app/(use-page-wrapper)/insights/layout.tsx b/apps/web/app/(use-page-wrapper)/insights/layout.tsx index 6eea6cf422..174cf18396 100644 --- a/apps/web/app/(use-page-wrapper)/insights/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/insights/layout.tsx @@ -2,7 +2,8 @@ import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppD import { getTranslate } from "app/_utils"; import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils"; -import Shell from "@calcom/features/shell/Shell"; + +import Shell from "~/shell/Shell"; import UpgradeTipWrapper from "./UpgradeTipWrapper"; diff --git a/apps/web/app/(use-page-wrapper)/refer/page.tsx b/apps/web/app/(use-page-wrapper)/refer/page.tsx index aa869f4fd0..69cadcc96b 100644 --- a/apps/web/app/(use-page-wrapper)/refer/page.tsx +++ b/apps/web/app/(use-page-wrapper)/refer/page.tsx @@ -1,9 +1,10 @@ import { getTranslate } from "app/_utils"; import type { Metadata } from "next"; -import Shell from "@calcom/features/shell/Shell"; import { IS_DUB_REFERRALS_ENABLED } from "@calcom/lib/constants"; +import Shell from "~/shell/Shell"; + import { DubReferralsPage } from "./DubReferralsPage"; export const metadata: Metadata = { diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx index 8a652a29e8..3424dc2d54 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx @@ -4,10 +4,11 @@ import { usePathname } from "next/navigation"; import type { ComponentProps } from "react"; import React from "react"; -import type Shell from "@calcom/features/shell/Shell"; import type { UserPermissionRole } from "@calcom/prisma/enums"; import { ErrorBoundary } from "@calcom/ui/components/errorBoundary"; +import type Shell from "~/shell/Shell"; + export type AdminLayoutProps = { children: React.ReactNode; userRole: UserPermissionRole | "INACTIVE_ADMIN" | undefined; @@ -18,7 +19,7 @@ export default function AdminLayoutAppDirClient({ children }: AdminLayoutProps) const isAppsPage = pathname?.startsWith("/settings/admin/apps"); return (
-
+
{children}
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 e4f8941d35..6e00831484 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 @@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { z } from "zod"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import { OrgForm } from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage"; +import { OrgForm } from "~/ee/organizations/admin/AdminOrgEditPage"; import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; 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 e47c0d6ade..2ca7016896 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 @@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage"; +import AdminOrgTable from "~/ee/organizations/admin/AdminOrgPage"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; 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 9f313ca07a..d92600e030 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 @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import WorkspacePlatformsPage from "@calcom/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage"; +import WorkspacePlatformsPage from "~/ee/organizations/admin/WorkspacePlatformPage"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx index 4754719f55..ac36a33164 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx @@ -13,7 +13,6 @@ import { useOrgBranding } from "@calcom/features/ee/organizations/context/provid import type { OrganizationBranding } from "@calcom/features/ee/organizations/context/provider"; import type { TeamFeatures } from "@calcom/features/flags/config"; import { useIsFeatureEnabledForTeam } from "@calcom/features/flags/hooks/useIsFeatureEnabledForTeam"; -import Shell from "@calcom/features/shell/Shell"; import { HOSTED_CAL_FEATURES, IS_CALCOM, WEBAPP_URL } from "@calcom/lib/constants"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; @@ -30,6 +29,8 @@ import type { VerticalTabItemProps } from "@calcom/ui/components/navigation"; import { VerticalTabItem } from "@calcom/ui/components/navigation"; import { Skeleton } from "@calcom/ui/components/skeleton"; +import Shell from "~/shell/Shell"; + const getTabs = (orgBranding: OrganizationBranding | null) => { const tabs: VerticalTabItemProps[] = [ { diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx index 14f36df7dd..7c41229d61 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/loading.tsx @@ -1,4 +1,4 @@ -import { SkeletonLoader } from "@calcom/features/webhooks/pages/webhooks-skeleton"; +import { SkeletonLoader } from "~/webhooks/views/webhooks-skeleton"; export default function Loading() { return ; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx index 4626d80c51..918192b650 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/(with-loader)/page.tsx @@ -4,12 +4,13 @@ import { cookies, headers } from "next/headers"; import { redirect } from "next/navigation"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; -import WebhooksView from "@calcom/features/webhooks/pages/webhooks-view"; import { APP_NAME } from "@calcom/lib/constants"; import { webhookRouter } from "@calcom/trpc/server/routers/viewer/webhook/_router"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; +import WebhooksView from "~/webhooks/views/webhooks-view"; + export const generateMetadata = async () => await _generateMetadata( (t) => t("webhooks"), diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx index 6953ea0ab5..7d25e5fdd4 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx @@ -2,9 +2,10 @@ import type { PageProps } from "app/_types"; import { _generateMetadata } from "app/_utils"; import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository"; -import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view"; import { APP_NAME } from "@calcom/lib/constants"; +import { EditWebhookView } from "~/webhooks/views/webhook-edit-view"; + export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) => await _generateMetadata( (t) => t("webhooks"), diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx index 8d9abaffc5..75482db52b 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/loading.tsx @@ -1,4 +1,4 @@ -import { SkeletonLoader } from "@calcom/features/webhooks/pages/webhook-new-skeleton"; +import { SkeletonLoader } from "~/webhooks/views/webhook-new-skeleton"; export default function Loading() { return ; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx index 5376fccfc3..3e949c6e5d 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx @@ -1,11 +1,12 @@ import { createRouterCaller } from "app/_trpc/context"; import { _generateMetadata } from "app/_utils"; -import { NewWebhookView } from "@calcom/features/webhooks/pages/webhook-new-view"; import { APP_NAME } from "@calcom/lib/constants"; import { appsRouter } from "@calcom/trpc/server/routers/viewer/apps/_router"; import { webhookRouter } from "@calcom/trpc/server/routers/viewer/webhook/_router"; +import { NewWebhookView } from "~/webhooks/views/webhook-new-view"; + export const generateMetadata = async () => await _generateMetadata( (t) => t("webhooks"), diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx index 224c6a160e..b96a7f6ecb 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata } from "app/_utils"; -import OrgAttributesEditPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view"; import { MembershipRole } from "@calcom/prisma/enums"; +import OrgAttributesEditPage from "@calcom/web/modules/ee/organizations/attributes/attributes-edit-view"; import { validateUserHasOrgPerms } from "../../../../actions/validateUserHasOrgPerms"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx index d503230653..e89eacf790 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import OrgAttributesCreatePage from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view"; +import OrgAttributesCreatePage from "@calcom/web/modules/ee/organizations/attributes/attributes-create-view"; 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)/attributes/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx index a260fb36ac..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 @@ -1,12 +1,13 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { redirect } from "next/navigation"; -import OrgSettingsAttributesPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-list-view"; import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; +import OrgSettingsAttributesPage from "~/ee/organizations/attributes/attributes-list-view"; + import { validateUserHasOrg } from "../../actions/validateUserHasOrg"; export const generateMetadata = async () => 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 a6ebd3e48c..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,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import DelegationCredentialList from "@calcom/features/ee/organizations/pages/settings/delegationCredential"; +import DelegationCredentialList from "~/ee/organizations/delegationCredential"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { MembershipRole } from "@calcom/prisma/enums"; 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 f6cbc55a7c..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 @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { redirect } from "next/navigation"; -import GuestNotificationsView from "@calcom/features/ee/organizations/pages/settings/guest-notifications"; +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/features/settings/appDir/SettingsHeader"; 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 641e9be469..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 @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { redirect } from "next/navigation"; -import PrivacyView from "@calcom/features/ee/organizations/pages/settings/privacy"; +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/features/settings/appDir/SettingsHeader"; 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 d430d57432..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,8 +1,9 @@ import { getTranslate, _generateMetadata } from "app/_utils"; -import { AdminAPIView } from "@calcom/features/ee/organizations/pages/settings/admin-api"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; +import { AdminAPIView } from "~/ee/organizations/admin-api"; + import { validateUserHasOrg } from "../actions/validateUserHasOrg"; export const generateMetadata = async () => 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 acde25d13d..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 @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import LegacyPage from "@calcom/features/ee/organizations/pages/settings/general"; +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/features/settings/appDir/SettingsHeader"; 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 56a8914f99..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 @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { redirect } from "next/navigation"; -import LegacyPage from "@calcom/features/ee/organizations/pages/settings/profile"; +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/features/settings/appDir/SettingsHeader"; 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 358f9da2bb..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,9 +1,10 @@ "use client"; -import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import SkeletonLoaderTeamList from "~/ee/teams/components/SkeletonloaderTeamList"; + export function SkeletonLoader() { const { t } = useLocale(); return ( 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 e2a460cea6..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,8 +1,9 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-view"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; +import LegacyPage from "~/ee/teams/views/team-appearance-view"; + import { validateUserHasOrg } from "../../../../actions/validateUserHasOrg"; export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) => 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 e47bbf78d1..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 @@ -2,7 +2,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LegacyPage, { TeamMembersCTA, -} from "@calcom/features/ee/organizations/pages/settings/other-team-members-view"; +} from "~/ee/organizations/other-team-members-view"; 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 1eaef435ef..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,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import LegacyPage from "@calcom/features/ee/organizations/pages/settings/other-team-profile-view"; +import LegacyPage from "~/ee/organizations/other-team-profile-view"; 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)/teams/[id]/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/appearance/page.tsx index 7e341c954f..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,8 +1,9 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-view"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; +import LegacyPage from "~/ee/teams/views/team-appearance-view"; + export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) => await _generateMetadata( (t) => t("booking_appearance"), 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 3cf44ce444..965db9892a 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 @@ -11,11 +11,10 @@ import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository"; 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"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; -import { TeamMembersView } from "~/teams/team-members-view"; - export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) => await _generateMetadata( (t) => t("team_members"), 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 5f375e33e9..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,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import LegacyPage from "@calcom/features/ee/teams/pages/team-profile-view"; 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 }> }) => await _generateMetadata( 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 4248d74740..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,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import TeamSettingsView from "@calcom/features/ee/teams/pages/team-settings-view"; 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 }> }) => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx index 25872bcae6..6e58e193f4 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-admin-only)/appearance/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import Page from "@calcom/features/ee/organizations/pages/settings/appearance"; +import Page from "~/ee/organizations/appearance"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx index 7403ef82cd..eef834cf8b 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx @@ -1,7 +1,8 @@ import { getTranslate } from "app/_utils"; import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils"; -import Shell from "@calcom/features/shell/Shell"; + +import Shell from "~/shell/Shell"; export default async function Layout({ children }: { children: React.ReactNode }) { const t = await getTranslate(); diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx index 489822d2d6..58084f89a3 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/loading.tsx @@ -1,4 +1,4 @@ -import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton"; +import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton"; export default function Loading() { return ; diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx index 489822d2d6..58084f89a3 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/loading.tsx @@ -1,4 +1,4 @@ -import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton"; +import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton"; export default function Loading() { return ; diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx index 4ca32d7432..7ccfa20ee8 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/about/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/about-view"; +import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/about-view"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx index 4894d1d695..d10245f1ae 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/add-teams/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/add-teams-view"; +import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/add-teams-view"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx index d78cb8ff1c..b6ace5e012 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/handover/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/onboarding-handover"; +import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/onboarding-handover"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx index d4903f8c04..fb35b9386a 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/onboard-members/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/onboard-members-view"; +import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/onboard-members-view"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx index e00cbee143..380d92ed31 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/page.tsx @@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/create-new-view"; +import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/create-new-view"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx index 3f4153df16..275e47321a 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/resume/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import ResumeOnboardingPage, { LayoutWrapper } from "~/settings/organizations/new/resume-view"; +import ResumeOnboardingPage, { LayoutWrapper } from "~/ee/organizations/new/resume-view"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx index 8d46b82052..f3b1c10f74 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/new/status/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata } from "app/_utils"; -import LegacyPage, { LayoutWrapper } from "~/settings/organizations/new/payment-status-view"; +import LegacyPage, { LayoutWrapper } from "~/ee/organizations/new/payment-status-view"; export const generateMetadata = async () => await _generateMetadata( diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx index 76a42b69f9..94dc169f9f 100644 --- a/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx @@ -1,9 +1,10 @@ import { getTranslate } from "app/_utils"; import { CTA_CONTAINER_CLASS_NAME } from "@calcom/features/data-table/lib/utils"; -import Shell from "@calcom/features/shell/Shell"; import { Button } from "@calcom/ui/components/button"; +import Shell from "~/shell/Shell"; + export default async function Layout({ children }: { children: React.ReactNode }) { const t = await getTranslate(); diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx index 489822d2d6..58084f89a3 100644 --- a/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/platform/members/loading.tsx @@ -1,4 +1,4 @@ -import { UserListTableSkeleton } from "@calcom/features/users/components/UserTable/UserListTableSkeleton"; +import { UserListTableSkeleton } from "@calcom/web/modules/users/components/UserTable/UserListTableSkeleton"; export default function Loading() { return ; diff --git a/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx index 0c2fd9147a..9ef814bb49 100644 --- a/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx +++ b/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx @@ -4,7 +4,7 @@ import { z } from "zod"; // import { cookies, headers } from "next/headers"; // import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; // import { buildLegacyRequest } from "@lib/buildLegacyCtx"; -import LegacyPage from "@calcom/features/ee/workflows/pages/workflow"; +import LegacyPage from "@calcom/web/modules/ee/workflows/views/WorkflowPage"; const querySchema = z.object({ workflow: z diff --git a/apps/web/app/(use-page-wrapper)/workflows/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/page.tsx index 1601dee104..ec79c0151c 100644 --- a/apps/web/app/(use-page-wrapper)/workflows/page.tsx +++ b/apps/web/app/(use-page-wrapper)/workflows/page.tsx @@ -3,7 +3,7 @@ // import { buildLegacyRequest } from "@lib/buildLegacyCtx"; // import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; // import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository"; -import LegacyPage from "@calcom/features/ee/workflows/pages/index"; +import LegacyPage from "@calcom/web/modules/ee/workflows/views/WorkflowsPage"; const Page = async () => { // const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) }); diff --git a/apps/web/app/api/support/conversation/route.ts b/apps/web/app/api/support/conversation/route.ts index 3718f5cc14..c1bfed2cf5 100644 --- a/apps/web/app/api/support/conversation/route.ts +++ b/apps/web/app/api/support/conversation/route.ts @@ -4,14 +4,14 @@ import { NextResponse } from "next/server"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; import { BillingPlanService } from "@calcom/features/ee/billing/domain/billing-plans"; -import type { Contact } from "@calcom/features/ee/support/lib/intercom/intercom"; -import { intercom } from "@calcom/features/ee/support/lib/intercom/intercom"; import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository"; import { UserRepository } from "@calcom/features/users/repositories/UserRepository"; import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import { prisma } from "@calcom/prisma"; +import type { Contact } from "@calcom/web/modules/ee/support/lib/intercom/intercom"; +import { intercom } from "@calcom/web/modules/ee/support/lib/intercom/intercom"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; diff --git a/apps/web/components/EnterprisePage.tsx b/apps/web/components/EnterprisePage.tsx index 13bd152779..9a7b247eb2 100644 --- a/apps/web/components/EnterprisePage.tsx +++ b/apps/web/components/EnterprisePage.tsx @@ -1,12 +1,13 @@ "use client"; -import Shell from "@calcom/features/shell/Shell"; -import { UpgradeTip } from "@calcom/features/tips"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Button } from "@calcom/ui/components/button"; import { ButtonGroup } from "@calcom/ui/components/buttonGroup"; import { Icon } from "@calcom/ui/components/icon"; +import Shell from "~/shell/Shell"; +import { UpgradeTip } from "~/shell/UpgradeTip"; + export default function EnterprisePage() { const { t } = useLocale(); diff --git a/apps/web/components/apps/App.tsx b/apps/web/components/apps/App.tsx index 33f4f2028c..ef36f2a2a7 100644 --- a/apps/web/components/apps/App.tsx +++ b/apps/web/components/apps/App.tsx @@ -1,7 +1,8 @@ import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import Shell from "~/shell/Shell"; + import type { AppPageProps } from "./AppPage"; import { AppPage } from "./AppPage"; diff --git a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx index 4214e51884..4354f43049 100644 --- a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx +++ b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx @@ -2,11 +2,6 @@ import { useMemo } from "react"; import { useFormContext } from "react-hook-form"; import type { UseFormGetValues, UseFormSetValue, Control, FormState } from "react-hook-form"; -import type { - TLocationOptions, - TEventTypeLocation, -} from "@calcom/features/eventtypes/components/locations/Locations"; -import Locations from "@calcom/features/eventtypes/components/locations/Locations"; import type { LocationFormValues } from "@calcom/features/eventtypes/lib/types"; import type { SingleValueLocationOption } from "@calcom/features/form/components/LocationSelect"; import { useLocale } from "@calcom/lib/hooks/useLocale"; @@ -20,6 +15,8 @@ import { QueryCell } from "@lib/QueryCell"; import type { TFormType } from "@components/apps/installation/ConfigureStepCard"; import type { TEventType } from "~/apps/installation/[[...step]]/step-view"; +import Locations from "~/event-types/components/locations/Locations"; +import type { TLocationOptions, TEventTypeLocation } from "~/event-types/components/locations/Locations"; const LocationsWrapper = ({ eventType, diff --git a/apps/web/components/apps/layouts/AppsLayout.tsx b/apps/web/components/apps/layouts/AppsLayout.tsx index 3ba1c1a35c..0a89da7710 100644 --- a/apps/web/components/apps/layouts/AppsLayout.tsx +++ b/apps/web/components/apps/layouts/AppsLayout.tsx @@ -2,10 +2,11 @@ import { useRouter } from "next/navigation"; import type { ComponentProps } from "react"; import React from "react"; -import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { EmptyScreen } from "@calcom/ui/components/empty-screen"; +import Shell from "~/shell/Shell"; + type AppsLayoutProps = { children: React.ReactNode; isAdmin: boolean; diff --git a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx index cb8ff9b5c3..24f9de5e9c 100644 --- a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx +++ b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx @@ -2,7 +2,8 @@ import type { ComponentProps } from "react"; import React from "react"; import AppCategoryNavigation from "@calcom/app-store/_components/AppCategoryNavigation"; -import Shell from "@calcom/features/shell/Shell"; + +import Shell from "~/shell/Shell"; export default function InstalledAppsLayout({ children, diff --git a/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx b/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx index be21fbd239..9c4b7e6918 100644 --- a/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx +++ b/apps/web/components/apps/routing-forms/TestFormDialog.test.tsx @@ -60,7 +60,7 @@ function mockEventTypeRedirectUrlMatchingRoute() { /** * fixes the error due to Formbricks */ -vi.mock("@calcom/features/shell/Shell", () => ({ +vi.mock("@calcom/web/modules/shell/Shell", () => ({ ShellMain: vi.fn(), })); diff --git a/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx b/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx index 2c4e4a0415..d61226b683 100644 --- a/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx +++ b/apps/web/components/booking/__tests__/CancelBooking.cancellationFee.test.tsx @@ -10,7 +10,7 @@ beforeAll(() => { Element.prototype.scrollIntoView = vi.fn(); }); -vi.mock("@calcom/trpc", () => ({ +vi.mock("@calcom/trpc/react", () => ({ trpc: { viewer: { bookings: { diff --git a/apps/web/components/booking/actions/BookingActionsDropdown.tsx b/apps/web/components/booking/actions/BookingActionsDropdown.tsx index e08f090641..5d3b3fc331 100644 --- a/apps/web/components/booking/actions/BookingActionsDropdown.tsx +++ b/apps/web/components/booking/actions/BookingActionsDropdown.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import type { z } from "zod"; import { MeetingSessionDetailsDialog } from "@calcom/features/ee/video/MeetingSessionDetailsDialog"; -import ViewRecordingsDialog from "@calcom/features/ee/video/ViewRecordingsDialog"; +import ViewRecordingsDialog from "~/ee/video/ViewRecordingsDialog"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { bookingMetadataSchema } from "@calcom/prisma/zod-utils"; import { trpc } from "@calcom/trpc/react"; diff --git a/apps/web/lib/app-providers-app-dir.tsx b/apps/web/lib/app-providers-app-dir.tsx index 6bdddf1289..e26329f39c 100644 --- a/apps/web/lib/app-providers-app-dir.tsx +++ b/apps/web/lib/app-providers-app-dir.tsx @@ -10,10 +10,10 @@ import { NuqsAdapter } from "nuqs/adapters/next/app"; import DynamicPostHogProvider from "@calcom/features/ee/event-tracking/lib/posthog/providerDynamic"; import DynamicPostHogPageView from "@calcom/features/ee/event-tracking/lib/posthog/web/pageViewDynamic"; import { OrgBrandingProvider } from "@calcom/features/ee/organizations/context/provider"; -import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic"; -import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic"; import { FeatureProvider } from "@calcom/features/flags/context/provider"; import { useFlags } from "@calcom/features/flags/hooks"; +import DynamicHelpscoutProvider from "@calcom/web/modules/ee/support/lib/helpscout/providerDynamic"; +import DynamicIntercomProvider from "@calcom/web/modules/ee/support/lib/intercom/providerDynamic"; import useIsBookingPage from "@lib/hooks/useIsBookingPage"; import useIsThemeSupported from "@lib/hooks/useIsThemeSupported"; diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx index 1a9f3eb075..a870a7c9f6 100644 --- a/apps/web/lib/app-providers.tsx +++ b/apps/web/lib/app-providers.tsx @@ -20,10 +20,10 @@ import type { PropsWithChildren, ReactNode } from "react"; import { useEffect } from "react"; import { OrgBrandingProvider } from "@calcom/features/ee/organizations/context/provider"; -import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic"; -import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic"; import { FeatureProvider } from "@calcom/features/flags/context/provider"; import { useFlags } from "@calcom/features/flags/hooks"; +import DynamicHelpscoutProvider from "@calcom/web/modules/ee/support/lib/helpscout/providerDynamic"; +import DynamicIntercomProvider from "@calcom/web/modules/ee/support/lib/intercom/providerDynamic"; import useIsBookingPage from "@lib/hooks/useIsBookingPage"; import { useNuqsParams } from "@lib/hooks/useNuqsParams"; diff --git a/apps/web/modules/apps/categories/[category]/category-view.tsx b/apps/web/modules/apps/categories/[category]/category-view.tsx index 7631b0ee2a..ff79f2596e 100644 --- a/apps/web/modules/apps/categories/[category]/category-view.tsx +++ b/apps/web/modules/apps/categories/[category]/category-view.tsx @@ -3,12 +3,13 @@ import Link from "next/link"; import { AppCard } from "@calcom/features/apps/components/AppCard"; -import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { SkeletonText } from "@calcom/ui/components/skeleton"; import type { CategoryDataProps } from "@lib/apps/categories/[category]/getStaticProps"; +import Shell from "~/shell/Shell"; + export default function Apps({ apps, category }: CategoryDataProps) { const { t, isLocaleReady } = useLocale(); diff --git a/apps/web/modules/apps/categories/categories-view.tsx b/apps/web/modules/apps/categories/categories-view.tsx index c73b4e2e73..d7d89e0fc8 100644 --- a/apps/web/modules/apps/categories/categories-view.tsx +++ b/apps/web/modules/apps/categories/categories-view.tsx @@ -2,7 +2,6 @@ import Link from "next/link"; -import Shell from "@calcom/features/shell/Shell"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import type { inferSSRProps } from "@calcom/types/inferSSRProps"; import { Icon } from "@calcom/ui/components/icon"; @@ -10,6 +9,8 @@ import { SkeletonText } from "@calcom/ui/components/skeleton"; import type { getServerSideProps } from "@lib/apps/categories/getServerSideProps"; +import Shell from "~/shell/Shell"; + export type PageProps = inferSSRProps; export default function Apps({ categories }: PageProps) { diff --git a/apps/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper.tsx b/apps/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper.tsx new file mode 100644 index 0000000000..bf76cae45c --- /dev/null +++ b/apps/web/modules/billing/components/UpgradeTeamsBadgeWebWrapper.tsx @@ -0,0 +1,18 @@ +"use client"; + +import { UpgradeTeamsBadge as UpgradeTeamsBadgeBase } from "@calcom/ui/components/badge"; +import { useHasPaidPlan, useHasActiveTeamPlan } from "@calcom/web/modules/billing/hooks/useHasPaidPlan"; + +export function UpgradeTeamsBadgeWebWrapper({ checkForActiveStatus }: { checkForActiveStatus?: boolean }) { + const { hasPaidPlan } = useHasPaidPlan(); + const { hasActiveTeamPlan, isTrial } = useHasActiveTeamPlan(); + + return ( + + ); +} diff --git a/packages/features/billing/hooks/useHasPaidPlan.ts b/apps/web/modules/billing/hooks/useHasPaidPlan.ts similarity index 100% rename from packages/features/billing/hooks/useHasPaidPlan.ts rename to apps/web/modules/billing/hooks/useHasPaidPlan.ts diff --git a/apps/web/modules/bookings/components/BookingCalendarView.tsx b/apps/web/modules/bookings/components/BookingCalendarView.tsx index 0ed86bb0fa..1bea45ffcc 100644 --- a/apps/web/modules/bookings/components/BookingCalendarView.tsx +++ b/apps/web/modules/bookings/components/BookingCalendarView.tsx @@ -6,8 +6,8 @@ import dayjs from "@calcom/dayjs"; import { useTimePreferences } from "@calcom/features/bookings/lib"; import { Calendar } from "@calcom/features/calendars/weeklyview"; import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events"; -import { useBanners } from "@calcom/features/shell/banners/useBanners"; import { useGetTheme } from "@calcom/lib/hooks/useTheme"; +import { useBanners } from "@calcom/web/modules/shell/banners/useBanners"; import { useBookingDetailsSheetStore } from "../store/bookingDetailsSheetStore"; import type { BookingOutput } from "../types"; diff --git a/packages/features/bookings/UnconfirmedBookingBadge.tsx b/apps/web/modules/bookings/components/UnconfirmedBookingBadge.tsx similarity index 97% rename from packages/features/bookings/UnconfirmedBookingBadge.tsx rename to apps/web/modules/bookings/components/UnconfirmedBookingBadge.tsx index c55320e816..29df3635cc 100644 --- a/packages/features/bookings/UnconfirmedBookingBadge.tsx +++ b/apps/web/modules/bookings/components/UnconfirmedBookingBadge.tsx @@ -1,3 +1,5 @@ +"use client"; + import Link from "next/link"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/modules/ee/LICENSE b/apps/web/modules/ee/LICENSE new file mode 100644 index 0000000000..a8c6744758 --- /dev/null +++ b/apps/web/modules/ee/LICENSE @@ -0,0 +1,42 @@ +The Cal.com Commercial License (the “Commercial License”) +Copyright (c) 2020-present Cal.com, Inc + +With regard to the Cal.com Software: + +This software and associated documentation files (the "Software") may only be +used in production, if you (and any entity that you represent) have agreed to, +and are in compliance with, the Cal.com Subscription Terms available +at https://cal.com/terms, or other agreements governing +the use of the Software, as mutually agreed by you and Cal.com, Inc ("Cal.com"), +and otherwise have a valid Cal.com Enterprise Edition subscription ("Commercial Subscription") +for the correct number of hosts as defined in the "Commercial Terms ("Hosts"). Subject to the foregoing sentence, +you are free to modify this Software and publish patches to the Software. You agree +that Cal.com and/or its licensors (as applicable) retain all right, title and interest in +and to all such modifications and/or patches, and all such modifications and/or +patches may only be used, copied, modified, displayed, distributed, or otherwise +exploited with a valid Commercial Subscription for the correct number of hosts. +Notwithstanding the foregoing, you may copy and modify the Software for development +and testing purposes, without requiring a subscription. You agree that Cal.com and/or +its licensors (as applicable) retain all right, title and interest in and to all such +modifications. You are not granted any other rights beyond what is expressly stated herein. +Subject to the foregoing, it is forbidden to copy, merge, publish, distribute, sublicense, +and/or sell the Software. + +This Commercial License applies only to the part of this Software that is not distributed under +the AGPLv3 license. Any part of this Software distributed under the MIT license or which +is served client-side as an image, font, cascading stylesheet (CSS), file which produces +or is compiled, arranged, augmented, or combined into client-side JavaScript, in whole or +in part, is copyrighted under the AGPLv3 license. The full text of this Commercial License shall +be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +For all third party components incorporated into the Cal.com Software, those +components are licensed under the original license provided by the owner of the +applicable component. diff --git a/packages/features/ee/organizations/pages/settings/admin-api.tsx b/apps/web/modules/ee/organizations/admin-api.tsx similarity index 97% rename from packages/features/ee/organizations/pages/settings/admin-api.tsx rename to apps/web/modules/ee/organizations/admin-api.tsx index 43ae635c55..16f4bc59d4 100644 --- a/packages/features/ee/organizations/pages/settings/admin-api.tsx +++ b/apps/web/modules/ee/organizations/admin-api.tsx @@ -1,12 +1,13 @@ "use client"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; -import { UpgradeTip } from "@calcom/features/tips"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Button } from "@calcom/ui/components/button"; import { ButtonGroup } from "@calcom/ui/components/buttonGroup"; import { Icon } from "@calcom/ui/components/icon"; +import { UpgradeTip } from "~/shell/UpgradeTip"; + export const AdminAPIView = () => { const { t } = useLocale(); diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx b/apps/web/modules/ee/organizations/admin/AdminOrgEditPage.tsx similarity index 100% rename from packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx rename to apps/web/modules/ee/organizations/admin/AdminOrgEditPage.tsx diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx b/apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx similarity index 98% rename from packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx rename to apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx index 5b98a031c7..85ef95c480 100644 --- a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx +++ b/apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx @@ -3,6 +3,7 @@ import { useState } from "react"; import { Dialog } from "@calcom/features/components/controlled-dialog"; +import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import { Badge } from "@calcom/ui/components/badge"; @@ -10,8 +11,6 @@ import { ConfirmationDialogContent } from "@calcom/ui/components/dialog"; import { DropdownActions, Table } from "@calcom/ui/components/table"; import { showToast } from "@calcom/ui/components/toast"; -import { subdomainSuffix } from "../../../../organizations/lib/orgDomains"; - const { Body, Cell, ColumnTitle, Header, Row } = Table; export function AdminOrgTable() { @@ -251,7 +250,7 @@ const DeleteOrgDialog = ({ cancelBtnText={t("cancel")} variety="danger" onConfirm={onConfirm}> -