From 7827028e0a9e2d690b8668841e22dab9f12f856b Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Wed, 18 Dec 2024 17:48:03 -0500 Subject: [PATCH] Revert "chore: app router - /reschedule pages (#18150)" (#18258) This reverts commit a7f24e777b6876d96e70643be788d3a7d8cc80a7. --- .../app/{ => future}/reschedule/[uid]/embed/page.tsx | 10 ++++------ apps/web/app/{ => future}/reschedule/[uid]/page.tsx | 7 +++++++ apps/web/middleware.ts | 1 - apps/web/pages/reschedule/[uid].tsx | 6 ++++++ apps/web/pages/reschedule/[uid]/embed.tsx | 7 +++++++ 5 files changed, 24 insertions(+), 7 deletions(-) rename apps/web/app/{ => future}/reschedule/[uid]/embed/page.tsx (51%) rename apps/web/app/{ => future}/reschedule/[uid]/page.tsx (78%) create mode 100644 apps/web/pages/reschedule/[uid].tsx create mode 100644 apps/web/pages/reschedule/[uid]/embed.tsx diff --git a/apps/web/app/reschedule/[uid]/embed/page.tsx b/apps/web/app/future/reschedule/[uid]/embed/page.tsx similarity index 51% rename from apps/web/app/reschedule/[uid]/embed/page.tsx rename to apps/web/app/future/reschedule/[uid]/embed/page.tsx index 0ec1cff1f6..52f7f7e1d9 100644 --- a/apps/web/app/reschedule/[uid]/embed/page.tsx +++ b/apps/web/app/future/reschedule/[uid]/embed/page.tsx @@ -1,17 +1,15 @@ -import { withAppDirSsr } from "app/WithAppDirSsr"; -import withEmbedSsrAppDir from "app/WithEmbedSSR"; +import { getServerSideProps as _getServerSideProps } from "@pages/reschedule/[uid]"; import type { PageProps } from "app/_types"; import { cookies, headers } from "next/headers"; import { buildLegacyCtx } from "@lib/buildLegacyCtx"; -import { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps"; +import withEmbedSsr from "@lib/withEmbedSsr"; -const getData = withAppDirSsr(getServerSideProps); -const getEmbedData = withEmbedSsrAppDir(getData); +const getData = withEmbedSsr(_getServerSideProps); const Page = async ({ params, searchParams }: PageProps) => { const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams); - await getEmbedData(legacyCtx); + await getData(legacyCtx); return null; }; diff --git a/apps/web/app/reschedule/[uid]/page.tsx b/apps/web/app/future/reschedule/[uid]/page.tsx similarity index 78% rename from apps/web/app/reschedule/[uid]/page.tsx rename to apps/web/app/future/reschedule/[uid]/page.tsx index 4e03ebe7a4..4f629a3ba0 100644 --- a/apps/web/app/reschedule/[uid]/page.tsx +++ b/apps/web/app/future/reschedule/[uid]/page.tsx @@ -1,10 +1,17 @@ import { withAppDirSsr } from "app/WithAppDirSsr"; import type { PageProps } from "app/_types"; +import { _generateMetadata } from "app/_utils"; import { headers, cookies } from "next/headers"; import { buildLegacyCtx } from "@lib/buildLegacyCtx"; import { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps"; +export const generateMetadata = async () => + await _generateMetadata( + () => "", + () => "" + ); + const getData = withAppDirSsr(getServerSideProps); const Page = async ({ params, searchParams }: PageProps) => { diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index 3b007c3774..276aa63324 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -192,7 +192,6 @@ export const config = { "/teams", "/future/teams/", "/settings/:path*", - "/reschedule/:path*", "/availability/:path*", "/booking/:path*", ], diff --git a/apps/web/pages/reschedule/[uid].tsx b/apps/web/pages/reschedule/[uid].tsx new file mode 100644 index 0000000000..1105adaa4c --- /dev/null +++ b/apps/web/pages/reschedule/[uid].tsx @@ -0,0 +1,6 @@ +export default function Type() { + // Just redirect to the schedule page to reschedule it. + return null; +} + +export { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps"; diff --git a/apps/web/pages/reschedule/[uid]/embed.tsx b/apps/web/pages/reschedule/[uid]/embed.tsx new file mode 100644 index 0000000000..5d6b405e57 --- /dev/null +++ b/apps/web/pages/reschedule/[uid]/embed.tsx @@ -0,0 +1,7 @@ +import withEmbedSsr from "@lib/withEmbedSsr"; + +import { getServerSideProps as _getServerSideProps } from "../[uid]"; + +export { default } from "../[uid]"; + +export const getServerSideProps = withEmbedSsr(_getServerSideProps);