From c0c07e8812c4781425eb121a14af25d616bc6fe1 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Tue, 12 Sep 2023 22:58:18 +0900 Subject: [PATCH 01/13] =?UTF-8?q?Fix:=20=EB=B3=80=EC=88=98=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __mocks__/handlers/channelHandlers.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/__mocks__/handlers/channelHandlers.ts b/__mocks__/handlers/channelHandlers.ts index 390e002..ede2f9c 100644 --- a/__mocks__/handlers/channelHandlers.ts +++ b/__mocks__/handlers/channelHandlers.ts @@ -7,25 +7,25 @@ const getChannels: ChannelCircleProps[][] = [ { channelLink: '123', title: '부경대 총장기', - category: 0, + gameCategory: 0, customChannelIndex: 0, }, { channelLink: '234', title: '부경대 총장기', - category: 1, + gameCategory: 1, customChannelIndex: 1, }, { channelLink: '345', title: '부경대 총장기', - category: 2, + gameCategory: 2, customChannelIndex: 2, }, { channelLink: '456', title: '부경대 총장기', - category: 3, + gameCategory: 3, customChannelIndex: 3, }, ], @@ -36,7 +36,7 @@ const postChannels: ChannelCircleProps[] = [ { channelLink: '26734', title: '부경대 추가대회', - category: 1, + gameCategory: 1, customChannelIndex: 4, }, ]; From 5cbb6852f5d7776bd556370a35a4f2239779e028 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Tue, 12 Sep 2023 23:12:51 +0900 Subject: [PATCH 02/13] =?UTF-8?q?Test:=20=EB=9D=BC=EC=9A=B4=EB=93=9C?= =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=B0=B8=EC=97=AC=EC=9E=90=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8A=94=20MSW=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __mocks__/browser.ts | 2 + __mocks__/handlers/matchHandlers.ts | 81 +++++++++++++++++++++++++++++ __mocks__/server.ts | 2 + 3 files changed, 85 insertions(+) create mode 100644 __mocks__/handlers/matchHandlers.ts diff --git a/__mocks__/browser.ts b/__mocks__/browser.ts index af5c195..b7b8241 100644 --- a/__mocks__/browser.ts +++ b/__mocks__/browser.ts @@ -8,6 +8,7 @@ import statHandlers from '@mocks/handlers/statHandlers'; import makeGameHandlers from './handlers/makeGameHandlers'; import mypageHandlers from './handlers/mypageHandlers'; import bracketHandlers from './handlers/bracketHandlers'; +import matchHandler from '@mocks/handlers/matchHandlers'; export const worker = setupWorker( ...testHandlers, @@ -18,4 +19,5 @@ export const worker = setupWorker( ...makeGameHandlers, ...mypageHandlers, ...bracketHandlers, + ...matchHandler, ); diff --git a/__mocks__/handlers/matchHandlers.ts b/__mocks__/handlers/matchHandlers.ts new file mode 100644 index 0000000..cc13dea --- /dev/null +++ b/__mocks__/handlers/matchHandlers.ts @@ -0,0 +1,81 @@ +import { SERVER_URL } from '@config/index'; +import { rest } from 'msw'; + +const players = { + requestMatchPlayerId: '유리', + matchPlayerScoreInfos: [ + { + matchPlayerId: 0, + participnatId: 0, + matchRank: 1, + participantImageUrl: '', + participantGameId: '짱구', + playerScore: 10, + }, + { + matchPlayerId: 1, + participnatId: 1, + matchRank: 2, + participantImageUrl: '', + participantGameId: '철수', + playerScore: 9, + }, + { + matchPlayerId: 2, + participnatId: 2, + matchRank: 3, + participantImageUrl: '', + participantGameId: '유리', + playerScore: 8, + }, + { + matchPlayerId: 3, + participnatId: 3, + matchRank: 4, + participantImageUrl: '', + participantGameId: '맹구', + playerScore: 7, + }, + { + matchPlayerId: 4, + participnatId: 4, + matchRank: 5, + participantImageUrl: '', + participantGameId: '훈이', + playerScore: 6, + }, + { + matchPlayerId: 5, + participnatId: 5, + matchRank: 6, + participantImageUrl: '', + participantGameId: '흑곰', + playerScore: 5, + }, + { + matchPlayerId: 6, + participnatId: 6, + matchRank: 7, + participantImageUrl: '', + participantGameId: '수지', + playerScore: 3, + }, + { + matchPlayerId: 7, + participnatId: 7, + matchRank: 8, + participantImageUrl: '', + participantGameId: '키자루', + playerScore: 2, + }, + ], +}; + +const matchHandler = [ + rest.get(SERVER_URL + '/api/match/:matchId/player/info', (req, res, ctx) => { + console.log('qwe'); + return res(ctx.status(200), ctx.json(players)); + }), +]; + +export default matchHandler; diff --git a/__mocks__/server.ts b/__mocks__/server.ts index 4353590..750713a 100644 --- a/__mocks__/server.ts +++ b/__mocks__/server.ts @@ -8,6 +8,7 @@ import statHandlers from '@mocks/handlers/statHandlers'; import makeGameHandlers from './handlers/makeGameHandlers'; import mypageHandlers from './handlers/mypageHandlers'; import bracketHandlers from './handlers/bracketHandlers'; +import matchHandler from '@mocks/handlers/matchHandlers'; export const server = setupServer( ...testHandlers, @@ -18,4 +19,5 @@ export const server = setupServer( ...makeGameHandlers, ...mypageHandlers, ...bracketHandlers, + ...matchHandler, ); From a5193bf377fc272caf147bd81bf5458fdf9c978b Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Tue, 12 Sep 2023 23:15:26 +0900 Subject: [PATCH 03/13] =?UTF-8?q?Feat:=20=EC=B0=B8=EA=B0=80=EC=9E=90?= =?UTF-8?q?=EA=B0=80=20=EB=8C=80=ED=9A=8C=20=EC=B2=B4=ED=81=AC=EC=9D=B8?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/contents/[channelLink]/checkIn.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/pages/contents/[channelLink]/checkIn.tsx diff --git a/src/pages/contents/[channelLink]/checkIn.tsx b/src/pages/contents/[channelLink]/checkIn.tsx new file mode 100644 index 0000000..2b52bde --- /dev/null +++ b/src/pages/contents/[channelLink]/checkIn.tsx @@ -0,0 +1,11 @@ +import RoundCheckIn from '@components/RoundCheckIn'; + +const CheckIn = () => { + return ( + <> + + + ); +}; + +export default CheckIn; From ed60264c701ca3639c5bd6dabc4a9d2070fb207b Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Tue, 12 Sep 2023 23:16:26 +0900 Subject: [PATCH 04/13] =?UTF-8?q?Feat:=20=EC=B2=B4=ED=81=AC=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=20=EB=9D=BC=EC=9A=B4?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=B3=B4=20=EB=B0=8F=20=EC=B0=B8=EC=97=AC?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=20=EB=B7=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/index.tsx | 59 +++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/components/RoundCheckIn/index.tsx diff --git a/src/components/RoundCheckIn/index.tsx b/src/components/RoundCheckIn/index.tsx new file mode 100644 index 0000000..8a2eb40 --- /dev/null +++ b/src/components/RoundCheckIn/index.tsx @@ -0,0 +1,59 @@ +import Icon from '@components/Icon'; +import PlayerLists from '@components/RoundCheckIn/PlayerLists'; +import styled from '@emotion/styled'; + +const RoundCheckIn = () => { + return ( + + + 2 of 3 + + + +
8
+ + + +
5
+ + + + + + ); +}; + +export default RoundCheckIn; + +const Container = styled.div` + padding: 2rem 0 0 2rem; +`; + +const ContainerHeader = styled.div` + display: flex; + justify-content: space-between; + width: 60%; + font-size: 2rem; + margin-bottom: 5rem; +`; + +const RoundInfo = styled.div` + padding-top: 1.5rem; +`; + +const FlexWrapper = styled.div` + display: flex; +`; + +const CheckInfo = styled.div` + display: flex; + background-color: #e4e7ec; + padding: 1rem; + margin: 1rem; + border-radius: 0.5rem; + font-size: 1.6rem; + width: 10rem; + height: 3rem; + align-items: center; + justify-content: space-between; +`; From 7d5bbe0847a9f74b88a946a61ca8ac587ce4ba44 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Tue, 12 Sep 2023 23:18:50 +0900 Subject: [PATCH 05/13] =?UTF-8?q?Feat:=20=ED=98=84=EC=9E=AC=20=EB=9D=BC?= =?UTF-8?q?=EC=9A=B4=EB=93=9C=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EB=B0=8F=20=EC=B0=B8=EC=97=AC=EC=9E=90=EB=93=A4?= =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=EB=A5=BC=20=ED=99=95=EC=9D=B8?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20UI=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/PlayerLists.tsx | 70 +++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 src/components/RoundCheckIn/PlayerLists.tsx diff --git a/src/components/RoundCheckIn/PlayerLists.tsx b/src/components/RoundCheckIn/PlayerLists.tsx new file mode 100644 index 0000000..984d680 --- /dev/null +++ b/src/components/RoundCheckIn/PlayerLists.tsx @@ -0,0 +1,70 @@ +import authAPI from '@apis/authAPI'; +import styled from '@emotion/styled'; +import { useEffect, useState } from 'react'; + +interface MatchPlayerScoreInfos { + matchPlayerId: number; + participantId: number; + matchRank: number; + participantImageUrl: string; + participantGameId: string; + playerScore: number; +} + +const PlayerLists = () => { + const [players, setPlayers] = useState([]); + + const fetchData = async (matchId: string) => { + const res = await authAPI({ method: 'get', url: `/api/match/${matchId}/player/info` }); + console.log('res', res); + if (res.status !== 200) return; + setPlayers(res.data.matchPlayerScoreInfos); + }; + + useEffect(() => { + setTimeout(() => { + fetchData('matchId'); + }, 1000); + }, []); + + return ( + + + 순위 + 게임ID + 점수 + 준비 + + {players.length !== 0 && + players.map((player) => ( + + {player.matchRank} + {player.participantGameId} + {player.playerScore} + 췤(소켓) + + ))} + + ); +}; + +export default PlayerLists; + +const Container = styled.div` + display: flex; + flex-direction: column; + width: 60%; +`; + +const MenuList = styled.ul` + display: flex; + justify-content: space-between; +`; + +const MenuItem = styled.li` + width: 5rem; + text-align: center; + align-items: center; + justify-content: center; + margin: 0 auto; +`; From f06b1a17bd10bbbcc0e87b82915a28e76b4c9e34 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 00:51:51 +0900 Subject: [PATCH 06/13] =?UTF-8?q?Design:=20=EC=B0=B8=EC=97=AC=EC=9E=90=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=9D=98=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/PlayerLists.tsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/RoundCheckIn/PlayerLists.tsx b/src/components/RoundCheckIn/PlayerLists.tsx index 984d680..8efccba 100644 --- a/src/components/RoundCheckIn/PlayerLists.tsx +++ b/src/components/RoundCheckIn/PlayerLists.tsx @@ -1,4 +1,5 @@ import authAPI from '@apis/authAPI'; +import Icon from '@components/Icon'; import styled from '@emotion/styled'; import { useEffect, useState } from 'react'; @@ -38,10 +39,12 @@ const PlayerLists = () => { {players.length !== 0 && players.map((player) => ( - {player.matchRank} + # {player.matchRank} {player.participantGameId} {player.playerScore} - 췤(소켓) + + + ))} @@ -59,6 +62,16 @@ const Container = styled.div` const MenuList = styled.ul` display: flex; justify-content: space-between; + font-size: 1.4rem; + border: 1px solid #e4e7ec; + border-radius: 0.5rem; + padding: 1rem 0 1rem; + margin-bottom: 0.5rem; + + &: first-child { + color: #97a1af; + margin-bottom: 1rem; + } `; const MenuItem = styled.li` From 4c07ab8d0dd0b9afef6d20afd9f211715d70b187 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:04:46 +0900 Subject: [PATCH 07/13] =?UTF-8?q?Design:=20=EC=BD=98=ED=85=90=EC=B8=A0?= =?UTF-8?q?=EC=9D=98=20=EA=B0=80=EB=A1=9C=20=ED=81=AC=EA=B8=B0=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/PlayerLists.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/RoundCheckIn/PlayerLists.tsx b/src/components/RoundCheckIn/PlayerLists.tsx index 8efccba..501f05c 100644 --- a/src/components/RoundCheckIn/PlayerLists.tsx +++ b/src/components/RoundCheckIn/PlayerLists.tsx @@ -17,7 +17,6 @@ const PlayerLists = () => { const fetchData = async (matchId: string) => { const res = await authAPI({ method: 'get', url: `/api/match/${matchId}/player/info` }); - console.log('res', res); if (res.status !== 200) return; setPlayers(res.data.matchPlayerScoreInfos); }; @@ -56,7 +55,7 @@ export default PlayerLists; const Container = styled.div` display: flex; flex-direction: column; - width: 60%; + width: 70%; `; const MenuList = styled.ul` @@ -68,7 +67,7 @@ const MenuList = styled.ul` padding: 1rem 0 1rem; margin-bottom: 0.5rem; - &: first-child { + &: first-of-type { color: #97a1af; margin-bottom: 1rem; } From 67c61c1d8686ca44cce7a8ddc1f992625f9e037a Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:06:04 +0900 Subject: [PATCH 08/13] =?UTF-8?q?=EC=A4=80=EB=B9=84/=EA=B8=B0=EA=B6=8C?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=B2=B4=ED=81=AC?= =?UTF-8?q?=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/CallAdminChat.tsx | 5 ++ src/components/RoundCheckIn/CheckInPage.tsx | 47 +++++++++++++++++++ src/components/RoundCheckIn/index.tsx | 8 +++- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 src/components/RoundCheckIn/CallAdminChat.tsx create mode 100644 src/components/RoundCheckIn/CheckInPage.tsx diff --git a/src/components/RoundCheckIn/CallAdminChat.tsx b/src/components/RoundCheckIn/CallAdminChat.tsx new file mode 100644 index 0000000..209f082 --- /dev/null +++ b/src/components/RoundCheckIn/CallAdminChat.tsx @@ -0,0 +1,5 @@ +const CallAdminChat = () => { + return <>; +}; + +export default CallAdminChat; diff --git a/src/components/RoundCheckIn/CheckInPage.tsx b/src/components/RoundCheckIn/CheckInPage.tsx new file mode 100644 index 0000000..037c677 --- /dev/null +++ b/src/components/RoundCheckIn/CheckInPage.tsx @@ -0,0 +1,47 @@ +import Icon from '@components/Icon'; +import CallAdminChat from '@components/RoundCheckIn/CallAdminChat'; +import styled from '@emotion/styled'; + +const CheckInPage = () => { + return ( + + + + 남은시간 + 04:59 + + + + + + + + + + ); +}; + +export default CheckInPage; + +const Container = styled.div` + width: 30%; + padding: 0 2rem 0 2rem; +`; + +const RemainTimeWrapper = styled.div` + display: flex; +`; + +const RemainTimeItem = styled.div` + padding-left: 0.3rem; +`; + +const ButtonWrapper = styled.div` + display: flex; + width: 100%; + justify-content: space-between; +`; + +const Button = styled.button``; + +const ChattingWrapper = styled.div``; diff --git a/src/components/RoundCheckIn/index.tsx b/src/components/RoundCheckIn/index.tsx index 8a2eb40..96aba1d 100644 --- a/src/components/RoundCheckIn/index.tsx +++ b/src/components/RoundCheckIn/index.tsx @@ -1,4 +1,5 @@ import Icon from '@components/Icon'; +import CheckInPage from '@components/RoundCheckIn/CheckInPage'; import PlayerLists from '@components/RoundCheckIn/PlayerLists'; import styled from '@emotion/styled'; @@ -18,7 +19,10 @@ const RoundCheckIn = () => { - + + + + ); }; @@ -32,7 +36,7 @@ const Container = styled.div` const ContainerHeader = styled.div` display: flex; justify-content: space-between; - width: 60%; + width: 70%; font-size: 2rem; margin-bottom: 5rem; `; From 1d9922e7fff4bcaa1594437118de535260ec39d7 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:13:57 +0900 Subject: [PATCH 09/13] =?UTF-8?q?Design:=20=EB=82=A8=EC=9D=80=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EB=B0=8F=20=EC=A4=80=EB=B9=84/=EA=B8=B0=EA=B6=8C?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=EC=9D=98=20=EB=8B=A4=EC=A7=80=EC=95=88=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/CheckInPage.tsx | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/components/RoundCheckIn/CheckInPage.tsx b/src/components/RoundCheckIn/CheckInPage.tsx index 037c677..0b51fa2 100644 --- a/src/components/RoundCheckIn/CheckInPage.tsx +++ b/src/components/RoundCheckIn/CheckInPage.tsx @@ -30,6 +30,15 @@ const Container = styled.div` const RemainTimeWrapper = styled.div` display: flex; + width: 100%; + border-radius: 0.5rem; + background: #202b37; + color: white; + height: 3rem; + padding: 1rem; + font-size: 1.3rem; + align-items: center; + margin-bottom: 1rem; `; const RemainTimeItem = styled.div` @@ -40,8 +49,16 @@ const ButtonWrapper = styled.div` display: flex; width: 100%; justify-content: space-between; + margin-bottom: 1rem; `; -const Button = styled.button``; +const Button = styled.button` + width: 48%; + height: 3rem; + color: white; + background: #637083; + border: none; + border-radius: 0.5rem; +`; const ChattingWrapper = styled.div``; From 62a5bac345951a830e7deef1df3c7c26774c5883 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:50:53 +0900 Subject: [PATCH 10/13] =?UTF-8?q?Design:=20=EA=B8=B0=EB=B3=B8=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=EC=83=89=EA=B3=BC=20=EC=BD=98=ED=85=90=EC=B8=A0?= =?UTF-8?q?=EC=9D=98=20=EB=B0=B0=EA=B2=BD=EC=83=89=EC=9D=84=20=EA=B0=81?= =?UTF-8?q?=EA=B0=81=20=EB=8B=A4=EB=A5=B8=20=ED=9D=B0=EC=83=89=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=84=A4=EC=A0=95=ED=95=98=EC=97=AC=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=EB=A5=BC=20=EA=B5=AC=EB=B6=84=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=89=BD=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/PlayerLists.tsx | 5 ++++- src/styles/GlobalStyle.tsx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/RoundCheckIn/PlayerLists.tsx b/src/components/RoundCheckIn/PlayerLists.tsx index 501f05c..d0e466a 100644 --- a/src/components/RoundCheckIn/PlayerLists.tsx +++ b/src/components/RoundCheckIn/PlayerLists.tsx @@ -42,7 +42,7 @@ const PlayerLists = () => { {player.participantGameId} {player.playerScore} - + ))} @@ -60,12 +60,15 @@ const Container = styled.div` const MenuList = styled.ul` display: flex; + height: 6rem; + align-items: center; justify-content: space-between; font-size: 1.4rem; border: 1px solid #e4e7ec; border-radius: 0.5rem; padding: 1rem 0 1rem; margin-bottom: 0.5rem; + background: #fff; &: first-of-type { color: #97a1af; diff --git a/src/styles/GlobalStyle.tsx b/src/styles/GlobalStyle.tsx index 7b0c817..835d416 100644 --- a/src/styles/GlobalStyle.tsx +++ b/src/styles/GlobalStyle.tsx @@ -9,7 +9,7 @@ export default GlobalStyle; const globalCss = css` html { font-size: 62.5%; - background-color: #fffef9; + background-color: #f9fafb; } *, *::before, From 0f2752017305abe96ccee68ae386d0bd6550c7f3 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:51:25 +0900 Subject: [PATCH 11/13] =?UTF-8?q?Design:=20padding,=20height=20=EA=B0=92?= =?UTF-8?q?=EC=9D=84=20=EC=A6=9D=EA=B0=80=EC=8B=9C=EC=BC=9C=20UI=20?= =?UTF-8?q?=EC=98=88=EC=81=98=EA=B2=8C=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/CheckInPage.tsx | 4 ++-- src/components/RoundCheckIn/index.tsx | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/RoundCheckIn/CheckInPage.tsx b/src/components/RoundCheckIn/CheckInPage.tsx index 0b51fa2..611914e 100644 --- a/src/components/RoundCheckIn/CheckInPage.tsx +++ b/src/components/RoundCheckIn/CheckInPage.tsx @@ -34,7 +34,7 @@ const RemainTimeWrapper = styled.div` border-radius: 0.5rem; background: #202b37; color: white; - height: 3rem; + height: 5rem; padding: 1rem; font-size: 1.3rem; align-items: center; @@ -54,7 +54,7 @@ const ButtonWrapper = styled.div` const Button = styled.button` width: 48%; - height: 3rem; + height: 5rem; color: white; background: #637083; border: none; diff --git a/src/components/RoundCheckIn/index.tsx b/src/components/RoundCheckIn/index.tsx index 96aba1d..6002b53 100644 --- a/src/components/RoundCheckIn/index.tsx +++ b/src/components/RoundCheckIn/index.tsx @@ -42,7 +42,8 @@ const ContainerHeader = styled.div` `; const RoundInfo = styled.div` - padding-top: 1.5rem; + padding-top: 3rem; + padding-left: 5rem; `; const FlexWrapper = styled.div` @@ -53,7 +54,7 @@ const CheckInfo = styled.div` display: flex; background-color: #e4e7ec; padding: 1rem; - margin: 1rem; + margin: 3rem 1rem 1rem 1rem; border-radius: 0.5rem; font-size: 1.6rem; width: 10rem; From 53bdafbfdc7271c92c04b4d96c87b422673303bf Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:51:54 +0900 Subject: [PATCH 12/13] =?UTF-8?q?Feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=EB=A5=BC=20=EB=B6=80=EB=A5=BC=20=EC=88=98=20=EC=9E=88=EB=8A=94?= =?UTF-8?q?=20=EC=B1=84=ED=8C=85=20UI=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoundCheckIn/CallAdminChat.tsx | 74 ++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/src/components/RoundCheckIn/CallAdminChat.tsx b/src/components/RoundCheckIn/CallAdminChat.tsx index 209f082..2866e9f 100644 --- a/src/components/RoundCheckIn/CallAdminChat.tsx +++ b/src/components/RoundCheckIn/CallAdminChat.tsx @@ -1,5 +1,77 @@ +import { css } from '@emotion/react'; +import styled from '@emotion/styled'; + const CallAdminChat = () => { - return <>; + return ( + +
+
Chat
+ Call Admin +
+ +
+ + 입력 +
+ + ); }; export default CallAdminChat; + +const Container = styled.div` + height: 40rem; + background: #fff; + border-radius: 0.5rem; +`; + +const Header = styled.div` + display: flex; + justify-content: space-between; + padding: 1rem; + color: white; + background: #202b37; + border-radius: 0.5rem; + font-size: 1.5rem; +`; + +const CallAdminButton = styled.button` + background: #fddc8b; + width: 9rem; + border: none; + border-radius: 0.3rem; +`; + +const ChattingWrapper = styled.div` + height: 30rem; +`; + +const InputChat = styled.input` + width: 90%; + height: 4rem; + padding-left: 1rem; + margin: 1rem; + border-radius: 0.5rem; + background: #f9fafb; + border: none; + padding-right: 6rem; +`; + +const SubmitButton = styled.button` + position: absolute; + width: 4rem; + top: 1.8rem; + right: 3.5rem; + background: #344051; + color: white; + border: none; + border-radius: 0.3rem; + height: 2.5rem; + &: hover { + cursor: pointer; + } +`; From bd1210807eac81cb47d2a3ed87405479c1b0073a Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 13 Sep 2023 01:58:12 +0900 Subject: [PATCH 13/13] =?UTF-8?q?Fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/ChannelBar/SelectChannelType.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Sidebar/ChannelBar/SelectChannelType.tsx b/src/components/Sidebar/ChannelBar/SelectChannelType.tsx index 377191e..e48bf6d 100644 --- a/src/components/Sidebar/ChannelBar/SelectChannelType.tsx +++ b/src/components/Sidebar/ChannelBar/SelectChannelType.tsx @@ -39,7 +39,7 @@ const SelectChannelType = (props: Props) => { const newChannel: ChannelCircleProps = { channelLink: res.data.channelLink, title: res.data.title, - category: res.data.category, + gameCategory: res.data.gameCategory, imgSrc: res.data?.imgSrc, customChannelIndex: res.data.customChannelIndex, };