Merge branch 'task-107-fix/add_checking_front' into 'development'

Task 107 fix/add checking front

See merge request !89

planner-front/src/components/MemberForm/MemberForm.js

@@ -77,7 +77,7 @@ const MemberForm = ({ onSubmit, members }) => {
                 id="free-solo-demo"
                 freeSolo
                 options={users}
-                getOptionLabel={(item) => item.displayName || ""}
+                getOptionLabel={(item) => (members[0]?.user?.displayName !== item.displayName) ? (item.displayName || "") : ""}
                 onChange={memberChangeHandler}
                 name={"userId"}
                 value={state.user}

planner-front/src/components/Menus/ProfileBlock/ProfileBlock.js

@@ -41,7 +41,7 @@ const ProfileBlock = () => {
             onClick={handleClick}
             id='test_greetings'
         >
-            Hello, {user?.displayName}
+            Привет, {user?.displayName}
         </Button>
         <Menu
             anchorEl={anchorEl}
@@ -49,9 +49,9 @@ const ProfileBlock = () => {
             onClose={handleClose}
 
         >
-            <MenuItem component={NavLink} to="/profile/test" color="inherit" onClick={handleClose}>Profile</MenuItem>
+            <MenuItem component={NavLink} to="/profile/test" color="inherit" onClick={handleClose}>Профиль</MenuItem>
             <MenuItem onClick={()=>{switchUser()}}>Поменять юзера</MenuItem>
-            <MenuItem onClick={()=>{logout()}}>Logout</MenuItem>
+            <MenuItem onClick={()=>{logout()}}>Выйти</MenuItem>
         </Menu>
         <SwitchUserModal 
         open={openSwitchUser}

planner-front/src/components/ProjectComponents/ProjectForm/ProjectForm.js

@@ -31,8 +31,11 @@ const ProjectForm = ({onSubmit}) => {
         e.preventDefault();
         let project = {title: state.title}
         console.log(project);
+        if (project.title === "") {
+          alert("Нельзя создать проект без названия")
+        } else {
           onSubmit(project);
-        
+        }        
     };
 
     const inputChangeHandler = (e) => {

planner-front/src/components/ProjectComponents/ProjectMembersItem/ProjectMembersItem.js

@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
 import DeleteIcon from "@mui/icons-material/Delete";
 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)
     const dispatch = useDispatch();
     const user = useSelector(state => state.users)
@@ -36,15 +36,14 @@ const ProjectMembersItem = ({ displayName, roleProject, id, roleProjectOfAuthor,
                     </strong>
                     <strong>
 
-                        {roleProjectOfAuthor === "admin" ?
+                        {(members.filter(e => e.user.displayName === authorOfProject).length > 0) ?
                             (<strong>
                                 <Tooltip title="Удалить">
                                     <IconButton
                                         onClick={(id) => {
                                             deleteHandle(userId);
                                         }}
-                                    >
-                                        <DeleteIcon style={{ marginTop: "-5px" }} />
+                                    > {(displayName !== authorOfProject) ? <DeleteIcon style={{ marginTop: "-5px" }} /> : null}                                       
                                     </IconButton>
                                 </Tooltip>
                             </strong>) : null}

planner-front/src/components/ProjectComponents/ProjectMembersList/ProjectMembersList.js

 import {Grid} from "@mui/material";
 import ProjectMembersItem from "../ProjectMembersItem/ProjectMembersItem";
 
-const ProjectMembersList = ({members, roleProjectOfAuthor}) => {
+const ProjectMembersList = ({members, roleProjectOfAuthor, authorOfProject}) => {
     console.log("members ", members)
     return (
         <Grid item container direction="column" spacing={1}>
@@ -14,6 +14,7 @@ const ProjectMembersList = ({members, roleProjectOfAuthor}) => {
                     roleProjectOfAuthor={roleProjectOfAuthor}
                     userId={member?.user?.id}
                     members={members}
+                    authorOfProject={authorOfProject}
                 />
             })}
         </Grid>

planner-front/src/containers/FullProject/FullProject.js

@@ -60,7 +60,7 @@ const FullProject = () => {
                         
                         </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>
                         <br></br>