Skip to content

Commit

Permalink
Hotfix: 참여 기록 팀 보이게 다시 설정 / 아젠다 아이템 22-> 21rem 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
JeongRon committed Sep 9, 2024
1 parent d8a2e55 commit 56dfe14
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 2 deletions.
37 changes: 37 additions & 0 deletions components/agenda/Profile/HistoryList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
} from 'types/agenda/profile/historyListTypes';
import AgendaTags from 'components/agenda/utils/AgendaTags';
import { countHistoryCoalitions } from 'components/agenda/utils/coalition/countCoalitions';
import ColorList from 'components/agenda/utils/ColorList';
import TeamIcon from 'public/image/agenda/rock-and-roll-hand.svg';
import TimeIcon from 'public/image/agenda/Time.svg';
import styles from 'styles/agenda/Profile/HistoryList.module.scss';

Expand Down Expand Up @@ -68,6 +70,41 @@ const HistoryList = ({ historyListData }: HistoryListProps) => {

<div className={styles.timeContent}>{timeString}</div>
</div>
{/* Team 정보 UI / host 경우 ❌ */}
{historyTeamMates && historyTeamMates.length > 0 ? (
<>
<hr className={styles.divider} />

<div className={styles.teamName}>
{historyData.teamName}
</div>

<div className={styles.teamIntraIdWrapper}>
<div className={styles.imageWrapper}>
<TeamIcon />
</div>

{/* intra id mapping */}
<div className={styles.intraIdWrapper}>
{historyTeamMates.map((mate, index) => (
<div
key={`${historyData.agendaId}-${mate.intraId}-${index}`}
>
{mate.intraId}
</div>
))}
</div>
</div>

{/* coalition color mapping */}
<div className={styles.coalitionWrapper}>
<ColorList
peopleCount={peopleCount}
totalPeople={totalPeople}
/>
</div>
</>
) : null}
</Link>
);
}
Expand Down
2 changes: 1 addition & 1 deletion styles/agenda/Profile/CurrentList.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
.currentItemWrapper {
width: 100%;
@media screen and (min-width: 961px) {
max-width: 22rem;
max-width: 21rem;
}
}
29 changes: 28 additions & 1 deletion styles/agenda/Profile/HistoryList.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.historyItem {
display: flex;
width: 100%;
max-width: 22rem;
max-width: 21rem;
height: auto;
flex-direction: column;
padding: 1rem;
Expand Down Expand Up @@ -56,3 +56,30 @@
width: 0.8rem;
height: 0.8rem;
}

.divider {
width: 100%;
}

.teamName {
@include text(tab);
}

.teamIntraIdWrapper {
display: flex;
align-items: center;
gap: 0.7rem;
@include text(description-s);

.intraIdWrapper {
display: flex;
align-items: center;
gap: 0.5rem;
}
}

.coalitionWrapper {
display: flex;
width: 100%;
height: 1rem;
}

0 comments on commit 56dfe14

Please sign in to comment.