File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 1
1
import type { Metadata } from "next" ;
2
2
import "./globals.css" ;
3
3
import { Noto_Sans_KR } from "@next/font/google" ;
4
+ import Footer from "@/components/footer/Footer" ;
5
+ import Navbar from "@/components/navbar/Navbar" ;
4
6
5
7
const notoSansKR = Noto_Sans_KR ( {
6
8
weight : [ "400" , "500" , "700" ] ,
@@ -19,7 +21,11 @@ export default function RootLayout({
19
21
} > ) {
20
22
return (
21
23
< html lang = "en" >
22
- < body className = { notoSansKR . className } > { children } </ body >
24
+ < body className = { notoSansKR . className } >
25
+ < Navbar />
26
+ { children }
27
+ < Footer />
28
+ </ body >
23
29
</ html >
24
30
) ;
25
31
}
Original file line number Diff line number Diff line change 1
- import Footer from "@/components/footer/Footer" ;
2
1
import ContentBlock from "@/components/main/ContentBlock" ;
3
2
import CopyBlock from "@/components/main/CopyBlock" ;
4
3
import Intro from "@/components/main/Intro" ;
5
4
import StoryBlock from "@/components/main/StoryBlock" ;
6
- import Navbar from "@/components/navbar/Navbar" ;
7
5
import { mainPageData } from "@/lib/data" ;
8
6
import { Metadata } from "next" ;
9
7
@@ -15,7 +13,6 @@ export const metadata: Metadata = {
15
13
const MainPage = async ( ) => {
16
14
return (
17
15
< >
18
- < Navbar />
19
16
< Intro />
20
17
< ContentBlock
21
18
title = { mainPageData [ 0 ] . title }
@@ -29,7 +26,6 @@ const MainPage = async () => {
29
26
/>
30
27
< CopyBlock />
31
28
< StoryBlock />
32
- < Footer />
33
29
</ >
34
30
) ;
35
31
} ;
You can’t perform that action at this time.
0 commit comments