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
75de717a
Commit
75de717a
authored
Dec 18, 2022
by
Ibadullina Inabat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
добавлены проверки вв раздел проекты по ТЗ
parent
186d716f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
11 deletions
+14
-11
MemberForm.js
planner-front/src/components/MemberForm/MemberForm.js
+1
-1
ProjectForm.js
...c/components/ProjectComponents/ProjectForm/ProjectForm.js
+5
-2
ProjectItem.js
...c/components/ProjectComponents/ProjectItem/ProjectItem.js
+1
-1
ProjectMembersItem.js
...rojectComponents/ProjectMembersItem/ProjectMembersItem.js
+3
-4
ProjectMembersList.js
...rojectComponents/ProjectMembersList/ProjectMembersList.js
+2
-1
FullProject.js
planner-front/src/containers/FullProject/FullProject.js
+1
-1
projectsActions.js
planner-front/src/store/actions/projectsActions.js
+1
-1
No files found.
planner-front/src/components/MemberForm/MemberForm.js
View file @
75de717a
...
@@ -77,7 +77,7 @@ const MemberForm = ({ onSubmit, members }) => {
...
@@ -77,7 +77,7 @@ const MemberForm = ({ onSubmit, members }) => {
id
=
"free-solo-demo"
id
=
"free-solo-demo"
freeSolo
freeSolo
options
=
{
users
}
options
=
{
users
}
getOptionLabel
=
{(
item
)
=>
item
.
displayName
||
""
}
getOptionLabel
=
{(
item
)
=>
(
members
[
0
]?.
user
?.
displayName
!==
item
.
displayName
)
?
(
item
.
displayName
||
""
)
:
""
}
onChange
=
{
memberChangeHandler
}
onChange
=
{
memberChangeHandler
}
name
=
{
"userId"
}
name
=
{
"userId"
}
value
=
{
state
.
user
}
value
=
{
state
.
user
}
...
...
planner-front/src/components/ProjectComponents/ProjectForm/ProjectForm.js
View file @
75de717a
...
@@ -31,8 +31,11 @@ const ProjectForm = ({onSubmit}) => {
...
@@ -31,8 +31,11 @@ const ProjectForm = ({onSubmit}) => {
e
.
preventDefault
();
e
.
preventDefault
();
let
project
=
{
title
:
state
.
title
}
let
project
=
{
title
:
state
.
title
}
console
.
log
(
project
);
console
.
log
(
project
);
onSubmit
(
project
);
if
(
project
.
title
===
""
)
{
alert
(
"Нельзя создать проект без названия"
)
}
else
{
onSubmit
(
project
);
}
};
};
const
inputChangeHandler
=
(
e
)
=>
{
const
inputChangeHandler
=
(
e
)
=>
{
...
...
planner-front/src/components/ProjectComponents/ProjectItem/ProjectItem.js
View file @
75de717a
...
@@ -25,7 +25,7 @@ const ProjectItem = ({ title, tasks, id }) => {
...
@@ -25,7 +25,7 @@ const ProjectItem = ({ title, tasks, id }) => {
<
CardActions
>
<
CardActions
>
<
IconButton
component
=
{
Link
}
to
=
{
"/projects/"
+
id
}
>
<
IconButton
component
=
{
Link
}
to
=
{
"/projects/"
+
id
}
>
<
ArrowForwardIcon
/>
<
ArrowForwardIcon
/>
<
/IconButton
>
<
/IconButton>
<
/CardActions
>
<
/CardActions
>
<
/Card
>
<
/Card
>
<
/Grid>
<
/Grid>
...
...
planner-front/src/components/ProjectComponents/ProjectMembersItem/ProjectMembersItem.js
View file @
75de717a
...
@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
...
@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
import
DeleteIcon
from
"@mui/icons-material/Delete"
;
import
DeleteIcon
from
"@mui/icons-material/Delete"
;
import
{
deleteMember
}
from
"../../../store/actions/projectsActions"
;
import
{
deleteMember
}
from
"../../../store/actions/projectsActions"
;
const
ProjectMembersItem
=
({
displayName
,
roleProject
,
id
,
roleProjectOfAuthor
,
userId
,
members
})
=>
{
const
ProjectMembersItem
=
({
displayName
,
roleProject
,
id
,
roleProjectOfAuthor
,
userId
,
members
,
authorOfProject
})
=>
{
console
.
log
(
displayName
)
console
.
log
(
displayName
)
const
dispatch
=
useDispatch
();
const
dispatch
=
useDispatch
();
const
user
=
useSelector
(
state
=>
state
.
users
)
const
user
=
useSelector
(
state
=>
state
.
users
)
...
@@ -36,15 +36,14 @@ const ProjectMembersItem = ({ displayName, roleProject, id, roleProjectOfAuthor,
...
@@ -36,15 +36,14 @@ const ProjectMembersItem = ({ displayName, roleProject, id, roleProjectOfAuthor,
<
/strong
>
<
/strong
>
<
strong
>
<
strong
>
{
roleProjectOfAuthor
===
"admin"
?
{
(
members
.
filter
(
e
=>
e
.
user
.
displayName
===
authorOfProject
).
length
>
0
)
?
(
<
strong
>
(
<
strong
>
<
Tooltip
title
=
"Удалить"
>
<
Tooltip
title
=
"Удалить"
>
<
IconButton
<
IconButton
onClick
=
{(
id
)
=>
{
onClick
=
{(
id
)
=>
{
deleteHandle
(
userId
);
deleteHandle
(
userId
);
}}
}}
>
>
{(
displayName
!==
authorOfProject
)
?
<
DeleteIcon
style
=
{{
marginTop
:
"-5px"
}}
/> : null}
<
DeleteIcon
style
=
{{
marginTop
:
"-5px"
}}
/
>
<
/IconButton
>
<
/IconButton
>
<
/Tooltip
>
<
/Tooltip
>
<
/strong>
)
: null
}
<
/strong>
)
: null
}
...
...
planner-front/src/components/ProjectComponents/ProjectMembersList/ProjectMembersList.js
View file @
75de717a
import
{
Grid
}
from
"@mui/material"
;
import
{
Grid
}
from
"@mui/material"
;
import
ProjectMembersItem
from
"../ProjectMembersItem/ProjectMembersItem"
;
import
ProjectMembersItem
from
"../ProjectMembersItem/ProjectMembersItem"
;
const
ProjectMembersList
=
({
members
,
roleProjectOfAuthor
})
=>
{
const
ProjectMembersList
=
({
members
,
roleProjectOfAuthor
,
authorOfProject
})
=>
{
console
.
log
(
"members "
,
members
)
console
.
log
(
"members "
,
members
)
return
(
return
(
<
Grid
item
container
direction
=
"column"
spacing
=
{
1
}
>
<
Grid
item
container
direction
=
"column"
spacing
=
{
1
}
>
...
@@ -14,6 +14,7 @@ const ProjectMembersList = ({members, roleProjectOfAuthor}) => {
...
@@ -14,6 +14,7 @@ const ProjectMembersList = ({members, roleProjectOfAuthor}) => {
roleProjectOfAuthor
=
{
roleProjectOfAuthor
}
roleProjectOfAuthor
=
{
roleProjectOfAuthor
}
userId
=
{
member
?.
user
?.
id
}
userId
=
{
member
?.
user
?.
id
}
members
=
{
members
}
members
=
{
members
}
authorOfProject
=
{
authorOfProject
}
/
>
/
>
})}
})}
<
/Grid
>
<
/Grid
>
...
...
planner-front/src/containers/FullProject/FullProject.js
View file @
75de717a
...
@@ -60,7 +60,7 @@ const FullProject = () => {
...
@@ -60,7 +60,7 @@ const FullProject = () => {
<
/div
>
<
/div
>
<
ProjectMembersList
users
=
{
users
}
project
=
{
project
}
members
=
{
project
?.
project
?.
members
}
roleProjectOfAuthor
=
{
project
?.
project
?.
members
[
0
]?.
roleProject
}
/
>
<
ProjectMembersList
users
=
{
users
}
project
=
{
project
}
members
=
{
project
?.
project
?.
members
}
roleProjectOfAuthor
=
{
project
?.
project
?.
members
[
0
]?.
roleProject
}
authorOfProject
=
{
project
?.
project
?.
members
[
0
]?.
user
.
displayName
}
/
>
<
/strong
>
<
/strong
>
<
strong
>
<
strong
>
<
br
><
/br
>
<
br
><
/br
>
...
...
planner-front/src/store/actions/projectsActions.js
View file @
75de717a
...
@@ -53,7 +53,7 @@ export const fetchProjects = () => {
...
@@ -53,7 +53,7 @@ export const fetchProjects = () => {
return
async
dispatch
=>
{
return
async
dispatch
=>
{
dispatch
(
fetchProjectsRequest
());
dispatch
(
fetchProjectsRequest
());
try
{
try
{
const
response
=
await
axios
.
get
(
"/projects"
);
const
response
=
await
axios
.
get
(
"/projects
/my
"
);
dispatch
(
fetchProjectsSuccess
(
response
.
data
));
dispatch
(
fetchProjectsSuccess
(
response
.
data
));
}
catch
(
e
)
{
}
catch
(
e
)
{
dispatch
(
fetchProjectsError
(
e
));
dispatch
(
fetchProjectsError
(
e
));
...
...
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