diff --git a/src/components/mypage/TotalScoreSection.tsx b/src/components/mypage/TotalScoreSection.tsx index 6b12c67..7a8790f 100644 --- a/src/components/mypage/TotalScoreSection.tsx +++ b/src/components/mypage/TotalScoreSection.tsx @@ -19,6 +19,7 @@ const TotalScoreSection = ({ myName }: { myName: string }) => { const [clickedUser, setClickedUser] = useState({} as UserScore); const scoreChanged = useRecoilValue(userScoreChanged); const [isPre, setIsPre] = useState(false); + const [sortScoreArray, setSortScoreArray] = useState([]); useEffect(() => { if (myName === '최재영' || myName === '박재윤') { @@ -59,8 +60,18 @@ const TotalScoreSection = ({ myName }: { myName: string }) => { } }); setTotalScoreArray(Object.values(tmpObject)); + const sort = totalScoreArray.sort((a: UserScore, b: UserScore) => { + if (a.track !== b.track) { + return a.track - b.track; + } + return a.name.localeCompare(b.name, 'ko'); + }); + setSortScoreArray(sort); } }, [totalAssignment, totalAttendance]); + + if (totalScoreArray) { + } return ( <> @@ -77,7 +88,7 @@ const TotalScoreSection = ({ myName }: { myName: string }) => { ))} - {totalScoreArray.map((userScore, i) => ( + {sortScoreArray.map((userScore, i) => ( {userScore.name}