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
1 change: 1 addition & 0 deletions src/components/ui/card/chatting/ChattingStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ export const chatInputBoxContainer = styled.div`
display: flex;
flex-direction: column;
gap: 10px;
height: 100%;
`;
3 changes: 1 addition & 2 deletions src/components/ui/chatInput/chatInputStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -31,5 +31,4 @@ export const chatInputBox = styled.div`
width: 100%;
display: flex;
gap: 10px;
height: 100%;
`;
9 changes: 5 additions & 4 deletions src/components/ui/modal/modalComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 />,
};
2 changes: 1 addition & 1 deletion src/pages/game/gameRoomList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function GameRoomList() {

const onClickModalOpen = () => {
if (!accessToken || accessToken === null) {
openModal("GameRoomJoinConfirm", "white");
openModal("gameRoomJoinConfirm", "white");
} else {
openModal("makeRoom", "white");
}
Expand Down
20 changes: 14 additions & 6 deletions src/routes/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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([
{
Expand Down Expand Up @@ -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 />,
Expand Down