Refactor layout structure: Replace Header and Footer with LayoutContent component in RootLayout for improved organization.
This commit is contained in:
27
app/layout-content.tsx
Normal file
27
app/layout-content.tsx
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { Header, Footer } from '@ciphera-net/ui'
|
||||||
|
import { useAuth } from '@/lib/auth/context'
|
||||||
|
import Link from 'next/link'
|
||||||
|
|
||||||
|
export default function LayoutContent({ children }: { children: React.ReactNode }) {
|
||||||
|
const auth = useAuth()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Header
|
||||||
|
auth={auth}
|
||||||
|
LinkComponent={Link}
|
||||||
|
logoSrc="/ciphera_icon_no_margins.png"
|
||||||
|
appName="Ciphera Analytics"
|
||||||
|
/>
|
||||||
|
<main className="flex-1 pt-24 pb-8">
|
||||||
|
{children}
|
||||||
|
</main>
|
||||||
|
<Footer
|
||||||
|
LinkComponent={Link}
|
||||||
|
appName="Ciphera Analytics"
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
import Header from '@ciphera-net/ui/Header'
|
|
||||||
import Footer from '@ciphera-net/ui/Footer'
|
|
||||||
import { AuthProvider } from '@/lib/auth/context'
|
|
||||||
import { ThemeProviders } from '@ciphera-net/ui'
|
import { ThemeProviders } from '@ciphera-net/ui'
|
||||||
|
import { AuthProvider } from '@/lib/auth/context'
|
||||||
import { Toaster } from 'sonner'
|
import { Toaster } from 'sonner'
|
||||||
import type { Metadata } from 'next'
|
import type { Metadata } from 'next'
|
||||||
import { Plus_Jakarta_Sans } from 'next/font/google'
|
import { Plus_Jakarta_Sans } from 'next/font/google'
|
||||||
|
import LayoutContent from './layout-content'
|
||||||
import '../styles/globals.css'
|
import '../styles/globals.css'
|
||||||
|
|
||||||
const plusJakartaSans = Plus_Jakarta_Sans({
|
const plusJakartaSans = Plus_Jakarta_Sans({
|
||||||
@@ -42,11 +41,7 @@ export default function RootLayout({
|
|||||||
<body className="antialiased min-h-screen flex flex-col bg-white dark:bg-neutral-950 text-neutral-900 dark:text-neutral-50">
|
<body className="antialiased min-h-screen flex flex-col bg-white dark:bg-neutral-950 text-neutral-900 dark:text-neutral-50">
|
||||||
<ThemeProviders>
|
<ThemeProviders>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<Header />
|
<LayoutContent>{children}</LayoutContent>
|
||||||
<main className="flex-1 pt-24 pb-8">
|
|
||||||
{children}
|
|
||||||
</main>
|
|
||||||
<Footer />
|
|
||||||
<Toaster position="top-center" richColors closeButton />
|
<Toaster position="top-center" richColors closeButton />
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
</ThemeProviders>
|
</ThemeProviders>
|
||||||
|
|||||||
7112
package-lock.json
generated
Normal file
7112
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user