From 48e82731522df9966f2097929a9fa6d315f9c511 Mon Sep 17 00:00:00 2001 From: rlarlduf20 Date: Sat, 13 Jan 2024 17:12:56 +0900 Subject: [PATCH 1/9] =?UTF-8?q?Feat:=20=EC=B9=9C=EA=B5=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C?= =?UTF-8?q?=20=EB=AA=A8=EB=8B=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 새로운 조각보 만들기와 동일하게 parallel routes 생성 후 intercept 하는 방식 modal route 이동에 따른 로고 텍스트 수정 --- .../{@modal => @addAlbumModal}/(.)addAlbum/page.tsx | 0 .../(main)/{@modal => @addAlbumModal}/default.tsx | 0 src/app/(main)/@addMateModal/(.)addMate/page.tsx | 12 ++++++++++++ src/app/(main)/@addMateModal/default.tsx | 5 +++++ src/app/(main)/addMate/page.tsx | 11 +++++++++++ src/app/(main)/layout.tsx | 12 +++++++++--- src/components/Modal.tsx | 2 +- src/components/header/LogoText.tsx | 2 +- src/templates/AddMateSection/index.tsx | 12 ++++++++++++ src/templates/MainSection/UserProfile.tsx | 4 ++++ 10 files changed, 55 insertions(+), 5 deletions(-) rename src/app/(main)/{@modal => @addAlbumModal}/(.)addAlbum/page.tsx (100%) rename src/app/(main)/{@modal => @addAlbumModal}/default.tsx (100%) create mode 100644 src/app/(main)/@addMateModal/(.)addMate/page.tsx create mode 100644 src/app/(main)/@addMateModal/default.tsx create mode 100644 src/app/(main)/addMate/page.tsx create mode 100644 src/templates/AddMateSection/index.tsx diff --git a/src/app/(main)/@modal/(.)addAlbum/page.tsx b/src/app/(main)/@addAlbumModal/(.)addAlbum/page.tsx similarity index 100% rename from src/app/(main)/@modal/(.)addAlbum/page.tsx rename to src/app/(main)/@addAlbumModal/(.)addAlbum/page.tsx diff --git a/src/app/(main)/@modal/default.tsx b/src/app/(main)/@addAlbumModal/default.tsx similarity index 100% rename from src/app/(main)/@modal/default.tsx rename to src/app/(main)/@addAlbumModal/default.tsx diff --git a/src/app/(main)/@addMateModal/(.)addMate/page.tsx b/src/app/(main)/@addMateModal/(.)addMate/page.tsx new file mode 100644 index 0000000..2eff91e --- /dev/null +++ b/src/app/(main)/@addMateModal/(.)addMate/page.tsx @@ -0,0 +1,12 @@ +import Modal from "@/components/Modal"; +import AddMateSection from "@/templates/AddMateSection"; + +const AddMateModalPage = () => { + return ( + + + + ); +}; + +export default AddMateModalPage; diff --git a/src/app/(main)/@addMateModal/default.tsx b/src/app/(main)/@addMateModal/default.tsx new file mode 100644 index 0000000..395785b --- /dev/null +++ b/src/app/(main)/@addMateModal/default.tsx @@ -0,0 +1,5 @@ +const Default = () => { + return null; +}; + +export default Default; diff --git a/src/app/(main)/addMate/page.tsx b/src/app/(main)/addMate/page.tsx new file mode 100644 index 0000000..86a8565 --- /dev/null +++ b/src/app/(main)/addMate/page.tsx @@ -0,0 +1,11 @@ +import AddMateSection from "@/templates/AddMateSection"; + +const AddMatePage = () => { + return ( +
+ +
+ ); +}; + +export default AddMatePage; diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx index ba67da2..b103f18 100644 --- a/src/app/(main)/layout.tsx +++ b/src/app/(main)/layout.tsx @@ -12,10 +12,15 @@ export const metadata: Metadata = { interface RootLayoutProps { children: React.ReactNode; - modal: React.ReactNode; + addAlbumModal: React.ReactNode; + addMateModal: React.ReactNode; } -const RootLayout = async ({ children, modal }: RootLayoutProps) => { +const RootLayout = async ({ + children, + addAlbumModal, + addMateModal, +}: RootLayoutProps) => { return ( @@ -23,7 +28,8 @@ const RootLayout = async ({ children, modal }: RootLayoutProps) => {
{children} - {modal} + {addAlbumModal} + {addMateModal}