diff --git a/components/board/calendar/calendar.table.jsx b/components/board/calendar/calendar.table.jsx index c773228..0207f0f 100644 --- a/components/board/calendar/calendar.table.jsx +++ b/components/board/calendar/calendar.table.jsx @@ -7,29 +7,22 @@ const CalendarTable = ({ calendars }) => { - 제목 - 기간 - D-Day + 제목 + 날짜 + D-Day {calendars.map((calendar) => { - const isActive = moment().isBetween( - moment(calendar.start_date), - moment(calendar.end_date), - ); - const duration = moment(calendar.end_date).diff( - moment(calendar.start_date), - 'days', - ); - const dDay = moment(calendar.start_date).diff(moment(), 'days'); + const isDisabled = moment().isAfter(moment(calendar.event_date)); + const dDay = moment(calendar.event_date).diff(moment(), 'days'); return ( - + {calendar.link ? ( { )} - {moment(calendar.start_date).format('YYYY-MM-DD')} ~{' '} - {moment(calendar.end_date).format('YYYY-MM-DD')} ({duration} - 일) + {calendar.event_date} {dDay ? `D-${dDay}` : 'D-Day'} diff --git a/pages/board/calendar/create.jsx b/pages/board/calendar/create.jsx index bf5d018..f3c7fee 100644 --- a/pages/board/calendar/create.jsx +++ b/pages/board/calendar/create.jsx @@ -13,27 +13,15 @@ const CalendarCreatePage = () => { const [title, setTitle] = useState(''); const [start_date, setStartDate] = useState(); - const [end_date, setEndDate] = useState(); - const duration = moment(end_date).diff(moment(start_date), 'days'); + const dDay = moment(event_date).diff(moment(), 'days'); const handleSubmit = async () => { const body = { title: title, start_date: start_date, - end_date: end_date, }; - if (!start_date || !end_date) { - alert('시작 일자와 종료 일자를 입력해주세요.'); - return; - } - - if (start_date > end_date) { - alert('시작 일자가 종료 일자보다 늦을 수 없습니다.'); - return; - } - PoPoAxios.post('/calendar', body, { withCredentials: true }) .then(() => { alert('학사일정이 등록 되었습니다!'); @@ -68,23 +56,9 @@ const CalendarCreatePage = () => { dateFormat="yyyy-MM-dd" /> -
- - setEndDate(moment(date).format('YYYY-MM-DD'))} - onKeyDown={(e) => e.preventDefault()} - dateFormat="yyyy-MM-dd" - minDate={moment(start_date).toDate()} - /> -
- {!start_date || !end_date - ? '행사 시작 날짜와 종료 날짜를 입력해주세요.' - : start_date > end_date - ? '시작 날짜가 종료 날짜보다 늦을 수 없습니다.' - : `행사 기간: ${start_date} ~ ${end_date} (${duration}일)`} + {!event_date ? '게시 시작 날짜와 종료 날짜를 입력해주세요.' : `D-${dDay}`} 생성 diff --git a/pages/board/calendar/update/[id].jsx b/pages/board/calendar/update/[id].jsx index dd3c475..b98abb4 100644 --- a/pages/board/calendar/update/[id].jsx +++ b/pages/board/calendar/update/[id].jsx @@ -16,23 +16,16 @@ const CalendarUpdatePage = ({ calendarInfo }) => { const id = calendarInfo.id; const [title, setTitle] = useState(calendarInfo.title); - const [start_date, setStartDate] = useState(calendarInfo.start_date); - const [end_date, setEndDate] = useState(calendarInfo.end_date); + const [event_date, setEventDate] = useState(calendarInfo.event_date); - const duration = moment(end_date).diff(moment(start_date), 'days'); + const dDay = moment(event_date).diff(moment(), 'days'); const handleSubmit = async () => { const body = { title: title, - start_date: start_date, - end_date: end_date, + event_date: event_date, }; - if (start_date > end_date) { - alert('시작 일자가 종료 일자보다 늦을 수 없습니다.'); - return; - } - PoPoAxios.put(`/calendar/${id}`, body, { withCredentials: true }) .then(() => { alert('학사일정이 업데이트 되었습니다!'); @@ -60,31 +53,17 @@ const CalendarUpdatePage = ({ calendarInfo }) => {
- setStartDate(moment(date).format('YYYY-MM-DD')) + setEventDate(moment(date).format('YYYY-MM-DD')) } onKeyDown={(e) => e.preventDefault()} dateFormat="yyyy-MM-dd" />
-
- - setEndDate(moment(date).format('YYYY-MM-DD'))} - onKeyDown={(e) => e.preventDefault()} - dateFormat="yyyy-MM-dd" - minDate={moment(start_date).toDate()} - /> -
- {!start_date || !end_date - ? '게시 시작 날짜와 종료 날짜를 입력해주세요.' - : start_date > end_date - ? '시작 날짜가 종료 날짜보다 늦을 수 없습니다.' - : `게시 기간: ${start_date} ~ ${end_date} (${duration}일)`} + {!event_date ? '게시 시작 날짜와 종료 날짜를 입력해주세요.' : `D-${dDay}`}