Merge remote-tracking branch 'origin/kimpen' into hijinju

server/client/src/Components/Schedule.js

-import React, { useState, useRef } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 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";
-
-function Cal() {
-  const [start, setStart] = useState(new Date());
-  const [end, setEnd] = useState(new Date(new Date().setMinutes(start.getMinutes() + 30)));;
-
+  
+function Cal(calledday) {
+  const calendarRef = useRef();
+  const [day, setDay] = useState(calledday + "15:00:00");
   const [myTheme, setMyTheme] = useState({
     'common.dayname.color': '#333',
     'common.today.color': '#333',
-    'common.creationGuide.backgroundColor': 'rgba(81, 92, 230, 0.05)',
+    // 'common.creationGuide.color': 'white',
+    'common.creationGuide.backgroundColor': 'gray',
+    // Theme object to extends default dark theme.
   });
 
-  // Calendar.prototype.openCreationPopup = function (schedule) {
-  //   if (this._openCreationPopup) {
-  //     this._openCreationPopup(schedule);
-  //   }
-  // };
+  useEffect(() => {
+    const cal = calendarRef.current.getInstance();
+    cal.setDate(new Date(day));
+    cal.changeView('week', false);
+    // cal.today(new Date(day));
+
+    // calendar.on('clickSchedule', function (event) {
+    //   const schedule = event.schedule;
+
+    //   if (lastClickSchedule) {
+    //     calendar.updateSchedule(lastClickSchedule.id, lastClickSchedule.calendarId, {
+    //       isFocused: false,
+    //     });
+    //   }
+    //   calendar.updateSchedule(schedule.id, schedule.calendarId, {
+    //     isFocused: true,
+    //   });
+
+    //   lastClickSchedule = schedule;
+    //   // open detail view
+
+    //   return (console.log(isFocused))
+    // });
+
+  }, [day])
 
   return (
     <Calendar
@@ -36,6 +57,11 @@ function Cal() {
       disableDblClick={false}
       disableClick={true}
       isReadOnly={false}
+            // template={
+      //   popupIsAllDay=function {
+      //     return display: "none"
+      //   }
+      // }
       schedules={[
         {
           id: '1',
@@ -72,10 +98,11 @@ function Cal() {
       ]}
       useDetailPopup
       useCreationPopup
+      view={"week"}
       week={{
+        workweek: true,
         hourStart: 8,
-        hourEnd: 23,
-        workweek: true
+        hourEnd: 23
       }}
     />
   )

server/client/src/Pages/HomePage.js

@@ -26,7 +26,9 @@ const Tab = styled.ul`
 function Home() {
     const [show, setShow] = useState(false);
     const [weeks, setWeeks] = useState([]);
-    
+    const [days, setDays] = useState([]);
+    const [sendDate, setSendDate] = useState(null);
+
     useEffect(() => {
         Dateform();
     }, []);
@@ -34,25 +36,38 @@ function Home() {
     function Dateform() {
         let today = moment();
         let weeks = [];
-        let dates = { start: null, end: null };
+        let dates = [];
+        let sendDates = [];
+        
         for (let i = 0; i < 6; i++) {
             if (i !== 0) {
                 today.add(7, 'd');
-            } 
+            }
 
-            dates.start = today.startOf('week').format("MMM Do");
-            dates.end = today.endOf('week').weekday(4).format("MMM Do");
-            const week = dates.start + "  ~  " + dates.end;
+            let date = { start: null, end: null };
+            date.start = today.startOf('week').format("MMM Do");
+            date.end = today.endOf('week').weekday(4).format("MMM Do");
+            dates.push(date);
+            const week = date.start + "  ~  " + date.end;
             weeks.push(week);
+
+            let sendDate = today.startOf('week').format("YYYY-MM-DD");
+            sendDates.push(sendDate);
         };
         setWeeks([...weeks])
+        setDays([...sendDates])
     };
 
+    function choose(e, index) {
+        setShow(true)
+        setSendDate(days[index])
+    }
+
     return (
         <div>
+            {console.log(sendDate)}
             <Menu />
             <div className="container mt-3">
-
                 <h2>대관 현황</h2>
                 <p>
                     <strong>대관 가능 시간</strong>
@@ -61,22 +76,16 @@ function Home() {
                         <li>주말: 이용 불가</li>
                     </ul>
                 </p>
-
                 <Drop className="row dropdown mt-1 mb-2">
-                    <div className="container">
-                        <Drop className="row dropdown mt-5 mb-5">
-                            <button className="btn btn-lg dropdown-toggle mx-auto col-5" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                기간을 선택해주십시오.
+                    <button className="btn btn-lg dropdown-toggle mx-auto col-5" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        기간을 선택해주십시오.
                     </button>
-                            <div className="dropdown-menu col-5" aria-labelledby="dropdownMenuButton">
-                                {weeks.map((week, index) => (
-                                    <a className="dropdown-item" href="#" onClick={() => setShow(true)}>{week}</a>
-                                ))}
-                            </div>
-                        </Drop>
+                    <div className="dropdown-menu col-5" aria-labelledby="dropdownMenuButton">
+                        {weeks.map((week, index) => (
+                            <a className="dropdown-item" id={index} onClick={(e) => choose(e, index)}>{week}</a>
+                        ))}
                     </div>
                 </Drop>
-
                 <Tab className="nav nav-tabs nav-justified mt-4" id="myTab" role="tablist" style={show ? {} : { display: "none" }}>
                     <li className="nav-item">
                         <a className="nav-link active" id="7-tab" data-toggle="tab" href="#tab-7" role="tab" aria-controls="7" aria-selected="true"> 7-223 </a>
@@ -88,12 +97,17 @@ function Home() {
                         <a className="nav-link" id="25-tab" data-toggle="tab" href="#tab-25" role="tab" aria-controls="25" aria-selected="false"> 25-307 </a>
                     </li>
                 </Tab>
-                <div className="tab-content" id="myTabContent" style={show ? {} : { display: "none" }}>
-                    <div className="tab-pane fade show active" id="tab-7" role="tabpanel" aria-labelledby="7-tab"><Schedule/></div>
-                    <div className="tab-pane fade" id="tab-9" role="tabpanel" aria-labelledby="9-tab">안녕 1과기대<Schedule/></div>
-                    <div className="tab-pane fade" id="tab-25" role="tabpanel" aria-labelledby="25-tab">안녕 농심<Schedule/></div>
+                <div className="tab-content row justify-content-center" id="myTabContent" style={show ? {} : { display: "none" }}>
+                    <div className="tab-pane fade show active col-md-11 col-12" id="tab-7" role="tabpanel" aria-labelledby="7-tab">
+                        <Schedule day={sendDate}/>
+                    </div>
+                    <div className="tab-pane fade col-md-11 col-12" id="tab-9" role="tabpanel" aria-labelledby="9-tab">
+                        <Schedule day={sendDate}/>
+                    </div>
+                    <div className="tab-pane fade col-md-11 col-12" id="tab-25" role="tabpanel" aria-labelledby="25-tab">
+                        <Schedule day={sendDate}/>
+                    </div>
                 </div>
-
                 <h3>유의사항</h3>
                 <p>
                     <ul>
@@ -102,7 +116,6 @@ function Home() {
                         <li><strong style={{ color: "red" }}>대관 시간 이외 강의실을 이용하다 적발될 경우 한달 간 강의실 이용이 불가합니다.</strong></li>
                     </ul>
                 </p>
-
                 <div className="bg-white">
                     <h6>고려대학교 대관시스템</h6>
                 </div>

server/package-lock.json

@@ -4,6 +4,7 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+<<<<<<< HEAD
     "@types/babel-types": {
       "version": "7.0.9",
       "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz",
@@ -15,6 +16,26 @@
       "integrity": "sha512-xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==",
       "requires": {
         "@types/babel-types": "*"
+=======
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
+    },
+    "@babel/parser": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
+    },
+    "@babel/types": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+>>>>>>> origin/kimpen
       }
     },
     "abbrev": {
@@ -51,6 +72,7 @@
         }
       }
     },
+<<<<<<< HEAD
     "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
@@ -66,6 +88,8 @@
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
+=======
+>>>>>>> origin/kimpen
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -115,11 +139,14 @@
         "to-fast-properties": "^1.0.3"
       }
     },
+<<<<<<< HEAD
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
     },
+=======
+>>>>>>> origin/kimpen
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -241,6 +268,7 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
     },
+<<<<<<< HEAD
     "clean-css": {
       "version": "3.4.28",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
@@ -260,11 +288,14 @@
         "wordwrap": "0.0.2"
       }
     },
+=======
+>>>>>>> origin/kimpen
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
+<<<<<<< HEAD
     "commander": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
@@ -273,6 +304,8 @@
         "graceful-readlink": ">= 1.0.0"
       }
     },
+=======
+>>>>>>> origin/kimpen
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -323,11 +356,14 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
+<<<<<<< HEAD
     "core-js": {
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
       "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
     },
+=======
+>>>>>>> origin/kimpen
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -348,11 +384,14 @@
         }
       }
     },
+<<<<<<< HEAD
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+=======
+>>>>>>> origin/kimpen
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -540,11 +579,14 @@
         "path-is-absolute": "^1.0.0"
       }
     },
+<<<<<<< HEAD
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
     },
+=======
+>>>>>>> origin/kimpen
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
@@ -715,6 +757,7 @@
       "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz",
       "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw=="
     },
+<<<<<<< HEAD
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -728,6 +771,8 @@
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
     },
+=======
+>>>>>>> origin/kimpen
     "lodash": {
       "version": "4.17.20",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
@@ -1299,21 +1344,27 @@
         }
       }
     },
+<<<<<<< HEAD
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
+=======
+>>>>>>> origin/kimpen
     "regexp-clone": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
       "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
     },
+<<<<<<< HEAD
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
+=======
+>>>>>>> origin/kimpen
     "require_optional": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
@@ -1336,6 +1387,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
       "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
     },
+<<<<<<< HEAD
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -1344,6 +1396,8 @@
         "align-text": "^0.1.1"
       }
     },
+=======
+>>>>>>> origin/kimpen
     "rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -1444,6 +1498,7 @@
       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
     },
+<<<<<<< HEAD
     "source-map": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
@@ -1452,6 +1507,8 @@
         "amdefine": ">=0.0.4"
       }
     },
+=======
+>>>>>>> origin/kimpen
     "sparse-bitfield": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
@@ -1593,11 +1650,14 @@
         "string-width": "^1.0.2 || 2"
       }
     },
+<<<<<<< HEAD
     "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
     },
+=======
+>>>>>>> origin/kimpen
     "with": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
@@ -1607,11 +1667,14 @@
         "acorn-globals": "^3.0.0"
       }
     },
+<<<<<<< HEAD
     "wordwrap": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
       "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
     },
+=======
+>>>>>>> origin/kimpen
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1621,6 +1684,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+<<<<<<< HEAD
     },
     "yargs": {
       "version": "3.10.0",
@@ -1632,6 +1696,8 @@
         "decamelize": "^1.0.0",
         "window-size": "0.1.0"
       }
+=======
+>>>>>>> origin/kimpen
     }
   }
 }