Merge pull request #86 from nexlabsweb3/fix_navbar

chore: fix layout

frontend/src/app/Home/page.tsx

@@ -1,15 +1,10 @@
-import Footer from '@/components/Footer';
-import NavBar from '@/components/Navbar';
 import React from 'react';
-import ManufacturerPage from '../manufacturer/account/page';
-import HeroSection from '@/components/HeroSection';
-import ContentSection from '@/components/ContentSection';
 
 const page = () => {
   return (
     <div>
-      <HeroSection />
-      <ContentSection />
+      {/* <HeroSection />
+      <ContentSection /> */}
     </div>
   );
 };

frontend/src/app/page.tsx

@@ -1,16 +1,17 @@
 'use client';
 
 import ContentSection from '@/components/ContentSection';
-import Footer from '@/components/Footer';
 import HeroSection from '@/components/HeroSection';
-import NavBar from '@/components/Navbar';
 import { useRouter } from 'next/navigation';
-import { useEffect } from 'react';
+import Layout from './Home/layout';
 
 export default function Home() {
   const router = useRouter();
-  useEffect(() => {
-    router.push('/Home');
-  });
-  return <main className=""></main>;
+
+  return (
+    <Layout>
+      <HeroSection />
+      <ContentSection />
+    </Layout>
+  );
 }

frontend/src/app/scan/[product]/page.tsx

@@ -5,6 +5,7 @@ import ScanProduct from '@/components/Scan';
 import ConnectModal from '@/components/ConnectModal';
 import { useParams } from 'next/navigation';
 import ProductPreview from '@/components/ProductPreview';
+import Layout from '@/app/Home/layout';
 
 export default function ScanPage() {
   const { address } = useAccount();
@@ -25,11 +26,13 @@ export default function ScanPage() {
   }, [product]);
 
   return (
-    <main className=" w-full md:h-fit bg-product-overview-mobile md:bg-product-overview bg-no-repeat bg-cover bg-center pb-[80px]">
-      <ProductPreview productId="product" />
-      {open && <ScanProduct />}
+    <Layout>
+      <main className=" w-full md:h-fit bg-product-overview-mobile md:bg-product-overview bg-no-repeat bg-cover bg-center pb-[80px]">
+        <ProductPreview productId="product" />
+        {open && <ScanProduct />}
 
-      <ConnectModal isOpen={openConnectedModal} onClose={toggleUserModal} />
-    </main>
+        <ConnectModal isOpen={openConnectedModal} onClose={toggleUserModal} />
+      </main>
+    </Layout>
   );
 }