Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
planner-team-one
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
21
Issues
21
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Евгений Положенцев
planner-team-one
Commits
31849cfa
Commit
31849cfa
authored
Dec 28, 2022
by
Ermolaev Timur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#133
пофиксил баг, сделал анимации чуть плавнее
parent
bfb45f27
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
3 deletions
+9
-3
package.json
planner-front/package.json
+1
-0
CalendarTask.js
...thCalendar/MonthCalendarBody/CalendarTask/CalendarTask.js
+3
-1
CalendarStandartCell.js
...Calendars/UI/CalendarStandartCell/CalendarStandartCell.js
+2
-0
CalendarWeekTask.js
...alendarColumnDayWeek/CalendarWeekTask/CalendarWeekTask.js
+2
-0
WeekCalendar.js
planner-front/src/containers/WeekCalendar/WeekCalendar.js
+1
-2
No files found.
planner-front/package.json
View file @
31849cfa
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
"@testing-library/user-event"
:
"^13.5.0"
,
"@testing-library/user-event"
:
"^13.5.0"
,
"axios"
:
"^1.1.2"
,
"axios"
:
"^1.1.2"
,
"dayjs"
:
"^1.11.6"
,
"dayjs"
:
"^1.11.6"
,
"react-datepicker"
:
"^4.8.0"
,
"moment"
:
"^2.29.4"
,
"moment"
:
"^2.29.4"
,
"prop-types"
:
"^15.8.1"
,
"prop-types"
:
"^15.8.1"
,
"react"
:
"^18.2.0"
,
"react"
:
"^18.2.0"
,
...
...
planner-front/src/components/Calendars/MonthCalendar/MonthCalendarBody/CalendarTask/CalendarTask.js
View file @
31849cfa
...
@@ -27,9 +27,11 @@ const CalendarTask = ({ setCurrentTask, handleOpen, task, setCopyTask, width, le
...
@@ -27,9 +27,11 @@ const CalendarTask = ({ setCurrentTask, handleOpen, task, setCopyTask, width, le
borderRadius
:
'10px'
,
borderRadius
:
'10px'
,
alignItems
:
'center'
,
alignItems
:
'center'
,
zIndex
:
'5'
,
zIndex
:
'5'
,
transition
:
'0.3s'
,
'&:hover'
:
{
'&:hover'
:
{
transition
:
'0.3s'
,
cursor
:
'pointer'
,
cursor
:
'pointer'
,
boxShadow
:
'inset 0 0 100px 100px rgba(255, 255, 255, 0.
3
)'
boxShadow
:
'inset 0 0 100px 100px rgba(255, 255, 255, 0.
4
)'
},
},
}
}
},
[
width
,
left
,
top
,
color
])
},
[
width
,
left
,
top
,
color
])
...
...
planner-front/src/components/Calendars/UI/CalendarStandartCell/CalendarStandartCell.js
View file @
31849cfa
...
@@ -11,7 +11,9 @@ const CalendarStandartCell = ({ children, xs, hours, dayNumber, createTaskInCell
...
@@ -11,7 +11,9 @@ const CalendarStandartCell = ({ children, xs, hours, dayNumber, createTaskInCell
height
:
linesInDay
?.
length
?
`
${
heightCell
*
linesInDay
.
length
+
5
}
px`
:
`
${
45
}
px`
,
height
:
linesInDay
?.
length
?
`
${
heightCell
*
linesInDay
.
length
+
5
}
px`
:
`
${
45
}
px`
,
borderRight
:
'1px solid black'
,
borderRight
:
'1px solid black'
,
borderBottom
:
week
?
'1px solid black'
:
null
,
borderBottom
:
week
?
'1px solid black'
:
null
,
transition
:
'0.3s'
,
'&:hover'
:
{
'&:hover'
:
{
transition
:
'0.3s'
,
cursor
:
children
?
null
:
'#d6d2d2'
,
cursor
:
children
?
null
:
'#d6d2d2'
,
background
:
children
?
null
:
'#d6d2d2'
background
:
children
?
null
:
'#d6d2d2'
},
},
...
...
planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/CalendarColumnDayWeek/CalendarWeekTask/CalendarWeekTask.js
View file @
31849cfa
...
@@ -46,8 +46,10 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen,
...
@@ -46,8 +46,10 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen,
zIndex
:
zIndexStyle
,
zIndex
:
zIndexStyle
,
textAlign
:
'left'
,
textAlign
:
'left'
,
overflow
:
'hidden'
,
overflow
:
'hidden'
,
transition
:
'0.2s'
,
textOverflow
:
'ellipsis'
,
textOverflow
:
'ellipsis'
,
'&:hover'
:
{
'&:hover'
:
{
transition
:
'0.2s'
,
cursor
:
'pointer'
,
cursor
:
'pointer'
,
boxShadow
:
'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
boxShadow
:
'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
},
},
...
...
planner-front/src/containers/WeekCalendar/WeekCalendar.js
View file @
31849cfa
...
@@ -260,7 +260,6 @@ function WeekCalendar() {
...
@@ -260,7 +260,6 @@ function WeekCalendar() {
setUserCalendarId
(
null
)
setUserCalendarId
(
null
)
}
}
},
[
dispatch
,
user
.
id
,
userId
])
},
[
dispatch
,
user
.
id
,
userId
])
return
(
return
(
<>
<>
<
DefaultModal
<
DefaultModal
...
@@ -270,7 +269,7 @@ function WeekCalendar() {
...
@@ -270,7 +269,7 @@ function WeekCalendar() {
<
CalendarModalWorkerContent
<
CalendarModalWorkerContent
workerInfo
=
{
workerInfo
}
workerInfo
=
{
workerInfo
}
allUserProjects
=
{
allUserProjects
}
allUserProjects
=
{
allUserProjects
}
workers
=
{
project
?.
project
?.
members
}
workers
=
{
workerInfo
?.
project
?.
members
}
onChangeProjectHandler
=
{
onChangeProjectHandler
}
onChangeProjectHandler
=
{
onChangeProjectHandler
}
onChangeWorkerHandler
=
{
onChangeWorkerHandler
}
onChangeWorkerHandler
=
{
onChangeWorkerHandler
}
handleClose
=
{
handleClose
}
handleClose
=
{
handleClose
}
...
...
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