diff --git a/src/app/(home)/home/page.tsx b/src/app/(home)/home/page.tsx index 5df4084..2c5723e 100644 --- a/src/app/(home)/home/page.tsx +++ b/src/app/(home)/home/page.tsx @@ -1,4 +1,9 @@ import React from 'react'; +import { Metadata } from 'next'; + +export const metadata: Metadata = { + title: 'Home', +}; export default function Home() { return ( diff --git a/src/app/(home)/layout.tsx b/src/app/(home)/layout.tsx index 7b804e2..f09af91 100644 --- a/src/app/(home)/layout.tsx +++ b/src/app/(home)/layout.tsx @@ -1,26 +1,13 @@ -import { Metadata } from 'next'; import React, { ReactNode } from 'react'; -import { inter } from '@local/ui/fonts'; -import '@local/styles/home-globals.scss'; +import '@local/ui/home.globals.scss'; import { Header } from '@local/ui/Header'; import { Inner } from '@local/ui/Inner'; -export const metadata: Metadata = { - title: { - template: '%s | Home | Litera.me', - default: 'Litera.me', - }, - description: 'Home of the Litera Family', - metadataBase: new URL('https://litera.me'), -}; - export default function HomeLayout({ children }: { children: ReactNode }) { return ( - - -
- {children} - - + <> +
+ {children} + ); } diff --git a/src/app/(homepage)/layout.tsx b/src/app/(homepage)/layout.tsx index f8e4740..84495dc 100644 --- a/src/app/(homepage)/layout.tsx +++ b/src/app/(homepage)/layout.tsx @@ -1,22 +1,6 @@ -import { Metadata } from 'next'; import { ReactNode } from 'react'; -import '@local/styles/globals.scss'; -import { inter } from '@local/ui/fonts'; -import React from 'react'; - -export const metadata: Metadata = { - title: { - template: '%s | Litera.me', - default: 'Litera.me', - }, - description: 'Litera Family', - metadataBase: new URL('https://litera.me'), -}; +import '@local/ui/homepage.globals.scss'; export default function HomepageLayout({ children }: { children: ReactNode }) { - return ( - - {children} - - ); + return children; } diff --git a/src/app/(homepage)/page.tsx b/src/app/(homepage)/page.tsx index 7569dd8..b15f766 100644 --- a/src/app/(homepage)/page.tsx +++ b/src/app/(homepage)/page.tsx @@ -1,5 +1,10 @@ import { FamilyMemberCard } from '@local/features/homepage/ui/FamilyMemberCard'; -import styles from '@local/styles/Home.module.scss'; +import styles from '@local/features/homepage/ui/Home.module.scss'; +import { Metadata } from 'next'; + +export const metadata: Metadata = { + title: 'Homepage', +}; export default function HomepagePage() { return ( diff --git a/src/app/layout.tsx b/src/app/layout.tsx new file mode 100644 index 0000000..3a39c19 --- /dev/null +++ b/src/app/layout.tsx @@ -0,0 +1,21 @@ +import { Metadata } from 'next'; +import { ReactNode } from 'react'; +import { inter } from '@local/ui/fonts'; +import React from 'react'; + +export const metadata: Metadata = { + title: { + template: '%s | Litera.me', + default: 'Litera.me', + }, + description: 'Litera Family', + metadataBase: new URL('https://litera.me'), +}; + +export default function RootLayout({ children }: { children: ReactNode }) { + return ( + + {children} + + ); +} diff --git a/src/styles/Home.module.scss b/src/features/homepage/ui/Home.module.scss similarity index 100% rename from src/styles/Home.module.scss rename to src/features/homepage/ui/Home.module.scss diff --git a/src/styles/home-globals.scss b/src/ui/home.globals.scss similarity index 100% rename from src/styles/home-globals.scss rename to src/ui/home.globals.scss diff --git a/src/styles/globals.scss b/src/ui/homepage.globals.scss similarity index 100% rename from src/styles/globals.scss rename to src/ui/homepage.globals.scss