Skip to content

Commit 5b6150d

Browse files
committed
fix: Leaderboard bug fixes
1 parent 58d7839 commit 5b6150d

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

src/components/LeaderBoard/LeaderBoardTopItem/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ function LeaderBoardTopItem({
3838
<KPMText>{KPM}</KPMText>
3939
</LeaderBoardTopItemBasicInfoContainer>
4040
<LeaderBoardTopItemLanguageSyntaxContainer>
41-
<Badge IconComponent={TagIcon}>
41+
<Badge IconComponent={TagIcon} language={LANGUAGES[language - 1]} syntax={syntax}>
4242
{type === "header" ? "언어" : LANGUAGES[language - 1]}
4343
</Badge>
44-
<Badge IconComponent={ExternalIcon}>
44+
<Badge IconComponent={ExternalIcon} language={LANGUAGES[language - 1]} syntax={syntax}>
4545
{type === "header" ? "문법" : SYNTAXES[LANGUAGES[language - 1]][syntax - 1].title}
4646
</Badge>
4747
</LeaderBoardTopItemLanguageSyntaxContainer>

src/components/LeaderBoard/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function LeaderBoard({ ranks }) {
4545
variants={defaultFadeInScaleVariants}
4646
username={rank.user.username}
4747
email={rank.user.email}
48-
KPM={rank.record}
48+
KPM={rank.highest_record}
4949
language={rank.language_no}
5050
syntax={rank.grammar_no}
5151
key={index}

src/hooks/useRanks.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import { fetcher } from "utils/fetcher";
44
// 전체 유저들의 랭킹을 가져옴. (본인 로그인 여부와 무관)
55
function useRanks(pageNumber, pageSize, languageNo = 1, grammarNo = 1) {
66
const { data, mutate, error } = useSWR(
7-
`/ranks?pageNumber=${pageNumber}&pageSize=${pageSize}&languageNo=${languageNo}`,
7+
languageNo
8+
? `/ranks?pageNumber=${pageNumber}&pageSize=${pageSize}&languageNo=${languageNo}`
9+
: `/ranks?pageNumber=${pageNumber}&pageSize=${pageSize}`,
810
fetcher,
911
{
1012
revalidateOnFocus: false,

src/pages/Leaderboard/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import { mutate } from "swr";
1919
import Pagination from "@mui/material/Pagination";
2020

2121
function Leaderboard() {
22-
const [languageNo, setLanguageNo] = useState(1);
22+
const [languageNo, setLanguageNo] = useState(null);
2323
const [languageText, setLanguageText] = useState(null);
24-
const [grammarNo, setgrammarNo] = useState(1);
24+
const [grammarNo, setgrammarNo] = useState(null);
2525
const [grammarText, setGrammarText] = useState(null);
26-
const { ranks, error } = useRanks(1, 10, languageNo, grammarNo);
26+
const { ranks, error } = useRanks(1, 70, languageNo, grammarNo);
2727
const LanguageList = ["PYTHON", "HTML", "C"];
2828
const [language, setSelected] = useState(undefined);
2929

@@ -70,7 +70,7 @@ function Leaderboard() {
7070
variants={defaultFadeInVariants}
7171
username={ranks[0].user.username}
7272
email={ranks[0].user.email}
73-
KPM={ranks[0].record}
73+
KPM={ranks[0].highest_record}
7474
language={ranks[0].language_no}
7575
syntax={ranks[0].grammar_no}
7676
ranking="first"
@@ -80,7 +80,7 @@ function Leaderboard() {
8080
variants={defaultFadeInVariants}
8181
username={ranks[1].user.username}
8282
email={ranks[1].user.email}
83-
KPM={ranks[1].record}
83+
KPM={ranks[1].highest_record}
8484
language={ranks[1].language_no}
8585
syntax={ranks[1].grammar_no}
8686
ranking="second"
@@ -105,9 +105,9 @@ function Leaderboard() {
105105
{ranks.slice(2).length !== 0 && (
106106
<>
107107
<LeaderBoard ranks={ranks.slice(2)}></LeaderBoard>
108-
<PaginationContainer>
108+
{/* <PaginationContainer>
109109
<Pagination count={10}></Pagination>
110-
</PaginationContainer>
110+
</PaginationContainer> */}
111111
</>
112112
)}
113113
</LeaderBoardPageContentContainer>

0 commit comments

Comments
 (0)