diff --git a/client/src/apis/subject.api.js b/client/src/apis/subject.api.js index 28817d5cba24a5dbcd200928541d79fb809a7276..afbeab6babb985d33ee3a77c0e9bde4f0cd0ef41 100644 --- a/client/src/apis/subject.api.js +++ b/client/src/apis/subject.api.js @@ -1,5 +1,5 @@ import axios from "axios"; -import baseUrl from "../utils/baseUrl.js"; +import baseUrl from "../utils/baseUrl"; const addsubject = async (info, userId) => { const url = `${baseUrl}/api/subject/addsubject`; diff --git a/client/src/components/Buttons/AddBtn.js b/client/src/components/Buttons/AddBtn.js index b8a56f575b7c9e98320497484aacac8ddb98260c..5ba8bddffc471889ec7b4cd18cff35f15d9f8e7d 100644 --- a/client/src/components/Buttons/AddBtn.js +++ b/client/src/components/Buttons/AddBtn.js @@ -1,4 +1,4 @@ -import TodoModal from "../Modal/TodoModal.js"; +import TodoModal from "../Modal/TodoModal"; import styles from "./buttons.module.scss"; const AddBtn = () => { diff --git a/client/src/components/Calendar/AdminMonthly.js b/client/src/components/Calendar/AdminMonthly.js index f3ce08f6ec99b6329452065504073e9c86d4bfb3..b61a7b9c16e83fecd03960ef41fc2e13132df767 100644 --- a/client/src/components/Calendar/AdminMonthly.js +++ b/client/src/components/Calendar/AdminMonthly.js @@ -1,9 +1,9 @@ import { useState, useEffect, useRef } from "react"; -import CalendarBtn from "../Buttons/CalendarBtn.js"; -import DatePickerModal from "../Modal/DatePickerModal.js"; -import ScheduleModal from "../Modal/ScheduleModal.js"; +import CalendarBtn from "../Buttons/CalendarBtn"; +import DatePickerModal from "../Modal/DatePickerModal"; +import ScheduleModal from "../Modal/ScheduleModal"; import scheduleApi from "../../apis/schedule.api"; -import catchErrors from "../../utils/catchErrors.js"; +import catchErrors from "../../utils/catchErrors"; import moment from 'moment'; import FullCalendar from '@fullcalendar/react'; import dayGridPlugin from '@fullcalendar/daygrid'; diff --git a/client/src/components/Calendar/CustomView.js b/client/src/components/Calendar/CustomView.js index b70fd4fd1dc579b01878e34e8937b3739457c8c7..98bebc02121fc4ff3e9227cfe09512e2490ea5ab 100644 --- a/client/src/components/Calendar/CustomView.js +++ b/client/src/components/Calendar/CustomView.js @@ -1,5 +1,5 @@ -import ScheduleCarousel from "../Schedule/ScheduleCarousel.js"; -import ScheduleList from "../Schedule/ScheduleList.js"; +import ScheduleCarousel from "../Schedule/ScheduleCarousel"; +import ScheduleList from "../Schedule/ScheduleList"; import { createPlugin } from '@fullcalendar/react'; const CustomDateView = () => { diff --git a/client/src/components/Calendar/DateView.js b/client/src/components/Calendar/DateView.js index 47fda6a268d9b87553da4d86f0fc5732573f3f38..f5137f3f19e1b7fabb0ffda29a4d4145cf30529b 100644 --- a/client/src/components/Calendar/DateView.js +++ b/client/src/components/Calendar/DateView.js @@ -2,7 +2,7 @@ import { useEffect, useRef } from "react"; import { useHistory, useParams } from "react-router-dom"; import moment from 'moment'; import FullCalendar from '@fullcalendar/react'; -import customViewPlugin from "./CustomView.js"; +import customViewPlugin from "./CustomView"; import bootstrapPlugin from '@fullcalendar/bootstrap'; import '@fortawesome/fontawesome-free/css/all.css'; diff --git a/client/src/components/Calendar/Weekly.js b/client/src/components/Calendar/Weekly.js index 885119436809648d7b8a1c177153c1e351e2e422..89d6fa525077bb43b12613a4fea227ad8f8de29e 100644 --- a/client/src/components/Calendar/Weekly.js +++ b/client/src/components/Calendar/Weekly.js @@ -1,6 +1,6 @@ import { useState, useEffect, useRef } from "react"; import { useHistory, useParams } from "react-router-dom"; -import Date from "./DateSet.js"; +import Date from "./DateSet"; import moment from 'moment'; import FullCalendar, { createPlugin } from '@fullcalendar/react'; import interactionPlugin from "@fullcalendar/interaction"; diff --git a/client/src/components/Footer.js b/client/src/components/Footer.js index e1eed77b57ca64f69c0a9f471bd255922ce26559..0a6e01709f5cff3065d3de4d2466e63af34ace6f 100644 --- a/client/src/components/Footer.js +++ b/client/src/components/Footer.js @@ -1,5 +1,5 @@ -import EditBtn from "./Buttons/EditBtn.js"; -import AddBtn from "./Buttons/AddBtn.js"; +import EditBtn from "./Buttons/EditBtn"; +import AddBtn from "./Buttons/AddBtn"; const Footer = ({ pathname="todo" }) => { return ( diff --git a/client/src/components/Form/LoginForm.js b/client/src/components/Form/LoginForm.js index 0b3deca7cc7457994bf50be2a4849f0864218b0b..dbd26a67bb351d2dee71bd9c1d1c8f9e3ff61c46 100644 --- a/client/src/components/Form/LoginForm.js +++ b/client/src/components/Form/LoginForm.js @@ -1,9 +1,9 @@ import { useState } from 'react'; import { Redirect, Link } from "react-router-dom"; import { Formik } from 'formik'; -import { useAuth } from "../../utils/context.js"; +import { useAuth } from "../../utils/context"; import * as Yup from 'yup'; -import catchErrors from "../../utils/catchErrors.js"; +import catchErrors from "../../utils/catchErrors"; import styles from "./form.module.scss"; const LoginForm = () => { diff --git a/client/src/components/Form/ScheduleForm.js b/client/src/components/Form/ScheduleForm.js index df99edce136fd5f83a79a820888a25abcdffa52f..080ae88c127eb7bb5361339d22ba760108e47080 100644 --- a/client/src/components/Form/ScheduleForm.js +++ b/client/src/components/Form/ScheduleForm.js @@ -1,9 +1,9 @@ import { useState, useEffect } from "react"; import { Redirect, useParams } from "react-router-dom"; -import BtnGroup from "../Buttons/BtnGroup.js"; +import BtnGroup from "../Buttons/BtnGroup"; import scheduleApi from "../../apis/schedule.api"; -import { useAuth } from "../../utils/context.js"; -import catchErrors from "../../utils/catchErrors.js"; +import { useAuth } from "../../utils/context"; +import catchErrors from "../../utils/catchErrors"; import styles from "./form.module.scss"; const ScheduleForm = () => { diff --git a/client/src/components/Form/SignupForm.js b/client/src/components/Form/SignupForm.js index 41f693d7397db369daa50f0364a2bb583a995291..6639be45913455b015a68a147abe1e30caa71e44 100644 --- a/client/src/components/Form/SignupForm.js +++ b/client/src/components/Form/SignupForm.js @@ -3,7 +3,7 @@ import { Redirect } from "react-router-dom"; import { Formik } from 'formik'; import * as Yup from 'yup'; import authApi from '../../apis/auth.api'; -import catchErrors from "../../utils/catchErrors.js"; +import catchErrors from "../../utils/catchErrors"; import styles from "./form.module.scss"; const SignupForm = () => { diff --git a/client/src/components/Form/StudyPlanEditForm.js b/client/src/components/Form/StudyPlanEditForm.js index 8e47d9d20778602471a9f52811e29e78dad29efc..e0fb2932a9d72b317dedcb8986d0244f6f0faa16 100644 --- a/client/src/components/Form/StudyPlanEditForm.js +++ b/client/src/components/Form/StudyPlanEditForm.js @@ -1,11 +1,11 @@ import { useState, useEffect } from 'react'; import { useParams } from 'react-router-dom'; -import { useAuth } from "../../utils/context.js"; +import { useAuth } from "../../utils/context"; import BtnGroup from "../Buttons/BtnGroup"; -import subjectApi from '../../apis/subject.api.js'; -import planApi from '../../apis/plan.api.js'; +import subjectApi from '../../apis/subject.api'; +import planApi from '../../apis/plan.api'; +import catchErrors from '../../utils/catchErrors'; import styles from "./form.module.scss"; -import catchErrors from '../../utils/catchErrors.js'; const StudyPlanEditForm = () => { const { user } = useAuth(); diff --git a/client/src/components/Form/SubjectForm.js b/client/src/components/Form/SubjectForm.js index fc4405e125ab8720fe15980e55372a4d3898d54c..656d02a5d98299eb6f48c57a6e89a9fe5ddb8417 100644 --- a/client/src/components/Form/SubjectForm.js +++ b/client/src/components/Form/SubjectForm.js @@ -1,9 +1,9 @@ import { useState, useEffect } from 'react'; import { Redirect, useParams } from 'react-router-dom'; -import { useAuth } from '../../utils/context.js'; +import { useAuth } from '../../utils/context'; import BtnGroup from "../Buttons/BtnGroup"; import subjectApi from '../../apis/subject.api'; -import catchErrors from '../../utils/catchErrors.js'; +import catchErrors from '../../utils/catchErrors'; import styles from "./form.module.scss"; const SubjectForm = () => { diff --git a/client/src/components/PrivateRoute.js b/client/src/components/PrivateRoute.js index b39474af19d00172ac312b8f3c7ff711ec9e6a5d..b3d717faec917023bc294573fccc146901edcd68 100644 --- a/client/src/components/PrivateRoute.js +++ b/client/src/components/PrivateRoute.js @@ -1,5 +1,5 @@ import { Redirect, Route } from "react-router-dom"; -import { useAuth } from "../utils/context.js" +import { useAuth } from "../utils/context"; import ErrorPage from "../pages/ErrorPage"; const PrivateRoute = ({ component: Component, ...rest }) => { diff --git a/client/src/components/Schedule/ScheduleCarousel.js b/client/src/components/Schedule/ScheduleCarousel.js index 27650a6645e604ed4e52093ac903a0932e704565..94722ae63961cd6738d805fb47f8c3cf525cb584 100644 --- a/client/src/components/Schedule/ScheduleCarousel.js +++ b/client/src/components/Schedule/ScheduleCarousel.js @@ -2,7 +2,7 @@ import { useState, useEffect } from "react"; import { useParams } from "react-router-dom"; import KU from "./KUSchedule.js"; import scheduleApi from "../../apis/schedule.api"; -import catchErrors from "../../utils/catchErrors.js"; +import catchErrors from "../../utils/catchErrors"; const ScheduleCarousel = () => { const [scheduleList, setScheduleList] = useState([]) diff --git a/client/src/components/Schedule/ScheduleList.js b/client/src/components/Schedule/ScheduleList.js index 7657d1ab4d324642934a7eadb29bbf164c6091e6..6e562ce9f40db5cd3afa914f6f3f73c153e7c27f 100644 --- a/client/src/components/Schedule/ScheduleList.js +++ b/client/src/components/Schedule/ScheduleList.js @@ -1,9 +1,9 @@ import { useState, useEffect } from "react"; import { useParams } from "react-router-dom"; -import Item from "./ScheduleItem.js"; +import Item from "./ScheduleItem"; import scheduleApi from "../../apis/schedule.api"; -import { useAuth } from "../../utils/context.js"; -import catchErrors from "../../utils/catchErrors.js"; +import { useAuth } from "../../utils/context"; +import catchErrors from "../../utils/catchErrors"; import styles from "./schedule.module.scss"; const ScheduleList = () => { diff --git a/client/src/components/StudyPlan/AddplanList.js b/client/src/components/StudyPlan/AddplanList.js index 5669e456c21f5b9079f1f7d82e7d65010390ea03..f70d0794a390b9c17cfd5ccdc5a8619072601d7f 100644 --- a/client/src/components/StudyPlan/AddplanList.js +++ b/client/src/components/StudyPlan/AddplanList.js @@ -1,4 +1,4 @@ -import PlanItem from "./PlanItem.js"; +import PlanItem from "./PlanItem"; import styles from "./studyplan.module.scss"; const AddplanList = () => { diff --git a/client/src/components/StudyPlan/PlanItem.js b/client/src/components/StudyPlan/PlanItem.js index 895943060ee908ff6a17cc524b1b8475a3ec787e..bd8f9aa8a086a6e2ceabd904b652268e3c4e36ab 100644 --- a/client/src/components/StudyPlan/PlanItem.js +++ b/client/src/components/StudyPlan/PlanItem.js @@ -1,6 +1,6 @@ import { useState } from "react"; import { Link } from "react-router-dom"; -import catchErrors from "../../utils/catchErrors.js"; +import catchErrors from "../../utils/catchErrors"; import styles from "../Schedule/schedule.module.scss"; import styles2 from "./studyplan.module.scss"; diff --git a/client/src/components/StudyPlanList.js b/client/src/components/StudyPlanList.js index 99828a9caee36ff44463e983fcfacf8efcc3d396..eb6e26082a226d2fc76a512cb09e97a3bc7fab54 100644 --- a/client/src/components/StudyPlanList.js +++ b/client/src/components/StudyPlanList.js @@ -1,8 +1,8 @@ import { useState, useEffect } from 'react'; -import { useAuth } from "../utils/context.js" +import { useAuth } from "../utils/context"; import { Link } from "react-router-dom"; -import StudyPlanCard from "./Card/StudyPlanCard.js"; -import subjectApi from '../apis/subject.api.js'; +import StudyPlanCard from "./Card/StudyPlanCard"; +import subjectApi from '../apis/subject.api'; const StudyPlanList = () => { const { user } = useAuth(); diff --git a/client/src/components/TodoList.js b/client/src/components/TodoList.js index 6d1b9fde5e9b5ac778d810435275f805d0db0d6f..03cac1c5f31ac9a7eba25a7c3284aa9fabc27f97 100644 --- a/client/src/components/TodoList.js +++ b/client/src/components/TodoList.js @@ -1,5 +1,5 @@ -import TodoModal from "../components/Modal/TodoModal.js"; -import TodoPostModal from "../components/Modal/TodoPostModal.js"; +import TodoModal from "../components/Modal/TodoModal"; +import TodoPostModal from "../components/Modal/TodoPostModal"; import styles from "../components/Form/form.module.scss"; const TodoList = () => { diff --git a/client/src/pages/Admin/AdminPage.js b/client/src/pages/Admin/AdminPage.js index 01bc010efffb27f07fb71db558ab69fb4de92cd5..bf5b125b990cfcdd37a3eab33b9eb45a1f0f024c 100644 --- a/client/src/pages/Admin/AdminPage.js +++ b/client/src/pages/Admin/AdminPage.js @@ -1,6 +1,6 @@ -import Monthly from "../../components/Calendar/AdminMonthly.js"; -import Footer from "../../components/Footer.js"; -import { useAuth } from "../../utils/context.js"; +import Monthly from "../../components/Calendar/AdminMonthly"; +import Footer from "../../components/Footer"; +import { useAuth } from "../../utils/context"; import styles from "./admin.module.scss"; const AdminPage = () => { diff --git a/client/src/pages/HomePage.js b/client/src/pages/HomePage.js index 226da8bec5ff5bdbc3c0ca214ed055071e5a6402..45b262289c364692724d95a4913ee6c4f2dc37c7 100644 --- a/client/src/pages/HomePage.js +++ b/client/src/pages/HomePage.js @@ -1,6 +1,6 @@ -import Menu from "../components/Menu/Menu.js"; -import Monthly from "../components/Calendar/Monthly.js"; -import Footer from "../components/Footer.js"; +import Menu from "../components/Menu/Menu"; +import Monthly from "../components/Calendar/Monthly"; +import Footer from "../components/Footer"; const HomePage = () => { return ( diff --git a/client/src/pages/LoginPage.js b/client/src/pages/LoginPage.js index 5fd017cde1dc3f468f2938e845102a4440cbc38b..a84853151d7ee53dd2487064bf520c2385bc0ec5 100644 --- a/client/src/pages/LoginPage.js +++ b/client/src/pages/LoginPage.js @@ -1,10 +1,6 @@ -import { Link } from 'react-router-dom'; import LoginForm from '../components/Form/LoginForm'; -import { useAuth } from "../utils/context"; function LoginPage() { - const { user } = useAuth() - console.log("LoginPage",user) return ( <>
@@ -12,7 +8,6 @@ function LoginPage() {

-일정관리앱

- asda ); } diff --git a/client/src/pages/ScheduleEditPage.js b/client/src/pages/ScheduleEditPage.js index 082048e3fc7a84111b946bb51a1aaa4f905a8996..95346714ffa523f19dbfe7c26d953a594a5060ac 100644 --- a/client/src/pages/ScheduleEditPage.js +++ b/client/src/pages/ScheduleEditPage.js @@ -1,4 +1,4 @@ -import ScheduleForm from "../components/Form/ScheduleForm.js"; +import ScheduleForm from "../components/Form/ScheduleForm"; const ScheduleEditPage = () => { return ( diff --git a/client/src/pages/SchedulePage.js b/client/src/pages/SchedulePage.js index 0d5a35b2205c67138b07ab6dbb1dde2488fb7506..4cd6b78880961c33dbba6ef09067cb50b0b3bc70 100644 --- a/client/src/pages/SchedulePage.js +++ b/client/src/pages/SchedulePage.js @@ -1,7 +1,7 @@ -import Menu from "../components/Menu/Menu.js"; -import HomeBtn from "../components/Buttons/HomeBtn.js"; -import DateView from "../components/Calendar/DateView.js"; -import Footer from "../components/Footer.js"; +import Menu from "../components/Menu/Menu"; +import HomeBtn from "../components/Buttons/HomeBtn"; +import DateView from "../components/Calendar/DateView"; +import Footer from "../components/Footer"; const SchedulePage = () => { return ( diff --git a/client/src/pages/SignupPage.js b/client/src/pages/SignupPage.js index b4ac048b12f587dad585f47f1f4eea19847af6db..040001fe5ea17156db495fa2bb13551793ac1eb0 100644 --- a/client/src/pages/SignupPage.js +++ b/client/src/pages/SignupPage.js @@ -1,10 +1,7 @@ -import BackBtn from "../components/Buttons/BackBtn.js"; +import BackBtn from "../components/Buttons/BackBtn"; import SignupForm from '../components/Form/SignupForm'; -import { useAuth } from "../utils/context"; function SingupPage() { - const { user } = useAuth() - console.log("Signup user",user) return ( <> diff --git a/client/src/pages/StudyPlanEditPage.js b/client/src/pages/StudyPlanEditPage.js index b621e44ac171d2f5cb27afec2a967952cf1be9b0..12d1529f75359827a60da63494746d58997a4150 100644 --- a/client/src/pages/StudyPlanEditPage.js +++ b/client/src/pages/StudyPlanEditPage.js @@ -1,4 +1,4 @@ -import StudyPlanEditForm from "../components/Form/StudyPlanEditForm.js" +import StudyPlanEditForm from "../components/Form/StudyPlanEditForm" const StudyPlanEditPage = () => { return ( diff --git a/client/src/pages/StudyPlanListPage.js b/client/src/pages/StudyPlanListPage.js index 35c9240060a5a33daa699803fbc3b2ef0d7cb862..54ba45e38c440de3e42fe70d7209304497331a57 100644 --- a/client/src/pages/StudyPlanListPage.js +++ b/client/src/pages/StudyPlanListPage.js @@ -1,6 +1,6 @@ -import Menu from "../components/Menu/Menu.js"; -import HomeBtn from "../components/Buttons/HomeBtn.js"; -import StudyPlanList from "../components/StudyPlanList.js"; +import Menu from "../components/Menu/Menu"; +import HomeBtn from "../components/Buttons/HomeBtn"; +import StudyPlanList from "../components/StudyPlanList"; const StudyPlanListPage = () => { return ( diff --git a/client/src/pages/StudyPlanPage.js b/client/src/pages/StudyPlanPage.js index 7bbac031ddbf677c0ed8599e428f9c09990df119..ae5b1c449f080c52850e376fc67fdf447b721ca1 100644 --- a/client/src/pages/StudyPlanPage.js +++ b/client/src/pages/StudyPlanPage.js @@ -1,8 +1,8 @@ import { useParams } from "react-router-dom"; -import Menu from "../components/Menu/Menu.js"; -import BackBtn from "../components/Buttons/BackBtn.js"; -import Footer from "../components/Footer.js"; -import AddplanList from "../components/StudyPlan/AddplanList.js"; +import Menu from "../components/Menu/Menu"; +import BackBtn from "../components/Buttons/BackBtn"; +import Footer from "../components/Footer"; +import AddplanList from "../components/StudyPlan/AddplanList"; const StudyPlanPage = () => { const { subjectId } = useParams(); diff --git a/client/src/pages/SubjectEditPage.js b/client/src/pages/SubjectEditPage.js index a47f740dffb9497c58e4ad3cd701d74f7a7092f1..09d0877737bb9f2dc089180a99563768d274c073 100644 --- a/client/src/pages/SubjectEditPage.js +++ b/client/src/pages/SubjectEditPage.js @@ -1,4 +1,4 @@ -import SubjectForm from "../components/Form/SubjectForm.js" +import SubjectForm from "../components/Form/SubjectForm" const SubjectEditPage = () => { return ( diff --git a/client/src/pages/ToDoPage.js b/client/src/pages/ToDoPage.js index 632dfc719e08c10431614588def85097fd42988e..5acaeeeaa9a8f497daaa8504b2864eb814b479af 100644 --- a/client/src/pages/ToDoPage.js +++ b/client/src/pages/ToDoPage.js @@ -1,8 +1,8 @@ -import Menu from "../components/Menu/Menu.js"; -import HomeBtn from "../components/Buttons/HomeBtn.js"; -import Weekly from "../components/Calendar/Weekly.js"; -import TodoList from "../components/TodoList.js"; -import Footer from "../components/Footer.js"; +import Menu from "../components/Menu/Menu"; +import HomeBtn from "../components/Buttons/HomeBtn"; +import Weekly from "../components/Calendar/Weekly"; +import TodoList from "../components/TodoList"; +import Footer from "../components/Footer"; const ToDoPage = () => { return ( diff --git a/client/src/utils/auth.js b/client/src/utils/auth.js deleted file mode 100644 index cd06faa9ceb1432a40e4da556b12f15645dc9d43..0000000000000000000000000000000000000000 --- a/client/src/utils/auth.js +++ /dev/null @@ -1,9 +0,0 @@ -export function getLoggedIn() { - const loggedData = localStorage.getItem("login"); - let loggedIn = null; - if (loggedData) { - // loggedIn = JSON.parse(loggedData); - loggedIn = loggedData - } - return loggedIn; -} \ No newline at end of file