diff --git a/.env.example b/.env.example index 4555a8d72cb925..0d6caf64bd4123 100644 --- a/.env.example +++ b/.env.example @@ -357,7 +357,6 @@ APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0 APP_ROUTER_BOOKING_ENABLED=0 APP_ROUTER_BOOKINGS_STATUS_ENABLED=0 APP_ROUTER_WORKFLOWS_ENABLED=0 -APP_ROUTER_SETTINGS_TEAMS_ENABLED=0 APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0 APP_ROUTER_APPS_ENABLED=0 APP_ROUTER_VIDEO_ENABLED=0 diff --git a/apps/web/abTest/middlewareFactory.ts b/apps/web/abTest/middlewareFactory.ts index 2b687f09698d64..8a01e79422caec 100644 --- a/apps/web/abTest/middlewareFactory.ts +++ b/apps/web/abTest/middlewareFactory.ts @@ -21,7 +21,6 @@ const ROUTES: [URLPattern, boolean][] = [ ["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const, ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const, ["/workflows/:path*", process.env.APP_ROUTER_WORKFLOWS_ENABLED === "1"] as const, - ["/settings/teams/:path*", process.env.APP_ROUTER_SETTINGS_TEAMS_ENABLED === "1"] as const, ["/getting-started/:step", process.env.APP_ROUTER_GETTING_STARTED_STEP_ENABLED === "1"] as const, ["/apps", process.env.APP_ROUTER_APPS_ENABLED === "1"] as const, ["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const, diff --git a/apps/web/app/future/settings/(settings)/layout.tsx b/apps/web/app/future/settings/(settings)/layout.tsx deleted file mode 100644 index 1e4a657288800f..00000000000000 --- a/apps/web/app/future/settings/(settings)/layout.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { WithLayout } from "app/layoutHOC"; - -import { getLayout } from "@calcom/features/settings/appDir/SettingsLayoutAppDir"; - -export default WithLayout({ getServerLayout: getLayout })<"L">; diff --git a/apps/web/app/future/settings/(settings)/teams/[id]/billing/page.tsx b/apps/web/app/future/settings/(settings)/teams/[id]/billing/page.tsx deleted file mode 100644 index e88787f0b75dd1..00000000000000 --- a/apps/web/app/future/settings/(settings)/teams/[id]/billing/page.tsx +++ /dev/null @@ -1,4 +0,0 @@ -import BillingPage, { generateMetadata } from "../../../billing/page"; - -export { generateMetadata }; -export default BillingPage; diff --git a/apps/web/app/future/settings/platform/new/page.tsx b/apps/web/app/future/settings/platform/new/page.tsx deleted file mode 100644 index 033ef74380771f..00000000000000 --- a/apps/web/app/future/settings/platform/new/page.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { withAppDirSsr } from "app/WithAppDirSsr"; -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps"; -import { type inferSSRProps } from "@lib/types/inferSSRProps"; - -import LegacyPage, { LayoutWrapper } from "~/settings/platform/new/create-new-view"; - -export const generateMetadata = async () => - await _generateMetadata( - (t) => t("set_up_your_platform_organization"), - (t) => t("platform_organization_description") - ); - -export default WithLayout({ - getLayout: LayoutWrapper, - Page: LegacyPage, - getData: withAppDirSsr>(getServerSideProps), - requiresLicense: true, -}); diff --git a/apps/web/app/future/settings/platform/oauth-clients/[clientId]/edit/page.tsx b/apps/web/app/future/settings/platform/oauth-clients/[clientId]/edit/page.tsx deleted file mode 100644 index 0b4ef43affc62c..00000000000000 --- a/apps/web/app/future/settings/platform/oauth-clients/[clientId]/edit/page.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import EditView from "~/settings/platform/oauth-clients/[clientId]/edit/edit-view"; - -export const generateMetadata = async () => - await _generateMetadata( - (t) => t("oAuth_client_updation_form"), - () => "" - ); - -export default WithLayout({ - getLayout: null, - Page: EditView, -}); diff --git a/apps/web/app/future/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx b/apps/web/app/future/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx deleted file mode 100644 index e26b34326976e3..00000000000000 --- a/apps/web/app/future/settings/platform/oauth-clients/[clientId]/edit/webhooks/page.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import EditWebhooksView from "~/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view"; - -export const generateMetadata = async () => - await _generateMetadata( - (t) => t("oAuth_client_updation_form"), - () => "" - ); - -export default WithLayout({ - getLayout: null, - Page: EditWebhooksView, -}); diff --git a/apps/web/app/future/settings/platform/oauth-clients/create/page.tsx b/apps/web/app/future/settings/platform/oauth-clients/create/page.tsx deleted file mode 100644 index 5303d7dc4a47e3..00000000000000 --- a/apps/web/app/future/settings/platform/oauth-clients/create/page.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import type { PageProps } from "app/_types"; -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import CreateNewView from "~/settings/platform/oauth-clients/create-new-view"; - -export const generateMetadata = async ({ params, searchParams }: PageProps) => { - const p = { ...params, ...searchParams }; - const clientId = p?.clientId ?? ""; - return await _generateMetadata( - () => `OAuth client ${!!clientId ? "updation" : "creation"} form`, - () => "" - ); -}; - -export default WithLayout({ - getLayout: null, - Page: CreateNewView, -}); diff --git a/apps/web/app/future/settings/platform/page.tsx b/apps/web/app/future/settings/platform/page.tsx deleted file mode 100644 index 104d334c6aab2f..00000000000000 --- a/apps/web/app/future/settings/platform/page.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { _generateMetadata } from "app/_utils"; -import { WithLayout } from "app/layoutHOC"; - -import PlatformView from "~/settings/platform/platform-view"; - -export const generateMetadata = async () => { - return await _generateMetadata( - (t) => t("platform"), - (t) => t("platform_description") - ); -}; - -export default WithLayout({ - getLayout: null, - Page: PlatformView, -}); diff --git a/apps/web/app/future/settings/(settings)/billing/page.tsx b/apps/web/app/settings/(settings-layout)/billing/page.tsx similarity index 91% rename from apps/web/app/future/settings/(settings)/billing/page.tsx rename to apps/web/app/settings/(settings-layout)/billing/page.tsx index 0822b347cc60a0..7b2a35bbd715c1 100644 --- a/apps/web/app/future/settings/(settings)/billing/page.tsx +++ b/apps/web/app/settings/(settings-layout)/billing/page.tsx @@ -13,9 +13,7 @@ export const generateMetadata = async () => ); const Page = async () => { - // FIXME: Refactor me once next-auth endpoint is migrated to App Router const session = await getServerSessionForAppDir(); - const t = await getFixedT(session?.user.locale || "en"); return ( diff --git a/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx index 77c80668ccecca..b187e8ee1c24d2 100644 --- a/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx +++ b/apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx @@ -1,4 +1,4 @@ -import BillingPage, { generateMetadata } from "app/future/settings/(settings)/billing/page"; +import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page"; export { generateMetadata }; diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx index 25f31d3027b6d4..8f1a0089377a4d 100644 --- a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx +++ b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx @@ -19,7 +19,7 @@ const Page = async () => { title={t("booking_appearance")} description={t("appearance_team_description")} borderInShellHeader={false}> - + ); }; diff --git a/apps/web/app/future/settings/(settings)/teams/[id]/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx similarity index 95% rename from apps/web/app/future/settings/(settings)/teams/[id]/appearance/page.tsx rename to apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx index 25f31d3027b6d4..8f1a0089377a4d 100644 --- a/apps/web/app/future/settings/(settings)/teams/[id]/appearance/page.tsx +++ b/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx @@ -19,7 +19,7 @@ const Page = async () => { title={t("booking_appearance")} description={t("appearance_team_description")} borderInShellHeader={false}> - + ); }; diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx new file mode 100644 index 00000000000000..4acaedef2b6299 --- /dev/null +++ b/apps/web/app/settings/(settings-layout)/teams/[id]/billing/page.tsx @@ -0,0 +1,4 @@ +import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page"; + +export { generateMetadata }; +export default BillingPage; diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx new file mode 100644 index 00000000000000..3e24ed997dff07 --- /dev/null +++ b/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx @@ -0,0 +1,27 @@ +import { _generateMetadata, getFixedT } from "app/_utils"; + +import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir"; +import TeamBookingLimitsView from "@calcom/features/ee/teams/pages/team-booking-limits-view"; +import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("booking_limits"), + (t) => t("booking_limits_team_description") + ); + +const Page = async () => { + const session = await getServerSessionForAppDir(); + const t = await getFixedT(session?.user.locale || "en"); + + return ( + + + + ); +}; + +export default Page; diff --git a/apps/web/app/future/settings/(settings)/teams/[id]/members/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx similarity index 95% rename from apps/web/app/future/settings/(settings)/teams/[id]/members/page.tsx rename to apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx index 711a118776de23..8e51857e7e34f6 100644 --- a/apps/web/app/future/settings/(settings)/teams/[id]/members/page.tsx +++ b/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx @@ -16,7 +16,7 @@ const Page = async () => { return ( - + ); }; diff --git a/apps/web/app/future/settings/(settings)/teams/[id]/profile/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx similarity index 95% rename from apps/web/app/future/settings/(settings)/teams/[id]/profile/page.tsx rename to apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx index b08a143563289d..82f50b6d3a29d8 100644 --- a/apps/web/app/future/settings/(settings)/teams/[id]/profile/page.tsx +++ b/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx @@ -19,7 +19,7 @@ const Page = async () => { title={t("profile")} description={t("profile_team_description")} borderInShellHeader={true}> - + ); }; diff --git a/apps/web/app/future/settings/(settings)/teams/page.tsx b/apps/web/app/settings/(settings-layout)/teams/page.tsx similarity index 95% rename from apps/web/app/future/settings/(settings)/teams/page.tsx rename to apps/web/app/settings/(settings-layout)/teams/page.tsx index 6aa5cd10734c4a..8be4b2e10a1439 100644 --- a/apps/web/app/future/settings/(settings)/teams/page.tsx +++ b/apps/web/app/settings/(settings-layout)/teams/page.tsx @@ -16,7 +16,7 @@ const Page = async () => { return ( - + ); }; diff --git a/apps/web/app/future/settings/teams/[id]/event-type/page.tsx b/apps/web/app/settings/teams/[id]/event-type/page.tsx similarity index 100% rename from apps/web/app/future/settings/teams/[id]/event-type/page.tsx rename to apps/web/app/settings/teams/[id]/event-type/page.tsx diff --git a/apps/web/app/future/settings/teams/[id]/onboard-members/page.tsx b/apps/web/app/settings/teams/[id]/onboard-members/page.tsx similarity index 100% rename from apps/web/app/future/settings/teams/[id]/onboard-members/page.tsx rename to apps/web/app/settings/teams/[id]/onboard-members/page.tsx diff --git a/apps/web/app/future/settings/teams/new/page.tsx b/apps/web/app/settings/teams/new/page.tsx similarity index 100% rename from apps/web/app/future/settings/teams/new/page.tsx rename to apps/web/app/settings/teams/new/page.tsx diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index d86c4662b12605..cd5d5281194309 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -180,7 +180,6 @@ export const config = { "/workflows/:path*", "/future/workflows/:path*", "/settings/teams/:path*", - "/future/settings/teams/:path*", "/getting-started/:step/", "/future/getting-started/:step/", "/apps", diff --git a/apps/web/pages/settings/billing/index.tsx b/apps/web/pages/settings/billing/index.tsx deleted file mode 100644 index b4f4cc80af379f..00000000000000 --- a/apps/web/pages/settings/billing/index.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; -import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Meta } from "@calcom/ui"; - -import PageWrapper from "@components/PageWrapper"; - -import BillingView from "~/settings/billing/billing-view"; - -const Page = () => { - const { t } = useLocale(); - - return ( - <> - - - - ); -}; - -Page.getLayout = getLayout; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/settings/teams/[id]/appearance.tsx b/apps/web/pages/settings/teams/[id]/appearance.tsx deleted file mode 100644 index ea0d5d2cc0fd83..00000000000000 --- a/apps/web/pages/settings/teams/[id]/appearance.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import TeamAppearenceView from "@calcom/features/ee/teams/pages/team-appearance-view"; -import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; - -import PageWrapper from "@components/PageWrapper"; - -const Page = () => ; - -Page.getLayout = getLayout; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/settings/teams/[id]/billing.tsx b/apps/web/pages/settings/teams/[id]/billing.tsx deleted file mode 100644 index ccd9d3c3693f48..00000000000000 --- a/apps/web/pages/settings/teams/[id]/billing.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import BillingPage from "../../billing"; - -export default BillingPage; diff --git a/apps/web/pages/settings/teams/[id]/bookingLimits.tsx b/apps/web/pages/settings/teams/[id]/bookingLimits.tsx deleted file mode 100644 index 18b98824936246..00000000000000 --- a/apps/web/pages/settings/teams/[id]/bookingLimits.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import TeamBookingLimitsView from "@calcom/features/ee/teams/pages/team-booking-limits-view"; -import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; -import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Meta } from "@calcom/ui"; - -import PageWrapper from "@components/PageWrapper"; - -const Page = () => { - const { t } = useLocale(); - return ( - <> - - - - ); -}; -Page.getLayout = getLayout; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/settings/teams/[id]/event-type.tsx b/apps/web/pages/settings/teams/[id]/event-type.tsx deleted file mode 100644 index ec0a2b1c3bbc34..00000000000000 --- a/apps/web/pages/settings/teams/[id]/event-type.tsx +++ /dev/null @@ -1,27 +0,0 @@ -"use client"; - -import Head from "next/head"; - -import { useLocale } from "@calcom/lib/hooks/useLocale"; - -import PageWrapper from "@components/PageWrapper"; - -import CreateTeamEventType, { GetLayout } from "~/settings/teams/[id]/event-types-view"; - -const TeamEventTypePage = () => { - const { t } = useLocale(); - return ( - <> - - {t("add_new_team_event_type")} - - - - - ); -}; - -TeamEventTypePage.getLayout = GetLayout; -TeamEventTypePage.PageWrapper = PageWrapper; - -export default TeamEventTypePage; diff --git a/apps/web/pages/settings/teams/[id]/members.tsx b/apps/web/pages/settings/teams/[id]/members.tsx deleted file mode 100644 index 3a56a6025c8991..00000000000000 --- a/apps/web/pages/settings/teams/[id]/members.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import TeamMembersView from "@calcom/features/ee/teams/pages/team-members-view"; -import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; - -import PageWrapper from "@components/PageWrapper"; - -const Page = () => ; - -Page.getLayout = getLayout; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/settings/teams/[id]/onboard-members.tsx b/apps/web/pages/settings/teams/[id]/onboard-members.tsx deleted file mode 100644 index ca352381b85d9f..00000000000000 --- a/apps/web/pages/settings/teams/[id]/onboard-members.tsx +++ /dev/null @@ -1,27 +0,0 @@ -"use client"; - -import Head from "next/head"; - -import { useLocale } from "@calcom/lib/hooks/useLocale"; - -import PageWrapper from "@components/PageWrapper"; - -import AddNewTeamMembers, { GetLayout } from "~/settings/teams/[id]/onboard-members-view"; - -const OnboardTeamMembersPage = () => { - const { t } = useLocale(); - return ( - <> - - {t("add_team_members")} - - - - - ); -}; - -OnboardTeamMembersPage.getLayout = GetLayout; -OnboardTeamMembersPage.PageWrapper = PageWrapper; - -export default OnboardTeamMembersPage; diff --git a/apps/web/pages/settings/teams/[id]/profile.tsx b/apps/web/pages/settings/teams/[id]/profile.tsx deleted file mode 100644 index d69987c83a1d52..00000000000000 --- a/apps/web/pages/settings/teams/[id]/profile.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import TeamProfileView from "@calcom/features/ee/teams/pages/team-profile-view"; -import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; - -import PageWrapper from "@components/PageWrapper"; - -const Page = () => ; - -Page.getLayout = getLayout; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/settings/teams/index.tsx b/apps/web/pages/settings/teams/index.tsx deleted file mode 100644 index ba0d9b85e23d5a..00000000000000 --- a/apps/web/pages/settings/teams/index.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import TeamListingView from "@calcom/features/ee/teams/pages/team-listing-view"; -import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; - -import PageWrapper from "@components/PageWrapper"; - -const Page = () => ; - -Page.getLayout = getLayout; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/settings/teams/new/index.tsx b/apps/web/pages/settings/teams/new/index.tsx deleted file mode 100644 index 07cacbfee557a9..00000000000000 --- a/apps/web/pages/settings/teams/new/index.tsx +++ /dev/null @@ -1,28 +0,0 @@ -"use client"; - -import Head from "next/head"; - -import { useLocale } from "@calcom/lib/hooks/useLocale"; - -import PageWrapper from "@components/PageWrapper"; - -import CreateNewTeamView, { LayoutWrapper } from "~/settings/teams/new/create-new-team-view"; - -const CreateNewTeamPage = () => { - const { t } = useLocale(); - - return ( - <> - - {t("create_new_team")} - - - - - ); -}; - -CreateNewTeamPage.getLayout = LayoutWrapper; -CreateNewTeamPage.PageWrapper = PageWrapper; - -export default CreateNewTeamPage; diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh index 147732b27c391b..70ea9c351fc942 100755 --- a/apps/web/scripts/vercel-app-router-deploy.sh +++ b/apps/web/scripts/vercel-app-router-deploy.sh @@ -22,7 +22,6 @@ checkRoute "$APP_ROUTER_AUTH_ERROR_ENABLED" app/future/auth/error checkRoute "$APP_ROUTER_AUTH_PLATFORM_ENABLED" app/future/auth/platform checkRoute "$APP_ROUTER_AUTH_OAUTH2_ENABLED" app/future/auth/oauth2 checkRoute "$APP_ROUTER_WORKFLOWS_ENABLED" app/future/workflows -checkRoute "$APP_ROUTER_SETTINGS_TEAMS_ENABLED" app/future/settings/teams checkRoute "$APP_ROUTER_GETTING_STARTED_STEP_ENABLED" app/future/getting-started checkRoute "$APP_ROUTER_APPS_ENABLED" app/future/apps checkRoute "$APP_ROUTER_BOOKINGS_STATUS_ENABLED" app/future/bookings diff --git a/packages/features/ee/components/CommonSkeletonLoaders.tsx b/packages/features/ee/components/CommonSkeletonLoaders.tsx index ad6d363c8f20d3..5979a9decf4418 100644 --- a/packages/features/ee/components/CommonSkeletonLoaders.tsx +++ b/packages/features/ee/components/CommonSkeletonLoaders.tsx @@ -1,18 +1,9 @@ import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { Meta, SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui"; -export const AppearanceSkeletonLoader = ({ - title, - description, - isAppDir, -}: { - title: string; - description: string; - isAppDir?: boolean; -}) => { +export const AppearanceSkeletonLoader = () => { return ( - {!isAppDir ? : null}
diff --git a/packages/features/ee/organizations/pages/settings/appearance.tsx b/packages/features/ee/organizations/pages/settings/appearance.tsx index f225bd78d47c17..142af7446fe39b 100644 --- a/packages/features/ee/organizations/pages/settings/appearance.tsx +++ b/packages/features/ee/organizations/pages/settings/appearance.tsx @@ -195,7 +195,6 @@ const OrgAppearanceView = ({ const OrgAppearanceViewWrapper = () => { const router = useRouter(); - const { t } = useLocale(); const session = useSession(); const orgRole = session?.data?.user?.org?.role; const { data: currentOrg, isPending, error } = trpc.viewer.organizations.listCurrent.useQuery(); @@ -210,7 +209,7 @@ const OrgAppearanceViewWrapper = () => { ); if (isPending) { - return ; + return ; } if (!currentOrg) return null; diff --git a/packages/features/ee/teams/pages/team-appearance-view.tsx b/packages/features/ee/teams/pages/team-appearance-view.tsx index fb3bfd11c9f716..870d21ec0164d6 100644 --- a/packages/features/ee/teams/pages/team-appearance-view.tsx +++ b/packages/features/ee/teams/pages/team-appearance-view.tsx @@ -23,9 +23,9 @@ type BrandColorsFormValues = { darkBrandColor: string; }; -type ProfileViewProps = { team: RouterOutputs["viewer"]["teams"]["get"] } & { isAppDir?: boolean }; +type ProfileViewProps = { team: RouterOutputs["viewer"]["teams"]["get"] }; -const ProfileView = ({ team, isAppDir }: ProfileViewProps) => { +const ProfileView = ({ team }: ProfileViewProps) => { const { t } = useLocale(); const utils = trpc.useUtils(); @@ -79,13 +79,6 @@ const ProfileView = ({ team, isAppDir }: ProfileViewProps) => { return ( <> - {!isAppDir ? ( - - ) : null} {isAdmin ? ( <>
{ ); }; -const ProfileViewWrapper = ({ isAppDir }: { isAppDir?: boolean }) => { +const ProfileViewWrapper = () => { const router = useRouter(); const params = useParamsWithFallback(); @@ -209,18 +202,11 @@ const ProfileViewWrapper = ({ isAppDir }: { isAppDir?: boolean }) => { [error] ); - if (isPending) - return ( - - ); + if (isPending) return ; if (!team) return null; - return ; + return ; }; export default ProfileViewWrapper; diff --git a/packages/features/ee/teams/pages/team-booking-limits-view.tsx b/packages/features/ee/teams/pages/team-booking-limits-view.tsx index 2f3359b49b4a6b..c826bb0d25f6b5 100644 --- a/packages/features/ee/teams/pages/team-booking-limits-view.tsx +++ b/packages/features/ee/teams/pages/team-booking-limits-view.tsx @@ -140,8 +140,6 @@ const BookingLimitsViewWrapper = () => { const router = useRouter(); const params = useParamsWithFallback(); - const { t } = useLocale(); - const { data: team, isPending, @@ -162,13 +160,7 @@ const BookingLimitsViewWrapper = () => { [error] ); - if (isPending) - return ( - - ); + if (isPending) return ; if (!team) return null; diff --git a/packages/features/ee/teams/pages/team-listing-view.tsx b/packages/features/ee/teams/pages/team-listing-view.tsx index a1595f4d2dd096..f31e0a959728f8 100644 --- a/packages/features/ee/teams/pages/team-listing-view.tsx +++ b/packages/features/ee/teams/pages/team-listing-view.tsx @@ -5,14 +5,9 @@ import { Meta } from "@calcom/ui"; import { TeamsListing } from "../components"; -const TeamListingView = ({ isAppDir }: { isAppDir?: boolean }) => { +const TeamListingView = () => { const { t } = useLocale(); - return ( - <> - {!isAppDir ? : null} - - - ); + return ; }; export default TeamListingView; diff --git a/packages/features/ee/teams/pages/team-members-view.tsx b/packages/features/ee/teams/pages/team-members-view.tsx index 5ca7653b4d230d..09cf37dcadd2c8 100644 --- a/packages/features/ee/teams/pages/team-members-view.tsx +++ b/packages/features/ee/teams/pages/team-members-view.tsx @@ -17,7 +17,7 @@ import { MemberInvitationModalWithoutMembers } from "../components/MemberInvitat import MemberList from "../components/MemberList"; import TeamInviteList from "../components/TeamInviteList"; -const MembersView = ({ isAppDir }: { isAppDir?: boolean }) => { +const MembersView = () => { const { t } = useLocale(); const [showMemberInvitationModal, setShowMemberInvitationModal] = useState(false); const [showInviteLinkSettingsModal, setInviteLinkSettingsModal] = useState(false); @@ -62,9 +62,6 @@ const MembersView = ({ isAppDir }: { isAppDir?: boolean }) => { return ( <> - {!isAppDir ? ( - } /> - ) : null} {!isPending && ( <>
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx index 3ab6250fc12fea..cbd6d2f9b22b85 100644 --- a/packages/features/ee/teams/pages/team-profile-view.tsx +++ b/packages/features/ee/teams/pages/team-profile-view.tsx @@ -60,18 +60,9 @@ const teamProfileFormSchema = z.object({ type FormValues = z.infer; -const SkeletonLoader = ({ - isAppDir, - title, - description, -}: { - isAppDir?: boolean; - title: string; - description: string; -}) => { +const SkeletonLoader = () => { return ( - {!isAppDir ? : null}
@@ -87,7 +78,7 @@ const SkeletonLoader = ({ ); }; -const ProfileView = ({ isAppDir }: { isAppDir?: boolean }) => { +const ProfileView = () => { const params = useParamsWithFallback(); const teamId = Number(params.id); const { t } = useLocale(); @@ -165,17 +156,11 @@ const ProfileView = ({ isAppDir }: { isAppDir?: boolean }) => { } if (isPending) { - return ( - - ); + return ; } return ( <> - {!isAppDir ? ( - - ) : null} - {isAdmin ? ( ) : ( diff --git a/turbo.json b/turbo.json index 0f46e0bdcfb494..7f90661544ecdf 100644 --- a/turbo.json +++ b/turbo.json @@ -242,7 +242,6 @@ "APP_ROUTER_BOOKINGS_STATUS_ENABLED", "APP_ROUTER_EVENT_TYPES_ENABLED", "APP_ROUTER_GETTING_STARTED_STEP_ENABLED", - "APP_ROUTER_SETTINGS_TEAMS_ENABLED", "APP_ROUTER_WORKFLOWS_ENABLED", "APP_ROUTER_VIDEO_ENABLED", "APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED",