Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
WhenMeet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
websystem2023-2
WhenMeet
Compare revisions
2407d5a1d8dbdf52c1fb47e0107cc61880114111 to aa2050f8b156d7042e4d50f5b5b13a6560f1dd10
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
websystem2023-2/whenmeet
Select target project
No results found
aa2050f8b156d7042e4d50f5b5b13a6560f1dd10
Select Git revision
Branches
main
Swap
Target
websystem2023-2/whenmeet
Select target project
websystem2023-2/whenmeet
1 result
2407d5a1d8dbdf52c1fb47e0107cc61880114111
Select Git revision
Branches
main
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
[ADD] 불가능한 시간 색 변경
· 3e94165b
이권민
authored
1 year ago
3e94165b
Merge branch 'main' of
https://git.ajou.ac.kr/websystem2023-2/whenmeet
· aa2050f8
이권민
authored
1 year ago
aa2050f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
react-whenMeet/src/components/CalendarWeek2.jsx
+49
-18
49 additions, 18 deletions
react-whenMeet/src/components/CalendarWeek2.jsx
react-whenMeet/src/styles/UserTimeInfo.css
+5
-0
5 additions, 0 deletions
react-whenMeet/src/styles/UserTimeInfo.css
with
54 additions
and
18 deletions
react-whenMeet/src/components/CalendarWeek2.jsx
View file @
aa2050f8
...
...
@@ -15,6 +15,7 @@ function CaculateWeek({
endDate
,
startTime
,
endTime
,
state
,
})
{
const
startDay
=
new
Date
(
nowYear
,
nowMonth
-
1
,
1
);
const
lastDay
=
new
Date
(
nowYear
,
nowMonth
,
0
);
...
...
@@ -39,13 +40,20 @@ function CaculateWeek({
if
(
!
isDragging
)
return
;
const
elm2
=
document
.
getElementById
(
comp
);
if
(
isContain
(
newDate
-
0
+
idx
)
||
elm2
.
classList
.
contains
(
"
dragging
"
))
{
if
(
isContain
(
newDate
-
0
+
idx
)
||
elm2
.
classList
.
contains
(
"
dragging
"
)
||
elm2
.
classList
.
contains
(
"
notAvailable
"
)
)
{
const
elm
=
document
.
getElementById
(
newDate
-
0
+
idx
);
elm
.
classList
.
remove
(
"
dragging
"
);
if
(
elm
.
classList
.
contains
(
"
dragging
"
))
elm
.
classList
.
remove
(
"
dragging
"
);
else
if
(
elm
.
classList
.
contains
(
"
notAvailable
"
))
elm
.
classList
.
remove
(
"
notAvailable
"
);
doCheck
=
doCheck
.
filter
((
key
)
=>
key
!==
newDate
-
0
+
idx
);
}
else
{
const
elm
=
document
.
getElementById
(
newDate
-
0
+
idx
);
elm
.
classList
.
add
(
"
dragging
"
);
if
(
state
)
elm
.
classList
.
add
(
"
dragging
"
);
else
elm
.
classList
.
add
(
"
notAvailable
"
);
doCheck
.
push
(
newDate
-
0
+
idx
);
}
};
...
...
@@ -58,13 +66,20 @@ function CaculateWeek({
const
handleClick
=
(
newDate
,
idx
,
comp
)
=>
{
const
elm2
=
document
.
getElementById
(
comp
);
if
(
isContain
(
newDate
-
0
+
idx
)
||
elm2
.
classList
.
contains
(
"
dragging
"
))
{
if
(
isContain
(
newDate
-
0
+
idx
)
||
elm2
.
classList
.
contains
(
"
dragging
"
)
||
elm2
.
classList
.
contains
(
"
notAvailable
"
)
)
{
const
elm
=
document
.
getElementById
(
newDate
-
0
+
idx
);
elm
.
classList
.
remove
(
"
dragging
"
);
if
(
elm
.
classList
.
contains
(
"
dragging
"
))
elm
.
classList
.
remove
(
"
dragging
"
);
else
if
(
elm
.
classList
.
contains
(
"
notAvailable
"
))
elm
.
classList
.
remove
(
"
notAvailable
"
);
doCheck
=
doCheck
.
filter
((
key
)
=>
key
!==
newDate
-
0
+
idx
);
}
else
{
const
elm
=
document
.
getElementById
(
newDate
-
0
+
idx
);
elm
.
classList
.
add
(
"
dragging
"
);
if
(
state
)
elm
.
classList
.
add
(
"
dragging
"
);
else
elm
.
classList
.
add
(
"
notAvailable
"
);
doCheck
.
push
(
newDate
-
0
+
idx
);
}
...
...
@@ -105,18 +120,33 @@ function CaculateWeek({
);
}
else
{
if
(
isContain
(
newDate
-
0
+
i
))
{
forSelect
.
push
(
<
TableCell
k
=
{
newDate
-
0
+
i
}
cn
=
{
"
dragging
"
}
newDate
=
{
newDate
}
handleClick
=
{
handleClick
}
hds
=
{
handleDragStart
}
hdw
=
{
handleDragWhile
}
hde
=
{
handleDragEnd
}
i
=
{
i
}
/>
);
if
(
state
)
{
forSelect
.
push
(
<
TableCell
k
=
{
newDate
-
0
+
i
}
cn
=
{
"
dragging
"
}
newDate
=
{
newDate
}
handleClick
=
{
handleClick
}
hds
=
{
handleDragStart
}
hdw
=
{
handleDragWhile
}
hde
=
{
handleDragEnd
}
i
=
{
i
}
/>
);
}
else
{
forSelect
.
push
(
<
TableCell
k
=
{
newDate
-
0
+
i
}
cn
=
{
"
notAvailable
"
}
newDate
=
{
newDate
}
handleClick
=
{
handleClick
}
hds
=
{
handleDragStart
}
hdw
=
{
handleDragWhile
}
hde
=
{
handleDragEnd
}
i
=
{
i
}
/>
);
}
}
else
{
forSelect
.
push
(
<
TableCell
...
...
@@ -242,6 +272,7 @@ function CalendarWeek2({
<
table
>
<
MakeDay2
/>
<
CaculateWeek
state
=
{
state
}
week
=
{
nowWeek
}
nowYear
=
{
nowYear
}
nowMonth
=
{
nowMonth
}
...
...
This diff is collapsed.
Click to expand it.
react-whenMeet/src/styles/UserTimeInfo.css
View file @
aa2050f8
...
...
@@ -68,6 +68,11 @@ h2.UTH2 {
vertical-align
:
middle
;
/* 텍스트를 수직 가운데 정렬 */
background-color
:
skyblue
;
/* 배경색 지정 */
}
.calendarTable
td
.notAvailable
{
text-align
:
center
;
/* 텍스트를 가운데 정렬 */
vertical-align
:
middle
;
/* 텍스트를 수직 가운데 정렬 */
background-color
:
pink
;
/* 배경색 지정 */
}
.header
button
:first-child
{
margin-right
:
10%
;
...
...
This diff is collapsed.
Click to expand it.