maybe this???

FanthStudios · Dec 22, 2023 · 314506b · 314506b
1 parent 8a34bc9
commit 314506b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -3,6 +3,8 @@ import type { Metadata } from "next";
 import "@/app/tailwind.css";
 import AuthProvider from "@/context/AuthProvider";
 
+import { EdgeStoreProvider } from "@/lib/edgestore";
+
 import { ToastContainer } from "react-toastify";
 
 import "react-toastify/dist/ReactToastify.css";
@@ -29,10 +31,12 @@ export default function RootLayout({
     return (
         <html lang="pl">
             <AuthProvider>
-                <body>
-                    {children}
-                    <ToastContainer />
-                </body>
+                <EdgeStoreProvider>
+                    <body>
+                        {children}
+                        <ToastContainer />
+                    </body>
+                </EdgeStoreProvider>
             </AuthProvider>
         </html>
     );

diff --git a/app/panel/layout.tsx b/app/panel/layout.tsx
@@ -1,7 +1,5 @@
 "use client";
 
-import { EdgeStoreProvider } from "@/lib/edgestore";
-
 import { Mobile, Sidebar } from "@/components/Sidebar";
 import { useEffect, useState } from "react";
 import {
@@ -85,36 +83,34 @@ export default function PanelLayout({ children }: Props) {
     }, [pathname, userRole]);
 
     return (
-        <EdgeStoreProvider>
-            <div>
-                <Mobile
-                    user={session?.user}
-                    sidebarOpen={sidebarOpen}
-                    setSidebarOpen={setSidebarOpen}
-                    navigation={
-                        session?.user.role.toLocaleLowerCase() === "student"
-                            ? navigation[0]
-                            : navigation[1]
-                    }
-                />
+        <div>
+            <Mobile
+                user={session?.user}
+                sidebarOpen={sidebarOpen}
+                setSidebarOpen={setSidebarOpen}
+                navigation={
+                    session?.user.role.toLocaleLowerCase() === "student"
+                        ? navigation[0]
+                        : navigation[1]
+                }
+            />
 
-                {/* Static sidebar for desktop */}
-                <Sidebar
-                    setNotifications={setNotifications}
-                    notifications={notifications}
-                    setSidebarOpen={setSidebarOpen}
-                    user={session?.user}
-                    navigation={
-                        session?.user.role.toLocaleLowerCase() === "student"
-                            ? navigation[0]
-                            : navigation[1]
-                    }
-                >
-                    <div className="px-4 py-4 sm:px-6 lg:px-8 grid grid-cols-3 grid-rows-2 gap-12 items-start h-full">
-                        {children}
-                    </div>
-                </Sidebar>
-            </div>
-        </EdgeStoreProvider>
+            {/* Static sidebar for desktop */}
+            <Sidebar
+                setNotifications={setNotifications}
+                notifications={notifications}
+                setSidebarOpen={setSidebarOpen}
+                user={session?.user}
+                navigation={
+                    session?.user.role.toLocaleLowerCase() === "student"
+                        ? navigation[0]
+                        : navigation[1]
+                }
+            >
+                <div className="px-4 py-4 sm:px-6 lg:px-8 grid grid-cols-3 grid-rows-2 gap-12 items-start h-full">
+                    {children}
+                </div>
+            </Sidebar>
+        </div>
     );
 }