Compare commits

..

No commits in common. "af48ab02f35ecb0fdf0f7921e6cb732a2e64da1f" and "07158c10227ae0eb56a9dda63a585f412c902ec0" have entirely different histories.

3 changed files with 8 additions and 15 deletions

View File

@ -3,9 +3,8 @@ import { Playfair_Display, DM_Sans } from "next/font/google";
import "./globals.css";
import ScrollToTop from "@/components/ScrollToTop/ScrollToTop";
// import Navbar from '@/components/Navbar/Navbar';
// import NavbarWrapper from "@/components/NavbarWrapper";
import NavbarWrapper from "@/components/NavbarWrapper";
import Script from "next/script";
import NavbarClient from "@/components/NavbarClient";
const playfairDisplay = Playfair_Display({
subsets: ["latin"],
@ -153,8 +152,7 @@ export default function RootLayout({
}}
/>
{/* <NavbarWrapper /> */}
<NavbarClient />
<NavbarWrapper />
{children}
<ScrollToTop />
</body>

View File

@ -1,11 +0,0 @@
"use client";
import dynamic from "next/dynamic";
const Navbar = dynamic(() => import("@/components/Navbar/Navbar"), {
ssr: false,
});
export default function NavbarClient() {
return <Navbar />;
}

View File

@ -0,0 +1,6 @@
"use client";
import Navbar from "./Navbar/Navbar";
export default function NavbarWrapper() {
return <Navbar />;
}