Merge pull request #158 from apuc/summary

Summary

src/App.js

@@ -55,6 +55,7 @@ import "./assets/fonts/stylesheet.css";
 import "bootstrap/dist/css/bootstrap.min.css";
 
 
+
 const App = () => {
   const notification = useSelector(getNotification)
   return (
@@ -79,6 +80,7 @@ const App = () => {
             path="/tracker/project/:id"
             element={<ProjectTracker />}
           />
+
           <Route exact path="/auth-candidate" element={<AuthForCandidate />} />
           <Route
             exact
@@ -135,6 +137,8 @@ const App = () => {
               element={<PartnerEmployees />}
             />
           </Route>
+          
+
           <Route exact path="profile-candidate/:id">
             <Route index element={<ProfileCandidate />} />
           </Route>

src/components/AuthBox/authBox.scss

@@ -55,7 +55,7 @@
     margin-bottom: 54px;
 
     span {
-      color: #8DC63F;
+      color: #8dc63f;
       font-size: 50px;
       font-weight: 700;
       font-style: normal;
@@ -193,7 +193,7 @@
 
   &__reset {
     color: #000000;
-    font-size: 13px;
+    font-size: 15px;
     line-height: 16px;
     cursor: pointer;
     text-decoration: underline;
@@ -208,7 +208,7 @@
 
     span {
       cursor: pointer;
-      color: #52B709;
+      color: #52b709;
       font-weight: 700;
     }
   }

src/components/Common/AuthHeader/AuthHeader.jsx

@@ -25,24 +25,10 @@ export const AuthHeader = () => {
                 </NavLink>
               </li>
               <li>
-                <a
+                <NavLink to={"/auth"}>Кабинет разработчика</NavLink>
-                  onClick={(e) => {
-                    e.preventDefault();
-                    scrollToForm();
-                  }}
-                >
-                  Кабинет разработчика
-                </a>
               </li>
               <li>
-                <a
+                <NavLink to={"/tracker-intro"}>Трекер</NavLink>
-                  onClick={(e) => {
-                    e.preventDefault();
-                    scrollToForm();
-                  }}
-                >
-                  Трекер
-                </a>
               </li>
               <li>
                 <NavLink to={"/auth-candidate"} className="candidate">

src/components/Common/BaseButton/BaseButton.jsx

@@ -2,9 +2,13 @@ import React from "react";
 
 import "./basebutton.scss";
 
-export const BaseButton = ({ children, styles, ...props }) => {
+export const BaseButton = ({ children, styles, onClick, ...props }) => {
   return (
-    <button className={styles ? `${styles} button` : "button"} {...props}>
+    <button
+      onClick={onClick}
+      className={styles ? `${styles} button` : "button"}
+      {...props}
+    >
       {children}
     </button>
   );

src/components/Modal/AcceptModal/acceptModal.scss

@@ -12,7 +12,7 @@
 
   .acceptModal {
     border-radius: 20px;
-    background: linear-gradient(180deg, #FFF 0%, #EBEBEB 100%);
+    background: linear-gradient(180deg, #fff 0%, #ebebeb 100%);
     padding: 50px 34px 25px;
     display: flex;
     flex-direction: column;
@@ -43,16 +43,18 @@
       }
 
       .agree {
-        background: #52B709;
+        background: #52b709;
       }
 
       .cancel {
-        background: #B0BABF;
+        background: #b0babf;
       }
     }
 
     &__close {
       position: absolute;
+      width: 14px;
+      height: 14px;
       top: 15px;
       right: 22px;
       cursor: pointer;

src/components/Modal/ModalRegistration/modalRegistration.scss

@@ -7,11 +7,11 @@
   border: 1px solid #dde2e4;
   border-radius: 8px;
   width: 1088px;
-  height: 529px;
+  height: 515px;
 
   &-body {
     &__left {
-      padding: 60px 0 30px 77px;
+      padding: 33px 0 30px 77px;
 
       h2 {
         font-weight: 500;
@@ -114,12 +114,13 @@
 
     &__right {
       border-left: 1px solid #f1f1f1;
-      padding: 80px 32px 46px 25px;
+      padding: 30px 32px 46px 25px;
       display: flex;
       flex-direction: column;
       justify-content: space-between;
 
       h4 {
+        margin: 22px 0 22px 0;
         font-weight: 900;
         font-size: 14px;
         line-height: 24px;
@@ -140,7 +141,7 @@
         }
 
         img {
-          margin: 0 18px 20px 0;
+          margin: 0 18px 0 0;
         }
       }
     }

src/components/Modal/Tracker/ModalTicket/modalTicket.scss

@@ -1060,7 +1060,7 @@
               height: 42px;
               cursor: pointer;
               column-gap: 8px;
-              padding: 5px;
+              padding: 5px 5px 5px 14px;
               border-radius: 8px;
               background: #fff;
 
@@ -1138,9 +1138,13 @@
             z-index: 10;
 
             &__item {
+              width: 66px;
+              font-size: 15px;
+              transition: 0.4s;
               cursor: pointer;
 
               &:hover {
+                transition: 0.4s;
                 font-weight: 700;
               }
             }

src/components/ProjectTiket/ProjectTiket.jsx

@@ -25,6 +25,7 @@ import "./projectTiket.scss";
 export const ProjectTiket = ({ project, index }) => {
   const [modalSelect, setModalSelect] = useState(false);
   const [modalAdd, setModalAdd] = useState(false);
+  const [modalDelete, setModalDelete] = useState(false);
   const [acceptModalOpen, setAcceptModalOpen] = useState(false);
   const [path, setPath] = useState("");
   const dispatch = useDispatch();
@@ -71,6 +72,7 @@ export const ProjectTiket = ({ project, index }) => {
 
   function closeAcceptModal() {
     setAcceptModalOpen(false);
+    setModalDelete(false);
   }
 
   function linkProject() {}
@@ -144,7 +146,13 @@ export const ProjectTiket = ({ project, index }) => {
             <img src={archiveSet}></img>
             <p>в архив</p>
           </div>
-          <div onClick={removeProject}>
+
+          <div
+            onClick={() => {
+              setModalDelete(true);
+              setModalSelect(false);
+            }}
+          >
             <img src={del}></img>
             <p>удалить</p>
           </div>
@@ -152,6 +160,15 @@ export const ProjectTiket = ({ project, index }) => {
       </ModalSelect>
       {acceptModalOpen && (
         <AcceptModal
+          title={"Вы точно хотите переместить проект в архив?"}
+          closeModal={closeAcceptModal}
+          agreeHandler={removeProject}
+        />
+      )}
+
+      {modalDelete && (
+        <AcceptModal
+          title={"Вы точно хотите удалить?"}
           closeModal={closeAcceptModal}
           agreeHandler={removeProject}
         />

src/pages/PartnerSettings/PartnerSettings.jsx

@@ -1,7 +1,12 @@
-import React from "react";
+import React, { useState } from "react";
+
+import { apiRequest } from "@api/request";
+
+import { useNotification } from "@hooks/useNotification";
 
 import BaseButton from "@components/Common/BaseButton/BaseButton";
 import { Footer } from "@components/Common/Footer/Footer";
+import { Loader } from "@components/Common/Loader/Loader";
 import { Navigation } from "@components/Navigation/Navigation";
 import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
@@ -12,6 +17,69 @@ import kontur from "assets/images/logo/konturLogo.png";
 import "./partnerSettings.scss";
 
 export const PartnerSettings = () => {
+  const { showNotification } = useNotification();
+  const [inputsValue, setInputsValue] = useState({
+    name: "",
+    oldPassword: "",
+    password: "",
+  });
+
+  const [inputsError, setInputsError] = useState({
+    name: false,
+    password: false,
+  });
+
+  const [loader, setLoader] = useState(false);
+
+  const setSettings = () => {
+    if (inputsValue.name.length < 2) {
+      setInputsError((prevValue) => ({ ...prevValue, name: true }));
+      return;
+    }
+    if (inputsValue.password.length < 6 || inputsValue.oldPassword.length < 6) {
+      setInputsError(() => ({ name: false, password: true }));
+      return;
+    }
+    setLoader(true);
+    apiRequest("/user/change-personal-data", {
+      method: "PUT",
+      data: {
+        newUsername: inputsValue.name,
+      },
+    }).then((data) => {
+      apiRequest("/user/change-password", {
+        method: "PUT",
+        data: {
+          password: inputsValue.oldPassword,
+          newPassword: inputsValue.password,
+        },
+      }).then((data) => {
+        setLoader(false);
+        if (data.status === "success") {
+          setInputsError({
+            name: false,
+            password: false,
+          });
+          setInputsValue({
+            name: "",
+            oldPassword: "",
+            password: "",
+          });
+          showNotification({
+            show: true,
+            text: "Данные изменены",
+            type: "success",
+          });
+        } else {
+          showNotification({
+            show: true,
+            text: "Неверные данные",
+            type: "error",
+          });
+        }
+      });
+    });
+  };
   return (
     <div className="settings">
       <ProfileHeader />
@@ -31,21 +99,84 @@ export const PartnerSettings = () => {
 
               <p className="settings__lable-first">Изменение логина</p>
               <div className="settings__input">
-                <input></input>
+                <input
+                  className={inputsError.name ? "warning" : ""}
+                  placeholder="Имя"
+                  onChange={(e) => {
+                    setInputsValue((prevValue) => ({
+                      ...prevValue,
+                      name: e.target.value,
+                    }));
+                    setInputsError((prevValue) => ({
+                      ...prevValue,
+                      name: false,
+                    }));
+                  }}
+                  value={inputsValue.name}
+                />
+                {inputsError.name && (
+                  <span className="error">Минимум 2 символов</span>
+                )}
               </div>
 
               <p className="settings__lable-second">Изменение пароля</p>
+              <div className="settings__input oldPassword">
+                <input
+                  className={inputsError.password ? "warning" : ""}
+                  placeholder="Старый пароль"
+                  type={"password"}
+                  onChange={(e) => {
+                    setInputsValue((prevValue) => ({
+                      ...prevValue,
+                      oldPassword: e.target.value,
+                    }));
+                    setInputsError((prevValue) => ({
+                      ...prevValue,
+                      password: false,
+                    }));
+                  }}
+                  value={inputsValue.oldPassword}
+                />
+                {inputsError.password && (
+                  <span className="error">Введите верный пароль</span>
+                )}
+              </div>
               <div className="settings__input">
-                <input></input>
+                <input
+                  className={inputsError.password ? "warning" : ""}
+                  placeholder="Новый пароль"
+                  type={"password"}
+                  onChange={(e) => {
+                    setInputsValue((prevValue) => ({
+                      ...prevValue,
+                      password: e.target.value,
+                    }));
+                    setInputsError((prevValue) => ({
+                      ...prevValue,
+                      password: false,
+                    }));
+                  }}
+                  value={inputsValue.password}
+                />
+                {inputsError.password && (
+                  <span className="error">Минимум 6 символов</span>
+                )}
               </div>
 
               <div className="settings__buttons">
                 <BaseButton styles={"settings__buttons-cancel"}>
                   Отмена
                 </BaseButton>
-                <BaseButton styles={"settings__buttons-save"}>
+                {loader ? (
+                  <Loader style={"green"} width={"40px"} height={"40px"} />
+                ) : (
+                  <BaseButton
+                    onClick={setSettings}
+                    styles={"settings__buttons-save"}
+                  >
                     Сохранить
                   </BaseButton>
+                )}
               </div>
               <span className="settings__agreement">
                 Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и

src/pages/PartnerSettings/partnerSettings.scss

@@ -34,26 +34,37 @@
       margin: 39px 0 10px 0;
     }
     &-second {
-      margin: 31px 0 10px 0;
+      margin: 15px 0 10px 0;
     }
   }
 
   &__input {
+    display: flex;
+    flex-direction: column;
+    row-gap: 5px;
+    input {
+      padding: 5px 10px;
       background: #eff2f7;
       border-radius: 8px;
       width: 373px;
       height: 35px;
       border: none;
-
-    input {
       font-size: 15px;
-      background: #eff2f7;
-      height: 100%;
-      margin-left: 15px;
-      width: 85%;
-      border: none;
       outline: none;
     }
+
+    .error {
+      color: red;
+      font-size: 12px;
+    }
+
+    .warning {
+      border: 1px solid red;
+    }
+  }
+
+  .oldPassword {
+    margin-bottom: 25px;
   }
 
   &__agreement {
@@ -72,7 +83,7 @@
 
     &-cancel,
     &-save {
-      width: 151px;
+      min-width: 151px;
       height: 40px;
       font-size: 14px;
       line-height: 32px;
@@ -143,7 +154,6 @@
   &__report,
   &__login {
     width: 500px;
-    height: 435px;
     background: #ffffff;
     border-radius: 12px;
     padding: 30px 60px;

src/pages/ProjectTracker/ProjectTracker.js

@@ -531,7 +531,13 @@ export const ProjectTracker = () => {
                     }
                   >
                     {Boolean(projectBoard.projectUsers?.length) && (
-                      <div className="projectPersons">
+                      <div
+                        className={
+                          projectBoard.projectUsers?.length == 1
+                            ? "onePerson"
+                            : "projectPersons"
+                        }
+                      >
                         {projectBoard.projectUsers.slice(0, 3).map((person) => {
                           return (
                             <img

src/pages/Summary/Summary.js

@@ -1,3 +1,5 @@
+import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
+import { CKEditor } from "@ckeditor/ckeditor5-react";
 import React, { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import { Navigate } from "react-router-dom";
@@ -27,12 +29,27 @@ export const Summary = () => {
   const profileInfo = useSelector(getProfileInfo);
   const [openGit, setOpenGit] = useState(false);
   const [gitInfo, setGitInfo] = useState([]);
+  const [editSummeryOpen, setEditSummeryOpen] = useState(false);
+  const [summery, setSummery] = useState("");
 
   useEffect(() => {
     apiRequest(
       `/profile/portfolio-projects?card_id=${localStorage.getItem("cardId")}`
     ).then((responseGit) => setGitInfo(responseGit));
   }, []);
+
+  useEffect(() => {
+    setSummery(profileInfo.vc_text);
+  }, [profileInfo]);
+
+  function editSummery() {
+    apiRequest("/resume/edit-text", {
+      method: "PUT",
+      data: {
+        resume: summery,
+      },
+    }).then(() => {});
+  }
   return (
     <div className="summary">
       <ProfileHeader />
@@ -101,12 +118,47 @@ export const Summary = () => {
             <div className="experience__block">
               <div className="summary__sections__head">
                 <h3>Описание опыта работы</h3>
-                <button>Редактировать раздел</button>
+                <button
+                  className={editSummeryOpen ? "edit" : ""}
+                  onClick={() => {
+                    if (editSummeryOpen) {
+                      editSummery();
+                    }
+                    setEditSummeryOpen(!editSummeryOpen);
+                  }}
+                >
+                  {editSummeryOpen ? "Сохранить" : "Редактировать раздел"}
+                </button>
               </div>
+              {editSummeryOpen ? (
+                <CKEditor
+                  editor={ClassicEditor}
+                  data={summery}
+                  config={{
+                    removePlugins: [
+                      "CKFinderUploadAdapter",
+                      "CKFinder",
+                      "EasyImage",
+                      "Image",
+                      "ImageCaption",
+                      "ImageStyle",
+                      "ImageToolbar",
+                      "ImageUpload",
+                      "MediaEmbed",
+                      "BlockQuote",
+                    ],
+                  }}
+                  onChange={(event, editor) => {
+                    const data = editor.getData();
+                    setSummery(data);
+                  }}
+                />
+              ) : (
                 <div
                   className="experience__content"
-                dangerouslySetInnerHTML={{ __html: profileInfo.vc_text }}
+                  dangerouslySetInnerHTML={{ __html: summery }}
                 ></div>
+              )}
             </div>
           </div>
         )}

src/pages/Summary/summary.scss

@@ -220,6 +220,11 @@
         white-space: nowrap;
       }
     }
+
+    .edit {
+      background-color: green;
+      color: white;
+    }
   }
 
   .skills__section {
@@ -287,6 +292,15 @@
     }
   }
 
+  .ck-toolbar {
+    border: none !important;
+  }
+
+  .ck-content {
+    border: none !important;
+    padding: 15px 35px 15px 50px !important;
+  }
+
   &__sectionGit {
     margin-top: 25px;
 

src/pages/Tracker/Tracker.jsx

@@ -317,7 +317,8 @@ export const Tracker = () => {
                           <tr key={task.id}>
                             <td>
                               <div className="taskList__table__title-task">
-                                {task.title}
+                                <p>{task.title}</p>
+
                                 <div
                                   onClick={(e) => {
                                     toggleDescTask(e);

src/pages/Tracker/tracker.scss

@@ -322,6 +322,7 @@
               display: flex;
               position: relative;
               left: 5px;
+
               img {
                 position: relative;
                 display: flex;
@@ -341,6 +342,19 @@
               }
             }
 
+            .onePerson {
+              display: flex;
+              position: relative;
+              left: -15px;
+
+              img {
+                position: relative;
+                display: flex;
+                width: 32px;
+                height: 32px;
+              }
+            }
+
             span {
               width: 32px;
               height: 32px;
@@ -1597,12 +1611,20 @@
               gap: 10px;
               align-items: center;
               transition: 0.4s;
+              max-width: 350px;
+
+              p {
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                overflow: hidden;
+              }
 
               div {
                 cursor: pointer;
 
                 width: 15px;
-                height: 15px;
+                min-width: 15px;
+                min-height: 15px;
                 display: flex;
                 background-color: #000;
                 align-items: center;

src/pages/TrackerIntro/TrackerIntro.js

@@ -36,7 +36,7 @@ export const TrackerIntro = () => {
                 компании в одном месте: проекты, задачи, цели, сотрудники,
                 документы, переписки, отчеты
               </p>
-              <NavLink to="/auth" className="trackerIntro__btn">
+              <NavLink to="/tracker-registration" className="trackerIntro__btn">
                 Начать работу
               </NavLink>
             </div>
@@ -57,7 +57,7 @@ export const TrackerIntro = () => {
               Управление большим количеством проектов и гибкая настройка
               структуры под любые процессы
             </p>
-            <NavLink to="/auth" className="trackerIntro__btn">
+            <NavLink to="/tracker-registration" className="trackerIntro__btn">
               Начать работу
             </NavLink>
           </div>