diff --git a/apps/user/app/(main)/(content)/(user)/layout.tsx b/apps/user/app/(main)/(content)/(user)/layout.tsx index 7d99efd..dcc2aeb 100644 --- a/apps/user/app/(main)/(content)/(user)/layout.tsx +++ b/apps/user/app/(main)/(content)/(user)/layout.tsx @@ -7,9 +7,9 @@ import { SidebarRight } from './sidebar-right'; export default async function DashboardLayout({ children }: { children: React.ReactNode }) { return ( - + {children} - + ); diff --git a/apps/user/app/(main)/(content)/(user)/sidebar-left.tsx b/apps/user/app/(main)/(content)/(user)/sidebar-left.tsx index 25a1674..d802083 100644 --- a/apps/user/app/(main)/(content)/(user)/sidebar-left.tsx +++ b/apps/user/app/(main)/(content)/(user)/sidebar-left.tsx @@ -1,17 +1,16 @@ 'use client'; +import { UserNav } from '@/components/user-nav'; import { navs } from '@/config/navs'; import { Sidebar, SidebarContent, - SidebarGroup, - SidebarGroupContent, - SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem, } from '@workspace/ui/components/sidebar'; import { Icon } from '@workspace/ui/custom-components/icon'; import { useTranslations } from 'next-intl'; +import Image from 'next/legacy/image'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; @@ -19,34 +18,39 @@ export function SidebarLeft({ ...props }: React.ComponentProps) const t = useTranslations('menu'); const pathname = usePathname(); return ( - - - - {navs.map((nav) => ( - - {nav.items && {t(nav.title)}} - - - {(nav.items || [nav]).map((item) => ( - - - - {item.icon && } - {t(item.title)} - - - - ))} - - - + +
+ logo +
+ + + {navs.map((nav, navIndex) => ( + + {(nav.items || [nav]).map((item) => ( + + + + {item.icon && } + {t(item.title)} + + + + ))} + ))} + +
+ +
); } diff --git a/apps/user/app/(main)/(content)/layout.tsx b/apps/user/app/(main)/(content)/layout.tsx index 960df4e..2b8874f 100644 --- a/apps/user/app/(main)/(content)/layout.tsx +++ b/apps/user/app/(main)/(content)/layout.tsx @@ -1,12 +1,3 @@ -import Footer from '@/components/footer'; -import Header from '@/components/Header/header'; - export default async function MainLayout({ children }: { children: React.ReactNode }) { - return ( - <> -
- {children} -