Merge pull request #30 from uc-cdis/fix/exclude-external-footer-from-layout

mfshao · web-flow · commit 70a31dffe788 · 2025-03-12T13:36:00.000-05:00
exclude external footer from layout
diff --git a/src/lib/Layouts.tsx b/src/lib/Layouts.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import HealHeader from './HealNav/HealHeader';
+import HealFooter from './HealNav/HealFooter';
+
+export default function Layout({
+    children,
+  }: {
+    children: React.ReactNode
+  }) {
+    return (
+        <>
+          <HealHeader />
+          {children}
+          <HealFooter />
+        </>
+    );
+}
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
@@ -1,14 +1,12 @@
 import Document, {
   DocumentContext,
   DocumentInitialProps,
-  Html,
   Head,
+  Html,
   Main,
   NextScript,
 } from 'next/document';
 import { ColorSchemeScript } from '@mantine/core';
-import HealHeader from '@/lib/HealNav/HealHeader';
-import HealFooter from '@/lib/HealNav/HealFooter';
 
 class Gen3Document extends Document {
   static async getInitialProps(
@@ -31,12 +29,10 @@ class Gen3Document extends Document {
       <Html lang="en">
         <Head />
         <body className="flex flex-col min-h-screen">
-          <HealHeader />
           <main id="main-content" className="flex-grow">
             <Main />
             <NextScript />
           </main>
-          <HealFooter />
         </body>
       </Html>
     );
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,2 +1,10 @@
+import Layout from '@/lib/Layouts';
 import HealLandingPage from './Home';
-export default HealLandingPage;
+
+export default function IndexPage() {
+    return (
+      <Layout>
+        <HealLandingPage />
+      </Layout>
+    );
+  }
diff --git a/src/pages/newly-available-datasets.tsx b/src/pages/newly-available-datasets.tsx
@@ -2,17 +2,18 @@ import React from 'react';
 import CardedPageContent from '@/lib/NewlyAvailableDatasets/CardedPageContent';
 import newDatasetsPageConfig from '../../config/heal/newDatasets.json';
 import PageTitle from '@/lib/HealNav/PageTitle';
+import Layout from '@/lib/Layouts';
 
 const NewlyAvailableDatasetsPage = () => {
   return (
-    <>
+    <Layout>
       <PageTitle pageName="Newly Available Datasets" />
       <div className="flex flex-row  justify-items-center">
         <div className="sm:prose-base lg:prose-lg xl:prose-xl 2xl:prose-xl mx-20">
           <CardedPageContent {...newDatasetsPageConfig} />
         </div>
       </div>
-    </>
+    </Layout>
   );
 };
 
