Skip to content

GitLab

Commit fd2237cd authored by Ha YeaJin's avatar Ha YeaJin
Browse files

Merge remote-tracking branch 'origin/cherry' into hyj

parents a22a38ea 915eaee4
Show whitespace changes
Inline Side-by-side
server/client/package-lock.json
View file @ fd2237cd
...@@ -1431,9 +1431,9 @@ ...@@ -1431,9 +1431,9 @@
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
}, },
"@popperjs/core": { "@popperjs/core": {
"version": "2.5.3", "version": "2.5.4",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.3.tgz", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.4.tgz",
"integrity": "sha512-RFwCobxsvZ6j7twS7dHIZQZituMIDJJNHS/qY6iuthVebxS3zhRY+jaC2roEKiAYaVuTcGmX6Luc6YBcf6zJVg==" "integrity": "sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ=="
}, },
"@restart/context": { "@restart/context": {
"version": "2.1.4", "version": "2.1.4",
...@@ -8764,9 +8764,9 @@ ...@@ -8764,9 +8764,9 @@
} }
}, },
"moment": { "moment": {
"version": "2.29.0", "version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
"integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==" "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
}, },
"move-concurrently": { "move-concurrently": {
"version": "1.0.1", "version": "1.0.1",
......
server/client/package.json
View file @ fd2237cd
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"bootstrap": "^4.5.3", "bootstrap": "^4.5.3",
"formik": "^2.1.5", "formik": "^2.1.5",
"jquery": "^3.5.1", "jquery": "^3.5.1",
"moment": "^2.29.0", "moment": "^2.29.1",
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"react": "^16.13.1", "react": "^16.13.1",
"react-bootstrap": "^1.4.0", "react-bootstrap": "^1.4.0",
......
server/client/src/Components/Schedule.js
View file @ fd2237cd
...@@ -3,46 +3,93 @@ import Calendar from '@toast-ui/react-calendar'; ...@@ -3,46 +3,93 @@ import Calendar from '@toast-ui/react-calendar';
import "tui-calendar/dist/tui-calendar.css"; import "tui-calendar/dist/tui-calendar.css";
import "tui-date-picker/dist/tui-date-picker.css"; import "tui-date-picker/dist/tui-date-picker.css";
import "tui-time-picker/dist/tui-time-picker.css"; import "tui-time-picker/dist/tui-time-picker.css";
import moment from 'moment';
import axios from 'axios';
function Cal(calledday) { function Cal(props) {
const calendarRef = useRef(); const calendarRef = useRef(null);
const [day, setDay] = useState(calledday); const [reserve, setReserve] = useState([]);
const [period, setPeriod] = useState();
const [myTheme, setMyTheme] = useState({ const [myTheme, setMyTheme] = useState({
'common.dayname.color': '#333', 'common.dayname.color': '#333',
'common.today.color': '#333', 'common.today.color': '#333',
// 'common.creationGuide.color': 'white',
'common.creationGuide.backgroundColor': 'gray', 'common.creationGuide.backgroundColor': 'gray',
// Theme object to extends default dark theme.
}); });
useEffect(() => { function getReserve(room) {
// const cal = calendarRef.current.getInstance(); axios.get(`/reserves/room/${room}`, {
// cal.setDate(new Date(day)); headers: { authorization: localStorage.getItem('token') },
// cal.changeView('week', false); })
// cal.today(new Date(day)); .then(res => {
const reserves = res.data.map(item => ({
id: item._id,
start: item.start,
end: item.end,
calendarId: 'Subject',
category: 'time',
}))
setReserve(reserves);
})
.catch(err => {
alert(err.error)
});
}
// calendar.on('clickSchedule', function (event) { function getDataAction(target) {
// const schedule = event.schedule; return target.dataset ? target.dataset.action : target.getAttribute('data-action');
}
// if (lastClickSchedule) { function onClickNavi(e) {
// calendar.updateSchedule(lastClickSchedule.id, lastClickSchedule.calendarId, { const cal = calendarRef.current.getInstance();
// isFocused: false, const action = getDataAction(e.target);
// });
// }
// calendar.updateSchedule(schedule.id, schedule.calendarId, {
// isFocused: true,
// });
// lastClickSchedule = schedule; switch (action) {
// // open detail view case 'move-prev':
cal.prev();
break;
case 'move-next':
cal.next();
break;
case 'move-today':
cal.today();
break;
default:
return;
}
// return (console.log(isFocused)) setRenderRangeText();
// }); }
function setRenderRangeText() {
const cal = calendarRef.current.getInstance();
let html = [];
html.push(moment(cal.getDateRangeStart().getTime()).format('YYYY.MM.DD'));
html.push(' ~ ');
html.push(moment(cal.getDateRangeEnd().getTime()).format(' MM.DD'));
setPeriod(html.join(''))
}
}, [day]) useEffect(() => {
setRenderRangeText();
getReserve(props.room);
}, [props.room])
return ( return (
<div>
<div id="menu">
<span id="menu-navi" onClick={(e) => onClickNavi(e)}>
<button type="button" className="btn btn-default btn-sm move-today" data-action="move-today">Today</button>
<button type="button" className="btn btn-default btn-sm move-day" data-action="move-prev">
<i class="calendar-icon ic-arrow-line-left" data-action="move-prev"></i>
</button>
<button type="button" className="btn btn-default btn-sm move-day" data-action="move-next">
<i className="calendar-icon ic-arrow-line-right" data-action="move-next"></i>
</button>
</span>
<span id="renderRange" className="render-range" style={{ height: "5em" }}>{period}</span>
</div>
<Calendar <Calendar
ref={calendarRef}
height="100%" height="100%"
calendars={[ calendars={[
{ {
...@@ -52,39 +99,11 @@ function Cal(calledday) { ...@@ -52,39 +99,11 @@ function Cal(calledday) {
isReadOnly: 'true' isReadOnly: 'true'
} }
]} ]}
view="week" view="week"
disableDblClick={false} disableDblClick={false}
disableClick={true} disableClick={true}
isReadOnly={false} isReadOnly={true}
// template={ schedules={reserve}
// 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']} scheduleView={['time']}
taskView={false} taskView={false}
theme={myTheme} theme={myTheme}
...@@ -104,6 +123,7 @@ function Cal(calledday) { ...@@ -104,6 +123,7 @@ function Cal(calledday) {
hourEnd: 23 hourEnd: 23
}} }}
/> />
</div>
) )
} }
......
server/client/src/Pages/ACheckPage.js
View file @ fd2237cd
...@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'; ...@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import axios from 'axios'; import axios from 'axios';
import { Link, Redirect } from 'react-router-dom'; import { Link, Redirect } from 'react-router-dom';
import 'bootstrap/dist/css/bootstrap.css';
function ACheck(props) { function ACheck(props) {
const [state, setState] = useState() const [state, setState] = useState()
......
server/client/src/Pages/ApplyPage.js
View file @ fd2237cd
...@@ -166,13 +166,12 @@ function Apply(props) { ...@@ -166,13 +166,12 @@ function Apply(props) {
<div className="form-group mb-4"> <div className="form-group mb-4">
<div className={touched.room && errors.room ? "text-danger" : ""}>강의실</div> <div className={touched.room && errors.room ? "text-danger" : ""}>강의실</div>
<input <Field as="select" name="room">
className={(touched.room && errors.room ? 'form-control is-invalid' : "form-control")} <option value="">강의실을 선택하세요</option>
type="text" <option value="9-116">9-116</option>
name="room" <option value="7-234">7-234</option>
{...getFieldProps('room')} <option value="25-101">25-101</option>
placeholder="bn-nnn" </Field>
/>
</div> </div>
<div className="form-group mb-4"> <div className="form-group mb-4">
...@@ -190,9 +189,8 @@ function Apply(props) { ...@@ -190,9 +189,8 @@ function Apply(props) {
<FieldArray name="students"> <FieldArray name="students">
{({ insert, remove, push }) => ( {({ insert, remove, push }) => (
<div> <div>
<label>이용자</label> <div className={touched.date && errors.date ? "text-danger" : ""}>이용자</div>
{ {values.students.map((student, index) => (
values.students.map((student, index) => (
<Row key={index}> <Row key={index}>
<Field <Field
name={`students.${index}.member`} name={`students.${index}.member`}
...@@ -225,7 +223,6 @@ function Apply(props) { ...@@ -225,7 +223,6 @@ function Apply(props) {
</button> </button>
</form> </form>
)} )}
</Formik> </Formik>
</Col> </Col>
</Row> </Row>
......
server/client/src/Pages/ChangePage.js
View file @ fd2237cd
...@@ -4,7 +4,7 @@ import * as Yup from 'yup'; ...@@ -4,7 +4,7 @@ import * as Yup from 'yup';
import axios from 'axios'; import axios from 'axios';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import { Link, Redirect } from 'react-router-dom'; import { Link, Redirect } from 'react-router-dom';
import { Container, Button, Col } from 'react-bootstrap'; import { Container, Button, Navbar, Col } from 'react-bootstrap';
import styled from 'styled-components'; import styled from 'styled-components';
const Check = styled.div` const Check = styled.div`
...@@ -30,7 +30,13 @@ function Change(props) { ...@@ -30,7 +30,13 @@ function Change(props) {
// console.log(props) // console.log(props)
return ( return (
<div className=""> <div className="">
{(localStorage.getItem("token") !== null) ? (
<Menu /> <Menu />
) : (
<Menu expand="md" variant="dark">
<Navbar.Brand>회원가입</Navbar.Brand>
</Menu>
)}
<Container fluid className="p-0 vh-90"> <Container fluid className="p-0 vh-90">
<Check className="row justify-content-center m-0"> <Check className="row justify-content-center m-0">
<Col md={4} className="pt-5"> <Col md={4} className="pt-5">
......
server/client/src/Pages/CheckPage.js
View file @ fd2237cd
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import axios from 'axios'; import axios from 'axios';
import 'bootstrap/dist/css/bootstrap.css';
function Check(props) { function Check(props) {
const [reserve, setReserve] = useState([]); const [reserve, setReserve] = useState([]);
......
server/client/src/Pages/HomePage.js
View file @ fd2237cd
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect } from 'react';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import Schedule from '../Components/Schedule'; import Schedule from '../Components/Schedule';
import styled from 'styled-components'; import Tabs from 'react-bootstrap/Tabs';
import moment from 'moment'; import Tab from 'react-bootstrap/Tab';
import "moment/locale/ko";
moment.locale("ko", {
week: {
dow: 1
}
});
const Drop = styled.div`
& button {
border solid 1px;
}
`
const Tab = styled.ul`
& a, a:hover, a:active {
color: black;
}
`
function Home() { function Home() {
const [show, setShow] = useState(false); const [key, setKey] = useState('9-116');
const [weeks, setWeeks] = useState([]);
const [days, setDays] = useState([]);
const [sendDate, setSendDate] = useState(null);
useEffect(() => {
Dateform();
}, []);
function Dateform() {
let today = moment();
let weeks = [];
let dates = [];
let sendDates = [];
for (let i = 0; i < 6; i++) {
if (i !== 0) {
today.add(7, 'd');
}
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 ( return (
<div> <div>
...@@ -75,38 +19,17 @@ function Home() { ...@@ -75,38 +19,17 @@ function Home() {
<li>주말: 이용 불가</li> <li>주말: 이용 불가</li>
</ul> </ul>
</p> </p>
<Drop className="row dropdown mt-1 mb-2"> <Tabs defaultActiveKey="9-116" id="uncontrolled-tab-example" onSelect={(k) => setKey(k)}>
<button className="btn btn-lg dropdown-toggle mx-auto col-5" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <Tab eventKey="9-116" title="9-116">
기간을 선택해주십시오. <Schedule room={key}/>
</button>
<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>
</li>
<li className="nav-item">
<a className="nav-link" id="9-tab" data-toggle="tab" href="#tab-9" role="tab" aria-controls="9" aria-selected="false"> 9-116 </a>
</li>
<li className="nav-item">
<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> </Tab>
<div className="tab-content row justify-content-center" id="myTabContent" style={show ? {} : { display: "none" }}> <Tab eventKey="7-234" title="7-234">
<div className="tab-pane fade show active col-md-11 col-12" id="tab-7" role="tabpanel" aria-labelledby="7-tab"> <Schedule room={key}/>
<Schedule day={sendDate}/> </Tab>
</div> <Tab eventKey="25-101" title="25-101">
<div className="tab-pane fade col-md-11 col-12" id="tab-9" role="tabpanel" aria-labelledby="9-tab"> <Schedule room={key}/>
<Schedule day={sendDate}/> </Tab>
</div> </Tabs>
<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> <h3>유의사항</h3>
<p> <p>
<ul> <ul>
......
server/client/src/Pages/NoticePage.js
View file @ fd2237cd
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect } from 'react';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import axios from 'axios'; import axios from 'axios';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
...@@ -9,8 +9,6 @@ function Notice() { ...@@ -9,8 +9,6 @@ function Notice() {
const [user, setUser] = useState({ role: "" }) const [user, setUser] = useState({ role: "" })
const [notices, setNotices] = useState([]); const [notices, setNotices] = useState([]);
// const [show, setShow] = useState(false);
useEffect(() => { useEffect(() => {
acheck(); acheck();
getNotice(); getNotice();
...@@ -39,6 +37,7 @@ function Notice() { ...@@ -39,6 +37,7 @@ function Notice() {
alert(err.error) alert(err.error)
}); });
} }
return ( return (
<div> <div>
<Menu /> <Menu />
...@@ -50,16 +49,6 @@ function Notice() { ...@@ -50,16 +49,6 @@ function Notice() {
<Accordion> <Accordion>
{notices.map((notice, index) => <CARD card_index={index} title={notice.notice_title} date={notice.post_date} content={notice.notice_content} /> {notices.map((notice, index) => <CARD card_index={index} title={notice.notice_title} date={notice.post_date} content={notice.notice_content} />
)} )}
{/* <Card>
<Card.Header className="d-flex justify-content-space-between">
<Accordion.Toggle as={Button} variant="link" eventKey={index + 1} className={"d-inline-block " + (show ? "text-wrap" : "text-truncate")} onClick={() => setShow(!show)}>{notice.notice_title}</Accordion.Toggle>
<span className="d-flex align-items-center" style={{ width: "50%" }}>{dateForm(notice.post_date)}</span>
</Card.Header>
<Accordion.Collapse eventKey={index + 1}>
<Card.Body><pre>{notice.notice_content}</pre></Card.Body>
</Accordion.Collapse>
</Card> */}
</Accordion> </Accordion>
</Col> </Col>
</Row> </Row>
......
server/client/src/Pages/WritePage.js
View file @ fd2237cd
...@@ -52,21 +52,6 @@ function Write() { ...@@ -52,21 +52,6 @@ function Write() {
getFieldProps, // contain values, handleChange, handleBlur getFieldProps, // contain values, handleChange, handleBlur
isSubmitting, isSubmitting,
}) => ( }) => (
// <Form onSubmit={handleSubmit}>
// <Form.Group>
// <Form.Label variant={touched.name && errors.name ? "danger" : ""}>제목</Form.Label>
// <Form.Control className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")}
// type="text"
// placeholder="제목"
// title="title"
// {...getFieldProps('title')} />
// </Form.Group>
// <Form.Group>
// <Form.Label>내용</Form.Label>
// <Form.Control as="textarea" rows={10} />
// </Form.Group>
// </Form>
<form onSubmit={handleSubmit} className="d-flex flex-column"> <form onSubmit={handleSubmit} className="d-flex flex-column">
<div className="form-group"> <div className="form-group">
<div className={touched.name && errors.name ? "text-danger" : ""}>제목</div> <div className={touched.name && errors.name ? "text-danger" : ""}>제목</div>
......
server/routes/notices.js
View file @ fd2237cd
...@@ -6,13 +6,15 @@ const router = express.Router(); ...@@ -6,13 +6,15 @@ const router = express.Router();
router.get('/', function (req, res, next) { router.get('/', function (req, res, next) {
Notice.find({}).sort({ post_date: -1 }) Notice.find({}).sort({ post_date: -1 })
.then((notices) => { .then((notices) => {
res.json(notices); res.status(201).json(notices);
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
next(err); next(err);
}); });
// res.status(404).json({error:"없음."})
res.status(201).json(notices);
}); });
module.exports = router; module.exports = router;
\ No newline at end of file
server/routes/reserves.js
View file @ fd2237cd
...@@ -38,8 +38,8 @@ router.post('/', function (req, res, next) { ...@@ -38,8 +38,8 @@ router.post('/', function (req, res, next) {
const strt = new Date(reserve.start) const strt = new Date(reserve.start)
const endt = new Date(reserve.end) const endt = new Date(reserve.end)
const reserveArr = reserves.map(item => ( const reserveArr = reserves.map(item => (
(strt >= new Date(item.start) && strt <= new Date(item.end)) || (strt >= new Date(item.start) && strt < new Date(item.end)) ||
(endt >= new Date(item.start) && endt <= new Date(item.end)) ? (endt > new Date(item.start) && endt <= new Date(item.end)) ?
"item" : "item" :
null null
)) ))
......
server/schemas/index.js
View file @ fd2237cd
...@@ -5,7 +5,7 @@ module.exports = () => { ...@@ -5,7 +5,7 @@ module.exports = () => {
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
mongoose.set('debug', true); mongoose.set('debug', true);
} }
mongoose.connect('mongodb://hyj:hyj3657@localhost:27017/admin', { mongoose.connect('mongodb://cherry:1q2w3e4r@localhost:27017/admin', {
dbName: 'ku_rental', useNewUrlParser: true, useUnifiedTopology: true, dbName: 'ku_rental', useNewUrlParser: true, useUnifiedTopology: true,
}, (error) => { }, (error) => {
if (error) { if (error) {
......
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