Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import Link from 'next/link'
import { Column, Flex } from '@repo/ui/components/Layout'
import { CLIENT_PATH } from '@/_constants/path'
import { Icon } from '@repo/ui/components/Icon'
import { Text } from '@repo/ui/components/Text'

export const FoodSlotMachineBanner = () => (
<Flex
as={'a'}
as={Link}
href={CLIENT_PATH.EVENTS_FOOD_SLOT}
className={
'mx-auto h-full w-[95%] justify-center gap-6 rounded-xl bg-yellow-100'
Expand All @@ -19,11 +20,7 @@ export const FoodSlotMachineBanner = () => (
</Text>
<Icon type={'slot'} />
</Flex>
<Text
fontSize={'lg'}
fontWeight={'semibold'}
className={'text-main sm:text-xl'}
>
<Text fontSize={'lg'} fontWeight={'semibold'} className={'text-main'}>
고민은 그만, 바로 결정해드려요!
</Text>
</Column>
Expand Down
82 changes: 64 additions & 18 deletions apps/web/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import './globals.css'
import type { Metadata } from 'next'
import QueryProvider from './QueryClientProvider'
import localFont from 'next/font/local'
import { initServerMSW } from '@/_mocks/initMSW'
import { MSWProvider } from '@/_mocks/MSWProvider'
// import { initServerMSW } from '@/_mocks/initMSW'
// import { MSWProvider } from '@/_mocks/MSWProvider'
import { Column } from '@repo/ui/components/Layout'
import { NaverMapProvider } from '@/NaverMapProvider'
import { HeroProvider } from '@/HeroProvider'
Expand Down Expand Up @@ -33,34 +33,80 @@ export const metadata: Metadata = {
}

const pretendard = localFont({
src: '../public/fonts/PretendardVariable.woff2',
src: [
{
path: '../public/fonts/Pretendard-Thin-Subset.woff2',
weight: '100',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-ExtraLight-Subset.woff2',
weight: '200',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-Light-Subset.woff2',
weight: '300',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-Regular-Subset.woff2',
weight: '400',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-Medium-Subset.woff2',
weight: '500',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-SemiBold-Subset.woff2',
weight: '600',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-Bold-Subset.woff2',
weight: '700',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-ExtraBold-Subset.woff2',
weight: '800',
style: 'normal',
},
{
path: '../public/fonts/Pretendard-Black-Subset.woff2',
weight: '900',
style: 'normal',
},
],
display: 'swap',
weight: '45 920',
variable: '--font-pretendard',
})

export default async function RootLayout({
children,
}: {
children: React.ReactNode
}) {
await initServerMSW()
// await initServerMSW()

return (
<html lang='ko' suppressHydrationWarning={true}>
<body className={pretendard.className}>
<MSWProvider>
<QueryProvider>
<HeroProvider>
<NaverMapProvider>
<div className={'flex h-svh justify-center bg-[#FEFCF9]'}>
<Column className={'relative w-full max-w-[450px] bg-white'}>
{children}
</Column>
</div>
</NaverMapProvider>
</HeroProvider>
</QueryProvider>
</MSWProvider>
{/*<MSWProvider>*/}
<QueryProvider>
<HeroProvider>
<NaverMapProvider>
<div className={'flex h-svh justify-center bg-[#FEFCF9]'}>
<Column className={'relative w-full max-w-[450px] bg-white'}>
{children}
</Column>
</div>
</NaverMapProvider>
</HeroProvider>
</QueryProvider>
{/*</MSWProvider>*/}
<Script
src='https://t1.kakaocdn.net/kakao_js_sdk/2.7.9/kakao.min.js'
integrity='sha384-JpLApTkB8lPskhVMhT+m5Ln8aHlnS0bsIexhaak0jOhAkMYedQoVghPfSpjNi9K1'
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed apps/web/public/fonts/PretendardVariable.woff2
Binary file not shown.