Merge pull request #962 from 42organization/GGFE-213-일반랭킹트로피메인

[GGFE-213] 메인에서 일반랭커보여주는 버그 수정
42organization · Aug 28, 2023 · c2b3147 · c2b3147
2 parents 4fff5e5 + 7e62282
commit c2b3147
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 8 deletions.
diff --git a/components/rank/topRank/RankListMain.tsx b/components/rank/topRank/RankListMain.tsx
@@ -17,15 +17,16 @@ export default function RankListMain({ isMain, season }: RankListMainProps) {
   const [page] = useState<number>(1);
 
   const makePathRanker = useMemo(() => {
-    return `/pingpong/users/images?seasonId=${season}&mode=${Mode}`;
-  }, [season, Mode]);
+    return `rank/${Mode}`;
+  }, [season, Mode, isMain]);
 
   useRankListMain({
     makePathRanker,
     setRanker: setRanker,
     toggleMode: Mode,
     page: page,
     season: season,
+    isMain: isMain,
   });
 
   useEffect(() => {

diff --git a/hooks/rank/useRankListMain.ts b/hooks/rank/useRankListMain.ts
@@ -8,6 +8,7 @@ interface useRankListProps {
   season: number | undefined;
   setRanker: Dispatch<SetStateAction<userImages[]>>;
   page: number;
+  isMain: boolean;
 }
 
 const useRankListMain = ({
@@ -16,6 +17,7 @@ const useRankListMain = ({
   season,
   setRanker,
   page,
+  isMain,
 }: useRankListProps): void => {
   /*   const getRankerDataHandler = useAxiosGet<any>({
     url: makePathRanker,
@@ -30,7 +32,7 @@ const useRankListMain = ({
     type: 'setError',
   }); */
   const getRankerDataHandler = useMockAxiosGet<any>({
-    url: 'rank/user',
+    url: makePathRanker,
     setState: (data) => {
       [data.rankList[0], data.rankList[1]] = [
         data.rankList[1],
@@ -44,7 +46,7 @@ const useRankListMain = ({
 
   useEffect(() => {
     getRankerDataHandler();
-  }, [page, season, toggleMode]);
+  }, [page, season, toggleMode, isMain]);
 };
 
 export default useRankListMain;
diff --git a/pages/api/pingpong/rank/NORMAL.ts b/pages/api/pingpong/rank/NORMAL.ts
@@ -0,0 +1,34 @@
+import { RankMain, userImages } from 'types/rankTypes';
+import type { NextApiRequest, NextApiResponse } from 'next';
+
+export default function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<RankMain>
+) {
+  const userImages: userImages[] = [
+    {
+      intraId: 'jeyoonnormal',
+      userImageUri: '/image/fallBackSrc.jpeg',
+      tierImageUri: '/image/fallBackSrc.jpeg',
+      edge: 'COLOR2',
+    },
+    {
+      intraId: 'hyobicho',
+      userImageUri: '/image/fallBackSrc.jpeg',
+      tierImageUri: '/image/fallBackSrc.jpeg',
+      edge: 'COLOR3',
+    },
+    {
+      intraId: 'hyungipa',
+      userImageUri: '/image/fallBackSrc.jpeg',
+      tierImageUri: '/image/fallBackSrc.jpeg',
+      edge: 'COLOR4',
+    },
+  ];
+
+  const RankData: RankMain = {
+    rankList: userImages,
+  };
+
+  res.status(200).json(RankData);
+}
diff --git a/pages/api/pingpong/rank/user.ts → pages/api/pingpong/rank/RANK.ts b/pages/api/pingpong/rank/user.ts → pages/api/pingpong/rank/RANK.ts
@@ -7,19 +7,19 @@ export default function handler(
 ) {
   const userImages: userImages[] = [
     {
-      intraId: '1',
+      intraId: 'jeyoon',
       userImageUri: '/image/fallBackSrc.jpeg',
       tierImageUri: '/image/fallBackSrc.jpeg',
       edge: 'COLOR2',
     },
     {
-      intraId: '2',
+      intraId: 'hyobicho',
       userImageUri: '/image/fallBackSrc.jpeg',
       tierImageUri: '/image/fallBackSrc.jpeg',
       edge: 'COLOR3',
     },
     {
-      intraId: '3',
+      intraId: 'hyungipa',
       userImageUri: '/image/fallBackSrc.jpeg',
       tierImageUri: '/image/fallBackSrc.jpeg',
       edge: 'COLOR4',

diff --git a/utils/recoil/colorMode.ts b/utils/recoil/colorMode.ts
@@ -1,7 +1,7 @@
-import { ToggleMode } from 'types/rankTypes';
 import { atom, selector } from 'recoil';
 import { v1 } from 'uuid';
 import { ColorMode } from 'types/colorModeTypes';
+import { ToggleMode } from 'types/rankTypes';
 
 export const colorModeState = atom<ColorMode>({
   key: `ColorMode/${v1()}`,