fixing image error on github page and refactoring layout

DTA32 · Sep 23, 2023 · 88efa0d · 88efa0d
1 parent 268571f
commit 88efa0d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/next.config.js b/next.config.js
@@ -1,6 +1,8 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   output: "export",
+  basePath: "/dta32-site",
+  images: { unoptimized: true },
 };
 
 module.exports = nextConfig;
diff --git a/src/app/components/Home.tsx b/src/app/components/Home.tsx
@@ -13,7 +13,7 @@ export default function Home() {
       </div>
       <div className="md:col-span-4 relative max-h-[90vh]">
         <Image
-          src="/home.jpg"
+          src="/dta32-site/home.jpg"
           alt="home"
           width={1992}
           height={1992}

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,6 +1,8 @@
 import "./globals.css";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
+import Navbar from "./components/Navbar";
+import Footer from "./components/Footer";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -16,7 +18,11 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en" className="scroll-pt-[9.9vh] scroll-smooth">
-      <body className={inter.className}>{children}</body>
+      <body className={inter.className}>
+        <Navbar />
+        {children}
+        <Footer />
+      </body>
     </html>
   );
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,21 +1,15 @@
-import Navbar from "./components/Navbar";
 import Home from "./components/Home";
 import About from "./components/About";
 import Portfolio from "./components/Portfolio";
 import Contact from "./components/Contact";
-import Footer from "./components/Footer";
 
 export default function Page() {
   return (
-    <div>
-      <Navbar />
-      <main>
-        <Home />
-        <About />
-        <Portfolio />
-        <Contact />
-      </main>
-      <Footer />
-    </div>
+    <main>
+      <Home />
+      <About />
+      <Portfolio />
+      <Contact />
+    </main>
   );
 }