Skip to content

chore: active 이벤트 상태 추가 #276

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

Merged
saseungmin merged 1 commit into from
Dec 27, 2024
Merged

chore: active 이벤트 상태 추가 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions apps/web/src/components/organisms/EventStatus/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ function EventStatus({ eventStatus }: Props) {
);
}

return (
<Badge label={eventStatus.label || `DND는 ${CURRENT_FLAG}기 진행중`} variant="success" />
);
if (status === 'ACTIVE') {
return (
<Badge label={eventStatus.label || `DND는 ${CURRENT_FLAG}기 진행중`} variant="success" />
);
}
}

export default EventStatus;
2 changes: 1 addition & 1 deletion apps/web/src/lib/assets/data/event_status.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"status": "ONGOING",
"status": "ACTIVE",
"applicationStartDateTime": "2024/11/18 00:00:00",
"applicationEndDateTime": "2024/12/15 23:59:59",
"applicantAcceptanceDateTime": "2024/12/26 23:59:59"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/@types/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type EventStatusType = 'UPCOMING' | 'ONGOING' | 'INACTIVE' | 'HOT';
export type EventStatusType = 'UPCOMING' | 'ONGOING' | 'ACTIVE' | 'INACTIVE' | 'HOT';

export interface EventStatus {
status: EventStatusType;
Expand Down