diff --git a/src/components/detailPage/DetailPageCard.tsx b/src/components/detailPage/DetailPageCard.tsx index e0419c3..d6cfa18 100644 --- a/src/components/detailPage/DetailPageCard.tsx +++ b/src/components/detailPage/DetailPageCard.tsx @@ -11,7 +11,7 @@ interface DetailPageCardProps { | 'CONFIRMED_STATUS' | 'PENDING_STATUS' | 'CANCELED_STATUS' - | 'PROGRESSING_STATUS'; + | 'DEADLINE_STATUS'; createUser: string; createUserProfileImgUrl: string; title: string; @@ -70,7 +70,7 @@ export default function DetailPageCard({ const deadlineText = getDeadlineText(deadLine); - //TODO 밑에 'CONFIRMED_STATUS' -> 교체해야함 Deadline_status로. + return (
@@ -81,7 +81,7 @@ export default function DetailPageCard({ fill style={{ objectFit: 'cover' }} /> - {openStatus === 'CONFIRMED_STATUS' ? ( + {openStatus === 'DEADLINE_STATUS' ? (
diff --git a/src/components/ui/CardList.tsx b/src/components/ui/CardList.tsx index d5b53ae..1b56418 100644 --- a/src/components/ui/CardList.tsx +++ b/src/components/ui/CardList.tsx @@ -19,7 +19,7 @@ interface CardListProps { | 'CONFIRMED_STATUS' | 'PENDING_STATUS' | 'CANCELED_STATUS' - | 'PROGRESSING_STATUS'; + | 'DEADLINE_STATUS'; wishList?: boolean; image: string; createUser: string; @@ -82,7 +82,7 @@ export default function CardList({
image - {openStatus === 'CONFIRMED_STATUS' && ( + {openStatus === 'DEADLINE_STATUS' && (
diff --git a/src/components/ui/ContainerInformation.tsx b/src/components/ui/ContainerInformation.tsx index 96fa52c..70c2d67 100644 --- a/src/components/ui/ContainerInformation.tsx +++ b/src/components/ui/ContainerInformation.tsx @@ -21,7 +21,7 @@ interface ContainerInformationProps { | 'CONFIRMED_STATUS' | 'PENDING_STATUS' | 'CANCELED_STATUS' - | 'PROGRESSING_STATUS'; + | 'DEADLINE_STATUS'; refetch?: () => void; } diff --git a/src/components/ui/ContainerProgress.tsx b/src/components/ui/ContainerProgress.tsx index 3e8b5fd..ef4a210 100644 --- a/src/components/ui/ContainerProgress.tsx +++ b/src/components/ui/ContainerProgress.tsx @@ -12,7 +12,7 @@ interface ContainerProgressProps { | 'CONFIRMED_STATUS' | 'PENDING_STATUS' | 'CANCELED_STATUS' - | 'PROGRESSING_STATUS'; // 마감상태로 부탁드림.. 오후 6시에 작업해주신다하셔서 들어오며수정 + | 'DEADLINE_STATUS'; deadLine?: string; } @@ -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: '', }, }, @@ -54,7 +54,7 @@ export default function ContainerProgress({ )}
- {openStatus === 'PROGRESSING_STATUS' ? ( + {openStatus === 'DEADLINE_STATUS' ? ( 모집마감 diff --git a/src/components/ui/ProgressChip.tsx b/src/components/ui/ProgressChip.tsx index cd1bf01..e2f32e1 100644 --- a/src/components/ui/ProgressChip.tsx +++ b/src/components/ui/ProgressChip.tsx @@ -6,7 +6,7 @@ interface ProgressChipProps { | 'CONFIRMED_STATUS' | 'PENDING_STATUS' | 'CANCELED_STATUS' - | 'PROGRESSING_STATUS'; // 마감상태로 부탁드림.. 오후 6시에 작업해주신다하셔서 들어오며수정 + | 'DEADLINE_STATUS'; children: React.ReactNode; } @@ -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', }, }, @@ -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', }, }, diff --git a/src/types/card.ts b/src/types/card.ts index 1dafca6..498e78e 100644 --- a/src/types/card.ts +++ b/src/types/card.ts @@ -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';