Commit 0c76aa6b authored by Kim, Subin's avatar Kim, Subin
Browse files

Merge remote-tracking branch 'origin/kimpen'

parents c97d4382 0e1e3a90
import moment from 'moment';
import FullCalendar from '@fullcalendar/react'; import FullCalendar from '@fullcalendar/react';
import dayGridPlugin from '@fullcalendar/daygrid'; import dayGridPlugin from '@fullcalendar/daygrid';
import interactionPlugin from "@fullcalendar/interaction";
import bootstrapPlugin from '@fullcalendar/bootstrap';
import '@fortawesome/fontawesome-free/css/all.css';
const Weekly = () => { const Weekly = () => {
return ( return (
<FullCalendar <FullCalendar
plugins={[dayGridPlugin]} plugins={[dayGridPlugin, interactionPlugin, bootstrapPlugin]}
initialView="dayGridWeek" initialView="dayGridWeek"
defaultView="dayGridWeek"
headerToolbar={{ headerToolbar={{
start: 'prev', start: 'title',
center: 'title', center: '',
end: 'next' end: ''
}}
titleFormat={(date) => {
// if (date.date.)
console.log("date==",date)
return date.date.year + "" + (date.date.month + 1) + "";
}} }}
/> />
) )
......
import Menu from "../components/Menu/Menu.js"; import Menu from "../components/Menu/Menu.js";
import HomeBtn from "../components/Buttons/HomeBtn.js"; import HomeBtn from "../components/Buttons/HomeBtn.js";
import Weekly from "../components/Calendar/Weekly.js";
import TodoModal from "../components/Modal/TodoModal.js";
import TodoPostModal from "../components/Modal/TodoPostModal.js";
import Footer from "../components/Footer.js"; import Footer from "../components/Footer.js";
import TodoList from "../components/TodoList.js"; import TodoList from "../components/TodoList.js";
...@@ -9,10 +12,19 @@ const ToDoPage = () => { ...@@ -9,10 +12,19 @@ const ToDoPage = () => {
<Menu /> <Menu />
<HomeBtn /> <HomeBtn />
<h1 className="text-center">To-do</h1> <h1 className="text-center">To-do</h1>
<div> <Weekly />
캘린더 자리 <div className="d-flex justify-content-between mt-3">
<div className="d-flex align-items-center">
<input className={`form-check-input rounded-0 shadow-none mt-0 ${styles.checkBox}`} type="checkbox" />
<label className={`form-check-label fs-5 ms-3 ${styles.title}`}>과제03 제출하기sadsa</label>
</div>
<div style={{ cursor: "pointer" }}>
<i class="bi bi-arrow-right pe-2 fs-5" data-bs-toggle="modal" data-bs-target="#postmodal"><TodoPostModal /></i>
<i className="bi bi-pencil-square pe-2 fs-5" data-bs-toggle="modal" data-bs-target="#staticBackdrop"></i>
<TodoModal />
<i className="bi bi-trash fs-5"></i>
</div>
</div> </div>
<TodoList />
<Footer /> <Footer />
</> </>
) )
......
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