Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
students
Today KU
Commits
54796f7c
Commit
54796f7c
authored
Nov 12, 2021
by
Kim, Subin
Browse files
Monthly 완성
parent
fe46675e
Changes
4
Hide whitespace changes
Inline
Side-by-side
client/src/components/Calendar/AdminMonthly.js
View file @
54796f7c
...
@@ -134,8 +134,10 @@ const AdminMonthly = () => {
...
@@ -134,8 +134,10 @@ const AdminMonthly = () => {
timeZone
=
"
local
"
timeZone
=
"
local
"
events
=
{
scheduleList
}
events
=
{
scheduleList
}
eventLimit
=
{
3
}
eventLimit
=
{
3
}
moreLinkContent
=
{
function
(
arg
)
{
moreLinkContent
=
{
arg
=>
arg
.
shortText
}
return
arg
.
shortText
moreLinkClick
=
{
info
=>
{
setDateShow
({
...
dateShow
,
date
:
moment
(
info
.
date
).
format
(
'
YYYY-MM-DD
'
),
show
:
true
})
return
<
button
type
=
"
button
"
className
=
"
btn btn-primary
"
data
-
bs
-
toggle
=
"
modal
"
data
-
bs
-
target
=
"
#scheduleModal
"
><
/button
>
}}
}}
themeSystem
=
'
bootstrap
'
themeSystem
=
'
bootstrap
'
height
=
'
78vh
'
height
=
'
78vh
'
...
...
client/src/components/Calendar/Monthly.js
View file @
54796f7c
...
@@ -126,12 +126,9 @@ const Monthly = () => {
...
@@ -126,12 +126,9 @@ const Monthly = () => {
timeZone
=
"
local
"
timeZone
=
"
local
"
themeSystem
=
'
bootstrap
'
themeSystem
=
'
bootstrap
'
eventLimit
=
{
3
}
eventLimit
=
{
3
}
moreLinkClick
=
{
function
(
arg
)
{
eventOrder
=
'
displayOrder
'
console
.
log
(
"
click..?
"
,
arg
)
moreLinkContent
=
{
arg
=>
arg
.
shortText
}
}}
moreLinkClick
=
{
info
=>
history
.
push
(
`/schedule/
${
moment
(
info
.
date
).
format
(
'
YYYY-MM-DD
'
)}
`
)}
moreLinkContent
=
{
function
(
arg
)
{
return
arg
.
shortText
}}
height
=
'
80vh
'
height
=
'
80vh
'
/>
/>
<
DatePickerModal
initialDate
=
{
initialDate
}
changeDate
=
{
changeDate
}
setChangeDate
=
{
setChangeDate
}
show
=
{
show
}
setShow
=
{
setShow
}
/
>
<
DatePickerModal
initialDate
=
{
initialDate
}
changeDate
=
{
changeDate
}
setChangeDate
=
{
setChangeDate
}
show
=
{
show
}
setShow
=
{
setShow
}
/
>
...
...
client/src/components/Schedule/ScheduleItem.js
View file @
54796f7c
...
@@ -20,7 +20,7 @@ const ScheduleItem = ({ index, curDate, schedule, handleClick }) => {
...
@@ -20,7 +20,7 @@ const ScheduleItem = ({ index, curDate, schedule, handleClick }) => {
<
div
className
=
"
col-11
"
>
{
schedule
.
location
}
<
/div
>
<
div
className
=
"
col-11
"
>
{
schedule
.
location
}
<
/div
>
<
/div> : null
}
<
/div> : null
}
{
schedule
.
memo
}
{
schedule
.
memo
}
<
div
className
=
"
d-flex justify-content-end
mt-3
"
>
<
div
className
=
{
"
d-flex justify-content-end
"
+
((
schedule
.
location
||
schedule
.
memo
)
?
"
mt-3
"
:
null
)}
>
<
Link
className
=
"
btn btn-light btn-sm border-dark
"
to
=
{
`/schedule/edit/
${
schedule
.
id
}
`
}
>
수정
<
/Link
>
<
Link
className
=
"
btn btn-light btn-sm border-dark
"
to
=
{
`/schedule/edit/
${
schedule
.
id
}
`
}
>
수정
<
/Link
>
<
button
type
=
"
button
"
className
=
"
btn btn-crimson btn-sm ms-2
"
onClick
=
{()
=>
handleClick
(
schedule
.
id
)}
>
삭제
<
/button
>
<
button
type
=
"
button
"
className
=
"
btn btn-crimson btn-sm ms-2
"
onClick
=
{()
=>
handleClick
(
schedule
.
id
)}
>
삭제
<
/button
>
<
/div
>
<
/div
>
...
...
client/src/scss/custom.scss
View file @
54796f7c
...
@@ -149,10 +149,6 @@ button {
...
@@ -149,10 +149,6 @@ button {
display
:
none
;
display
:
none
;
}
}
&
.fc-dayGridDay-view
{
display
:
none
;
}
&
.text
{
&
.text
{
font-family
:
"Plex-Text"
;
font-family
:
"Plex-Text"
;
...
...
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