diff --git a/src/layouts/Layout.tsx b/src/layouts/Layout.tsx index e50a051..3875beb 100644 --- a/src/layouts/Layout.tsx +++ b/src/layouts/Layout.tsx @@ -63,10 +63,10 @@ const Layout = () => { const hideBottomBar = isLogin || isSignup || isCertification || isCertificationGuide || isCertificationShoot || isCertificationSuccess || isCertificationFail || isImageSearch || isProblemSearch || isMyContribution || isAllContribution || isDisposalInfoFail || isDisposalInfoDetail || isCamera || isDisposalInfo || isReward || isCommunityDetail || isMyPosts || isMycomments || isMyProfileEdit || isMyfavorites || isMyhistory || isCommunityWrite || isCommunityModify; - const hasGreenBackground = isGuide || isCertification || isCertificationGuide || isCertificationShoot || isCertificationSuccess || isDisposalInfo || isDisposalInfoDetail || isImageSearch || isProblemSearch || isDisposalInfoFail || isCamera || isAllContribution || isReward || isCommunityMain || isCommunityWrite || isCommunityModify || isCommunityDetail || isMyContribution; + const hasGreenBackground = isGuide || isCertification || isCertificationGuide || isCertificationShoot || isCertificationSuccess || isDisposalInfo || isDisposalInfoDetail || isImageSearch || isProblemSearch || isDisposalInfoFail || isCamera || isCommunityMain || isCommunityWrite || isCommunityModify || isCommunityDetail; return ( -
+
{isGuide && } @@ -91,17 +91,17 @@ const Layout = () => { {isMyhistory && navigate('/')} bgColor='bg-bg-my' />} {isMycomments && navigate('/')} bgColor='bg-bg-my' />} - {isReward && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardHistory && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardStore && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardProdocts && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardCheckout && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardAddressList && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardAddressSearch && navigate('/')} bgColor='bg-bg-green1' />} - {isRewardAddressEdit && navigate('/')} bgColor='bg-bg-green1' />} - - {isMyContribution && navigate('/')} bgColor='bg-bg-green1' />} - {isAllContribution && navigate('/')} bgColor='bg-bg-green1' />} + {isReward && navigate('/')} bgColor='bg-bg-my' />} + {isRewardHistory && navigate('/')} bgColor='bg-bg-my' />} + {isRewardStore && navigate('/')} bgColor='bg-bg-my' />} + {isRewardProdocts && navigate('/')} bgColor='bg-bg-my' />} + {isRewardCheckout && navigate('/')} bgColor='bg-bg-my' />} + {isRewardAddressList && navigate('/')} bgColor='bg-bg-my' />} + {isRewardAddressSearch && navigate('/')} bgColor='bg-bg-my' />} + {isRewardAddressEdit && navigate('/')} bgColor='bg-bg-my' />} + + {isMyContribution && navigate('/')} bgColor='bg-bg-my' />} + {isAllContribution && navigate('/')} bgColor='bg-bg-my' />}
diff --git a/src/pages/all-contribution-page.tsx b/src/pages/all-contribution-page.tsx index d944908..316fbfa 100644 --- a/src/pages/all-contribution-page.tsx +++ b/src/pages/all-contribution-page.tsx @@ -104,7 +104,7 @@ export default function AllContributionPage() { if (isPending) { return ( -
+
); @@ -112,7 +112,7 @@ export default function AllContributionPage() { if (isError) { return ( -
+

전체 기여도를 불러오지 못했어요.

@@ -131,7 +131,7 @@ export default function AllContributionPage() { const feeds = data.pages.flatMap((page) => page.feeds); return ( -
+
+
{/* 홈 상단 인사말과 로그아웃 진입 버튼입니다. */}
diff --git a/src/pages/my-contribution-page.tsx b/src/pages/my-contribution-page.tsx index 2d21c0a..78f2434 100644 --- a/src/pages/my-contribution-page.tsx +++ b/src/pages/my-contribution-page.tsx @@ -46,7 +46,7 @@ export default function MyContributionPage() { } return ( -
+

diff --git a/src/pages/my-page/reward-use-history-page.tsx b/src/pages/my-page/reward-use-history-page.tsx index 4e9b2a6..b562732 100644 --- a/src/pages/my-page/reward-use-history-page.tsx +++ b/src/pages/my-page/reward-use-history-page.tsx @@ -160,7 +160,7 @@ const RewardUseHistoryPage = () => { if (isPending) { return ( -
+
); @@ -168,14 +168,14 @@ const RewardUseHistoryPage = () => { if (isError) { return ( -
+
리워드 사용 내역을 불러오지 못했어요.
); } return ( -
+
{rewardUseHistory.length > 0 ? (
    @@ -250,4 +250,4 @@ const RewardUseHistoryPage = () => { ); }; -export default RewardUseHistoryPage; \ No newline at end of file +export default RewardUseHistoryPage; diff --git a/src/pages/reward-page/reward-address-complete-page.tsx b/src/pages/reward-page/reward-address-complete-page.tsx index 7feecaa..6b0bb5b 100644 --- a/src/pages/reward-page/reward-address-complete-page.tsx +++ b/src/pages/reward-page/reward-address-complete-page.tsx @@ -15,7 +15,7 @@ export default function RewardAddressCompletePage() { } return ( -
    +
    +

    상세정보를 입력해주세요

    @@ -239,7 +239,7 @@ export default function RewardAddressDetailPage() { if (isEditMode && isAddressListPending) { return ( -
    +
    ); diff --git a/src/pages/reward-page/reward-address-list-page.tsx b/src/pages/reward-page/reward-address-list-page.tsx index a2be322..5bc455e 100644 --- a/src/pages/reward-page/reward-address-list-page.tsx +++ b/src/pages/reward-page/reward-address-list-page.tsx @@ -54,7 +54,7 @@ export default function RewardAddressListPage() { if (isPending) { return ( -
    +
    ); @@ -62,7 +62,7 @@ export default function RewardAddressListPage() { if (isError || !addressList) { return ( -
    +
    +