From 338e852bf1aec5b522445ea0697d22a880e48ed5 Mon Sep 17 00:00:00 2001 From: hojpegmafia Date: Mon, 10 Aug 2026 20:48:09 +0900 Subject: [PATCH] =?UTF-8?q?[modify]=20=EB=A6=AC=EC=9B=8C=EB=93=9C=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=A0=95=EB=B3=B4=20API=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/character/blue2.svg | 35 +++++++++++++++++++ src/assets/icons/character/gray2.svg | 40 ++++++++++++++++++++++ src/assets/icons/character/green2.svg | 34 ++++++++++++++++++ src/assets/icons/character/orange2.svg | 40 ++++++++++++++++++++++ src/assets/icons/character/purple2.svg | 33 ++++++++++++++++++ src/assets/icons/character/yellow2.svg | 32 +++++++++++++++++ src/pages/reward-page/reward-home-page.tsx | 34 ++++++++++++++---- 7 files changed, 242 insertions(+), 6 deletions(-) create mode 100644 src/assets/icons/character/blue2.svg create mode 100644 src/assets/icons/character/gray2.svg create mode 100644 src/assets/icons/character/green2.svg create mode 100644 src/assets/icons/character/orange2.svg create mode 100644 src/assets/icons/character/purple2.svg create mode 100644 src/assets/icons/character/yellow2.svg diff --git a/src/assets/icons/character/blue2.svg b/src/assets/icons/character/blue2.svg new file mode 100644 index 0000000..500d229 --- /dev/null +++ b/src/assets/icons/character/blue2.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/character/gray2.svg b/src/assets/icons/character/gray2.svg new file mode 100644 index 0000000..b122c86 --- /dev/null +++ b/src/assets/icons/character/gray2.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/character/green2.svg b/src/assets/icons/character/green2.svg new file mode 100644 index 0000000..7e1834a --- /dev/null +++ b/src/assets/icons/character/green2.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/character/orange2.svg b/src/assets/icons/character/orange2.svg new file mode 100644 index 0000000..98f910f --- /dev/null +++ b/src/assets/icons/character/orange2.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/character/purple2.svg b/src/assets/icons/character/purple2.svg new file mode 100644 index 0000000..431fc63 --- /dev/null +++ b/src/assets/icons/character/purple2.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/character/yellow2.svg b/src/assets/icons/character/yellow2.svg new file mode 100644 index 0000000..780265c --- /dev/null +++ b/src/assets/icons/character/yellow2.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/reward-page/reward-home-page.tsx b/src/pages/reward-page/reward-home-page.tsx index e5533ce..cbf35cd 100644 --- a/src/pages/reward-page/reward-home-page.tsx +++ b/src/pages/reward-page/reward-home-page.tsx @@ -1,12 +1,34 @@ import { Link } from 'react-router-dom'; import { useQuery } from '@tanstack/react-query'; -import YellowCharacter from '../../assets/icons/character/yellow-character.svg'; +import YellowRewardCharacter from '../../assets/icons/character/yellow2.svg?react'; +import GrayRewardCharacter from '../../assets/icons/character/gray2.svg?react'; +import GreenRewardCharacter from '../../assets/icons/character/green2.svg?react'; +import OrangeRewardCharacter from '../../assets/icons/character/orange2.svg?react'; +import PurpleRewardCharacter from '../../assets/icons/character/purple2.svg?react'; +import BlueRewardCharacter from '../../assets/icons/character/blue2.svg?react'; import RewardCard from '../../components/RewardPage/RewardCard'; -import { HOME_USER } from '../../mocks/home'; import { getRewardHistory, getRewardPoints } from '../../apis/reward'; +import { getMyInfo } from '../../apis/user'; + +const REWARD_CHARACTER_IMAGE_MAP = { + '1': YellowRewardCharacter, + '2': GrayRewardCharacter, + '3': GreenRewardCharacter, + '4': OrangeRewardCharacter, + '5': PurpleRewardCharacter, + '6': BlueRewardCharacter, +} as const; export default function RewardHomePage() { - const { nickname } = HOME_USER; + const { data: userInfo } = useQuery({ + queryKey: ['myInfo'], + queryFn: getMyInfo, + }); + + const CharacterImage = userInfo?.characterCode + ? REWARD_CHARACTER_IMAGE_MAP[userInfo.characterCode] + : REWARD_CHARACTER_IMAGE_MAP['1']; + const { data, isPending, isError } = useQuery({ queryKey: ['rewardPoints'], queryFn: getRewardPoints, @@ -23,9 +45,9 @@ export default function RewardHomePage() { return (
{/* 포인트 카드 부분 */} -
+
-

{nickname}님의 포인트

+

{userInfo?.nickname}님의 포인트

{isPending ? ( @@ -50,7 +72,7 @@ export default function RewardHomePage() {