From 0626c925decf4aec5a656a0972100d3c39d86c53 Mon Sep 17 00:00:00 2001
From: danggin <danggin.min@gmail.com>
Date: Fri, 17 Jan 2025 15:53:40 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=92=84=20style:=20=EA=B2=8C=EC=9E=84?=
 =?UTF-8?q?=20=EC=B1=84=ED=8C=85=EC=B0=BD=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=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

---
 src/components/ui/card/chatting/ChattingStyle.ts | 1 +
 src/components/ui/chatInput/chatInputStyle.ts    | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/card/chatting/ChattingStyle.ts b/src/components/ui/card/chatting/ChattingStyle.ts
index 7f6a6ff..4fdb6c2 100644
--- a/src/components/ui/card/chatting/ChattingStyle.ts
+++ b/src/components/ui/card/chatting/ChattingStyle.ts
@@ -19,4 +19,5 @@ export const chatInputBoxContainer = styled.div`
   display: flex;
   flex-direction: column;
   gap: 10px;
+  height: 100%;
 `;
diff --git a/src/components/ui/chatInput/chatInputStyle.ts b/src/components/ui/chatInput/chatInputStyle.ts
index ca77810..6fe5c36 100644
--- a/src/components/ui/chatInput/chatInputStyle.ts
+++ b/src/components/ui/chatInput/chatInputStyle.ts
@@ -3,8 +3,8 @@ import styled from "styled-components";
 export const chatLog = styled.div`
   flex-grow: 1;
   font-size: 14px;
-  max-height: 290px;
   overflow-y: scroll;
+  height: 100%;
 `;
 
 export const chatInput = styled.input`
@@ -31,5 +31,4 @@ export const chatInputBox = styled.div`
   width: 100%;
   display: flex;
   gap: 10px;
-  height: 100%;
 `;

From ceb82926f9e99f425bd5e3bcd52203749548adc0 Mon Sep 17 00:00:00 2001
From: danggin <danggin.min@gmail.com>
Date: Fri, 17 Jan 2025 15:54:31 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=92=A4=20chore:=20=EC=B6=A9=EB=8F=8C?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ui/modal/modalComponent.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/ui/modal/modalComponent.tsx b/src/components/ui/modal/modalComponent.tsx
index 5670e3a..1b940f4 100644
--- a/src/components/ui/modal/modalComponent.tsx
+++ b/src/components/ui/modal/modalComponent.tsx
@@ -12,13 +12,9 @@ export const modalComponents: Record<string, React.ReactNode> = {
   selectWhiteBlack: <BigDeck />,
   turnWaiting: <TurnWaiting />,
   gameWaiting: <GameWaiting />,
-  guessNumber: <GuessNumber />,
-  myTurn: <BigDeck />,
-
   GameRoomJoinConfirm: (
     <Alert message="개임 방 만들기는 로그인 후 가능합니다." />
   ),
   guessNumber: <GuessNumber />,
   myTurn: <BigDeck />,
-  
 };

From 435e3951ef68f398be1ef20df4f621c8eedda0bd Mon Sep 17 00:00:00 2001
From: danggin <danggin.min@gmail.com>
Date: Fri, 17 Jan 2025 16:18:00 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=A8=20feat:=20=EB=A7=88=EC=9D=B4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/router.tsx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/routes/router.tsx b/src/routes/router.tsx
index 7d646f3..fbc4112 100644
--- a/src/routes/router.tsx
+++ b/src/routes/router.tsx
@@ -12,6 +12,7 @@ import Home from "@pages/home/Home";
 import SignUpFinish from "@pages/user/signUp/SignUpFinish";
 import Error from "@pages/error/Error";
 import TestPage from "../pages/testpage/Testpage";
+import MyPage from "../pages/mypage/myScorePage/MyPage";
 
 export const router = createBrowserRouter([
   {
@@ -58,13 +59,20 @@ export const router = createBrowserRouter([
         ],
       },
       {
-        path: "/user/mypage/checkPassword",
-        element: <CheckPassword />,
-      },
-      {
-        path: "/user/mypage/updateMyPage",
-        element: <UpdateMyPage />,
+        path: "/user/mypage",
+        element: <MyPage />,
+        children: [
+          {
+            path: "checkPassword",
+            element: <CheckPassword />,
+          },
+          {
+            path: "updateMyPage",
+            element: <UpdateMyPage />,
+          },
+        ],
       },
+
       {
         path: "/test",
         element: <TestPage />,