-
Notifications
You must be signed in to change notification settings - Fork 0
[FEAT] 마이페이지 매칭 현황 화면 구현 #64
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a791bc4
feat: 매칭 현황 프로필 카드 컴포넌트 구현
kyeongb-bin f0092bd
feat: 매칭 현황 타이머 카드 컴포넌트 구현
kyeongb-bin 6320b95
feat: 매칭 현황 유의사항 컴포넌트 구현
kyeongb-bin b143de2
feat: 매칭 현황 프로젝트 카드 컴포넌트 구현
kyeongb-bin d1109a2
feat: 매칭 현황 페이지 구현
kyeongb-bin b6ea9ec
feat: 매칭 현황 모달 구현 및 CTAModal 공용화
kyeongb-bin 873ef51
feat: CTAModal 단일 버튼 모드 추가
kyeongb-bin c58f281
refactor: 탭 버튼 컴포넌트 통합 및 재사용성 개선
kyeongb-bin 2e17992
fix: MatchingStatus에서 RoleTagChip props 타입 에러 수정
kyeongb-bin 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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 was deleted.
Oops, something went wrong.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import { cn } from '@/utils/cn' | ||
|
|
||
| interface SegmentTabButtonProps { | ||
| /** 탭 텍스트 */ | ||
| label: string | ||
| /** 카운트 (Count 타입일 때 표시) */ | ||
| count?: number | ||
| /** 활성화 여부 */ | ||
| isActive: boolean | ||
| /** 클릭 핸들러 */ | ||
| onClick?: () => void | ||
| /** 추가 클래스명 */ | ||
| className?: string | ||
| } | ||
|
|
||
| const SegmentTabButton = ({ label, count, isActive, onClick, className }: SegmentTabButtonProps) => { | ||
| return ( | ||
| <button | ||
| type='button' | ||
| onClick={onClick} | ||
| className={cn('flex flex-col gap-3 w-30 pt-2.5', className)} | ||
| > | ||
| <div | ||
| className={cn( | ||
| 'title-3 font-semibold text-center flex items-center justify-center gap-1.5', | ||
| isActive ? 'text-primary-500-normal' : 'text-neutral-400' | ||
| )} | ||
| > | ||
| <span>{label}</span> | ||
| {count !== undefined && <span>{count}</span>} | ||
| </div> | ||
| <div | ||
| className={cn( | ||
| 'h-0.75 w-full', | ||
| isActive ? 'bg-primary-400-normal' : 'bg-neutral-300' | ||
| )} | ||
| /> | ||
| </button> | ||
| ) | ||
| } | ||
|
|
||
| export default SegmentTabButton |
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import { cn } from '@/utils/cn' | ||
| import type { NoticeItem } from '@/constants/matchingNotice' | ||
|
|
||
| interface MatchingNoticeProps { | ||
| /** 유의사항 항목 목록 */ | ||
| items: NoticeItem[] | ||
| /** 추가 클래스명 */ | ||
| className?: string | ||
| } | ||
|
|
||
| const MatchingNotice = ({ items, className }: MatchingNoticeProps) => { | ||
| return ( | ||
| <div | ||
| className={cn( | ||
| 'bg-neutral-50 flex flex-col gap-4 items-start px-[22px] py-5 relative rounded-12 w-[784px]', | ||
| className | ||
| )} | ||
| > | ||
| {items.map((item, index) => ( | ||
| <div | ||
| key={index} | ||
| className={cn( | ||
| 'flex flex-col items-start relative shrink-0 w-full', | ||
| item.subText && 'gap-3' | ||
| )} | ||
| > | ||
| {/* 규칙 메인 텍스트 */} | ||
| <p className="title-3 font-semibold text-primary-600-normal h-6 justify-center leading-[1.4] w-full"> | ||
| <span className="text-neutral-900">{item.number}. </span> | ||
| {/* 텍스트 내부의 "/" 처리 */} | ||
| {item.text.split(/(\/)/).map((part, partIndex) => { | ||
| if (part === '/') { | ||
| return <span key={partIndex} className="body-1 font-medium">{part}</span> | ||
| } | ||
| return <span key={partIndex}>{part}</span> | ||
| })} | ||
| </p> | ||
|
|
||
| {/* 규칙 하위 설명 텍스트 */} | ||
| {item.subText && ( | ||
| <div className="flex flex-col body-1 font-medium text-neutral-700 tracking-[-0.08px] w-full whitespace-pre-wrap"> | ||
| {item.subText.split('\n').map((line, lineIndex) => ( | ||
| <p key={lineIndex} className={lineIndex === 0 ? 'mb-0 leading-[1.5]' : 'leading-[1.5]'}> | ||
| {line.split(/(\*\*.*?\*\*)/).map((segment, segIndex) => { | ||
| if (segment.startsWith('**') && segment.endsWith('**')) { | ||
| return ( | ||
| <span key={segIndex} className="font-bold"> | ||
| {segment.slice(2, -2)} | ||
| </span> | ||
| ) | ||
| } | ||
| return <span key={segIndex}>{segment}</span> | ||
| })} | ||
| </p> | ||
| ))} | ||
| </div> | ||
| )} | ||
| </div> | ||
| ))} | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export default MatchingNotice |
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.
이 컴포넌트 내에서 조건부 클래스명을 문자열 템플릿으로 처리하고 있습니다. 프로젝트의 다른 컴포넌트들과 일관성을 맞추고 가독성을 높이기 위해
cn유틸리티를 사용하는 것이 좋습니다.먼저
import { cn } from '@/utils/cn'를 추가한 후, 다음과 같이 수정할 수 있습니다.