Merge pull request #77 from intuita-inc/new/structure

apps/web/app/future/(layout)/insights/page.tsx → apps/web/app/future/(individual-page-wrapper)/insights/page.tsx

@@ -1,13 +1,16 @@
 import InsightsPage from "@pages/insights";
 import { headers } from "next/headers";
 
+import { getLayout } from "@calcom/features/MainLayoutAppDir";
 import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
 import { constructGenericImage } from "@calcom/lib/OgImages";
 import { IS_CALCOM, WEBAPP_URL, APP_NAME, SEO_IMG_OGIMG } from "@calcom/lib/constants";
 import { getFixedT } from "@calcom/lib/server/getFixedT";
 
 import { preparePageMetadata } from "@lib/metadata";
 
+import PageWrapper from "@components/PageWrapperAppDir";
+
 export const generateMetadata = async () => {
   const h = headers();
   const canonical = h.get("x-pathname") ?? "";
@@ -53,7 +56,14 @@ export const getProps = async () => {
   };
 };
 
-export default function Insights(props: any) {
-  props.params.relativePath = "insights/page.tsx";
-  return <InsightsPage />;
+export default async function Insights() {
+  const props = await getProps();
+  const h = headers();
+  const nonce = h.get("x-nonce") ?? undefined;
+
+  return (
+    <PageWrapper getLayout={getLayout} requiresLicense={false} nonce={nonce} themeBasis={null} {...props}>
+      <InsightsPage />
+    </PageWrapper>
+  );
 }

apps/web/app/future/(layout)/layout.tsx → apps/web/app/future/(shared-page-wrapper)/(layout)/layout.tsx

@@ -11,18 +11,12 @@ type WrapperWithLayoutProps = {
   params: { [key: string]: any };
 };
 
-const handleGetProps = async (relativePath: string) => {
-  const props = await import(`./${relativePath}`).then((mod) => mod.getProps?.() ?? null);
-  return props;
-};
-
-export default async function WrapperWithLayout({ children, params }: WrapperWithLayoutProps) {
+export default async function WrapperWithLayout({ children }: WrapperWithLayoutProps) {
   const h = headers();
   const nonce = h.get("x-nonce") ?? undefined;
-  const props = await handleGetProps(params.relativePath);
 
   return (
-    <PageWrapper getLayout={getLayout} requiresLicense={false} nonce={nonce} themeBasis={null} {...props}>
+    <PageWrapper getLayout={getLayout} requiresLicense={false} nonce={nonce} themeBasis={null}>
       {children}
     </PageWrapper>
   );