Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
reservation-service
Commits
e701227c
Commit
e701227c
authored
Oct 05, 2020
by
Kim, Subin
Browse files
Merge remote-tracking branch 'origin/hijinju' into kimpen
parents
18fd1a9b
aebef277
Changes
5
Hide whitespace changes
Inline
Side-by-side
server/client/package.json
View file @
e701227c
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
"eject"
:
"react-scripts eject"
,
"eject"
:
"react-scripts eject"
,
"proxy"
:
"http://localhost:3030"
"proxy"
:
"http://localhost:3030"
},
},
"proxy"
:
"http://localhost:3030"
,
"eslintConfig"
:
{
"eslintConfig"
:
{
"extends"
:
"react-app"
"extends"
:
"react-app"
},
},
...
...
server/client/src/Components/Calendar.js
0 → 100644
View file @
e701227c
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
Calendar
from
'
tui-calendar
'
;
import
"
tui-calendar/dist/tui-calendar.css
"
;
const
calendar
=
new
Calendar
(
'
#calendar
'
,
{
defaultView
:
'
week
'
,
// useCreationPopup: true,
// useDetailPopup: true
});
calendar
.
createSchedules
([
{
id
:
'
1
'
,
calendarId
:
'
Major Lecture
'
,
title
:
'
자료 구조
'
,
category
:
'
time
'
,
start
:
'
2018-11-20T10:30:00
'
,
end
:
'
2018-11-20T12:30:00
'
},
{
id
:
'
2
'
,
calendarId
:
'
General Lecture
'
,
title
:
'
건강과 영양
'
,
category
:
'
time
'
,
dueDateClass
:
''
,
start
:
'
2018-11-20T14:30:00
'
,
end
:
'
2018-11-20T16:30:00
'
,
isReadOnly
:
true
// schedule is read-only
}
]);
calendar
.
render
();
export
default
Calendar
\ No newline at end of file
server/client/src/Pages/HomePage.js
View file @
e701227c
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
React
,
{
useState
,
useEffect
}
from
'
react
'
;
import
Menu
from
'
../Components/Menu
'
;
import
Menu
from
'
../Components/Menu
'
;
import
Calendar
from
'
../Components/Calendar
'
;
import
styled
from
'
styled-components
'
;
import
styled
from
'
styled-components
'
;
import
moment
from
'
moment
'
;
import
moment
from
'
moment
'
;
import
"
moment/locale/ko
"
;
import
"
moment/locale/ko
"
;
...
@@ -50,8 +51,18 @@ function Home() {
...
@@ -50,8 +51,18 @@ function Home() {
return
(
return
(
<
div
>
<
div
>
<
Menu
/>
<
Menu
/>
<
div
className
=
"
container
"
>
<
div
className
=
"
container mt-3
"
>
<
Drop
className
=
"
row dropdown mt-5 mb-5
"
>
<
h2
>
대관
현황
<
/h2
>
<
p
>
<
strong
>
대관
가능
시간
<
/strong
>
<
ul
>
<
li
>
평일
:
9
시
-
22
시
/
예약가능
시간
이후
폐쇄
<
/li
>
<
li
>
주말
:
이용
불가
<
/li
>
<
/ul
>
<
/p
>
<
Drop
className
=
"
row dropdown mt-1 mb-2
"
>
<
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
>
<
/button
>
...
@@ -61,9 +72,36 @@ function Home() {
...
@@ -61,9 +72,36 @@ function Home() {
))}
))}
<
/div
>
<
/div
>
<
/Drop
>
<
/Drop
>
<
ul
className
=
"
nav nav-tabs nav-justified mt-4
"
id
=
"
myTab
"
role
=
"
tablist
"
>
<
li
className
=
"
nav-item
"
>
<
a
className
=
"
nav-link active
"
id
=
"
7-tab
"
data
-
toggle
=
"
tab
"
href
=
"
#7
"
role
=
"
tab
"
>
7
-
223
<
/a
>
<
/li
>
<
li
className
=
"
nav-item
"
>
<
a
className
=
"
nav-link
"
id
=
"
9-tab
"
data
-
toggle
=
"
tab
"
href
=
"
#9
"
role
=
"
tab
"
>
9
-
116
<
/a
>
<
/li
>
<
li
className
=
"
nav-item
"
>
<
a
className
=
"
nav-link
"
id
=
"
25-tab
"
data
-
toggle
=
"
tab
"
href
=
"
#25
"
role
=
"
tab
"
>
25
-
307
<
/a
>
<
/li
>
<
/ul
>
<
div
className
=
"
tab-content
"
id
=
"
myTabContent
"
>
<
div
className
=
"
tab-pane fade show active
"
id
=
"
7
"
role
=
"
tabpanel
"
>
{
/* <Calendar />
<div className="container mt-1 mb-2"></div> */
}
<
/div
>
<
div
className
=
"
tab-pane fade
"
id
=
"
9
"
role
=
"
tabpanel
"
aria
-
labelledby
=
"
9-tab
"
>
<
/div
>
<
div
className
=
"
tab-pane fade
"
id
=
"
25
"
role
=
"
tabpanel
"
aria
-
labelledby
=
"
25-tab
"
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
)
)
}
}
export
default
Home
export
default
Home
;
\ No newline at end of file
\ No newline at end of file
server/client/src/Pages/LoginPage.js
View file @
e701227c
...
@@ -104,4 +104,4 @@ function Login() {
...
@@ -104,4 +104,4 @@ function Login() {
)
)
}
}
export
default
Login
export
default
Login
;
\ No newline at end of file
\ No newline at end of file
server/client/src/Pages/NoticePage.js
View file @
e701227c
...
@@ -11,4 +11,4 @@ function Notice() {
...
@@ -11,4 +11,4 @@ function Notice() {
)
)
}
}
export
default
Notice
export
default
Notice
;
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment