Commit 58e8f781 authored by Kim, Subin's avatar Kim, Subin
Browse files

찐 수정 완료

parent 28ab3286
...@@ -13,7 +13,7 @@ const StudyPlanEditForm = () => { ...@@ -13,7 +13,7 @@ const StudyPlanEditForm = () => {
useEffect(() => { useEffect(() => {
let isMounted = true; let isMounted = true;
const checkInfo = { studyplanTitle: studyplan.studyplanTitle, endDate: studyplan.endDate} const checkInfo = { studyplanTitle: studyplan.studyplanTitle, endDate: studyplan.endDate }
if (studyplan.deadline !== "on") { if (studyplan.deadline !== "on") {
checkInfo.endTime = studyplan.endTime checkInfo.endTime = studyplan.endTime
} else { } else {
...@@ -38,39 +38,37 @@ const StudyPlanEditForm = () => { ...@@ -38,39 +38,37 @@ const StudyPlanEditForm = () => {
} }
return ( return (
<> <div className="pt-5">
<div className="pt-5"> <select className="form-select mb-4" aria-label="Default select example">
<select className="form-select mb-4" aria-label="Default select example"> <option selected>관련 과목을 선택해주세요.</option>
<option selected>관련 과목을 선택해주세요.</option> <option value="1">운영체제</option>
<option value="1">운영체제</option> <option value="2">네트워크 프로그래밍 실습</option>
<option value="2">네트워크 프로그래밍 실습</option> <option value="3">수학적 모델링</option>
<option value="3">수학적 모델링</option> </select>
</select> <input type="text" name="studyplanTitle"
<input type="text" name="studyplanTitle" className={`form-control shadow-none rounded-0 mb-5 ${styles.textInput}`}
className="form-control border-top-0 border-end-0 border-start-0 shadow-none rounded-0 mb-5" placeholder="제목" onChange={handleChange} />
placeholder="제목" onChange={handleChange} /> <div className="d-flex mb-3">
<div className="d-flex mb-3"> <label className="col col-form-label align-self-center py-0">마감일</label>
<label className="col col-form-label align-self-center py-0">마감일</label> <div className={studyplan.deadline === "on" ? "col-7" : "col-5"}>
<div className={studyplan.deadline === "on" ? "col-7" : "col-5"}> <input className={`form-control shadow-none ${styles.dateInput}`} type="date" name="endDate" aria-label="endDate" onChange={handleChange} />
<input className={`form-control shadow-none ${styles.dateInput}`} type="date" name="endDate" aria-label="endDate" onChange={handleChange} />
</div>
<div className={"col-4 " + (studyplan.deadline === "on" ? "d-none" : "d-block")}>
<input className={`form-control shadow-none ${styles.dateInput}`} type="time" name="endTime" aria-label="endTime" onChange={handleChange} />
</div>
</div> </div>
<div className="d-flex justify-content-end form-check mb-4"> <div className={"col-4 " + (studyplan.deadline === "on" ? "d-none" : "d-block")}>
<input className={`form-check-input shadow-none ${styles.checkBox} me-2`} type="checkbox" id="deadline" name="deadline" onChange={handleChange} /> <input className={`form-control shadow-none ${styles.dateInput}`} type="time" name="endTime" aria-label="endTime" onChange={handleChange} />
<label className="form-check-label" htmlFor="deadline">시간 </label>
</div> </div>
<div className="d-flex justify-content-between mb-5"> </div>
<i className="col bi bi-journal-text fs-3"></i> <div className="d-flex justify-content-end form-check mb-4">
<div className="col-10"> <input className={`form-check-input shadow-none ${styles.checkBox} me-2`} type="checkbox" id="deadline" name="deadline" onChange={handleChange} />
<textarea className={`form-control shadow-none ${styles.textArea}`} name="memo" rows="5" onChange={handleChange}></textarea> <label className="form-check-label" htmlFor="deadline">시간 </label>
</div> </div>
<div className="d-flex justify-content-between mb-5">
<i className="col bi bi-journal-text fs-3"></i>
<div className="col-10">
<textarea className={`form-control shadow-none ${styles.textArea}`} name="memo" rows="5" onChange={handleChange}></textarea>
</div> </div>
<BtnGroup disabled={disabled} />
</div> </div>
</> <BtnGroup disabled={disabled} />
</div>
) )
} }
......
...@@ -34,7 +34,7 @@ const TodoModal = () => { ...@@ -34,7 +34,7 @@ const TodoModal = () => {
placeholder="제목" onChange={handleChange} value={todo.todoTitle} /> placeholder="제목" onChange={handleChange} value={todo.todoTitle} />
<div className="d-flex justify-content-between mt-4"> <div className="d-flex justify-content-between mt-4">
<label className="col-2 col-form-label ms-2">날짜</label> <label className="col-2 col-form-label ms-2">날짜</label>
<div className="col-6 d-flex align-items-center"> <div className="col-8 d-flex align-items-center">
<input type="date" className="form-control form-control-sm" name="todoDate" onChange={handleChange} value={todo.todoDate} /> <input type="date" className="form-control form-control-sm" name="todoDate" onChange={handleChange} value={todo.todoDate} />
</div> </div>
</div> </div>
......
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 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 TodoList from "../components/TodoList.js"; import TodoList from "../components/TodoList.js";
import Footer from "../components/Footer.js";
const ToDoPage = () => { const ToDoPage = () => {
return ( return (
...@@ -13,18 +11,7 @@ const ToDoPage = () => { ...@@ -13,18 +11,7 @@ const ToDoPage = () => {
<HomeBtn /> <HomeBtn />
<h1 className="text-center">To-do</h1> <h1 className="text-center">To-do</h1>
<Weekly /> <Weekly />
<div className="d-flex justify-content-between mt-3"> <TodoList />
<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>
<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