-
Notifications
You must be signed in to change notification settings - Fork 3
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
Open
simeunseo
wants to merge
26
commits into
main
Choose a base branch
from
feat/#1699
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: 멤버 탭 변경사항 및 mds 반영 #1705
Changes from 9 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
090a37e
feat: 참여한 프로젝트, 모임이 없는 경우 해당 항목 전부 비노출
simeunseo fd72336
feat: 본인 프로필에 커피챗 오픈 버튼 추가
simeunseo 03d3903
chore: makers-ui 버전 업
simeunseo 34265b9
feat: 개선된 Select에 맞추어 레이아웃 변경
simeunseo 7f18120
feat: 멤버 정렬 Select를 mds로 교체
simeunseo 77c5763
feat: ProfileSection mds 반영
simeunseo 1a3bec6
feat: 활동 팀 mds Tag로 변경
simeunseo e2d23af
feat: soptActivitySection 모바일 레이아웃 변경
simeunseo 64c2341
feat: 본인 프로필이면서 활동 내역에 등록된 프로젝트가 없을 경우 프로젝트 등록 페이지로 이동하는 버튼 추가
simeunseo ed217c7
refactor: activity 필드 내부 값에 대한 가드
simeunseo 926a5cb
feat: 멤버 순서 정렬 Select mds 수정사항 반영하여 교체
simeunseo 56f4eab
fix: 프로필 기본정보 gap 수정
simeunseo c5c76d5
feat: Merge branch 'main' into feat/#1699
simeunseo b9dd49a
feat: BottomSheetSelect 수정
simeunseo 58376b2
feat: 멤버탭 모바일 Select를 BottomSheetSelect로 교체
simeunseo 59c9b00
feat: BottomSheetSelect에서 icon prop과 스타일 커스텀 추가
simeunseo f904e75
feat: 멤버 탭에서 모바일 정렬 Select를 BottomSheetSelect로 교체
simeunseo 8e534e7
fix: coffeechatform의 career 항목에 대해 string[] 타입 비허용
simeunseo 9383798
Merge branch 'main' into feat/#1699
simeunseo 509cb88
feat: 쪽지 보내기에 커피챗 뱃지 추가
simeunseo 291e5a0
fix: 멤버 상세 activity section에서 프로젝트가 없을 경우 내용을 세로 가운데 정렬
simeunseo 268b036
fix: 멤버 상세 activity section 내 간격 조정
simeunseo 9592e6b
fix: 멤버 상세 career section 커리어-스킬 사이 마진 수정
simeunseo 37d79c0
fix: 멤버 상세 페이지 하단 마진값 수정
simeunseo 891f352
fix: 멤버 상세 연락처 정보 마진 수정
simeunseo fda6a98
feat: BottomSheetSelect width 정의 방식 변경
simeunseo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
import styled from '@emotion/styled'; | ||
import { colors } from '@sopt-makers/colors'; | ||
import { fonts } from '@sopt-makers/fonts'; | ||
import axios from 'axios'; | ||
import Link from 'next/link'; | ||
|
||
|
@@ -13,7 +14,6 @@ import { playgroundLink } from '@/constants/links'; | |
import useEnterScreen from '@/hooks/useEnterScreen'; | ||
import { MOBILE_MEDIA_QUERY } from '@/styles/mediaQuery'; | ||
import { safeParseInt } from '@/utils'; | ||
import { fonts } from '@sopt-makers/fonts'; | ||
|
||
interface GroupSectionProps { | ||
profile: ProfileDetail; | ||
|
@@ -40,9 +40,9 @@ const GroupSection = ({ profile, meId, memberId }: GroupSectionProps) => { | |
} | ||
|
||
return ( | ||
<Container> | ||
<> | ||
{meetingList.length > 0 ? ( | ||
<> | ||
<Container> | ||
<ActivityTitle> | ||
{profile.name}님이 참여한 {meetingList.length}개의 모임이에요! | ||
</ActivityTitle> | ||
|
@@ -56,11 +56,11 @@ const GroupSection = ({ profile, meId, memberId }: GroupSectionProps) => { | |
))} | ||
</ActivityDisplay> | ||
<Target ref={ref} /> | ||
</> | ||
</Container> | ||
) : ( | ||
<> | ||
{String(meId) === memberId ? ( | ||
<> | ||
{String(meId) === memberId && ( | ||
<Container> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 요부분 훨씬 직관성 있게 바뀐 것 같아요!! 배워갑니다! |
||
<ActivityTitle>아직 참여한 모임이 없어요</ActivityTitle> | ||
<ActivityUploadNudge> | ||
<NudgeSubText typography='SUIT_16_M' style={{ textAlign: 'center', lineHeight: '24px' }}> | ||
|
@@ -72,13 +72,11 @@ const GroupSection = ({ profile, meId, memberId }: GroupSectionProps) => { | |
</ActivityUploadButton> | ||
<ActivityUploadMaskImg src='/icons/img/meeting-mask.png' alt='meeting-mask-image' height={134} /> | ||
</ActivityUploadNudge> | ||
</> | ||
) : ( | ||
<ActivityTitle>아직 {profile.name}님이 참여한 모임이 없어요</ActivityTitle> | ||
</Container> | ||
)} | ||
</> | ||
)} | ||
</Container> | ||
</> | ||
); | ||
}; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
요기 없애준 이유가 뭘까요?!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<DetailInfoSection/>
컴포넌트는 멤버 프로필과 커피챗에서 재사용되는 컴포넌트인데요! 기존에 이 섹션 내에서 유저의 생일 정보를 노출하고 있었는데, 이번에 생일 정보를 다른 위치로 옮기는 변경사항이 생겼어요.그런데
<DetailInfoSection/>
컴포넌트에서 isCoffeeChat이라는 flag를 통해 생일 정보를 조건부 렌더링하고 있었고, 위의 변경사항에 따라 더이상 이 분기가 필요하지 않아서 isCoffeeChat이라는 prop이 필요가 없어졌습니다!기존의
<DetailInfoSection/>
내 조건부 렌더링-> 더이상 이 컴포넌트에서 생일을 노출하지 않으므로 해당 코드 아예 삭제