Skip to content

Commit

Permalink
Merge pull request #339 from TEAM-SEONYAK/fix/#337/seniorJuniorNav
Browse files Browse the repository at this point in the history
[ Fix ] 선후배 Nav바 다른 거 반영
  • Loading branch information
se0jinYoon authored Nov 4, 2024
2 parents dc06614 + 204eed9 commit ba7393d
Showing 1 changed file with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions src/components/commons/Nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,30 @@ const Nav = () => {
return (
<>
<Wrapper>
<TapContainer onClick={() => handleOnClickNav('둘러보기')} $disabled={userRole === 'SENIOR'}>
<NaviLookBlackIcon isactive={(currNav === '/juniorPromise') + ''} />
<TapContent $isActive={currNav === '/juniorPromise'}>둘러보기</TapContent>
</TapContainer>
<TapContainer onClick={() => handleOnClickNav('나의 약속')}>
<NaviPromiseBlackIcon isactive={(currNav === '/promiseList') + ''} />
<TapContent $isActive={currNav === '/promiseList'}>나의 약속</TapContent>
</TapContainer>
{userRole === 'SENIOR' ? (
<>
<TapContainer onClick={() => handleOnClickNav('둘러보기')} $disabled={userRole === 'SENIOR'}>
<NaviLookBlackIcon isactive={(currNav === '/juniorPromise') + ''} />
<TapContent $isActive={currNav === '/juniorPromise'}>둘러보기</TapContent>
</TapContainer>
<TapContainer onClick={() => handleOnClickNav('나의 약속')}>
<NaviPromiseBlackIcon isactive={(currNav === '/promiseList') + ''} />
<TapContent $isActive={currNav === '/promiseList'}>나의 약속</TapContent>
</TapContainer>
</>
) : (
<>
<TapContainer onClick={() => handleOnClickNav('나의 약속')}>
<NaviPromiseBlackIcon isactive={(currNav === '/promiseList') + ''} />
<TapContent $isActive={currNav === '/promiseList'}>나의 약속</TapContent>
</TapContainer>
<TapContainer onClick={() => handleOnClickNav('둘러보기')}>
<NaviLookBlackIcon isactive={(currNav === '/juniorPromise') + ''} />
<TapContent $isActive={currNav === '/juniorPromise'}>둘러보기</TapContent>
</TapContainer>
</>
)}

<TapContainer onClick={() => handleOnClickNav('마이페이지')} $disabled={true}>
<NaviMyBlackIcon isactive={(currNav === '마이페이지') + ''} />
<TapContent $isActive={currNav === '마이페이지'}>마이페이지</TapContent>
Expand Down

0 comments on commit ba7393d

Please sign in to comment.