Skip to content

Commit 614a85e

Browse files
committed
issue #233 refactor: mypage tab condition refactoring
1 parent 04d47a5 commit 614a85e

File tree

5 files changed

+1801
-1836
lines changed

5 files changed

+1801
-1836
lines changed

.pnp.cjs

Lines changed: 24 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.pnp.loader.mjs

Lines changed: 15 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

packages/waggle-service/src/pages/MyPage.tsx

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,11 @@ const MyPage = () => {
2222

2323
const [searchParams, setSearchParams] = useSearchParams();
2424

25+
const validTabs = Object.values(MY_PAGE_TAB_KEY);
26+
const tabMode = searchParams.get(TAB_KEY);
27+
2528
useEffect(() => {
26-
if (
27-
!searchParams ||
28-
(searchParams.get(TAB_KEY) !== MY_PAGE_TAB_KEY.PROFILE &&
29-
searchParams.get(TAB_KEY) !== MY_PAGE_TAB_KEY.LOG &&
30-
searchParams.get(TAB_KEY) !== MY_PAGE_TAB_KEY.SIREN_POST &&
31-
searchParams.get(TAB_KEY) !== MY_PAGE_TAB_KEY.SIREN_COMMENT &&
32-
searchParams.get(TAB_KEY) !== MY_PAGE_TAB_KEY.QUESTION_POST &&
33-
searchParams.get(TAB_KEY) !== MY_PAGE_TAB_KEY.QUESTION_COMMENT)
34-
) {
29+
if (tabMode === null || validTabs.includes(tabMode) === false) {
3530
setSearchParams(`${TAB_KEY}=${MY_PAGE_TAB_KEY.PROFILE}`);
3631
}
3732
}, [searchParams]);
@@ -40,25 +35,21 @@ const MyPage = () => {
4035
<Flex css={layoutStyle}>
4136
<MyPageProfile memberData={memberData.result} />
4237

43-
{searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.PROFILE && <MyPageMain paramUrl={paramUrl} />}
38+
{tabMode === MY_PAGE_TAB_KEY.PROFILE && <MyPageMain paramUrl={paramUrl} />}
4439

45-
{searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.LOG && <MyPageLog paramUrl={paramUrl} />}
40+
{tabMode === MY_PAGE_TAB_KEY.LOG && <MyPageLog paramUrl={paramUrl} />}
4641

47-
{searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.SIREN_POST && (
48-
<MyPageSiren paramUrl={paramUrl} />
49-
)}
42+
{tabMode === MY_PAGE_TAB_KEY.SIREN_POST && <MyPageSiren paramUrl={paramUrl} />}
5043

51-
{(searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.SIREN_COMMENT ||
52-
searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.QUESTION_COMMENT) && (
44+
{(tabMode === MY_PAGE_TAB_KEY.SIREN_COMMENT ||
45+
tabMode === MY_PAGE_TAB_KEY.QUESTION_COMMENT) && (
5346
<MyPageComment
5447
paramUrl={paramUrl}
55-
isQuestion={searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.QUESTION_COMMENT}
48+
isQuestion={tabMode === MY_PAGE_TAB_KEY.QUESTION_COMMENT}
5649
/>
5750
)}
5851

59-
{searchParams.get(TAB_KEY) === MY_PAGE_TAB_KEY.QUESTION_POST && (
60-
<MyPageQuestion paramUrl={paramUrl} />
61-
)}
52+
{tabMode === MY_PAGE_TAB_KEY.QUESTION_POST && <MyPageQuestion paramUrl={paramUrl} />}
6253
</Flex>
6354
);
6455
};

0 commit comments

Comments
 (0)