From 0bdc45a1a551220fb55c6e4db346694cd8c063fc Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Fri, 12 Jan 2024 18:32:39 +0000
Subject: [PATCH] chore: [app-router-migration 18] Migrate
 "/settings/organizations/*" pages (#13042)

* manual: app-directory-boilerplate-calcom

* manual: import components directly

* manual: move files to correct route groups and add metadata

* manual: Change structure & Refactor to make code up to date

* manual: refactors

* Fix

* manual: fix type of arg of getData

* manual: fix type error

* fix type bugs

* fix

* fixing the build

* wip

---------

Co-authored-by: Greg Pabian <35925521+grzpab@users.noreply.github.com>
---
 apps/web/app/future/apps/categories/page.tsx  |  7 +-
 apps/web/app/future/apps/page.tsx             |  7 +-
 .../app/future/bookings/[status]/layout.tsx   |  5 +-
 .../getting-started/[[...step]]/page.tsx      |  8 +-
 .../organizations/[id]/about/page.tsx         | 11 +++
 .../organizations/[id]/add-teams/page.tsx     | 11 +++
 .../[id]/onboard-admins/page.tsx              | 35 +++++++++
 .../organizations/[id]/set-password/page.tsx  | 11 +++
 .../organizations/appearance/layout.tsx       |  5 ++
 .../organizations/appearance/page.tsx         | 11 +++
 .../settings/organizations/billing/layout.tsx |  5 ++
 .../settings/organizations/billing/page.tsx   | 10 +++
 .../settings/organizations/general/layout.tsx |  5 ++
 .../settings/organizations/general/page.tsx   | 11 +++
 .../settings/organizations/members/layout.tsx |  5 ++
 .../settings/organizations/members/page.tsx   | 11 +++
 .../settings/organizations/new/page.tsx       | 34 +++++++++
 .../settings/organizations/profile/layout.tsx |  5 ++
 .../settings/organizations/profile/page.tsx   | 11 +++
 .../teams/other/[id]/appearance/layout.tsx    |  5 ++
 .../teams/other/[id]/appearance/page.tsx      | 11 +++
 .../teams/other/[id]/members/layout.tsx       |  5 ++
 .../teams/other/[id]/members/page.tsx         | 11 +++
 .../teams/other/[id]/profile/layout.tsx       |  5 ++
 .../teams/other/[id]/profile/page.tsx         | 11 +++
 .../organizations/teams/other/layout.tsx      |  5 ++
 .../organizations/teams/other/page.ts         | 11 +++
 apps/web/app/future/teams/page.tsx            |  7 +-
 apps/web/app/future/video/[uid]/page.tsx      |  9 +--
 .../future/video/meeting-ended/[uid]/page.tsx |  1 -
 .../video/meeting-not-started/[uid]/page.tsx  |  1 -
 .../future/video/no-meeting-found/page.tsx    |  6 +-
 .../app/future/workflows/[workflow]/page.tsx  |  1 -
 apps/web/app/layoutHOC.tsx                    |  7 +-
 .../settings/organizations/[id]/about.tsx     | 14 +++-
 .../settings/organizations/[id]/add-teams.tsx | 17 +++++
 .../organizations/[id]/onboard-admins.tsx     | 21 ++++-
 .../organizations/[id]/set-password.tsx       | 12 ++-
 .../settings/organizations/new/index.tsx      | 12 ++-
 .../pages/settings/appearance.tsx             |  2 +
 .../organizations/pages/settings/general.tsx  |  2 +
 .../organizations/pages/settings/members.tsx  |  2 +
 .../settings/other-team-listing-view.tsx      |  2 +
 .../settings/other-team-members-view.tsx      |  2 +
 .../settings/other-team-profile-view.tsx      |  2 +
 .../organizations/pages/settings/profile.tsx  |  2 +
 packages/ui/index.tsx                         |  1 +
 packages/ui/layouts/WizardLayoutAppDir.tsx    | 76 +++++++++++++++++++
 48 files changed, 428 insertions(+), 43 deletions(-)
 create mode 100644 apps/web/app/future/settings/organizations/[id]/about/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/[id]/add-teams/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/[id]/onboard-admins/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/[id]/set-password/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/appearance/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/appearance/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/billing/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/billing/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/general/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/general/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/members/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/members/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/new/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/profile/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/profile/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/[id]/appearance/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/[id]/appearance/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/[id]/members/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/[id]/members/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/[id]/profile/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/[id]/profile/page.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/layout.tsx
 create mode 100644 apps/web/app/future/settings/organizations/teams/other/page.ts
 create mode 100644 packages/ui/layouts/WizardLayoutAppDir.tsx

diff --git a/apps/web/app/future/apps/categories/page.tsx b/apps/web/app/future/apps/categories/page.tsx
index d3b36bb356..0ef5547ee4 100644
--- a/apps/web/app/future/apps/categories/page.tsx
+++ b/apps/web/app/future/apps/categories/page.tsx
@@ -1,13 +1,12 @@
 import LegacyPage from "@pages/apps/categories/index";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
+import type { GetServerSidePropsContext } from "next";
 
 import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { APP_NAME } from "@calcom/lib/constants";
 
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
 import { ssrInit } from "@server/lib/ssr";
 
 export const generateMetadata = async () => {
@@ -17,11 +16,9 @@ export const generateMetadata = async () => {
   );
 };
 
-const getData = async (ctx: ReturnType<typeof buildLegacyCtx>) => {
-  // @ts-expect-error Argument of type '{ query: Params; params: Params; req: { headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }; }' is not assignable to parameter of type 'GetServerSidePropsContext'.
+const getData = async (ctx: GetServerSidePropsContext) => {
   const ssr = await ssrInit(ctx);
 
-  // @ts-expect-error Type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to type 'NextApiRequest | IncomingMessage
   const session = await getServerSession({ req: ctx.req });
 
   let appStore;
diff --git a/apps/web/app/future/apps/page.tsx b/apps/web/app/future/apps/page.tsx
index 0a24ec567e..cdccef7bdf 100644
--- a/apps/web/app/future/apps/page.tsx
+++ b/apps/web/app/future/apps/page.tsx
@@ -1,6 +1,7 @@
 import AppsPage from "@pages/apps";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
+import type { GetServerSidePropsContext } from "next";
 
 import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
 import { getLayout } from "@calcom/features/MainLayoutAppDir";
@@ -10,8 +11,6 @@ import getUserAdminTeams from "@calcom/features/ee/teams/lib/getUserAdminTeams";
 import { APP_NAME } from "@calcom/lib/constants";
 import type { AppCategories } from "@calcom/prisma/enums";
 
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
 import { ssrInit } from "@server/lib/ssr";
 
 export const generateMetadata = async () => {
@@ -21,11 +20,9 @@ export const generateMetadata = async () => {
   );
 };
 
-const getData = async (ctx: ReturnType<typeof buildLegacyCtx>) => {
-  // @ts-expect-error Argument of type '{ query: Params; params: Params; req: { headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }; }' is not assignable to parameter of type 'GetServerSidePropsContext'.
+const getData = async (ctx: GetServerSidePropsContext) => {
   const ssr = await ssrInit(ctx);
 
-  // @ts-expect-error Type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to type 'NextApiRequest
   const session = await getServerSession({ req: ctx.req });
 
   let appStore, userAdminTeams: UserAdminTeams;
diff --git a/apps/web/app/future/bookings/[status]/layout.tsx b/apps/web/app/future/bookings/[status]/layout.tsx
index 3eff385303..70fe487437 100644
--- a/apps/web/app/future/bookings/[status]/layout.tsx
+++ b/apps/web/app/future/bookings/[status]/layout.tsx
@@ -1,13 +1,12 @@
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
+import type { GetServerSidePropsContext } from "next";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
 import { getLayout } from "@calcom/features/MainLayoutAppDir";
 import { APP_NAME } from "@calcom/lib/constants";
 
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
 import { ssgInit } from "@server/lib/ssg";
 
 const validStatuses = ["upcoming", "recurring", "past", "cancelled", "unconfirmed"] as const;
@@ -26,7 +25,7 @@ export const generateStaticParams = async () => {
   return validStatuses.map((status) => ({ status }));
 };
 
-const getData = async (ctx: ReturnType<typeof buildLegacyCtx>) => {
+const getData = async (ctx: GetServerSidePropsContext) => {
   const parsedParams = querySchema.safeParse(ctx.params);
 
   if (!parsedParams.success) {
diff --git a/apps/web/app/future/getting-started/[[...step]]/page.tsx b/apps/web/app/future/getting-started/[[...step]]/page.tsx
index 2751566cd5..1665eca319 100644
--- a/apps/web/app/future/getting-started/[[...step]]/page.tsx
+++ b/apps/web/app/future/getting-started/[[...step]]/page.tsx
@@ -1,16 +1,15 @@
 import LegacyPage from "@pages/getting-started/[[...step]]";
 import { WithLayout } from "app/layoutHOC";
+import type { GetServerSidePropsContext } from "next";
 import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import prisma from "@calcom/prisma";
 
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
 import { ssrInit } from "@server/lib/ssr";
 
-const getData = async (ctx: ReturnType<typeof buildLegacyCtx>) => {
+const getData = async (ctx: GetServerSidePropsContext) => {
   const req = { headers: headers(), cookies: cookies() };
 
   //@ts-expect-error Type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to type 'NextApiRequest
@@ -19,7 +18,6 @@ const getData = async (ctx: ReturnType<typeof buildLegacyCtx>) => {
   if (!session?.user?.id) {
     return redirect("/auth/login");
   }
-  // @ts-expect-error Argument of type '{ query: Params; params: Params; req: { headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }; }' is not assignable to parameter of type 'GetServerSidePropsContext'.
   const ssr = await ssrInit(ctx);
   await ssr.viewer.me.prefetch();
 
@@ -54,7 +52,7 @@ const getData = async (ctx: ReturnType<typeof buildLegacyCtx>) => {
 
   return {
     dehydratedState: ssr.dehydrate(),
-    hasPendingInvites: user.teams.find((team: any) => team.accepted === false) ?? false,
+    hasPendingInvites: user.teams.find((team) => team.accepted === false) ?? false,
     requiresLicense: false,
     themeBasis: null,
   };
diff --git a/apps/web/app/future/settings/organizations/[id]/about/page.tsx b/apps/web/app/future/settings/organizations/[id]/about/page.tsx
new file mode 100644
index 0000000000..5141efa323
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/[id]/about/page.tsx
@@ -0,0 +1,11 @@
+import LegacyPage, { WrappedAboutOrganizationPage } from "@pages/settings/organizations/[id]/about";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("about_your_organization"),
+    (t) => t("about_your_organization_description")
+  );
+
+export default WithLayout({ Page: LegacyPage, getLayout: WrappedAboutOrganizationPage });
diff --git a/apps/web/app/future/settings/organizations/[id]/add-teams/page.tsx b/apps/web/app/future/settings/organizations/[id]/add-teams/page.tsx
new file mode 100644
index 0000000000..de3c76b58d
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/[id]/add-teams/page.tsx
@@ -0,0 +1,11 @@
+import LegacyPage, { WrapperAddNewTeamsPage } from "@pages/settings/organizations/[id]/add-teams";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("create_your_teams"),
+    (t) => t("create_your_teams_description")
+  );
+
+export default WithLayout({ Page: LegacyPage, getLayout: WrapperAddNewTeamsPage });
diff --git a/apps/web/app/future/settings/organizations/[id]/onboard-admins/page.tsx b/apps/web/app/future/settings/organizations/[id]/onboard-admins/page.tsx
new file mode 100644
index 0000000000..aa001b9973
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/[id]/onboard-admins/page.tsx
@@ -0,0 +1,35 @@
+import LegacyPage, {
+  buildWrappedOnboardTeamMembersPage,
+} from "@pages/settings/organizations/[id]/onboard-admins";
+import { type Params } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { headers } from "next/headers";
+
+import PageWrapper from "@components/PageWrapperAppDir";
+
+type PageProps = Readonly<{
+  params: Params;
+}>;
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("invite_organization_admins"),
+    (t) => t("invite_organization_admins_description")
+  );
+
+const Page = ({ params }: PageProps) => {
+  const h = headers();
+  const nonce = h.get("x-nonce") ?? undefined;
+
+  return (
+    <PageWrapper
+      getLayout={(page: React.ReactElement) => buildWrappedOnboardTeamMembersPage(params.id, page)}
+      requiresLicense={false}
+      nonce={nonce}
+      themeBasis={null}>
+      <LegacyPage />
+    </PageWrapper>
+  );
+};
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/[id]/set-password/page.tsx b/apps/web/app/future/settings/organizations/[id]/set-password/page.tsx
new file mode 100644
index 0000000000..3ffb2a3a50
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/[id]/set-password/page.tsx
@@ -0,0 +1,11 @@
+import LegacyPage, { WrappedSetPasswordPage } from "@pages/settings/organizations/[id]/set-password";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("set_a_password"),
+    (t) => t("set_a_password_description")
+  );
+
+export default WithLayout({ Page: LegacyPage, getLayout: WrappedSetPasswordPage });
diff --git a/apps/web/app/future/settings/organizations/appearance/layout.tsx b/apps/web/app/future/settings/organizations/appearance/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/appearance/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/appearance/page.tsx b/apps/web/app/future/settings/organizations/appearance/page.tsx
new file mode 100644
index 0000000000..5f8b2547f0
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/appearance/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/appearance";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("appearance"),
+    (t) => t("appearance_org_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/billing/layout.tsx b/apps/web/app/future/settings/organizations/billing/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/billing/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/billing/page.tsx b/apps/web/app/future/settings/organizations/billing/page.tsx
new file mode 100644
index 0000000000..7dbae67d41
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/billing/page.tsx
@@ -0,0 +1,10 @@
+import Page from "@pages/settings/billing/index";
+import { _generateMetadata } from "app/_utils";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("billing"),
+    (t) => t("manage_billing_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/general/layout.tsx b/apps/web/app/future/settings/organizations/general/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/general/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/general/page.tsx b/apps/web/app/future/settings/organizations/general/page.tsx
new file mode 100644
index 0000000000..e55435094b
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/general/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/general";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("general"),
+    (t) => t("general_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/members/layout.tsx b/apps/web/app/future/settings/organizations/members/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/members/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/members/page.tsx b/apps/web/app/future/settings/organizations/members/page.tsx
new file mode 100644
index 0000000000..5c90c6869e
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/members/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/members";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("organization_members"),
+    (t) => t("organization_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/new/page.tsx b/apps/web/app/future/settings/organizations/new/page.tsx
new file mode 100644
index 0000000000..195140cda8
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/new/page.tsx
@@ -0,0 +1,34 @@
+import LegacyPage, { WrappedCreateNewOrganizationPage } from "@pages/settings/organizations/new/index";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+import { type GetServerSidePropsContext } from "next";
+import { notFound } from "next/navigation";
+
+import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("set_up_your_organization"),
+    (t) => t("organizations_description")
+  );
+
+const getPageProps = async (context: GetServerSidePropsContext) => {
+  const prisma = await import("@calcom/prisma").then((mod) => mod.default);
+  const flags = await getFeatureFlagMap(prisma);
+  // Check if organizations are enabled
+  if (flags["organizations"] !== true) {
+    return notFound();
+  }
+
+  const querySlug = context.query.slug as string;
+
+  return {
+    querySlug: querySlug ?? null,
+  };
+};
+
+export default WithLayout({
+  getLayout: WrappedCreateNewOrganizationPage,
+  Page: LegacyPage,
+  getData: getPageProps,
+});
diff --git a/apps/web/app/future/settings/organizations/profile/layout.tsx b/apps/web/app/future/settings/organizations/profile/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/profile/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/profile/page.tsx b/apps/web/app/future/settings/organizations/profile/page.tsx
new file mode 100644
index 0000000000..3450c5abdd
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/profile/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/profile";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("profile"),
+    (t) => t("profile_org_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/teams/other/[id]/appearance/layout.tsx b/apps/web/app/future/settings/organizations/teams/other/[id]/appearance/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/[id]/appearance/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/teams/other/[id]/appearance/page.tsx b/apps/web/app/future/settings/organizations/teams/other/[id]/appearance/page.tsx
new file mode 100644
index 0000000000..ac76104d07
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/[id]/appearance/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/teams/pages/team-appearance-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("booking_appearance"),
+    (t) => t("appearance_team_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/teams/other/[id]/members/layout.tsx b/apps/web/app/future/settings/organizations/teams/other/[id]/members/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/[id]/members/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/teams/other/[id]/members/page.tsx b/apps/web/app/future/settings/organizations/teams/other/[id]/members/page.tsx
new file mode 100644
index 0000000000..9e5018ada3
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/[id]/members/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/other-team-members-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("team_members"),
+    (t) => t("members_team_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/teams/other/[id]/profile/layout.tsx b/apps/web/app/future/settings/organizations/teams/other/[id]/profile/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/[id]/profile/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/teams/other/[id]/profile/page.tsx b/apps/web/app/future/settings/organizations/teams/other/[id]/profile/page.tsx
new file mode 100644
index 0000000000..66cf714fbc
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/[id]/profile/page.tsx
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/other-team-profile-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("profile"),
+    (t) => t("profile_team_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/settings/organizations/teams/other/layout.tsx b/apps/web/app/future/settings/organizations/teams/other/layout.tsx
new file mode 100644
index 0000000000..230bfea4d1
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/app/future/settings/organizations/teams/other/page.ts b/apps/web/app/future/settings/organizations/teams/other/page.ts
new file mode 100644
index 0000000000..ffaf5302cb
--- /dev/null
+++ b/apps/web/app/future/settings/organizations/teams/other/page.ts
@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import Page from "@calcom/features/ee/organizations/pages/settings/other-team-listing-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("org_admin_other_teams"),
+    (t) => t("org_admin_other_teams_description")
+  );
+
+export default Page;
diff --git a/apps/web/app/future/teams/page.tsx b/apps/web/app/future/teams/page.tsx
index fe17ec9fb4..6453ac8e01 100644
--- a/apps/web/app/future/teams/page.tsx
+++ b/apps/web/app/future/teams/page.tsx
@@ -1,13 +1,12 @@
 import OldPage from "@pages/teams/index";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
+import type { GetServerSidePropsContext } from "next";
 import { redirect } from "next/navigation";
 
 import { getLayout } from "@calcom/features/MainLayoutAppDir";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
 import { ssrInit } from "@server/lib/ssr";
 
 export const generateMetadata = async () =>
@@ -16,14 +15,12 @@ export const generateMetadata = async () =>
     (t) => t("create_manage_teams_collaborative")
   );
 
-async function getData(context: ReturnType<typeof buildLegacyCtx>) {
-  // @ts-expect-error Argument of type '{ query: Params; params: Params; req: { headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }; }' is not assignable to parameter of type 'GetServerSidePropsContext'.
+async function getData(context: GetServerSidePropsContext) {
   const ssr = await ssrInit(context);
 
   await ssr.viewer.me.prefetch();
 
   const session = await getServerSession({
-    // @ts-expect-error Type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to type 'NextApiRequest | (IncomingMessage & { cookies: Partial<{ [key: string]: string; }>; })'.
     req: context.req,
   });
 
diff --git a/apps/web/app/future/video/[uid]/page.tsx b/apps/web/app/future/video/[uid]/page.tsx
index 1e4d7ee00a..7625bd0125 100644
--- a/apps/web/app/future/video/[uid]/page.tsx
+++ b/apps/web/app/future/video/[uid]/page.tsx
@@ -2,14 +2,13 @@ import OldPage from "@pages/video/[uid]";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
 import MarkdownIt from "markdown-it";
+import type { GetServerSidePropsContext } from "next";
 import { redirect } from "next/navigation";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { APP_NAME } from "@calcom/lib/constants";
 import prisma, { bookingMinimalSelect } from "@calcom/prisma";
 
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
 import { ssrInit } from "@server/lib/ssr";
 
 export const generateMetadata = async () =>
@@ -20,8 +19,7 @@ export const generateMetadata = async () =>
 
 const md = new MarkdownIt("default", { html: true, breaks: true, linkify: true });
 
-async function getData(context: ReturnType<typeof buildLegacyCtx>) {
-  // @ts-expect-error Argument of type '{ query: Params; params: Params; req: { headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }; }' is not assignable to parameter of type 'GetServerSidePropsContext'.
+async function getData(context: GetServerSidePropsContext) {
   const ssr = await ssrInit(context);
 
   const booking = await prisma.booking.findUnique({
@@ -79,12 +77,11 @@ async function getData(context: ReturnType<typeof buildLegacyCtx>) {
     endTime: booking.endTime.toString(),
   });
 
-  // @ts-expect-error Type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to type 'NextApiRequest | (IncomingMessage & { cookies: Partial<{ [key: string]: string; }>; })'.
   const session = await getServerSession({ req: context.req });
 
   // set meetingPassword to null for guests
   if (session?.user.id !== bookingObj.user?.id) {
-    bookingObj.references.forEach((bookRef: any) => {
+    bookingObj.references.forEach((bookRef) => {
       bookRef.meetingPassword = null;
     });
   }
diff --git a/apps/web/app/future/video/meeting-ended/[uid]/page.tsx b/apps/web/app/future/video/meeting-ended/[uid]/page.tsx
index 0674d39566..9c86ca58bd 100644
--- a/apps/web/app/future/video/meeting-ended/[uid]/page.tsx
+++ b/apps/web/app/future/video/meeting-ended/[uid]/page.tsx
@@ -49,5 +49,4 @@ async function getData(context: Omit<GetServerSidePropsContext, "res" | "resolve
   };
 }
 
-// @ts-expect-error getData arg
 export default WithLayout({ getData, Page: OldPage, getLayout: null })<"P">;
diff --git a/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx b/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx
index bde0c18328..3d71a3859d 100644
--- a/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx
+++ b/apps/web/app/future/video/meeting-not-started/[uid]/page.tsx
@@ -47,5 +47,4 @@ async function getData(context: Omit<GetServerSidePropsContext, "res" | "resolve
   };
 }
 
-// @ts-expect-error getData arg
 export default WithLayout({ getData, Page: OldPage, getLayout: null })<"P">;
diff --git a/apps/web/app/future/video/no-meeting-found/page.tsx b/apps/web/app/future/video/no-meeting-found/page.tsx
index 9c69388ad3..63d728e96f 100644
--- a/apps/web/app/future/video/no-meeting-found/page.tsx
+++ b/apps/web/app/future/video/no-meeting-found/page.tsx
@@ -1,8 +1,7 @@
 import LegacyPage from "@pages/video/no-meeting-found";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
-
-import type { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { type GetServerSidePropsContext } from "next";
 
 import { ssrInit } from "@server/lib/ssr";
 
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
     (t) => t("no_meeting_found")
   );
 
-const getData = async (context: ReturnType<typeof buildLegacyCtx>) => {
-  // @ts-expect-error Argument of type '{ query: Params; params: Params; req: { headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }; }' is not assignable to parameter of type 'GetServerSidePropsContext'.
+const getData = async (context: GetServerSidePropsContext) => {
   const ssr = await ssrInit(context);
 
   return {
diff --git a/apps/web/app/future/workflows/[workflow]/page.tsx b/apps/web/app/future/workflows/[workflow]/page.tsx
index f0c5c5eaa6..f368cf6a8c 100644
--- a/apps/web/app/future/workflows/[workflow]/page.tsx
+++ b/apps/web/app/future/workflows/[workflow]/page.tsx
@@ -35,7 +35,6 @@ async function getProps(context: GetServerSidePropsContext) {
 
 export const generateStaticParams = () => [];
 
-// @ts-expect-error getData arg
 export default WithLayout({ getLayout: null, getData: getProps, Page: LegacyPage })<"P">;
 export const dynamic = "force-static";
 // generate segments on demand
diff --git a/apps/web/app/layoutHOC.tsx b/apps/web/app/layoutHOC.tsx
index 29a2b56b7f..fab74cb2d5 100644
--- a/apps/web/app/layoutHOC.tsx
+++ b/apps/web/app/layoutHOC.tsx
@@ -1,4 +1,5 @@
 import type { LayoutProps, PageProps } from "app/_types";
+import { type GetServerSidePropsContext } from "next";
 import { cookies, headers } from "next/headers";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
@@ -8,14 +9,16 @@ import PageWrapper from "@components/PageWrapperAppDir";
 type WithLayoutParams<T extends Record<string, any>> = {
   getLayout: ((page: React.ReactElement) => React.ReactNode) | null;
   Page?: (props: T) => React.ReactElement | null;
-  getData?: (arg: ReturnType<typeof buildLegacyCtx>) => Promise<T>;
+  getData?: (arg: GetServerSidePropsContext) => Promise<T>;
 };
 
 export function WithLayout<T extends Record<string, any>>({ getLayout, getData, Page }: WithLayoutParams<T>) {
   return async <P extends "P" | "L">(p: P extends "P" ? PageProps : LayoutProps) => {
     const h = headers();
     const nonce = h.get("x-nonce") ?? undefined;
-    const props = getData ? await getData(buildLegacyCtx(h, cookies(), p.params)) : ({} as T);
+    const props = getData
+      ? await getData(buildLegacyCtx(h, cookies(), p.params) as unknown as GetServerSidePropsContext)
+      : ({} as T);
 
     const children = "children" in p ? p.children : null;
 
diff --git a/apps/web/pages/settings/organizations/[id]/about.tsx b/apps/web/pages/settings/organizations/[id]/about.tsx
index 5c310c0741..2388ac3c4d 100644
--- a/apps/web/pages/settings/organizations/[id]/about.tsx
+++ b/apps/web/pages/settings/organizations/[id]/about.tsx
@@ -1,6 +1,8 @@
+"use client";
+
 import { AboutOrganizationForm } from "@calcom/features/ee/organizations/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta, WizardLayout } from "@calcom/ui";
+import { Meta, WizardLayout, WizardLayoutAppDir } from "@calcom/ui";
 
 import PageWrapper from "@components/PageWrapper";
 
@@ -15,7 +17,7 @@ const AboutOrganizationPage = () => {
     </>
   );
 };
-const LayoutWrapper = (page: React.ReactElement) => {
+export const LayoutWrapper = (page: React.ReactElement) => {
   return (
     <WizardLayout currentStep={3} maxSteps={5}>
       {page}
@@ -23,6 +25,14 @@ const LayoutWrapper = (page: React.ReactElement) => {
   );
 };
 
+export const WrappedAboutOrganizationPage = (page: React.ReactElement) => {
+  return (
+    <WizardLayoutAppDir currentStep={3} maxSteps={5}>
+      {page}
+    </WizardLayoutAppDir>
+  );
+};
+
 AboutOrganizationPage.getLayout = LayoutWrapper;
 AboutOrganizationPage.PageWrapper = PageWrapper;
 
diff --git a/apps/web/pages/settings/organizations/[id]/add-teams.tsx b/apps/web/pages/settings/organizations/[id]/add-teams.tsx
index d7a071d925..070d7e6d49 100644
--- a/apps/web/pages/settings/organizations/[id]/add-teams.tsx
+++ b/apps/web/pages/settings/organizations/[id]/add-teams.tsx
@@ -1,8 +1,12 @@
+"use client";
+
 import type { AppProps as NextAppProps } from "next/app";
+import { redirect } from "next/navigation";
 
 import { AddNewTeamsForm } from "@calcom/features/ee/organizations/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Meta, WizardLayout } from "@calcom/ui";
+import { WizardLayoutAppDir } from "@calcom/ui";
 
 import PageWrapper from "@components/PageWrapper";
 
@@ -33,4 +37,17 @@ AddNewTeamsPage.getLayout = (page: React.ReactElement, router: NextAppProps["rou
 
 AddNewTeamsPage.PageWrapper = PageWrapper;
 
+export const WrapperAddNewTeamsPage = (page: React.ReactElement) => {
+  return (
+    <WizardLayoutAppDir
+      currentStep={5}
+      maxSteps={5}
+      isOptionalCallback={() => {
+        redirect(`/event-types`);
+      }}>
+      {page}
+    </WizardLayoutAppDir>
+  );
+};
+
 export default AddNewTeamsPage;
diff --git a/apps/web/pages/settings/organizations/[id]/onboard-admins.tsx b/apps/web/pages/settings/organizations/[id]/onboard-admins.tsx
index 9689f8bc66..ee42522c78 100644
--- a/apps/web/pages/settings/organizations/[id]/onboard-admins.tsx
+++ b/apps/web/pages/settings/organizations/[id]/onboard-admins.tsx
@@ -1,8 +1,11 @@
+"use client";
+
 import type { AppProps as NextAppProps } from "next/app";
+import { redirect } from "next/navigation";
 
 import { AddNewOrgAdminsForm } from "@calcom/features/ee/organizations/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta, WizardLayout } from "@calcom/ui";
+import { Meta, WizardLayout, WizardLayoutAppDir } from "@calcom/ui";
 
 import PageWrapper from "@components/PageWrapper";
 
@@ -33,6 +36,22 @@ OnboardTeamMembersPage.getLayout = (page: React.ReactElement, router: NextAppPro
   </WizardLayout>
 );
 
+export const buildWrappedOnboardTeamMembersPage = (
+  id: string | string[] | undefined,
+  page: React.ReactElement
+) => {
+  return (
+    <WizardLayoutAppDir
+      currentStep={4}
+      maxSteps={5}
+      isOptionalCallback={() => {
+        redirect(`/settings/organizations/${id}/add-teams`);
+      }}>
+      {page}
+    </WizardLayoutAppDir>
+  );
+};
+
 OnboardTeamMembersPage.PageWrapper = PageWrapper;
 
 export default OnboardTeamMembersPage;
diff --git a/apps/web/pages/settings/organizations/[id]/set-password.tsx b/apps/web/pages/settings/organizations/[id]/set-password.tsx
index ded908eae4..42f068c048 100644
--- a/apps/web/pages/settings/organizations/[id]/set-password.tsx
+++ b/apps/web/pages/settings/organizations/[id]/set-password.tsx
@@ -1,6 +1,8 @@
+"use client";
+
 import { SetPasswordForm } from "@calcom/features/ee/organizations/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta, WizardLayout } from "@calcom/ui";
+import { Meta, WizardLayout, WizardLayoutAppDir } from "@calcom/ui";
 
 import PageWrapper from "@components/PageWrapper";
 
@@ -23,6 +25,14 @@ const LayoutWrapper = (page: React.ReactElement) => {
   );
 };
 
+export const WrappedSetPasswordPage = (page: React.ReactElement) => {
+  return (
+    <WizardLayoutAppDir currentStep={2} maxSteps={5}>
+      {page}
+    </WizardLayoutAppDir>
+  );
+};
+
 SetPasswordPage.getLayout = LayoutWrapper;
 SetPasswordPage.PageWrapper = PageWrapper;
 
diff --git a/apps/web/pages/settings/organizations/new/index.tsx b/apps/web/pages/settings/organizations/new/index.tsx
index 98d3c442f8..8130165edf 100644
--- a/apps/web/pages/settings/organizations/new/index.tsx
+++ b/apps/web/pages/settings/organizations/new/index.tsx
@@ -1,10 +1,12 @@
+"use client";
+
 import type { GetServerSidePropsContext } from "next";
 
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { CreateANewOrganizationForm } from "@calcom/features/ee/organizations/components";
 import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { WizardLayout, Meta } from "@calcom/ui";
+import { WizardLayout, Meta, WizardLayoutAppDir } from "@calcom/ui";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
@@ -27,6 +29,14 @@ const LayoutWrapper = (page: React.ReactElement) => {
   );
 };
 
+export const WrappedCreateNewOrganizationPage = (page: React.ReactElement) => {
+  return (
+    <WizardLayoutAppDir currentStep={1} maxSteps={5}>
+      {page}
+    </WizardLayoutAppDir>
+  );
+};
+
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const prisma = await import("@calcom/prisma").then((mod) => mod.default);
   const flags = await getFeatureFlagMap(prisma);
diff --git a/packages/features/ee/organizations/pages/settings/appearance.tsx b/packages/features/ee/organizations/pages/settings/appearance.tsx
index d6941a3ede..ada65f378a 100644
--- a/packages/features/ee/organizations/pages/settings/appearance.tsx
+++ b/packages/features/ee/organizations/pages/settings/appearance.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
diff --git a/packages/features/ee/organizations/pages/settings/general.tsx b/packages/features/ee/organizations/pages/settings/general.tsx
index f38c63b491..7f3064d8f8 100644
--- a/packages/features/ee/organizations/pages/settings/general.tsx
+++ b/packages/features/ee/organizations/pages/settings/general.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { useRouter } from "next/navigation";
 import { Controller, useForm } from "react-hook-form";
 
diff --git a/packages/features/ee/organizations/pages/settings/members.tsx b/packages/features/ee/organizations/pages/settings/members.tsx
index 9f40c42a57..3e039f3274 100644
--- a/packages/features/ee/organizations/pages/settings/members.tsx
+++ b/packages/features/ee/organizations/pages/settings/members.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { UserListTable } from "@calcom/features/users/components/UserTable/UserListTable";
diff --git a/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx
index 7597a8f116..ea4fc7a39b 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-listing-view.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Meta } from "@calcom/ui";
 
diff --git a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
index 3d49c61265..293675a190 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 // import { debounce } from "lodash";
 import { useSession } from "next-auth/react";
 import { useRouter } from "next/navigation";
diff --git a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
index cb9960a03f..69a3a9c567 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { zodResolver } from "@hookform/resolvers/zod";
 import type { Prisma } from "@prisma/client";
 import { useSession } from "next-auth/react";
diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/packages/features/ee/organizations/pages/settings/profile.tsx
index b2bb7063dd..6dd7a266c3 100644
--- a/packages/features/ee/organizations/pages/settings/profile.tsx
+++ b/packages/features/ee/organizations/pages/settings/profile.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { zodResolver } from "@hookform/resolvers/zod";
 import type { Prisma } from "@prisma/client";
 import { LinkIcon } from "lucide-react";
diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx
index 2ebcdfb042..20251b7fc4 100644
--- a/packages/ui/index.tsx
+++ b/packages/ui/index.tsx
@@ -150,6 +150,7 @@ export { CreateButton, CreateButtonWithTeamsList } from "./components/createButt
 export { useCalcomTheme } from "./styles/useCalcomTheme";
 export { ScrollableArea } from "./components/scrollable/ScrollableArea";
 export { WizardLayout } from "./layouts/WizardLayout";
+export { WizardLayoutAppDir } from "./layouts/WizardLayoutAppDir";
 export { DataTable } from "./components/data-table";
 export {
   Sheet,
diff --git a/packages/ui/layouts/WizardLayoutAppDir.tsx b/packages/ui/layouts/WizardLayoutAppDir.tsx
new file mode 100644
index 0000000000..c818aff533
--- /dev/null
+++ b/packages/ui/layouts/WizardLayoutAppDir.tsx
@@ -0,0 +1,76 @@
+"use client";
+
+// eslint-disable-next-line no-restricted-imports
+import { noop } from "lodash";
+import { usePathname } from "next/navigation";
+import React, { useEffect, useState } from "react";
+import { Toaster } from "react-hot-toast";
+
+import { APP_NAME } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Button, SkeletonText, StepCard, Steps } from "@calcom/ui";
+
+export function WizardLayoutAppDir({
+  children,
+  maxSteps = 2,
+  currentStep = 0,
+  isOptionalCallback,
+}: {
+  children: React.ReactNode;
+} & { maxSteps?: number; currentStep?: number; isOptionalCallback?: () => void }) {
+  const { t, isLocaleReady } = useLocale();
+  const [meta, setMeta] = useState({ title: "", subtitle: " " });
+  const pathname = usePathname();
+  const { title, subtitle } = meta;
+
+  useEffect(() => {
+    setMeta({
+      title: window.document.title,
+      subtitle: window.document.querySelector('meta[name="description"]')?.getAttribute("content") || "",
+    });
+  }, [pathname]);
+
+  return (
+    <div
+      className="dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen"
+      data-testid="onboarding">
+      <div>
+        <Toaster position="bottom-right" />
+      </div>
+      <div className="mx-auto px-4 py-24">
+        <div className="relative">
+          <div className="sm:mx-auto sm:w-full sm:max-w-[600px]">
+            <div className="mx-auto sm:max-w-[520px]">
+              <header>
+                {isLocaleReady ? (
+                  <>
+                    <p className="font-cal mb-3 text-[28px] font-medium leading-7">
+                      {title.replace(` | ${APP_NAME}`, "")}&nbsp;
+                    </p>
+                    <p className="text-subtle font-sans text-sm font-normal">{subtitle}&nbsp;</p>
+                  </>
+                ) : (
+                  <>
+                    <SkeletonText className="h-6 w-1/2" />
+                    <SkeletonText className="mt-4 h-4 w-3/4" />
+                  </>
+                )}
+              </header>
+              <Steps maxSteps={maxSteps} currentStep={currentStep} navigateToStep={noop} />
+            </div>
+            <StepCard>{children}</StepCard>
+          </div>
+        </div>
+        {isOptionalCallback && (
+          <div className="mt-4 flex justify-center">
+            <Button color="minimal" onClick={isOptionalCallback}>
+              {t("ill_do_this_later")}
+            </Button>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export const getLayout = (page: React.ReactElement) => <WizardLayoutAppDir>{page}</WizardLayoutAppDir>;