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
2 changes: 1 addition & 1 deletion apps/web/app/(view)/(main)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { WebViewBridge } from '@/components/WebViewBridge';

export default function MainLayout({ children }: { children: React.ReactNode }) {
return (
<div className="relative min-h-screen">
<div className="relative min-h-screen bg-[#FFF5F5]">
{/* WebView와 네이티브 앱 간 통신 */}
<WebViewBridge />

Expand Down
17 changes: 14 additions & 3 deletions apps/web/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
'use client';

import HomePage from './(view)/(main)/home/page';
import { BottomNavBar } from '@/components/BottomNavBar';
import { WebViewBridge } from '@/components/WebViewBridge';

export default function Web() {
return (
<>
<HomePage />
</>
<div className="relative min-h-screen bg-[#FFF5F5]">
<WebViewBridge />
<main
className="pb-[70px] overflow-y-auto"
style={{
paddingBottom: 'calc(70px + env(safe-area-inset-bottom))',
}}
>
<HomePage />
</main>
<BottomNavBar />
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { AppBar, Layout as SharedLayout } from "@repo/shared";

const Layout = ({ children }: { children: React.ReactNode }) => {
return (
<div className="w-full relative bg-[#FFF5F5]">
<>
<AppBar leftContent={<AppBar.MainLogo nickName="허브" />} rightContent={<AppBar.Date date="4일" />} bgColor="bg-[#FFF5F5]" />
<SharedLayout>
{/* 하단 네비게이션 바는 (main) 레이아웃에서 처리 */}
{children}
</SharedLayout>
</div>
</>
)
}

Expand Down