merge master-bootstrap into master #14

Merged
victor.ebuka merged 1 commits from master-bootstrap into master 2025-01-20 05:17:17 +00:00
2 changed files with 41 additions and 17 deletions
+33 -11
View File
@@ -11,13 +11,34 @@ export default function Calendar(){
// setDraggedEvent(event) // setDraggedEvent(event)
// } // }
const dummyEvents = [ const events = [
{id: '1111', title: 'Family Vacation', color: 'fc-event-primary', start: new Date('2025-01-18')}, {id: '1111', title: 'Family Vacation', color: 'fc-event-primary', start: new Date('2025-01-18')},
{id: '2222', title: 'Meeting In Office', color: 'fc-event-warning', start: new Date('2025-01-19')}, {id: '2222', title: 'Meeting In Office', color: 'fc-event-warning', start: new Date('2025-01-19')},
{id: '3333', title: 'Client Call', color: 'fc-event-danger', start: new Date('2025-01-22')}, {id: '3333', title: 'Client Call', color: 'fc-event-danger', start: new Date('2025-01-22')},
{id: '4444', title: 'Interview', color: 'fc-event-success', start: new Date('2025-01-1')} {id: '4444', title: 'Interview', color: 'fc-event-success', start: new Date('2025-01-1')}
] ]
const [dummyEvents, setDummyEvents] = useState(events)
const [removeAfterDrop, setRemoveAfterDrop] = useState(false)
const [newEvent, setNewEvent] = useState({
title: '', color: ''
})
const handleEditEvent = ({target:{name,value}}) => {
setNewEvent(prev => ({...prev, [name]:value}))
}
const handleAddNewEvent = () => {
if(newEvent.title && newEvent.color){
const eventToAdd = {...newEvent}
setDummyEvents(prev => ([...prev, eventToAdd]))
setNewEvent({title: '', color: ''})
}
}
return( return(
<> <>
<BreadcrumbComBS title='Calendar' paths={['Dashboard', 'Calendar']} /> <BreadcrumbComBS title='Calendar' paths={['Dashboard', 'Calendar']} />
@@ -51,8 +72,8 @@ export default function Calendar(){
))} */} ))} */}
<ExternalDraggable dummyEvents={dummyEvents} /> <ExternalDraggable dummyEvents={dummyEvents} />
<div className="form-check"> <div className="form-check">
<input className="form-check-input" type="checkbox" value="" <input className="form-check-input" type="checkbox" value={removeAfterDrop}
id="defaultCheck1" /> id="defaultCheck1" onChange={() => setRemoveAfterDrop(prev => !prev)} />
<label className="form-check-label" htmlFor="defaultCheck1"> <label className="form-check-label" htmlFor="defaultCheck1">
Remove After Drop Remove After Drop
</label> </label>
@@ -62,7 +83,7 @@ export default function Calendar(){
<div className="col-xl-9"> <div className="col-xl-9">
<div className="event-calendar"> <div className="event-calendar">
{/* <EventCalendar draggedEvent={draggedEvent} setDraggedEvent={setDraggedEvent} /> */} {/* <EventCalendar draggedEvent={draggedEvent} setDraggedEvent={setDraggedEvent} /> */}
<EventCalendar /> <EventCalendar removeAfterDrop={removeAfterDrop} setDummyEvents={setDummyEvents} />
</div> </div>
</div> </div>
</div> </div>
@@ -86,15 +107,16 @@ export default function Calendar(){
<form> <form>
<div className="form-group"> <div className="form-group">
<label>Event Name</label> <label>Event Name</label>
<input type="email" className="form-control" id="eventname" /> <input type="email" className="form-control" id="eventname" name='title' value={newEvent.title} onChange={handleEditEvent} />
</div> </div>
<div className="form-group"> <div className="form-group">
<label>Choose Event Color</label> <label>Choose Event Color</label>
<select className="form-control"> <select className="form-control" name='color' value={newEvent.color} onChange={handleEditEvent}>
<option>Primary</option> <option value={''}>Select</option>
<option>Warning</option> <option value={'fc-event-primary'}>Primary</option>
<option>Success</option> <option value={'fc-event-warning'}>Warning</option>
<option>Danger</option> <option value={'fc-event-success'}>Success</option>
<option value={'fc-event-danger'}>Danger</option>
</select> </select>
</div> </div>
@@ -102,7 +124,7 @@ export default function Calendar(){
</div> </div>
<div className="modal-footer"> <div className="modal-footer">
<button type="button" className="btn btn-danger" data-bs-dismiss="modal">Close</button> <button type="button" className="btn btn-danger" data-bs-dismiss="modal">Close</button>
<button type="button" className="btn btn-success">Save changes</button> <button type="button" className="btn btn-success" onClick={handleAddNewEvent}>Save changes</button>
</div> </div>
</div> </div>
</div> </div>
+8 -6
View File
@@ -6,7 +6,7 @@ import timeGridPlugin from '@fullcalendar/timegrid';
import interactionPlugin from '@fullcalendar/interaction'; import interactionPlugin from '@fullcalendar/interaction';
import { INITIAL_EVENTS, createEventId } from './event-utils'; import { INITIAL_EVENTS, createEventId } from './event-utils';
export default function EventCalendar({draggedEvent, setDraggedEvent}) { export default function EventCalendar({draggedEvent, setDraggedEvent, removeAfterDrop, setDummyEvents}) {
const [weekendsVisible, setWeekendsVisible] = useState(true); const [weekendsVisible, setWeekendsVisible] = useState(true);
const [currentEvents, setCurrentEvents] = useState(INITIAL_EVENTS); const [currentEvents, setCurrentEvents] = useState(INITIAL_EVENTS);
@@ -51,14 +51,16 @@ export default function EventCalendar({draggedEvent, setDraggedEvent}) {
...event ...event
} }
setCurrentEvents(prev => ([...prev, newEvent])) setCurrentEvents(prev => ([...prev, newEvent]))
if(removeAfterDrop){
setDummyEvents(prev => prev.filter(item => item.title != newEvent.title))
}
} }
} }
const removeEvent = (event) => { const removeEvent = (event) => {
// let eventToRemove = event?.event?._def?.title let eventToRemove = event?.event?._def?.publicId
// let remainingEvent = currentEvents.filter(item => item.title != eventToRemove) let remainingEvent = currentEvents.filter(item => item.id != eventToRemove)
// setCurrentEvents(remainingEvent) setCurrentEvents(remainingEvent)
console.log('Event', event, currentEvents)
} }
@@ -94,7 +96,7 @@ export default function EventCalendar({draggedEvent, setDraggedEvent}) {
weekends={weekendsVisible} weekends={weekendsVisible}
// initialEvents={INITIAL_EVENTS} // alternatively, use the `events` setting to fetch from a feed // initialEvents={INITIAL_EVENTS} // alternatively, use the `events` setting to fetch from a feed
events={currentEvents} events={currentEvents}
// select={handleDateSelect} select={handleDateSelect}
eventContent={renderEventContent} // custom render function eventContent={renderEventContent} // custom render function
eventClick={handleEventClick} eventClick={handleEventClick}
eventsSet={handleEvents} // called after events are initialized/added/changed/removed eventsSet={handleEvents} // called after events are initialized/added/changed/removed