From 37fbe839f7c86de93721937e3c3b77a27a0f9c4a Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Wed, 2 Jul 2025 05:30:42 +0000
Subject: [PATCH] Fix: Resolve import and type errors

The commit addresses two TypeScript errors in `src/components/layout/NewModernLayout.tsx`: a conflict in the import of `SidebarContent` and a type mismatch in the `children` prop. The changes should resolve these errors and ensure the application functions correctly.
---
 src/components/layout/NewModernLayout.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/layout/NewModernLayout.tsx b/src/components/layout/NewModernLayout.tsx
index 2af05fe..3e217ac 100644
--- a/src/components/layout/NewModernLayout.tsx
+++ b/src/components/layout/NewModernLayout.tsx
@@ -59,9 +59,8 @@ const Logo = () => {
   );
 };
 
-const SidebarContent = () => {
+const AppSidebar = () => {
   const location = useLocation();
-  const { toggleSidebar } = useSidebar();
   
   const mainItems = [
     {
@@ -124,7 +123,7 @@ const SidebarContent = () => {
   ];
 
   return (
-    <>
+    <Sidebar>
       <SidebarHeader>
         <Logo />
       </SidebarHeader>
@@ -195,7 +194,7 @@ const SidebarContent = () => {
           </SidebarMenu>
         </SidebarGroup>
       </SidebarFooter>
-    </>
+    </Sidebar>
   );
 };
 
@@ -242,9 +241,7 @@ export default function NewModernLayout({ children }: NewModernLayoutProps) {
   return (
     <div className="min-h-screen bg-background flex w-full">
       <SidebarProvider defaultOpen={false}>
-        <Sidebar>
-          <SidebarContent />
-        </Sidebar>
+        <AppSidebar />
 
         <SidebarInset className="flex-1">
           <HeaderContent />