Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 멤버 탭 변경사항 및 mds 반영 #1705

Merged
merged 27 commits into from
Jan 14, 2025
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
090a37e
feat: 참여한 프로젝트, 모임이 없는 경우 해당 항목 전부 비노출
simeunseo Dec 12, 2024
fd72336
feat: 본인 프로필에 커피챗 오픈 버튼 추가
simeunseo Dec 12, 2024
03d3903
chore: makers-ui 버전 업
simeunseo Dec 13, 2024
34265b9
feat: 개선된 Select에 맞추어 레이아웃 변경
simeunseo Dec 13, 2024
7f18120
feat: 멤버 정렬 Select를 mds로 교체
simeunseo Dec 13, 2024
77c5763
feat: ProfileSection mds 반영
simeunseo Dec 13, 2024
1a3bec6
feat: 활동 팀 mds Tag로 변경
simeunseo Dec 13, 2024
e2d23af
feat: soptActivitySection 모바일 레이아웃 변경
simeunseo Dec 13, 2024
64c2341
feat: 본인 프로필이면서 활동 내역에 등록된 프로젝트가 없을 경우 프로젝트 등록 페이지로 이동하는 버튼 추가
simeunseo Dec 13, 2024
ed217c7
refactor: activity 필드 내부 값에 대한 가드
simeunseo Dec 16, 2024
926a5cb
feat: 멤버 순서 정렬 Select mds 수정사항 반영하여 교체
simeunseo Dec 19, 2024
56f4eab
fix: 프로필 기본정보 gap 수정
simeunseo Dec 19, 2024
c5c76d5
feat: Merge branch 'main' into feat/#1699
simeunseo Dec 19, 2024
b9dd49a
feat: BottomSheetSelect 수정
simeunseo Dec 19, 2024
58376b2
feat: 멤버탭 모바일 Select를 BottomSheetSelect로 교체
simeunseo Dec 19, 2024
59c9b00
feat: BottomSheetSelect에서 icon prop과 스타일 커스텀 추가
simeunseo Dec 19, 2024
f904e75
feat: 멤버 탭에서 모바일 정렬 Select를 BottomSheetSelect로 교체
simeunseo Dec 19, 2024
8e534e7
fix: coffeechatform의 career 항목에 대해 string[] 타입 비허용
simeunseo Dec 19, 2024
9383798
Merge branch 'main' into feat/#1699
simeunseo Dec 24, 2024
509cb88
feat: 쪽지 보내기에 커피챗 뱃지 추가
simeunseo Dec 28, 2024
291e5a0
fix: 멤버 상세 activity section에서 프로젝트가 없을 경우 내용을 세로 가운데 정렬
simeunseo Dec 28, 2024
268b036
fix: 멤버 상세 activity section 내 간격 조정
simeunseo Dec 28, 2024
9592e6b
fix: 멤버 상세 career section 커리어-스킬 사이 마진 수정
simeunseo Dec 28, 2024
37d79c0
fix: 멤버 상세 페이지 하단 마진값 수정
simeunseo Dec 28, 2024
891f352
fix: 멤버 상세 연락처 정보 마진 수정
simeunseo Dec 28, 2024
fda6a98
feat: BottomSheetSelect width 정의 방식 변경
simeunseo Jan 4, 2025
fb27ba1
feat: mds ui 버전업
simeunseo Jan 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: 멤버 상세 activity section 내 간격 조정
simeunseo committed Dec 28, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 268b036496d8766a0d9617e9a3a9e89c27dbd8eb
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ export const MemberDetailSection = styled.section`
width: 100%;
@media ${MOBILE_MEDIA_QUERY} {
gap: 20px;
gap: 25px;
border-radius: 18px;
padding: 30px 20px;
}
53 changes: 27 additions & 26 deletions src/components/members/detail/PartItem.tsx
Original file line number Diff line number Diff line change
@@ -40,39 +40,40 @@ const PartItem: FC<PartItemProps> = ({ generation, part, teams, activities, isMi
</Tag>
))}
</BelongArea>
<Badges>
{activities.map((activity, idx) => (
<Link key={idx} href={activity.href}>
<ActivityBadge category={activity.type} name={activity.name} />
</Link>
))}
{isMine && activities.length === 0 && (
<Link href={playgroundLink.projectUpload()}>
<AddProject typography='SUIT_13_M'>
<StyledIconPlus />
프로젝트 추가하기
</AddProject>
</Link>
)}
</Badges>
{hasActivities && (
<Badges>
{activities.map((activity, idx) => (
<Link key={idx} href={activity.href}>
<ActivityBadge category={activity.type} name={activity.name} />
</Link>
))}
{isMine && activities.length === 0 && (
<Link href={playgroundLink.projectUpload()}>
<AddProject typography='SUIT_13_M'>
<StyledIconPlus />
프로젝트 추가하기
</AddProject>
</Link>
)}
</Badges>
)}
</Container>
);
};

const Container = styled.div<{ hasActivities: boolean }>`
display: grid;
grid-template: ${({ hasActivities }) =>
hasActivities
? `[row1-start] 'thumbnail generation belongs' 1fr [row1-end]
[row2-start] 'thumbnail activities activities' 1fr [row2-end] / auto auto 1fr`
: `[row1-start] 'thumbnail generation belongs' 1fr [row1-end] / auto auto 1fr`};
grid-template-areas:
'thumbnail generation belongs'
${({ hasActivities }) => hasActivities && "'thumbnail activities activities'"};
grid-template-columns: auto auto 1fr;
align-items: center;
@media ${MOBILE_MEDIA_QUERY} {
grid:
[row1-start] 'thumbnail generation belongs' 1fr [row1-end]
[row2-start] 'activities activities activities' 1fr [row2-end]
/ auto auto 1fr;
grid-template-areas:
'thumbnail generation belongs'
${({ hasActivities }) => hasActivities && "'activities activities activities'"};
grid-template-columns: auto auto 1fr;
}
`;

@@ -130,10 +131,10 @@ const Badges = styled.div`
grid-area: activities;
gap: 8px;
align-self: start;
margin-top: 12px;
margin-top: 16px;
@media ${MOBILE_MEDIA_QUERY} {
margin-top: 12px;
margin-top: 10px;
}
`;