Commit 54796f7c authored by Kim, Subin's avatar Kim, Subin
Browse files

Monthly 완성

parent fe46675e
...@@ -134,8 +134,10 @@ const AdminMonthly = () => { ...@@ -134,8 +134,10 @@ const AdminMonthly = () => {
timeZone="local" timeZone="local"
events={scheduleList} events={scheduleList}
eventLimit={3} eventLimit={3}
moreLinkContent={function(arg) { moreLinkContent={arg => arg.shortText}
return arg.shortText moreLinkClick={info => {
setDateShow({ ...dateShow, date: moment(info.date).format('YYYY-MM-DD'), show: true })
return <button type="button" className="btn btn-primary" data-bs-toggle="modal" data-bs-target="#scheduleModal"></button>
}} }}
themeSystem='bootstrap' themeSystem='bootstrap'
height='78vh' height='78vh'
......
...@@ -126,12 +126,9 @@ const Monthly = () => { ...@@ -126,12 +126,9 @@ const Monthly = () => {
timeZone="local" timeZone="local"
themeSystem='bootstrap' themeSystem='bootstrap'
eventLimit={3} eventLimit={3}
moreLinkClick={function(arg) { eventOrder= 'displayOrder'
console.log("click..?",arg) moreLinkContent={arg => arg.shortText}
}} moreLinkClick={info => history.push(`/schedule/${moment(info.date).format('YYYY-MM-DD')}`)}
moreLinkContent={function(arg) {
return arg.shortText
}}
height='80vh' height='80vh'
/> />
<DatePickerModal initialDate={initialDate} changeDate={changeDate} setChangeDate={setChangeDate} show={show} setShow={setShow} /> <DatePickerModal initialDate={initialDate} changeDate={changeDate} setChangeDate={setChangeDate} show={show} setShow={setShow} />
......
...@@ -20,7 +20,7 @@ const ScheduleItem = ({ index, curDate, schedule, handleClick }) => { ...@@ -20,7 +20,7 @@ const ScheduleItem = ({ index, curDate, schedule, handleClick }) => {
<div className="col-11">{schedule.location}</div> <div className="col-11">{schedule.location}</div>
</div> : null} </div> : null}
{schedule.memo} {schedule.memo}
<div className="d-flex justify-content-end mt-3"> <div className={"d-flex justify-content-end " + ((schedule.location || schedule.memo) ? "mt-3" : null)}>
<Link className="btn btn-light btn-sm border-dark" to={`/schedule/edit/${schedule.id}`}>수정</Link> <Link className="btn btn-light btn-sm border-dark" to={`/schedule/edit/${schedule.id}`}>수정</Link>
<button type="button" className="btn btn-crimson btn-sm ms-2" onClick={() => handleClick(schedule.id)}>삭제</button> <button type="button" className="btn btn-crimson btn-sm ms-2" onClick={() => handleClick(schedule.id)}>삭제</button>
</div> </div>
......
...@@ -149,10 +149,6 @@ button { ...@@ -149,10 +149,6 @@ button {
display: none; display: none;
} }
& .fc-dayGridDay-view {
display: none;
}
& .text { & .text {
font-family: "Plex-Text"; font-family: "Plex-Text";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment