From 71fa6cb1afb731fb1c18baada1482b1684eb1bf9 Mon Sep 17 00:00:00 2001
From: HarrySeop <harryseop@gmail.com>
Date: Tue, 5 Aug 2025 01:41:31 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F[#263]=20Refactor:=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/what-today/src/layouts/DefaultLayout.tsx  | 16 ++++++----------
 apps/what-today/src/pages/activities/index.tsx | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/what-today/src/layouts/DefaultLayout.tsx b/apps/what-today/src/layouts/DefaultLayout.tsx
index 7fde4502..7ba80257 100644
--- a/apps/what-today/src/layouts/DefaultLayout.tsx
+++ b/apps/what-today/src/layouts/DefaultLayout.tsx
@@ -1,5 +1,6 @@
 import { Footer } from '@what-today/design-system';
 import { Outlet, useLocation } from 'react-router-dom';
+import { twJoin } from 'tailwind-merge';
 
 import FloatingTranslateButton from '@/components/FloatingTranslateButton';
 import Header from '@/components/Header';
@@ -10,27 +11,22 @@ export default function DefaultLayout() {
   const { isDesktop } = useResponsive();
   const isActivityDetailPage = location.pathname.startsWith('/activities/');
 
-  const footerMarginBottom = isActivityDetailPage && !isDesktop ? 'w-full mb-125' : 'w-full';
+  // const footerMarginBottom = isActivityDetailPage && !isDesktop ? 'w-full mb-120' : 'w-full';
 
   // FloatingTranslateButton의 bottom 위치 조건부 설정
   const floatingButtonClass = !isDesktop && isActivityDetailPage ? 'bottom-160' : undefined;
 
   return (
-    <div className='flex w-full flex-col items-center gap-8 overflow-x-hidden'>
+    <div className='flex w-full flex-col items-center gap-8'>
       <header className='w-full max-w-7xl px-[5vw]'>
         <Header />
       </header>
-      <main
-        className={`min-h-[90vh] w-full ${
-          isActivityDetailPage
-            ? 'max-w-7xl px-16 sm:px-24 md:px-32 lg:px-48 xl:max-w-7xl' // 상세 페이지: 반응형 패딩
-            : 'max-w-6xl px-[5vw] xl:max-w-5xl' // 기본 페이지: 기존 스타일
-        }`}
-      >
+
+      <main className='w-full max-w-7xl px-16 sm:px-24 md:px-32 lg:px-48'>
         <Outlet />
       </main>
 
-      <div className={footerMarginBottom}>
+      <div className={twJoin('w-full', isActivityDetailPage && !isDesktop && 'mb-120', 'mt-30')}>
         <Footer />
       </div>
 
diff --git a/apps/what-today/src/pages/activities/index.tsx b/apps/what-today/src/pages/activities/index.tsx
index ec713bc0..b21571b5 100644
--- a/apps/what-today/src/pages/activities/index.tsx
+++ b/apps/what-today/src/pages/activities/index.tsx
@@ -101,7 +101,7 @@ export default function ActivityDetailPage() {
               <Divider />
               <ReviewSection activityId={activity.id} />
             </div>
-            <div className='sticky top-16 flex h-fit flex-col gap-38'>
+            <div className='flex flex-col gap-38'>
               <ActivitiesInformation
                 address={activity.address}
                 category={activity.category}
@@ -112,13 +112,15 @@ export default function ActivityDetailPage() {
                 reviewCount={activity.reviewCount}
                 title={activity.title}
               />
-              <ReservationForm
-                activityId={activity.id}
-                isAuthor={user?.id ? activity?.userId === user.id : false}
-                isLoggedIn={!!user}
-                price={activity.price}
-                schedules={activity.schedules}
-              />
+              <div className='sticky top-16'>
+                <ReservationForm
+                  activityId={activity.id}
+                  isAuthor={user?.id ? activity?.userId === user.id : false}
+                  isLoggedIn={!!user}
+                  price={activity.price}
+                  schedules={activity.schedules}
+                />
+              </div>
             </div>
           </div>
         ) : (

From 0407fa49dc2dedac765eacd5b4d184793e867035 Mon Sep 17 00:00:00 2001
From: HarrySeop <harryseop@gmail.com>
Date: Tue, 5 Aug 2025 01:42:47 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=8E=A8=20[#263]=20Style:=20=EB=B2=88?=
 =?UTF-8?q?=EC=97=AD=20=EC=96=B8=EC=96=B4=20=EC=BB=A8=ED=85=90=EC=B8=A0=20?=
 =?UTF-8?q?=EB=84=88=EB=B9=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/what-today/src/components/FloatingTranslateButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/what-today/src/components/FloatingTranslateButton.tsx b/apps/what-today/src/components/FloatingTranslateButton.tsx
index c3c3f27a..11eb18e7 100644
--- a/apps/what-today/src/components/FloatingTranslateButton.tsx
+++ b/apps/what-today/src/components/FloatingTranslateButton.tsx
@@ -330,7 +330,7 @@ const FloatingTranslateButton: React.FC<FloatingTranslateButtonProps> = ({ class
       <div ref={containerRef} className={twMerge('fixed right-10 bottom-10 z-45', className)}>
         {/* 언어 선택 드롭다운 */}
         {isOpen && (
-          <div className='absolute right-0 bottom-50 flex h-300 w-160 transform flex-col rounded-xl border border-gray-50 bg-white p-10 shadow-[0px_4px_24px_rgba(156,180,202,0.2)] transition-all duration-200 ease-out'>
+          <div className='absolute right-0 bottom-50 flex h-300 w-170 transform flex-col rounded-xl border border-gray-50 bg-white p-10 shadow-[0px_4px_24px_rgba(156,180,202,0.2)] transition-all duration-200 ease-out'>
             <div className='caption-text mb-2 p-2 text-gray-400'>언어 선택</div>
             <div className='mr-4 flex-1 space-y-4 overflow-y-auto px-3 py-2'>
               {languages.map((language) => (

From 9c0d8f16c2bfdbf489d7bace97c68f0fb29e9a5d Mon Sep 17 00:00:00 2001
From: HarrySeop <harryseop@gmail.com>
Date: Tue, 5 Aug 2025 02:32:09 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=8E=A8=20[#263]=20Style:=20=EC=84=9C?=
 =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EC=B5=9C=EC=86=8C=20=EB=84=88=EB=B9=84=20?=
 =?UTF-8?q?=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/what-today/src/layouts/DefaultLayout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/what-today/src/layouts/DefaultLayout.tsx b/apps/what-today/src/layouts/DefaultLayout.tsx
index 7ba80257..45083375 100644
--- a/apps/what-today/src/layouts/DefaultLayout.tsx
+++ b/apps/what-today/src/layouts/DefaultLayout.tsx
@@ -17,7 +17,7 @@ export default function DefaultLayout() {
   const floatingButtonClass = !isDesktop && isActivityDetailPage ? 'bottom-160' : undefined;
 
   return (
-    <div className='flex w-full flex-col items-center gap-8'>
+    <div className='flex w-full min-w-375 flex-col items-center gap-8'>
       <header className='w-full max-w-7xl px-[5vw]'>
         <Header />
       </header>

From 22caeaf6afe1a1411d34a805f9044db58bf1f7ee Mon Sep 17 00:00:00 2001
From: HarrySeop <harryseop@gmail.com>
Date: Tue, 5 Aug 2025 02:33:09 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=8E=A8=20[#263]=20Style:=20=ED=91=B8?=
 =?UTF-8?q?=ED=84=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design-system/src/components/Footer.tsx   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/design-system/src/components/Footer.tsx b/packages/design-system/src/components/Footer.tsx
index 149bd186..17f52c39 100644
--- a/packages/design-system/src/components/Footer.tsx
+++ b/packages/design-system/src/components/Footer.tsx
@@ -37,7 +37,28 @@ export default function Footer() {
             </a>
           </div>
 
-          <p>© CODEIT FE 15</p>
+          <p className='space-x-2 text-center text-sm text-gray-500'>
+            <a
+              aria-label='JIHYUN GitHub'
+              href='https://github.com/kjhyun0830'
+              rel='noopener noreferrer'
+              target='_blank'
+            >
+              지현
+            </a>
+            <span>|</span>
+            <a aria-label='TAEIL GitHub' href='https://github.com/Taeil08' rel='noopener noreferrer' target='_blank'>
+              태일
+            </a>
+            <span>|</span>
+            <a aria-label='JIWOO GitHub' href='https://github.com/MyungJiwoo' rel='noopener noreferrer' target='_blank'>
+              지우
+            </a>
+            <span>|</span>
+            <a aria-label='JISEOP GitHub' href='https://github.com/HarrySeop' rel='noopener noreferrer' target='_blank'>
+              지섭
+            </a>
+          </p>
         </div>
       </div>
     </footer>

From 6b2a570fff713069b22a2a19aa2d33f74f6f5ffb Mon Sep 17 00:00:00 2001
From: HarrySeop <harryseop@gmail.com>
Date: Tue, 5 Aug 2025 03:09:07 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8E=A8=20[#263]=20Style:=20=EB=A7=88?=
 =?UTF-8?q?=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/what-today/src/components/MypageSidebar.tsx | 2 +-
 apps/what-today/src/layouts/DefaultLayout.tsx    | 4 ++--
 apps/what-today/src/layouts/Mypage.tsx           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/what-today/src/components/MypageSidebar.tsx b/apps/what-today/src/components/MypageSidebar.tsx
index 3cbebd14..e2779e4a 100644
--- a/apps/what-today/src/components/MypageSidebar.tsx
+++ b/apps/what-today/src/components/MypageSidebar.tsx
@@ -56,7 +56,7 @@ export default function MypageSidebar({ onLogoutClick, onClick, isOpen }: Mypage
     <nav
       className={twMerge(
         // 공통 스타일
-        'fixed z-50 max-w-200 min-w-200 rounded-2xl border border-gray-50 bg-white transition duration-300 md:static md:h-fit xl:w-280',
+        'fixed top-62 z-50 max-w-200 min-w-200 rounded-2xl border border-gray-50 bg-white transition duration-300 md:static md:h-fit xl:w-280',
         // 모바일에서 Drawer 위치
         isOpen ? 'translate-x-0' : 'h-100 -translate-x-full bg-gray-200',
         'md:translate-x-0',
diff --git a/apps/what-today/src/layouts/DefaultLayout.tsx b/apps/what-today/src/layouts/DefaultLayout.tsx
index 45083375..b7b64060 100644
--- a/apps/what-today/src/layouts/DefaultLayout.tsx
+++ b/apps/what-today/src/layouts/DefaultLayout.tsx
@@ -17,12 +17,12 @@ export default function DefaultLayout() {
   const floatingButtonClass = !isDesktop && isActivityDetailPage ? 'bottom-160' : undefined;
 
   return (
-    <div className='flex w-full min-w-375 flex-col items-center gap-8'>
+    <div className='flex min-h-screen w-full min-w-375 flex-col items-center gap-8'>
       <header className='w-full max-w-7xl px-[5vw]'>
         <Header />
       </header>
 
-      <main className='w-full max-w-7xl px-16 sm:px-24 md:px-32 lg:px-48'>
+      <main className='w-full max-w-7xl flex-grow px-16 sm:px-24 md:px-32 lg:px-48'>
         <Outlet />
       </main>
 
diff --git a/apps/what-today/src/layouts/Mypage.tsx b/apps/what-today/src/layouts/Mypage.tsx
index 46304692..642d9ce0 100644
--- a/apps/what-today/src/layouts/Mypage.tsx
+++ b/apps/what-today/src/layouts/Mypage.tsx
@@ -28,7 +28,7 @@ export default function MyPageLayout() {
   }, [location.pathname]);
 
   return (
-    <div className='flex h-full w-full flex-col md:flex-row md:gap-30'>
+    <div className='flex h-full w-full flex-col justify-center md:flex-row md:gap-30'>
       {/* 모바일: 오버레이 배경 */}
       {isSidebarOpen && (
         <div className='fixed inset-0 z-50 bg-black/30 md:hidden' onClick={() => setSidebarOpen(false)} />
@@ -40,7 +40,7 @@ export default function MyPageLayout() {
         onLogoutClick={handleLogout}
       />
       <Button
-        className={twMerge('fixed top-92 left-4 z-55 w-fit p-0 md:hidden', isSidebarOpen && 'hidden')}
+        className={twMerge('fixed top-92 left-3 z-55 w-fit p-0 md:hidden', isSidebarOpen && 'hidden')}
         size='xs'
         variant='none'
         onClick={() => setSidebarOpen(true)}