Removal Fixed

nditc · Oct 22, 2024 · f233596 · f233596
1 parent 9168e32
commit f233596
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/src/app/(main)/Components/Navbar.tsx b/src/app/(main)/Components/Navbar.tsx
@@ -6,7 +6,6 @@ import Image from "next/image";
 import Link from "next/link";
 import { usePathname, useSearchParams } from "next/navigation";
 import { RxCross2 } from "react-icons/rx";
-import ClubNavbar from "../../club/Components/Layout/Navbar";
 
 const Navbar = () => {
   const [showOptions, setShowOptions] = useState(false);
@@ -58,9 +57,7 @@ const Navbar = () => {
     };
   }, [Route, Params]);
 
-  return Route.includes("club") ? (
-    <ClubNavbar />
-  ) : (
+  return (
     <nav
       ref={navRef}
       className={

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -12,9 +12,6 @@ import NextTopLoader from "nextjs-toploader";
 import { Suspense } from "react";
 import { ToastContainer } from "react-toastify";
 import { NextUIProvider } from "@nextui-org/react";
-import DeveloperLink from "./club/Components/DeveloperLink";
-import { AuthContextProvider } from "./club/Components/Layout/AuthContextProvider";
-import { UserDataContextProvider } from "./club/Components/Layout/UserDataProvider";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -54,20 +51,16 @@ export default function RootLayout({
     <html lang="en">
       <body className={inter.className}>
         <NextUIProvider>
-          <AuthContextProvider>
-            <UserDataContextProvider>
-              <NextTopLoader color="#3b82f6" />
-              <Suspense>
-                <Navbar />
-              </Suspense>
-              <div id="scrollToTop" className="h-0 w-0" />
-              <SideBar />
-              {children}
-              <Footer />
-              <DeveloperLink />
-              <ToastContainer bodyClassName={"Inter"} position="top-center" />
-            </UserDataContextProvider>
-          </AuthContextProvider>
+          <NextTopLoader color="#3b82f6" />
+          <Suspense>
+            <Navbar />
+          </Suspense>
+          <div id="scrollToTop" className="h-0 w-0" />
+          <SideBar />
+          {children}
+          <Footer />
+
+          <ToastContainer bodyClassName={"Inter"} position="top-center" />
         </NextUIProvider>
       </body>
     </html>