create layout for routing/forms

Author: hbjORbj

apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/page.tsx

@@ -5,7 +5,6 @@ import { cookies, headers } from "next/headers";
 
 import { routingFormsComponents } from "@calcom/app-store/routing-forms/pages/app-routing.client-config";
 import type { routingServerSidePropsConfig } from "@calcom/app-store/routing-forms/pages/app-routing.server-config";
-import Shell from "@calcom/features/shell/Shell";
 
 import { getServerSideProps } from "@lib/apps/routing-forms/[...pages]/getServerSideProps";
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
@@ -41,22 +40,12 @@ const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
   const { mainPage } = normalizePages((await params).pages);
 
   const Component = await routingFormsComponents[mainPage as keyof typeof routingFormsComponents]();
-  const FinalComponent = () => (
+
+  return (
     <FormProvider>
       <Component {...(props as any)} />
     </FormProvider>
   );
-
-  // TODO: we should really be using layout for this.
-  if (mainPage === "forms") {
-    return (
-      <Shell withoutMain>
-        <FinalComponent />
-      </Shell>
-    );
-  }
-
-  return <FinalComponent />;
 };
 
 export default ServerPage;

apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/layout.tsx

@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+import Shell from "@calcom/features/shell/Shell";
+
+export default function Layout({ children }: { children: ReactNode }) {
+  return <Shell withoutMain={true}>{children}</Shell>;
+}

apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/page.tsx

@@ -0,0 +1,2 @@
+export { generateMetadata } from "../[...pages]/page";
+export { default } from "../[...pages]/page";