Extract layout components

kir-dev · Dec 12, 2024 · d566741 · d566741
1 parent dbd1413
commit d566741
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 38 deletions.
diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx
@@ -3,11 +3,15 @@ import './globals.css';
 import { GeistSans } from 'geist/font/sans';
 import type { Metadata } from 'next';
 
+import { Header } from '@/components/layout/header';
+import { Player } from '@/components/layout/player';
+import { RightSidebar } from '@/components/layout/right-sidebar';
+import { Sidebar } from '@/components/layout/sidebar';
 import { ThemeProvider } from '@/components/theme-provider';
 
 export const metadata: Metadata = {
   title: 'MMMK',
-  description: 'MMMK Rehearsal Room Booking Platform',
+  description: 'MMMK Homepage and Rehearsal Room Booking Platform',
 };
 
 export default function RootLayout({
@@ -19,7 +23,15 @@ export default function RootLayout({
     <html lang='hu'>
       <body className={`${GeistSans.className}`}>
         <ThemeProvider attribute='class' defaultTheme='dark' enableSystem disableTransitionOnChange>
-          {children}
+          <div className='h-screen flex flex-col'>
+            <Header />
+            <div className='flex-1 flex overflow-hidden'>
+              <Sidebar />
+              {children}
+              <RightSidebar />
+            </div>
+            <Player />
+          </div>
         </ThemeProvider>
       </body>
     </html>

diff --git a/apps/frontend/src/app/page.tsx b/apps/frontend/src/app/page.tsx
@@ -1,19 +1,5 @@
-import { Header } from '@/components/header';
 import { MainContent } from '@/components/main-content';
-import { Player } from '@/components/player';
-import { RightSidebar } from '@/components/right-sidebar';
-import { Sidebar } from '@/components/sidebar';
 
 export default function Home() {
-  return (
-    <div className='h-screen flex flex-col'>
-      <Header />
-      <div className='flex-1 flex overflow-hidden'>
-        <Sidebar />
-        <MainContent />
-        <RightSidebar />
-      </div>
-      <Player />
-    </div>
-  );
+  return <MainContent />;
 }
diff --git a/apps/frontend/src/components/hello-world.tsx b/apps/frontend/src/components/hello-world.tsx
diff --git a/apps/frontend/src/components/header.tsx → ...frontend/src/components/layout/header.tsx b/apps/frontend/src/components/header.tsx → ...frontend/src/components/layout/header.tsx
@@ -23,7 +23,7 @@ export function Header() {
 
   return (
     <header className='px-4 py-3 flex items-center justify-between'>
-      <Link href='/' className='flex items-center space-x-2'>
+      <Link href='/apps/frontend/public' className='flex items-center space-x-2'>
         <span className={`${GeistSans.className} text-2xl font-bold tracking-tighter`}>MMMK</span>
       </Link>
 
@@ -44,7 +44,7 @@ export function Header() {
             </DropdownMenuItem>
             <DropdownMenuSeparator />
             <DropdownMenuItem asChild>
-              <Link href='/'>Profile</Link>
+              <Link href='/apps/frontend/public'>Profile</Link>
             </DropdownMenuItem>
             <DropdownMenuItem>Log out</DropdownMenuItem>
           </DropdownMenuContent>

diff --git a/apps/frontend/src/components/player.tsx → ...frontend/src/components/layout/player.tsx b/apps/frontend/src/components/player.tsx → ...frontend/src/components/layout/player.tsx
diff --git a/...frontend/src/components/right-sidebar.tsx → ...d/src/components/layout/right-sidebar.tsx b/...frontend/src/components/right-sidebar.tsx → ...d/src/components/layout/right-sidebar.tsx
diff --git a/apps/frontend/src/components/sidebar.tsx → ...rontend/src/components/layout/sidebar.tsx b/apps/frontend/src/components/sidebar.tsx → ...rontend/src/components/layout/sidebar.tsx
@@ -9,13 +9,13 @@ export function Sidebar() {
       <div className='space-y-4'>
         <div className='space-y-2'>
           <Button variant='ghost' className='w-full justify-start' asChild>
-            <Link href='/'>
+            <Link href='/apps/frontend/public'>
               <Radio className='mr-2 h-4 w-4' />
               Feed
             </Link>
           </Button>
           <Button variant='ghost' className='w-full justify-start' asChild>
-            <Link href='/'>
+            <Link href='/apps/frontend/public'>
               <ListMusic className='mr-2 h-4 w-4' />
               Bands
             </Link>
@@ -26,13 +26,13 @@ export function Sidebar() {
           <h2 className='text-xs uppercase text-zinc-400 font-bold mb-2'>About Us</h2>
           <div className='space-y-2'>
             <Button variant='ghost' className='w-full justify-start' asChild>
-              <Link href='/'>
+              <Link href='/apps/frontend/public'>
                 <Heart className='mr-2 h-4 w-4' />
                 MMMK
               </Link>
             </Button>
             <Button variant='ghost' className='w-full justify-start' asChild>
-              <Link href='/'>
+              <Link href='/apps/frontend/public'>
                 <MicVocal className='mr-2 h-4 w-4' />
                 The Room
               </Link>
@@ -44,13 +44,13 @@ export function Sidebar() {
           <h2 className='text-xs uppercase text-zinc-400 font-bold mb-2'>For Members</h2>
           <div className='space-y-2'>
             <Button variant='ghost' className='w-full justify-start' asChild>
-              <Link href='/'>
+              <Link href='/apps/frontend/public'>
                 <CalendarPlus className='mr-2 h-4 w-4' />
                 New Reservations
               </Link>
             </Button>
             <Button variant='ghost' className='w-full justify-start' asChild>
-              <Link href='/'>
+              <Link href='/apps/frontend/public'>
                 <BarChart3 className='mr-2 h-4 w-4' />
                 Statistics
               </Link>
@@ -62,7 +62,7 @@ export function Sidebar() {
           <h2 className='text-xs uppercase text-zinc-400 font-bold mb-2'>Admin</h2>
           <div className='space-y-2'>
             <Button variant='ghost' className='w-full justify-start' asChild>
-              <Link href='/'>
+              <Link href='/apps/frontend/public'>
                 <KeyboardMusic className='mr-2 h-4 w-4' />
                 Super View
               </Link>