Merge pull request #17 from danggin/feature/chatting

Feature/chatting

Author: danggin

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%;
 `;

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%;
 `;

src/components/ui/modal/modalComponent.tsx

@@ -5,17 +5,18 @@ import TurnWaiting from "../modalContents/TurnWaiting";
 import GameWaiting from "../modalContents/GameWaiting";
 import Alert from "../modalContents/Alert";
 import GuessNumber from "../selectionNumber/GuessNumber";
+import SelectTurn from "../modalContents/SelectTurn";
 
 export const modalComponents: Record<string, React.ReactNode> = {
   firstSelect: <FirstSelect />,
   makeRoom: <MakeRoom />,
   selectWhiteBlack: <BigDeck />,
   turnWaiting: <TurnWaiting />,
   gameWaiting: <GameWaiting />,
-  guessNumber: <GuessNumber />,
-  myTurn: <BigDeck />,
-
-  GameRoomJoinConfirm: (
+  selectTurn: <SelectTurn />,
+  gameRoomJoinConfirm: (
     <Alert message="개임 방 만들기는 로그인 후 가능합니다." />
   ),
+  guessNumber: <GuessNumber />,
+  myTurn: <BigDeck />,
 };

src/pages/game/gameRoomList.tsx

@@ -22,7 +22,7 @@ export default function GameRoomList() {
 
   const onClickModalOpen = () => {
     if (!accessToken || accessToken === null) {
-      openModal("GameRoomJoinConfirm", "white");
+      openModal("gameRoomJoinConfirm", "white");
     } else {
       openModal("makeRoom", "white");
     }

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 />,