From 667a54bb51101a81dda8d529fab2fc2cb19a1b3d Mon Sep 17 00:00:00 2001 From: greatSweetMango <93255519+greatSweetMango@users.noreply.github.com> Date: Thu, 28 Dec 2023 14:17:38 +0900 Subject: [PATCH 1/5] Update README.md --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index bee9e6bdd..05aa68eed 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,21 @@ +

5๊ธฐ

+ + + + + + + + + + + + + +
์—ญํ• LEAD๐Ÿง๐ŸŒš๐Ÿฅจ
์ด๋ฆ„๊น€์žฌํ˜ @jaehyuki์ „์ค€ํ˜ธ @junhjeon๋ฐ•์ง„์ฒ  @jincipark

์ฃผ์š” ๊ธฐ๋Šฅ ์†Œ๊ฐœ

From a210fabe6628143e4d22c98c289715f2675b7422 Mon Sep 17 00:00:00 2001 From: Jincheol Park <67998022+Clearsu@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:04:30 +0900 Subject: [PATCH 2/5] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ์•„์ด๋”” ์ˆ˜์ • --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05aa68eed..be91a2846 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ ์ด๋ฆ„ ๊น€์žฌํ˜ @jaehyuki ์ „์ค€ํ˜ธ @junhjeon - ๋ฐ•์ง„์ฒ  @jincipark + ๋ฐ•์ง„์ฒ  @jincpark
From 3b3dd1bac0faf35f4296281597c8f2abb26a6a4a Mon Sep 17 00:00:00 2001 From: greatSweetMango <93255519+greatSweetMango@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:58:44 +0900 Subject: [PATCH 3/5] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index be91a2846..16dd802fa 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,16 @@
+### ํ† ๋„ˆ๋จผํŠธ ๋‚ด์šฉ +![rank](https://github.com/42organization/42gg.client/assets/93255519/8614432d-e570-4423-a064-5655c766df5b) +![4A71969B-DA59-4783-9E5B-483AF3DCD775_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/40d5b219-fd55-4b9f-a4ab-f57c29f39e6c) +![B279D587-DCAB-447A-A067-4A2CC6731DCC_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/e6fce8ce-bb7d-4e44-b3c2-b19167c5ce39) + +![5F53D32F-6A6E-4BD2-BACD-4EFC60EFEECB_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/53b6d903-de35-401d-979d-90ab7ec19eb5) + +![42899FF5-3DF3-4133-B88A-BD43DDA4E410_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/524d6c26-39bb-48f6-ae08-ca0690a69bfb) + + ### ๐Ÿ”ฅย ์ตœ๊ทผ ๊ฒฝ๊ธฐ๋“ค์„ ํ™•์ธํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค RecentGame_Both From 49490535bb4c36e9c8a6899074ddd80045378b83 Mon Sep 17 00:00:00 2001 From: Jaehyuk Kim Date: Thu, 28 Dec 2023 18:07:25 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[Docs]=20readme=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=ED=83=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 16dd802fa..56a49a81f 100644 --- a/README.md +++ b/README.md @@ -224,15 +224,21 @@
-### ํ† ๋„ˆ๋จผํŠธ ๋‚ด์šฉ -![rank](https://github.com/42organization/42gg.client/assets/93255519/8614432d-e570-4423-a064-5655c766df5b) -![4A71969B-DA59-4783-9E5B-483AF3DCD775_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/40d5b219-fd55-4b9f-a4ab-f57c29f39e6c) -![B279D587-DCAB-447A-A067-4A2CC6731DCC_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/e6fce8ce-bb7d-4e44-b3c2-b19167c5ce39) +### ๐Ÿ“ ๊ฐœ์ตœ๋œ ํ† ๋„ˆ๋จผํŠธ์— ์ฐธ๊ฐ€ ์‹ ์ฒญ์„ ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค +Store_CoinHistory +    +Store_CoinHistory + +### ๐Ÿ“ ์ง„ํ–‰์ค‘์ธ ํ† ๋„ˆ๋จผํŠธ๋ฅผ ์‹ค์‹œ๊ฐ„์œผ๋กœ ํ™•์ธ ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค -![5F53D32F-6A6E-4BD2-BACD-4EFC60EFEECB_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/53b6d903-de35-401d-979d-90ab7ec19eb5) +Store_CoinHistory -![42899FF5-3DF3-4133-B88A-BD43DDA4E410_1_105_c](https://github.com/42organization/42gg.client/assets/93255519/524d6c26-39bb-48f6-ae08-ca0690a69bfb) +### ๐Ÿ† ๋ช…์˜ˆ์˜ ์ „๋‹น์—์„œ ํ† ๋„ˆ๋จผํŠธ ์šฐ์Šน์ž๋“ค์„ ํ™•์ธ ํ•  ์ˆ˜ ์žˆ์–ด์š”! +Store_CoinHistory +    +Store_CoinHistory +
### ๐Ÿ”ฅย ์ตœ๊ทผ ๊ฒฝ๊ธฐ๋“ค์„ ํ™•์ธํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค From ea3c625a883c3213a660374f1c72eab6059f81a4 Mon Sep 17 00:00:00 2001 From: Jincheol Park <67998022+Clearsu@users.noreply.github.com> Date: Mon, 1 Jan 2024 18:58:19 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[Others]=20=EC=98=88=EC=A0=95=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=A4=91=20=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20fetching=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81=20#1024=20(#1218)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Fix] ์ง„ํ–‰์ค‘์ธ ํ† ๋„ˆ๋จผํŠธ ์—†์„ ์‹œ '0' ๋ Œ๋”๋ง ์ˆ˜์ • #1173 * [Chore] ํŒŒ์ผ ๊ฒฝ๋กœ ๋ณ€๊ฒฝ #1173 * [Feat] boucing dots UI ์ปดํฌ๋„ŒํŠธ ์ถ”๊ฐ€ #1173 * [Feat] bouncing dots ์ปดํฌ๋„ŒํŠธ ์ถ”๊ฐ€ #1173 * [Style] ํŒจ์ž ์–ด๋‘์šด ์˜ค๋ฒ„๋ ˆ์ด ์ ์šฉ #1173 * [Refactor] ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” Import ์ œ๊ฑฐ * [Feat] ๊ฒฝ๊ธฐ ์ƒํƒœ์— ๋”ฐ๋ฅธ bouncing dots UI ํ‘œ์‹œ #1173 * [Refactor] before, live ๋ฐ์ดํ„ฐ๋ฅผ ๋ถ„๋ฆฌํ•˜์—ฌ ๋ฐ˜ํ™˜ํ•˜๋„๋ก ์ˆ˜์ • #1204 * [Chore] ๋””๋ ‰ํ† ๋ฆฌ ์‚ญ์ œ #1204 * [Chore] ๋ฏธ์‚ฌ์šฉ ์ปดํฌ๋„ŒํŠธ ์ œ๊ฑฐ #1204 * [Refactor] ์˜์กด์„ฑ๋ฐฐ์—ด ์ˆ˜์ •, ์ฐธ๊ฐ€ ์ƒํƒœ ๋ฌธ์ž์—ด ์ˆ˜์ • #1204 * [Refactor] ๋ฆฌํ„ด ํƒ€์ž… ๋ช…์‹œ #1204 * [Refactor] ์˜ˆ์ •&์ง„ํ–‰์ค‘์ธ ํ† ๋„ˆ๋จผํŠธ data fetching ์ปค์Šคํ…€ํ›… ์ ์šฉ #1204 * [Style] noTournamentText ์ƒ‰์ƒ ๋ฐ ํฐํŠธ ์‚ฌ์ด์ฆˆ ์กฐ์ • #1204 * [Style] gap ๋ฐ ํฐํŠธ ์‚ฌ์ด์ฆˆ ์ˆ˜์ • #1204 --- components/main/Section.tsx | 2 +- .../TournamentPreview.tsx | 36 +++--- .../TournamentPreviewItem.tsx | 34 ----- components/tournament/TournamentCard.tsx | 27 ++-- .../tournament/useBeforeLiveTournamentData.ts | 41 +++--- pages/index.tsx | 11 +- pages/tournament.tsx | 117 ++++++------------ .../TournamentPreview.module.scss | 0 .../TournamentPreviewItem.module.scss | 35 ------ styles/tournament/TournamentCard.module.scss | 4 +- .../TournamentContainer.module.scss | 5 +- 11 files changed, 107 insertions(+), 205 deletions(-) rename components/main/{TournamentPreview => }/TournamentPreview.tsx (56%) delete mode 100644 components/main/TournamentPreview/TournamentPreviewItem.tsx rename styles/main/{TournamentPreview => }/TournamentPreview.module.scss (100%) delete mode 100644 styles/main/TournamentPreview/TournamentPreviewItem.module.scss diff --git a/components/main/Section.tsx b/components/main/Section.tsx index 7081161f6..1c4019eca 100644 --- a/components/main/Section.tsx +++ b/components/main/Section.tsx @@ -2,7 +2,7 @@ import { useRouter } from 'next/router'; import React from 'react'; import { FaChevronRight } from 'react-icons/fa'; import GameResult from 'components/game/GameResult'; -import TournamentPreview from 'components/main/TournamentPreview/TournamentPreview'; +import TournamentPreview from 'components/main/TournamentPreview'; import RankListMain from 'components/rank/topRank/RankListMain'; import styles from 'styles/main/Section.module.scss'; diff --git a/components/main/TournamentPreview/TournamentPreview.tsx b/components/main/TournamentPreview.tsx similarity index 56% rename from components/main/TournamentPreview/TournamentPreview.tsx rename to components/main/TournamentPreview.tsx index 255478fa0..3a4896c36 100644 --- a/components/main/TournamentPreview/TournamentPreview.tsx +++ b/components/main/TournamentPreview.tsx @@ -1,24 +1,26 @@ import { useRouter } from 'next/router'; import { useState, useRef } from 'react'; import { Virtuoso, VirtuosoHandle } from 'react-virtuoso'; -import { TournamentInfo } from 'types/tournamentTypes'; import TournamentCard from 'components/tournament/TournamentCard'; import useBeforeLiveTournamentData from 'hooks/tournament/useBeforeLiveTournamentData'; import useInterval from 'hooks/useInterval'; -import styles from 'styles/main/TournamentPreview/TournamentPreview.module.scss'; -import TournamentPreviewItem from './TournamentPreviewItem'; +import styles from 'styles/main/TournamentPreview.module.scss'; export default function TournamentPreview() { - const data: TournamentInfo[] | undefined = useBeforeLiveTournamentData(); + const { data } = useBeforeLiveTournamentData(); const [selectedIndex, setSelectedIndex] = useState(0); const virtuoso = useRef(null); const router = useRouter(); + const dataCombined = data + ? [...data.beforeTournament, ...data.liveTournament] + : []; + useInterval(() => { - if (!data || data?.length === 0) { + if (!data || dataCombined.length === 0) { return; } - const nextIndex = (selectedIndex + 1) % data.length; + const nextIndex = (selectedIndex + 1) % dataCombined.length; setSelectedIndex(nextIndex); if (virtuoso.current !== null) { virtuoso.current.scrollToIndex({ @@ -34,18 +36,16 @@ export default function TournamentPreview() { className={styles.rollingBanner} onClick={() => router.push('tournament')} > - {data && data.length > 0 && ( - ( - - )} - style={{ height: '100%' }} - /> - )} + ( + + )} + style={{ height: '100%' }} + /> ); } diff --git a/components/main/TournamentPreview/TournamentPreviewItem.tsx b/components/main/TournamentPreview/TournamentPreviewItem.tsx deleted file mode 100644 index 174f9f06e..000000000 --- a/components/main/TournamentPreview/TournamentPreviewItem.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { dateToKRLocaleTimeString } from 'utils/handleTime'; -import styles from 'styles/main/TournamentPreview/TournamentPreviewItem.module.scss'; - -interface TournamentPreviewItemProps { - id: number; - title: string; - startTime: string; - endTime: string; - status: string; -} - -export default function TournamentPreviewItem({ - title, - startTime, - endTime, - status, -}: TournamentPreviewItemProps) { - const formattedStartTime = dateToKRLocaleTimeString(new Date(startTime)); - const formattedEndTime = dateToKRLocaleTimeString(new Date(endTime)); - - const statusColor = status === 'LIVE' ? 'live' : 'scheduled'; - - return ( -
-
-

{title}

-
- {status === 'LIVE' ? '๊ฒฝ๊ธฐ ์ค‘' : '์˜ˆ์ •'} -
-
- ~ -
- ); -} diff --git a/components/tournament/TournamentCard.tsx b/components/tournament/TournamentCard.tsx index 79145b8ac..c79bd485d 100644 --- a/components/tournament/TournamentCard.tsx +++ b/components/tournament/TournamentCard.tsx @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useMemo, useState } from 'react'; +import { useCallback, useEffect, useState } from 'react'; import { useRecoilValue, useSetRecoilState } from 'recoil'; import { BiCalendar } from 'react-icons/bi'; import { MdPeopleAlt } from 'react-icons/md'; @@ -47,7 +47,7 @@ export default function TournamentCard({ }); }; - const getTournamentInfo = useCallback(() => { + const getTournamentInfo = useCallback(async () => { return instance .get(`/pingpong/tournaments/${tournamentId}`) .then((res) => { @@ -57,16 +57,9 @@ export default function TournamentCard({ .catch((error) => { setError('JJH2'); }); - }, [tournamentId]); + }, [tournamentId, setError]); - useEffect(() => { - if (modal.modalName === null) { - getTournamentInfo(); - getStatus(); - } - }, [modal]); - - const getStatus = useCallback(() => { + const getStatus = useCallback(async () => { return instance .get(`/pingpong/tournaments/${tournamentId}/users`) .then((res) => { @@ -79,12 +72,20 @@ export default function TournamentCard({ }, []); const start = dateToKRLocaleTimeString(new Date(startTime)); + + useEffect(() => { + if (modal.modalName === null) { + getTournamentInfo(); + getStatus(); + } + }, [modal, getStatus, getTournamentInfo]); + const end = dateToKRLocaleTimeString(new Date(endTime)); const isFull = playerCount === 8 ? 'full' : 'notFull'; const userState: Record = { - BEFORE: '์ฐธ์—ฌํ•˜๊ธฐ!', - PLAYER: '์ฐธ์—ฌ ์ค‘', + BEFORE: '์ฐธ๊ฐ€ํ•˜๊ธฐ!', + PLAYER: '์ฐธ๊ฐ€ ์ค‘', WAIT: '๋Œ€๊ธฐ ์ค‘', }; diff --git a/hooks/tournament/useBeforeLiveTournamentData.ts b/hooks/tournament/useBeforeLiveTournamentData.ts index 338da1a01..0452acf66 100644 --- a/hooks/tournament/useBeforeLiveTournamentData.ts +++ b/hooks/tournament/useBeforeLiveTournamentData.ts @@ -5,31 +5,42 @@ import { TournamentInfo } from 'types/tournamentTypes'; import { instance } from 'utils/axios'; import { errorState } from 'utils/recoil/error'; -export default function useBeforeLiveTournamentData() { +type UseBeforeLiveTournamentDataReturn = { + data: + | { + beforeTournament: TournamentInfo[]; + liveTournament: TournamentInfo[]; + } + | undefined; + isLoading: boolean; +}; + +export default function useBeforeLiveTournamentData(): UseBeforeLiveTournamentDataReturn { const setError = useSetRecoilState(errorState); const fetchTournamentData = useCallback(async () => { - const liveRes = await instance.get( - '/pingpong/tournaments?page=1&status=LIVE' - ); const beforeRes = await instance.get( '/pingpong/tournaments?page=1&status=BEFORE' ); - const combinedData = [ - ...liveRes.data.tournaments, - ...beforeRes.data.tournaments, - ]; - return combinedData; + const liveRes = await instance.get( + '/pingpong/tournaments?page=1&status=LIVE' + ); + return { + beforeTournament: beforeRes.data.tournaments, + liveTournament: liveRes.data.tournaments, + }; }, []); - const { data, isError } = useQuery( - 'beforeLiveTournamentData', - fetchTournamentData, - { retry: 1, staleTime: 60000 } - ); + const { data, isLoading, isError } = useQuery<{ + beforeTournament: TournamentInfo[]; + liveTournament: TournamentInfo[]; + }>('beforeLiveTournamentData', fetchTournamentData, { + retry: 1, + staleTime: 60000, + }); if (isError) { setError('JC04'); } - return data; + return { data, isLoading }; } diff --git a/pages/index.tsx b/pages/index.tsx index 99b92e730..5e9913eb2 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -5,13 +5,16 @@ import useBeforeLiveTournamentData from 'hooks/tournament/useBeforeLiveTournamen import styles from 'styles/main/Home.module.scss'; const Home: NextPage = () => { - const tournamentData = useBeforeLiveTournamentData(); + const { data: tournamentData } = useBeforeLiveTournamentData(); + return (
- {tournamentData && tournamentData?.length > 0 && ( -
- )} + {tournamentData && + (tournamentData.beforeTournament?.length > 0 || + tournamentData.liveTournament?.length > 0) && ( +
+ )}
diff --git a/pages/tournament.tsx b/pages/tournament.tsx index 6f0155053..9c17ca066 100644 --- a/pages/tournament.tsx +++ b/pages/tournament.tsx @@ -1,99 +1,53 @@ import { Match } from '@g-loot/react-tournament-brackets/dist/src/types'; -import React, { useState, useEffect, useCallback, useRef } from 'react'; -import { useQuery } from 'react-query'; +import React, { useState, useEffect, useCallback } from 'react'; import { useSetRecoilState } from 'recoil'; -import { TournamentData, TournamentGame } from 'types/tournamentTypes'; import { instance } from 'utils/axios'; import { convertTournamentGamesToBracketMatchs } from 'utils/handleTournamentGame'; import { errorState } from 'utils/recoil/error'; import TournamentBraket from 'components/tournament/TournamentBraket'; import TournamentCard from 'components/tournament/TournamentCard'; +import useBeforeLiveTournamentData from 'hooks/tournament/useBeforeLiveTournamentData'; +import useComponentSize from 'hooks/util/useComponentSize'; import styles from 'styles/tournament/TournamentContainer.module.scss'; export default function Tournament() { const setError = useSetRecoilState(errorState); - const [openTournamentId, setOpenTournamentId] = useState( - undefined - ); - const [openTournament, setOpenTournament] = useState([]); - const [containerSize, setContainerSize] = useState({ width: 0, height: 0 }); - const containerRef = useRef(null); // useRef๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ Ref ์ƒ์„ฑ - - const openInfo = useQuery( - 'openTorunamentInfo', - () => - instance - .get('/pingpong/tournaments?size=20&page=1&status=LIVE') - .then((res) => { - if (res.data.tournaments?.length === 1) { - setOpenTournamentId(res.data.tournaments[0].tournamentId); - } - return res.data; - }), - { - onError: (error) => { - setError('JJH02'); - }, - retry: 1, - staleTime: 60000 /* 60์ดˆ */, - } - ); + const { data, isLoading } = useBeforeLiveTournamentData(); + const [ref, size] = useComponentSize(); + const [liveMatch, setLiveMatch] = useState(); - const waitInfo = useQuery( - 'waitTournamentInfo', - () => - instance - .get(`/pingpong/tournaments?size=20&page=1&status=BEFORE`) - .then((res) => { - return res.data; - }), - { - onError: (error) => { - setError('JJH03'); - }, - retry: 1, - staleTime: 60000, - } + const fetchTournamentGames = useCallback( + async (tournamentId: number) => { + try { + const res = await instance.get( + `pingpong/tournaments/${tournamentId}/games` + ); + setLiveMatch(convertTournamentGamesToBracketMatchs(res.data.games)); + } catch (error) { + setError('JJH01'); + } + }, + [setError] ); - const fetchTournamentGames = useCallback(async () => { - try { - const res = await instance.get( - `pingpong/tournaments/${openTournamentId}/games` - ); - const data: TournamentGame[] = res.data.games; - const bracketMatchs = convertTournamentGamesToBracketMatchs(data); - setOpenTournament(bracketMatchs); - return data; - } catch (error) { - console.error('Error fetching data:', error); - } - }, [openTournamentId]); - useEffect(() => { - if (openTournamentId !== undefined) fetchTournamentGames(); - }, [openTournamentId, fetchTournamentGames]); - - useEffect(() => { - if (containerRef.current) { - const width = containerRef.current.clientWidth; - const height = containerRef.current.clientHeight; - setContainerSize({ width, height }); + if (data && data.liveTournament.length > 0) { + fetchTournamentGames(data.liveTournament[0].tournamentId); } - }, []); + }, [data, fetchTournamentGames]); return (

Tournament

์˜ˆ์ •๋œ ํ† ๋„ˆ๋จผํŠธ
- {waitInfo.data?.tournaments.length === 0 ? ( -

+ {data?.beforeTournament.length === 0 ? ( +
์˜ˆ์ •๋œ ํ† ๋„ˆ๋จผํŠธ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค. -

+
) : (
- {waitInfo.data?.tournaments.map((tournament) => ( + {data?.beforeTournament.map((tournament) => (
)}
์ง„ํ–‰์ค‘์ธ ํ† ๋„ˆ๋จผํŠธ
- {openInfo.data && openInfo.data.tournaments?.length === 0 ? ( + {data?.liveTournament?.length === 0 ? (
์ง„ํ–‰์ค‘์ธ ํ† ๋„ˆ๋จผํŠธ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค
) : ( <> - {openInfo.data?.tournaments[0].tournamentId && ( + {data && ( )} -
- -
+ {liveMatch && ( +
+ +
+ )} )}
diff --git a/styles/main/TournamentPreview/TournamentPreview.module.scss b/styles/main/TournamentPreview.module.scss similarity index 100% rename from styles/main/TournamentPreview/TournamentPreview.module.scss rename to styles/main/TournamentPreview.module.scss diff --git a/styles/main/TournamentPreview/TournamentPreviewItem.module.scss b/styles/main/TournamentPreview/TournamentPreviewItem.module.scss deleted file mode 100644 index 8da1ac0f9..000000000 --- a/styles/main/TournamentPreview/TournamentPreviewItem.module.scss +++ /dev/null @@ -1,35 +0,0 @@ -.itemWrapper { - width: 100%; - height: 5rem; - padding: 1rem; - - .titleStatusWrapper { - display: flex; - align-items: center; - - h4 { - margin: 0; - } - - .statusWrapper { - display: flex; - padding: 0.3rem; - margin-left: 0.5rem; - font-size: 0.7rem; - border-radius: 0.5rem; - align-items: center; - - &.live { - background-color: red; - } - &.scheduled { - background-color: green; - } - } - } - - time { - font-size: 0.8rem; - color: yellow; - } -} diff --git a/styles/tournament/TournamentCard.module.scss b/styles/tournament/TournamentCard.module.scss index 1d127047b..328d7b944 100644 --- a/styles/tournament/TournamentCard.module.scss +++ b/styles/tournament/TournamentCard.module.scss @@ -30,7 +30,7 @@ display: flex; flex-direction: row; justify-items: flex-start; - gap: 1rem; + gap: 0.5rem; .title { max-width: 55%; @@ -47,7 +47,7 @@ flex-direction: row; justify-content: flex-start; gap: 0.5rem; - font-size: small; + font-size: 0.7rem; .playerState { @include tag-style; diff --git a/styles/tournament/TournamentContainer.module.scss b/styles/tournament/TournamentContainer.module.scss index 5d91b77fd..9f956f510 100644 --- a/styles/tournament/TournamentContainer.module.scss +++ b/styles/tournament/TournamentContainer.module.scss @@ -38,7 +38,7 @@ margin: 1.5rem 0 1rem; font-weight: 700; color: white; - text-align: center; /* ํ…์ŠคํŠธ๋ฅผ ๊ฐ€๋กœ๋กœ ์ค‘์•™์— ์ •๋ ฌ */ + text-align: center; } .cardContainer { @@ -51,7 +51,8 @@ .noTournamentText { display: flex; - color: white; + font-size: 0.9rem; + color: rgb(174, 174, 174); justify-content: center; align-content: center; }