하아

server/client/src/Components/Schedule.js

@@ -3,14 +3,9 @@ import Calendar from '@toast-ui/react-calendar';
 import "tui-calendar/dist/tui-calendar.css";
 import "tui-date-picker/dist/tui-date-picker.css";
 import "tui-time-picker/dist/tui-time-picker.css";
-<<<<<<< HEAD
-
-function Cal(calledday) {
-=======
 import axios from 'axios';
 
 function Cal(props) {
->>>>>>> origin/cherry
   const calendarRef = useRef();
   const [reserve, setReserve] = useState([]);
   // const [day, setDay] = useState(props.calledday);
@@ -23,39 +18,6 @@ function Cal(props) {
     // Theme object to extends default dark theme.
   });
 
-<<<<<<< HEAD
-  function getDataAction(target) {
-    return target.dataset ? target.dataset.action : target.getAttribute('data-action');
-  }
-
-  function onClickNavi(e) {
-    const cal = calendarRef.current.getInstance();
-    const action = getDataAction(e.target);
-  
-    switch (action) {
-      case 'move-prev':
-        cal.prev();
-        break;
-      case 'move-next':
-        cal.next();
-        break;
-      case 'move-today':
-        cal.today();
-        break;
-      default:
-        return;
-    }
-  
-    // setRenderRangeText();
-    // setSchedules();
-  }
-
-  function useday(day) {
-    const cal = calendarRef.current.getInstance();
-    cal.setDate(new Date(day));
-    cal.changeView('week', true);
-    cal.today(new Date(day));
-=======
   const yj = [
     {
       id: 'a',
@@ -107,7 +69,6 @@ function Cal(props) {
       .catch(err => {
         alert(err.error)
       });
->>>>>>> origin/cherry
   }
 
   useEffect(() => {
@@ -147,78 +108,6 @@ function Cal(props) {
   }, [day])
 
   return (
-<<<<<<< HEAD
-    <div className="container mt-3">
-    <div class="tui-datepicker-input tui-datetime-input tui-has-focus">
-    <input type="text" id="datepicker-input" aria-label="Date-Time"></input>
-    <span class="tui-ico-date"></span>
-</div>
-<div id="wrapper" style="margin-top: -1px;"></div>
-
-    <Calendar
-      ref={calendarRef}
-      height="100%"
-      calendars={[
-        {
-          id: 'Subject',
-          bgColor: '#a9a9a9',
-          borderColor: '#a9a9a9',
-          isReadOnly: 'true'
-        }
-      ]}
-      
-      view="week"
-      disableDblClick={false}
-      disableClick={true}
-      isReadOnly={false}
-            // template={
-      //   popupIsAllDay=function {
-      //     return display: "none"
-      //   }
-      // }
-      schedules={[
-        {
-          id: '1',
-          calendarId: 'Subject',
-          category: 'time',
-          start: '2020-10-05T11:00:00',
-          end: '2020-10-05T12:00:00',
-        },
-        {
-          id: '2',
-          calendarId: 'Subject',
-          category: 'time',
-          start: '2020-10-09T10:00:00',
-          end: '2020-10-09T11:00:00',
-        },
-        {
-          id: '3',
-          calendarId: 'Subject',
-          category: 'time',
-          start: '2020-10-08T11:00:00',
-          end: '2020-10-08T15:00:00',
-        }
-      ]}
-      scheduleView={['time']}
-      taskView={false}
-      theme={myTheme}
-      timezones={[
-        {
-          timezoneOffset: 540,
-          displayLabel: 'GMT+09:00',
-          tooltip: 'Seoul'
-        },
-      ]}
-      useDetailPopup
-      useCreationPopup
-      view={"week"}
-      week={{
-        workweek: true,
-        hourStart: 8,
-        hourEnd: 23
-      }}
-    />
-=======
     <div>{
       console.log("reserve", reserve)}
       <Calendar
@@ -290,7 +179,6 @@ function Cal(props) {
           hourEnd: 23
         }}
       />
->>>>>>> origin/cherry
     </div>
   )
 }

server/schemas/index.js

@@ -5,11 +5,7 @@ module.exports = () => {
         if (process.env.NODE_ENV !== 'production') {
             mongoose.set('debug', true);
         }
-<<<<<<< HEAD
         mongoose.connect('mongodb://hijinju:highlight@localhost:27017/admin', {
-=======
-        mongoose.connect('mongodb://cherry:1q2w3e4r@localhost:27017/admin', {
->>>>>>> origin/cherry
             dbName: 'ku_rental', useNewUrlParser: true, useUnifiedTopology: true,
         }, (error) => {
             if (error) {