Skip to content

[#145] DEADLINE_STATUS 추가 적용 & 디테일 페이지 openStatus고정 값 이슈 발생 #147

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.

Sign up for GitHub

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

Open
jaehyeongjung wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[#145] DEADLINE_STATUS 추가 적용 & 디테일 페이지 openStatus고정 값 이슈 발생 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d83d7c4
fix: Transction쪽 문제 미해결
jaehyeongjung Jun 23, 2025
6df727f
Merge branch 'main' into refactor/#145/deadLine-enum-andLike
jaehyeongjung Jun 23, 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
6 changes: 3 additions & 3 deletions src/components/detailPage/DetailPageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface DetailPageCardProps {
| 'CONFIRMED_STATUS'
| 'PENDING_STATUS'
| 'CANCELED_STATUS'
| 'PROGRESSING_STATUS';
| 'DEADLINE_STATUS';
createUser: string;
createUserProfileImgUrl: string;
title: string;
Expand Down Expand Up @@ -70,7 +70,7 @@ export default function DetailPageCard({

const deadlineText = getDeadlineText(deadLine);

//TODO 밑에 'CONFIRMED_STATUS' -> 교체해야함 Deadline_status로.

return (
<div>
<div className="flex flex-col sm:flex-row sm:px-3 sm:gap-10 gap-6 sm:h-95 sm:items-end">
Expand All @@ -81,7 +81,7 @@ export default function DetailPageCard({
fill
style={{ objectFit: 'cover' }}
/>
{openStatus === 'CONFIRMED_STATUS' ? (
{openStatus === 'DEADLINE_STATUS' ? (
<div className="absolute bg-black/50 w-full h-full flex flex-col justify-center items-center gap-6">
<HandIcon className="w-8 h-8 text-gray-600 fill-white" />
<div className="flex justify-center items-center text-gray-100 text-sm text-center">
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/CardList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface CardListProps {
| 'CONFIRMED_STATUS'
| 'PENDING_STATUS'
| 'CANCELED_STATUS'
| 'PROGRESSING_STATUS';
| 'DEADLINE_STATUS';
wishList?: boolean;
image: string;
createUser: string;
Expand Down Expand Up @@ -82,7 +82,7 @@ export default function CardList({
<div className="w-full flex flex-col sm:flex-row sm:py-3 sm:pl-3 sm:pr-6 sm:gap-6 gap-0 sm:min-h-67.5 min-h-97 hover:bg-gray-900 active:opacity-50 hover:cursor-pointer">
<div className="w-full sm:w-1/4 relative h-50 sm:h-auto">
<Image src={image} alt="image" fill objectFit="cover" />
{openStatus === 'CONFIRMED_STATUS' && (
{openStatus === 'DEADLINE_STATUS' && (
<div className="absolute bg-black/80 w-full h-full flex flex-col justify-center items-center gap-6">
<HandIcon width={32} height={32} />
<div className="flex justify-center items-center text-gray-100 text-sm text-center">
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/ContainerInformation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface ContainerInformationProps {
| 'CONFIRMED_STATUS'
| 'PENDING_STATUS'
| 'CANCELED_STATUS'
| 'PROGRESSING_STATUS';
| 'DEADLINE_STATUS';
refetch?: () => void;
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/ui/ContainerProgress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interface ContainerProgressProps {
| 'CONFIRMED_STATUS'
| 'PENDING_STATUS'
| 'CANCELED_STATUS'
| 'PROGRESSING_STATUS'; // 마감상태로 부탁드림.. 오후 6시에 작업해주신다하셔서 들어오며수정
| 'DEADLINE_STATUS';
deadLine?: string;
}

Expand All @@ -28,7 +28,7 @@ export default function ContainerProgress({
openStatus: {
PENDING_STATUS: 'bg-gray-300',
CONFIRMED_STATUS: 'bg-green-400',
PROGRESSING_STATUS: 'bg-green-800', // TODO Deadline으로 교체
DEADLINE_STATUS: 'bg-green-800',
CANCELED_STATUS: '',
},
},
Expand All @@ -54,7 +54,7 @@ export default function ContainerProgress({
)}
</div>

{openStatus === 'PROGRESSING_STATUS' ? (
{openStatus === 'DEADLINE_STATUS' ? (
<ProgressChip openStatus={openStatus}>
모집마감
</ProgressChip>
Expand Down
6 changes: 3 additions & 3 deletions src/components/ui/ProgressChip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface ProgressChipProps {
| 'CONFIRMED_STATUS'
| 'PENDING_STATUS'
| 'CANCELED_STATUS'
| 'PROGRESSING_STATUS'; // 마감상태로 부탁드림.. 오후 6시에 작업해주신다하셔서 들어오며수정
| 'DEADLINE_STATUS';
children: React.ReactNode;
}

Expand All @@ -20,8 +20,8 @@ export default function ProgressChip({
variants: {
openStatus: {
PENDING_STATUS: 'text-[#fb923c]',
DEADLINE_STATUS: 'text-green-400',
CONFIRMED_STATUS: 'text-green-400',
PROGRESSING_STATUS: 'text-green-400',
CANCELED_STATUS: 'hidden',
},
},
Expand All @@ -35,7 +35,7 @@ export default function ProgressChip({
openStatus: {
PENDING_STATUS: 'hidden',
CONFIRMED_STATUS: 'text-black fill-green-500',
PROGRESSING_STATUS: 'fill-gray-900',
DEADLINE_STATUS: 'fill-gray-900',
CANCELED_STATUS: 'hidden',
},
},
Expand Down
8 changes: 4 additions & 4 deletions src/types/card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ export type Card = {
currentPerson: number;
maxPerson: number;
openStatus:
| 'CONFIRMED_STATUS' // 최소인원 초과 상태
| 'PENDING_STATUS' // 대기
| 'CANCELED_STATUS' // 취소
| 'PROGRESSING_STATUS'; // 최소인원 초과 + 데드라인 -> 요고 6시에 넣어주신다고..
| 'CONFIRMED_STATUS'
| 'PENDING_STATUS'
| 'CANCELED_STATUS'
| 'DEADLINE_STATUS';
wish: boolean;
image: string;
useStatus: 'UPCOMING_STATUS' | 'COMPLETED_STATUS';
Expand Down