delete modal create, and fixed modal add

src/components/UI/ModalAdd/ModalAdd.jsx

@@ -5,23 +5,34 @@ import { apiRequest } from "../../../api/request";
 import {
   getProjectBoard,
   getValueModalType,
+  setProject,
   setProjectBoardFetch,
 } from "../../../redux/projectsTrackerSlice";
 
 import "./modalAdd.scss";
 
-export const ModalAdd = ({ active, setActive, selectedTab, defautlInput }) => {
+export const ModalAdd = ({
+  active,
+  setActive,
+  selectedTab,
+  defautlInput,
+  titleProject,
+}) => {
   const dispatch = useDispatch();
   const projectBoard = useSelector(getProjectBoard);
 
   const modalType = useSelector(getValueModalType);
 
+  const [emailWorker, setEmailWorker] = useState("");
+  const [ProjectName, setProjectName] = useState(defautlInput);
+  const [valueColumn, setValueColumn] = useState("");
+  const [nameProject, setNameProject] = useState("");
+
   const [valueTiket, setValueTiket] = useState("");
-  const [valueColl, setValueColl] = useState("");
   const [descriptionTicket, setDescriptionTicket] = useState("");
 
   function createTab() {
-    if (!valueColl) {
+    if (!valueColumn) {
       return;
     }
 
@@ -29,12 +40,12 @@ export const ModalAdd = ({ active, setActive, selectedTab, defautlInput }) => {
       method: "POST",
       data: {
         project_id: projectBoard.id,
-        title: valueColl,
+        title: valueColumn,
       },
     }).then((res) => {
       dispatch(setProjectBoardFetch(projectBoard.id));
     });
-    setValueColl("");
+    setValueColumn("");
     setActive(false);
   }
 
@@ -62,62 +73,64 @@ export const ModalAdd = ({ active, setActive, selectedTab, defautlInput }) => {
     setDescriptionTicket("");
   }
 
-  function editProject() {
+  function editProject() {}
+
+  function editProjectName(value) {
+    setProjectName(value);
   }
 
-  function getModal() {
+  function createProject() {
-    switch (modalType) {
+    if (nameProject === "") {
-      case "createColumn":
+      return;
-        return (
+    } else {
-          <div
+      apiRequest("/project/create", {
-            className="modal-add__content"
+        method: "POST",
-            onClick={(e) => e.stopPropagation()}
+        data: {
-          >
+          user_id: localStorage.getItem("id"),
-            <div className="title-project">
+          name: nameProject,
-              <h4>Введите название колонки</h4>
+          status: 1,
-              <div className="input-container">
+        },
-                <input
+      }).then((res) => {
-                  className="name-project"
+        const result = { ...res, columns: [] };
-                  value={valueColl}
+        dispatch(setProject(result));
-                  onChange={(e) => setValueColl(e.target.value)}
+        setActive(false);
-                ></input>
+        setNameProject("");
-              </div>
+      });
-            </div>
+    }
-            <button className="button-add" onClick={createTab}>
+  }
-              Создать
+
-            </button>
+  return (
-            <span className="exit" onClick={() => setActive(false)}></span>
+    <div
-          </div>
+      className={active ? "modal-add active" : "modal-add"}
-        );
+      onClick={() => setActive(false)}
-      case "addWorker":
+    >
-        return (
+      <div className="modal-add__content" onClick={(e) => e.stopPropagation()}>
-          <div
+        {modalType === "addWorker" && (
-            className="modal-add__content"
+          <div>
-            onClick={(e) => e.stopPropagation()}
-          >
             <div className="title-project">
               <h4>Добавьте участника</h4>
               <p className="title-project__decs">Введите имя или e-mail </p>
               <div className="input-container">
                 <input
                   className="name-project"
-                  value={valueTiket}
+                  value={emailWorker}
-                  onChange={(e) => setValueTiket(e.target.value)}
+                  onChange={(e) => setEmailWorker(e.target.value)}
                 ></input>
               </div>
             </div>
-            <button className="button-add" onClick={(e) => e.preventDefault()}>
+            <button
+              className="button-add"
+              onClick={(e) => {
+                e.preventDefault();
+                setActive(false);
+              }}
+            >
               Добавить
             </button>
-            <span className="exit" onClick={() => setActive(false)}></span>
           </div>
-        );
+        )}
-      case "createTiketProject":
+        {modalType === "createTiketProject" && (
-        return (
+          <div>
-          <div
-            className="modal-add__content"
-            onClick={(e) => e.stopPropagation()}
-          >
             <div className="title-project">
               <h4>Введите название и описание задачи</h4>
               <div className="input-container">
@@ -140,37 +153,79 @@ export const ModalAdd = ({ active, setActive, selectedTab, defautlInput }) => {
             <button className="button-add" onClick={createTiket}>
               Создать
             </button>
-            <span className="exit" onClick={() => setActive(false)}></span>
           </div>
-        );
+        )}
-      case "editProject":
+        {modalType === "editProject" && (
-        return (
+          <div>
-          <div
-            className="modal-add__content"
-            onClick={(e) => e.stopPropagation()}
-          >
             <div className="title-project">
               <h4>Введите новое название</h4>
               <div className="input-container">
                 <input
                   className="name-project"
-                  value={defautlInput}
+                  value={ProjectName}
-                  onChange={(e) => setValueTiket(e.target.value)}
+                  onChange={(e) => editProjectName(e.target.value)}
                 ></input>
               </div>
             </div>
             <button className="button-add" onClick={editProject}>
               Сохранить
             </button>
-            <span className="exit" onClick={() => setActive(false)}></span>
           </div>
-        );
+        )}
-      case "editColumn":
+        {modalType === "createProject" && (
-        return (
+          <div>
-          <div
+            <div className="title-project">
-            className="modal-add__content"
+              <h4>{titleProject}</h4>
-            onClick={(e) => e.stopPropagation()}
+              <div className="input-container">
-          >
+                <input
+                  className="name-project"
+                  value={nameProject}
+                  onChange={(e) => setNameProject(e.target.value)}
+                />
+              </div>
+              <button className="button-add" onClick={createProject}>
+                Создать
+              </button>
+            </div>
+          </div>
+        )}
+        {modalType === "addSubtask" && (
+          <div>
+            <div className="title-project subtask">
+              <h4>
+                Вы добавляете подзадачу{" "}
+                <p>в колонку(id) задачи "{defautlInput}"</p>
+              </h4>
+              <p className="title-project__decs">Введите текст</p>
+              <div>
+                <textarea className="title-project__textarea"></textarea>
+              </div>
+            </div>
+            <button className="button-add" onClick={(e) => e.preventDefault()}>
+              Добавить
+            </button>
+          </div>
+        )}
+        {modalType === "createColumn" && (
+          <div>
+            <div className="title-project">
+              <h4>Введите название колонки</h4>
+              <div className="input-container">
+                <input
+                  className="name-project"
+                  value={valueColumn}
+                  onChange={(e) => setValueColumn(e.target.value)}
+                ></input>
+              </div>
+            </div>
+            <button className="button-add" onClick={createTab}>
+              Создать
+            </button>
+          </div>
+        )}
+        {/* TODO: fix state */}
+        {modalType === "editColumn" && (
+          <div>
             <div className="title-project">
               <h4>Введите новое название</h4>
               <div className="input-container">
@@ -184,20 +239,11 @@ export const ModalAdd = ({ active, setActive, selectedTab, defautlInput }) => {
             <button className="button-add" onClick={(e) => e.preventDefault()}>
               Сохранить
             </button>
-            <span className="exit" onClick={() => setActive(false)}></span>
           </div>
-        );
+        )}
-      default:
-        return null;
-    }
-  }
 
-  return (
+        <span className="exit" onClick={() => setActive(false)}></span>
-    <div
+      </div>
-      className={active ? "modal-add active" : "modal-add"}
-      onClick={() => setActive(false)}
-    >
-      {getModal()}
     </div>
   );
 };

src/components/UI/ModalAdd/modalAdd.scss

@@ -39,7 +39,7 @@
 
     h4 {
       font-weight: 500;
-      font-size: 17px;
+      font-size: 22px;
       line-height: 26px;
       color: #263238 !important;
     }

src/components/UI/ModalCreate/ModalCreate.jsx

@@ -1,60 +0,0 @@
-import React, { useState } from "react";
-import { useDispatch } from "react-redux";
-import { setProject } from "../../../redux/projectsTrackerSlice";
-import {apiRequest} from "../../../api/request";
-
-import "./ModalCreate.scss";
-
-export const ModalCreate = ({ active, setActive, title }) => {
-  const [inputValue, setInputValue] = useState("");
-  const dispatch = useDispatch();
-
-  function createName() {
-    if (inputValue === "") {
-      return;
-    } else {
-      apiRequest('/project/create', {
-        method: 'POST',
-        data: {
-          user_id: localStorage.getItem('id'),
-          name: inputValue,
-          status: 1,
-        }
-      }).then((res) => {
-        const result = {...res, columns: []}
-        dispatch(setProject(result));
-        setActive(false);
-        setInputValue("");
-      })
-    }
-  }
-
-  return (
-    <div
-      className={active ? "modal-project active" : "modal-project"}
-      onClick={() => setActive(false)}
-    >
-      <div
-        className="modal-project__content"
-        onClick={(e) => e.stopPropagation()}
-      >
-        <div className="title-project">
-          <h4>{title}</h4>
-          <div className="input-container">
-            <input
-              className="name-project"
-              value={inputValue}
-              onChange={(e) => setInputValue(e.target.value)}
-            />
-          </div>
-          <button className="create-project" onClick={createName}>
-            Создать
-          </button>
-        </div>
-        <span className="exit" onClick={() => setActive(false)}></span>
-      </div>
-    </div>
-  );
-};
-
-export default ModalCreate;

src/components/UI/ModalCreate/ModalCreate.scss

@@ -1,77 +0,0 @@
-.modal-project {
-  z-index: 9999;
-  height: 100%;
-  width: 100%;
-  background-color: rgba(0, 0, 0, 0.11);
-  position: fixed;
-  top: 0;
-  left: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transform: scale(0);
-
-  &__content {
-    position: relative;
-    width: 424px;
-    height: 248px;
-    background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%);
-    border-radius: 40px;
-
-    padding: 15px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .title-project {
-      display: flex;
-      align-items: flex-start;
-      flex-direction: column;
-
-      .input-container {
-        width: 287px;
-        height: 35px;
-        background: #ffffff;
-        border-radius: 8px;
-      }
-
-      h4 {
-        font-weight: 500;
-        font-size: 22px;
-        line-height: 26px;
-        color: #263238;
-        margin-bottom: 22px;
-      }
-    }
-
-    .name-project {
-      margin-left: 10px;
-      border: none;
-      outline: none;
-      height: 100%;
-      width: 90%;
-      font-size: 14px;
-    }
-
-    .create-project {
-      margin: 30px 0 0 0;
-      width: 130px;
-      height: 37px;
-      background: #52b709;
-      border-radius: 44px;
-      border: none;
-      font-weight: 400;
-      font-size: 15px;
-      line-height: 32px;
-      color: #ffffff;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-}
-
-.modal-project.active {
-  transform: scale(1);
-}

src/components/UI/ModalTicket/ModalTicket.jsx

@@ -3,7 +3,10 @@ import { Link } from "react-router-dom";
 import ModalAdd from "../ModalAdd/ModalAdd";
 import { apiRequest } from "../../../api/request";
 import { useDispatch } from "react-redux";
-import { setProjectBoardFetch } from "../../../redux/projectsTrackerSlice";
+import {
+  modalToggle,
+  setProjectBoardFetch,
+} from "../../../redux/projectsTrackerSlice";
 
 import category from "../../../images/category.png";
 import watch from "../../../images/watch.png";
@@ -56,7 +59,10 @@ export const ModalTiсket = ({
           <h3 className="title-project">
             <img src={category} className="title-project__category"></img>
             Проект: {projectName}
-            <Link to={`/tracker/task/${task.id}`} className="title-project__full">
+            <Link
+              to={`/tracker/task/${task.id}`}
+              className="title-project__full"
+            >
               <img src={fullScreen}></img>
             </Link>
           </h3>
@@ -71,7 +77,12 @@ export const ModalTiсket = ({
             </div>
             <div className="content__communication">
               <p className="tasks">
-                <button onClick={() => setAddSubtask(true)}>
+                <button
+                  onClick={() => {
+                    dispatch(modalToggle("addSubtask"));
+                    setAddSubtask(true);
+                  }}
+                >
                   <img src={plus}></img>
                   Добавить под задачу
                 </button>
@@ -97,14 +108,15 @@ export const ModalTiсket = ({
             <span>{task.title}</span>
             <p className="workers__creator">Создатель : {task.user?.fio}</p>
             <div>
-              {Boolean(task.taskUsers?.length) && task.taskUsers.map((worker, index) => {
+              {Boolean(task.taskUsers?.length) &&
-                return (
+                task.taskUsers.map((worker, index) => {
-                  <div className="worker" key={index}>
+                  return (
-                    <img src={worker.avatar}></img>
+                    <div className="worker" key={index}>
-                    <p>{worker.name}</p>
+                      <img src={worker.avatar}></img>
-                  </div>
+                      <p>{worker.name}</p>
-                );
+                    </div>
-              })}
+                  );
+                })}
             </div>
 
             <div className="add-worker moreItems">
@@ -145,20 +157,12 @@ export const ModalTiсket = ({
           </div>
         </div>
       </div>
-      <ModalAdd active={addSubtask} setActive={setAddSubtask}>
+
-        <div className="title-project subtask">
+      <ModalAdd
-          <h4>
+        active={addSubtask}
-            Вы добавляете подзадачу <p>в колонку задачи {"Готово"}</p>
+        setActive={setAddSubtask}
-          </h4>
+        defautlInput={task.column_id}
-          <p className="title-project__decs">Введите текст</p>
+      ></ModalAdd>
-          <div>
-            <textarea className="title-project__textarea"></textarea>
-          </div>
-        </div>
-        <button className="button-add" onClick={(e) => e.preventDefault()}>
-          Добавить
-        </button>
-      </ModalAdd>
     </div>
   );
 };

src/pages/Tracker/Tracker.js

@@ -1,18 +1,24 @@
-import React, {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 
 import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader";
 import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { Footer } from "../../components/Footer/Footer";
-import {apiRequest} from "../../api/request";
+import { apiRequest } from "../../api/request";
 import { Navigation } from "../../components/Navigation/Navigation";
 
 import { useDispatch, useSelector } from "react-redux";
-import { setAllProjects, getProjects, setToggleTab, getToggleTab } from "../../redux/projectsTrackerSlice";
+import {
+  setAllProjects,
+  getProjects,
+  setToggleTab,
+  getToggleTab,
+  modalToggle,
+} from "../../redux/projectsTrackerSlice";
 
-import ModalCreate from "../../components/UI/ModalCreate/ModalCreate";
+import ModalAdd from "../../components/UI/ModalAdd/ModalAdd";
 import ProjectTiket from "../../components/ProjectTiket/ProjectTiket";
-import { urlForLocal } from '../../helper'
+import { urlForLocal } from "../../helper";
-import { getCorrectDate} from "../../components/Calendar/calendarHelper";
+import { getCorrectDate } from "../../components/Calendar/calendarHelper";
 import { Loader } from "../../components/Loader/Loader";
 
 import project from "../../images/trackerProject.svg";
@@ -27,10 +33,11 @@ import "./tracker.scss";
 export const Tracker = () => {
   const dispatch = useDispatch();
   const projects = useSelector(getProjects);
-  const tab = useSelector(getToggleTab)
+  const tab = useSelector(getToggleTab);
-  const [allTasks, setAllTasks] = useState([])
+
+  const [allTasks, setAllTasks] = useState([]);
   const [filteredAllTasks, setFilteredAllTasks] = useState([]);
-  const [loader, setLoader] = useState(false)
+  const [loader, setLoader] = useState(false);
 
   const [archiveProjects] = useState([
     {
@@ -40,7 +47,7 @@ export const Tracker = () => {
     {
       name: "Будущее России",
       date: "7 марта 2023 г",
-    }
+    },
   ]);
 
   const [completeTasks] = useState([
@@ -64,7 +71,7 @@ export const Tracker = () => {
       dateComplete: "7 марта 2023 г",
       avatarDo: avatarTest,
       project: "Будущее России",
-    }
+    },
   ]);
 
   const [filterCompleteTasks, setFilterCompleteTasks] = useState(completeTasks);
@@ -73,36 +80,42 @@ export const Tracker = () => {
   const [modalCreateProject, setModalCreateProject] = useState(false);
 
   useEffect(() => {
-    setLoader(true)
+    setLoader(true);
-    apiRequest(`/project/project-list?user_id=${localStorage.getItem('id')}&expand=columns`).then((el) => {
+    apiRequest(
-      dispatch(setAllProjects(el.projects))
+      `/project/project-list?user_id=${localStorage.getItem(
-      setLoader(false)
+        "id"
-    })
+      )}&expand=columns`
-    apiRequest(`/task/get-user-tasks?user_id=${localStorage.getItem('id')}`).then((el) => {
+    ).then((el) => {
-      setAllTasks(el)
+      dispatch(setAllProjects(el.projects));
-      setFilteredAllTasks(el)
+      setLoader(false);
-    })
+    });
-  }, [])
+    apiRequest(
+      `/task/get-user-tasks?user_id=${localStorage.getItem("id")}`
+    ).then((el) => {
+      setAllTasks(el);
+      setFilteredAllTasks(el);
+    });
+  }, []);
 
   const toggleTabs = (index) => {
-    dispatch(setToggleTab(index))
+    dispatch(setToggleTab(index));
   };
 
   function filterAllTask(e) {
     setFilteredAllTasks(
-        allTasks.filter((item) => {
+      allTasks.filter((item) => {
-          if (!e.target.value) {
+        if (!e.target.value) {
-            return item;
+          return item;
-          }
+        }
-          if (
+        if (
-              item.title.toLowerCase().startsWith(e.target.value.toLowerCase()) ||
+          item.title.toLowerCase().startsWith(e.target.value.toLowerCase()) ||
-              item.description
+          item.description
-                  .toLowerCase()
+            .toLowerCase()
-                  .startsWith(e.target.value.toLowerCase())
+            .startsWith(e.target.value.toLowerCase())
-          ) {
+        ) {
-            return item;
+          return item;
-          }
+        }
-        })
+      })
     );
   }
 
@@ -171,52 +184,58 @@ export const Tracker = () => {
                 : "tracker__tabs__content__projects tracker__tabs__content__wrapper"
             }
           >
-            <ModalCreate
+            <ModalAdd
               active={modalCreateProject}
               setActive={setModalCreateProject}
-              title={"Укажите название проекта:"}
+              titleProject={"Укажите название проекта:"}
-            />
+            ></ModalAdd>
 
-            {loader &&
+            {loader && <Loader style="green" />}
-              <Loader style='green'/>
-            }
 
-            {Boolean(projects.length) && !loader &&
+            {Boolean(projects.length) &&
+              !loader &&
               projects.map((project, index) => {
-                return (
+                return project.status !== 10 ? (
-                    project.status !== 10 ?
+                  <ProjectTiket key={index} project={project}></ProjectTiket>
-                      <ProjectTiket
+                ) : (
-                        key={index}
+                  ""
-                        project={project}
-                      ></ProjectTiket>
-                        : ''
                 );
               })}
-            {(!Boolean(projects.length) || !Boolean(projects.filter((project) => project.status !== 10).length)) && !loader && (
+            {(!Boolean(projects.length) ||
-              <div className="no-projects">
+              !Boolean(
-                <div className="no-projects__createNew">
+                projects.filter((project) => project.status !== 10).length
-                  <div>
+              )) &&
-                    <img src={noProjects} alt="noProjectImg" />
+              !loader && (
-                    <p>Создайте свой первый проект</p>
+                <div className="no-projects">
+                  <div className="no-projects__createNew">
+                    <div>
+                      <img src={noProjects} alt="noProjectImg" />
+                      <p>Создайте свой первый проект</p>
+                    </div>
+                    <button
+                      className="createProjectBtn"
+                      onClick={() => {
+                        dispatch(modalToggle("createProject"));
+                        setModalCreateProject(true);
+                      }}
+                    >
+                      <span>+</span>Создать проект
+                    </button>
                   </div>
-                  <button
+                  <p className="no-projects__info">
-                    className="createProjectBtn"
+                    Ставьте задачи, следите за прогрессом, ведите учёт рабочего
-                    onClick={() => setModalCreateProject(true)}
+                    времени
-                  >
+                  </p>
-                    <span>+</span>Создать проект
-                  </button>
                 </div>
-                <p className="no-projects__info">
+              )}
-                  Ставьте задачи, следите за прогрессом, ведите учёт рабочего
-                  времени
-                </p>
-              </div>
-            )}
             {Boolean(projects.length) && !loader && (
               <div className="create-newProject">
                 <button
                   className="createProjectBtn"
-                  onClick={() => setModalCreateProject(true)}
+                  onClick={() => {
+                    dispatch(modalToggle("createProject"));
+                    setModalCreateProject(true);
+                  }}
                 >
                   <span>+</span>Создать проект
                 </button>
@@ -245,30 +264,32 @@ export const Tracker = () => {
                 />
               </div>
             </div>
-            {loader &&
+            {loader && <Loader style="green" />}
-              <Loader style='green' />
+            {!loader && (
-            }
-            {!loader &&
               <div className="taskList__wrapper">
-                {Boolean(filteredAllTasks.length) && filteredAllTasks.map((task) => {
+                {Boolean(filteredAllTasks.length) &&
-                  return (
+                  filteredAllTasks.map((task) => {
-                    <div className="task" key={task.id}>
+                    return (
-                      <div className="task__info">
+                      <div className="task" key={task.id}>
-                        <h5>{task.title}</h5>
+                        <div className="task__info">
-                        <p>{task.description}</p>
+                          <h5>{task.title}</h5>
-                      </div>
+                          <p>{task.description}</p>
-                      <div className="task__person">
+                        </div>
-                        <img src={urlForLocal(task.user.avatar)} alt="avatar" />
+                        <div className="task__person">
-                        <div className="task__project">
+                          <img
-                          <p>{task.user.fio}</p>
+                            src={urlForLocal(task.user.avatar)}
-                          <span>{getCorrectDate(task.created_at)}</span>
+                            alt="avatar"
+                          />
+                          <div className="task__project">
+                            <p>{task.user.fio}</p>
+                            <span>{getCorrectDate(task.created_at)}</span>
+                          </div>
                         </div>
                       </div>
-                    </div>
+                    );
-                  );
+                  })}
-                })}
               </div>
-            }
+            )}
           </div>
           <div
             className={