refactor: introduce shared root layout

literat · Nov 18, 2024 · 989440b · 989440b
1 parent 5e9c41c
commit 989440b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 37 deletions.
diff --git 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
@@ -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 (
-    <html lang="en">
-      <body className={`${inter.className} antialiased`}>
-        <Header />
-        <Inner>{children}</Inner>
-      </body>
-    </html>
+    <>
+      <Header />
+      <Inner>{children}</Inner>
+    </>
   );
 }
diff --git 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 (
-    <html lang="en">
-      <body className={`${inter.className} antialiased`}>{children}</body>
-    </html>
-  );
+  return children;
 }
diff --git 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
@@ -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 (
+    <html lang="en">
+      <body className={`${inter.className} antialiased`}>{children}</body>
+    </html>
+  );
+}
diff --git a/src/styles/Home.module.scss → src/features/homepage/ui/Home.module.scss b/src/styles/Home.module.scss → src/features/homepage/ui/Home.module.scss
diff --git a/src/styles/home-globals.scss → src/ui/home.globals.scss b/src/styles/home-globals.scss → src/ui/home.globals.scss
diff --git a/src/styles/globals.scss → src/ui/homepage.globals.scss b/src/styles/globals.scss → src/ui/homepage.globals.scss