tracker

src/components/UI/ModalCreate/ModalCreate.js

@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { useDispatch } from "react-redux";
 import { setProject } from "../../../redux/projectsTrackerSlice";
+import {apiRequest} from "../../../api/request";
 
 import "./ModalCreate.scss";
 
@@ -16,9 +17,20 @@ export const ModalCreate = ({ active, setActive, title }) => {
         name: inputValue,
         count: 0,
       };
-      dispatch(setProject(newItem));
+      apiRequest('/project/create', {
-      setActive(false);
+        method: 'POST',
-      setInputValue("");
+        data: {
+          user_id: localStorage.getItem('id'),
+          name: inputValue,
+          status: 1,
+          // description: '',
+          // company_id: 3
+        }
+      }).then((res) => {
+        dispatch(setProject(newItem));
+        setActive(false);
+        setInputValue("");
+      })
     }
   }
 

src/pages/Tracker/Tracker.js

@@ -23,9 +23,12 @@ import search from "../../images/serchIcon.png";
 import noProjects from "../../images/noProjects.png";
 import arrow from "../../images/arrowCalendar.png";
 
-import "./tracker.scss";
+import {apiRequest} from "../../api/request";
 import { Navigation } from "../../components/Navigation/Navigation";
 
+
+import "./tracker.scss";
+
 export const Tracker = () => {
   const [toggleTab, setToggleTab] = useState(1);
   const [tabTaskMok, setTabTaskMok] = useState([
@@ -385,6 +388,12 @@ export const Tracker = () => {
     false,
   ]);
 
+  useEffect(() => {
+    apiRequest(`/project/project-list?user_id=${localStorage.getItem('id')}&expand=columns`).then((el) => {
+
+    })
+  }, [])
+
   const projects = useSelector(getProjects);
 
   const toggleTabs = (index) => {
@@ -689,7 +698,7 @@ export const Tracker = () => {
 
                 <div className="tasks__head__add">
                   <span onClick={() => setModalCreateColl(true)}>+</span>
-                  <p>добавить задачу в проект</p>
+                  <p>добавить колонку</p>
                 </div>
                 <div className="tasks__head__persons">
                   <img src={avatarTest} alt="avatar" />
@@ -698,10 +707,10 @@ export const Tracker = () => {
                   <span className="addPerson" onClick={setModalAddWorker}>
                     +
                   </span>
-                  <p>добавить участника в проект</p>
+                  <p>добавить участника</p>
                 </div>
                 <div className="tasks__head__select">
-                  <span>Учавствую</span>
+                  <span>Участвую</span>
                   <img src={selectArrow} alt="arrow" />
                 </div>
                 <div className="tasks__head__select">

src/pages/Tracker/tracker.scss

@@ -250,6 +250,8 @@
               font-size: 14px;
               line-height: 17px;
               max-width: 120px;
+              display: flex;
+              align-items: center;
             }
           }
 
@@ -294,7 +296,7 @@
               background: #00c5a8;
               color: white;
               font-size: 14px;
-              left: -35px;
+              left: -30px;
               z-index: 1;
             }