13 changed files with 46 additions and 51 deletions
--- a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
+++ b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
@ -6,7 +6,7 @@ import {
  modalToggle
 } from "@redux/projectsTrackerSlice";

-import { caseOfNum, removeLast, urlForLocal } from "@utils/helper";
+import { caseOfNum, urlForLocal } from "@utils/helper";

 import { apiRequest } from "@api/request";

@ -67,7 +67,7 @@ const ListEmployees = ({
                  }
                  alt="avatar"
                />
-                <span>{removeLast(person.user.fio)}</span>
+                <span>{person.user.fio}</span>
                <img
                  className="delete"
                  src={close}
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@ -11,10 +11,10 @@ import { getProfileInfo } from "@redux/outstaffingSlice";
 import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";

 import {
+  backendImg,
  caseOfNum,
  getCorrectRequestDate,
  getToken,
-  removeLast,
  urlForLocal
 } from "@utils/helper";

@ -759,12 +759,12 @@ export const ModalTiсket = ({
          <div className="workers_box task__info">
            <span className="exit" onClick={() => setActive(false)}></span>
            <h5>Создатель: </h5>
-            <p className="workers__creator">{removeLast(task.user?.fio)}</p>
+            <p className="workers__creator">{task.user?.fio}</p>
            {executor ? (
              <>
                <h5>Исполнитель: </h5>
                <div className="executor">
-                  <p>{removeLast(executor.fio)}</p>
+                  <p>{executor.fio}</p>
                  <img
                    src={
                      executor?.avatar
@ -803,7 +803,7 @@ export const ModalTiсket = ({
                          key={person.user_id}
                          onClick={() => taskExecutor(person)}
                        >
-                          <span>{removeLast(person.user.fio)}</span>
+                          <span>{person.user.fio}</span>
                          <img
                            src={
                              person.user?.avatar
@ -826,7 +826,7 @@ export const ModalTiсket = ({
                  {members.map((member) => {
                    return (
                      <div className="worker" key={member.user_id}>
-                        <p>{removeLast(member.fio)}</p>
+                        <p>{member.fio}</p>
                        <img
                          src={
                            member?.avatar
@ -869,7 +869,7 @@ export const ModalTiсket = ({
                          key={person.user_id}
                          onClick={() => addMember(person)}
                        >
-                          <span>{removeLast(person.user.fio)}</span>
+                          <span>{person.user.fio}</span>
                          <img
                            src={
                              person.user?.avatar
@ -895,7 +895,7 @@ export const ModalTiсket = ({
                className="dead-line__container"
                onClick={() => setDatePickerOpen(!datePickerOpen)}
              >
-                <p>⌛</p>
+                <img src={calendarIcon} alt="calendar" />
                <span>
                  {deadLine ? getCorrectDate(deadLine) : "Срок исполнения"}
                </span>
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@ -950,7 +950,7 @@ export const TicketFullScreen = () => {
                      className="dead-line__container"
                      onClick={() => setDatePickerOpen(!datePickerOpen)}
                    >
-                      <p>⌛</p>
+                      <img src={calendarIcon} alt="calendar" />
                      <span>
                        {deadLine
                          ? getCorrectDate(deadLine)
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@ -23,7 +23,7 @@ import {
 } from "@redux/projectsTrackerSlice";

 import { getCorrectDate } from "@utils/calendarHelper";
-import { getCorrectRequestDate, removeLast, urlForLocal } from "@utils/helper";
+import { getCorrectRequestDate, urlForLocal } from "@utils/helper";

 import { apiRequest } from "@api/request";

@ -448,7 +448,7 @@ export const TrackerModal = ({
                  >
                    <p>
                      {selectedWorker
-                        ? removeLast(selectedWorker.employee.fio)
+                        ? selectedWorker.employee.fio
                        : "Выберите пользователя"}
                    </p>
                    <img className="arrow" src={arrowDown} alt="arrow" />
@ -467,7 +467,7 @@ export const TrackerModal = ({
                                  setSelectedWorker(worker);
                                }}
                              >
-                                <span>{removeLast(worker.employee.fio)}</span>
+                                <span>{worker.employee.fio}</span>
                                <img
                                  src={urlForLocal(worker.employee.avatar)}
                                  alt="avatar"
@ -521,6 +521,7 @@ export const TrackerModal = ({
            </div>
            <div className="create-task-body">
              <div className="create-task-body__left">
+                <h4>Введите название и описание задачи</h4>
                <div className="input-container">
                  <input
                    maxLength="100"
@ -698,7 +699,7 @@ export const TrackerModal = ({
                                }
                                alt="avatar"
                              />
-                              <span>{removeLast(person.user.fio)}</span>
+                              <span>{person.user.fio}</span>
                            </div>
                          );
                        })
@ -709,7 +710,7 @@ export const TrackerModal = ({
                  )}
                </div>
                <div className="create-task-body__right__dead-line">
-                  <p>⌛</p>
+                  <img src={calendarImg} alt="calendar" />
                  <p onClick={() => setDatePickerOpen(!datePickerOpen)}>
                    {deadLineDate
                      ? getCorrectDate(deadLineDate)
@ -733,7 +734,7 @@ export const TrackerModal = ({
              <Loader style={"green"} />
            ) : (
              <BaseButton styles={"button-add"} onClick={createTicket}>
-                Создать задачу
+                Создать
              </BaseButton>
            )}
          </div>
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@ -262,7 +262,7 @@
      position: absolute;
      width: 100%;
      padding: 9.5px 12px;
-      top: 45px;
+      top: 48px;
      left: 0;
      background: white;
      border-radius: 5px;
@ -337,7 +337,7 @@
  }

  .create-task-body {
-    padding: 15px 30px;
+    padding: 15px 20px;
    display: flex;
    column-gap: 20px;

@ -373,8 +373,8 @@
      }

      .ck-editor__editable.ck-rounded-corners {
-        min-height: 180px;
-        max-height: 180px;
+        min-height: 150px;
+        max-height: 150px;
      }
    }

@ -383,7 +383,6 @@
      flex-direction: column;
      align-items: start;
      justify-content: end;
-      row-gap: 10px;

      &__owner {
        display: flex;
@ -715,11 +714,6 @@
      }
    }
  }
-
-  .button-add {
-    margin: 0 30px;
-    align-self: flex-end;
-  }
 }

 .name-project {
--- a/src/components/Navigation/Navigation.jsx
+++ b/src/components/Navigation/Navigation.jsx
@ -97,7 +97,7 @@ export const Navigation = () => {

        <div className="profile-header__personal-info">
          <h3 className="profile-header__personal-info-name">
-            {profileInfo?.fio || profileInfo?.username}
+            {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
          </h3>
          <NavLink end to={"/profile"}>
            <img
--- a/src/components/ProfileCalendar/ProfileCalendar.jsx
+++ b/src/components/ProfileCalendar/ProfileCalendar.jsx
@ -95,7 +95,7 @@ export const ProfileCalendar = () => {
              alt="avatar"
            />
            <p className="summary__name">
-              {profileInfo?.fio || profileInfo?.username},{" "}
+              {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
              {profileInfo.specification} разработчик
            </p>
          </div>
--- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx
+++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx
@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
                ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
                : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
              : activePeriod
-                ? "Выберите диапазон на календаре"
-                : "Выбрать диапазон"}
+              ? "Выберите диапазон на календаре"
+              : "Выбрать диапазон"}
          </span>
          <span>
            {totalRangeHours
              ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
              : endDate
-                ? "0 часов"
-                : ""}
+              ? "0 часов"
+              : ""}
          </span>
          {endDate && (
            <BaseButton
--- a/src/components/ProfileHeader/ProfileHeader.jsx
+++ b/src/components/ProfileHeader/ProfileHeader.jsx
@ -146,7 +146,7 @@ export const ProfileHeader = () => {
        <nav className="auth-body__navigation">
          <div className="profile-header__personal-info">
            <h3 className="profile-header__personal-info-name">
-              {profileInfo?.fio || profileInfo?.username}
+              {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
            </h3>
            <NavLink end to={"/profile"}>
              <img
--- a/src/pages/Profile/Profile.jsx
+++ b/src/pages/Profile/Profile.jsx
@ -103,12 +103,12 @@ export const Profile = () => {
          {user === "developer" ? (
            <span>
              <p>Добрый день,&nbsp;</p>
-              {profileInfo?.fio || profileInfo?.username}
+              {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
            </span>
          ) : (
            <span>
              <p>Добрый день,&nbsp;</p>
-              {profileInfo?.fio || profileInfo?.username}
+              {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
            </span>
          )}
        </h2>
@ -124,11 +124,13 @@ export const Profile = () => {
            <p className="summary__name">
              {user === "developer" ? (
                <span>
-                  {profileInfo?.fio || profileInfo?.username},{" "}
+                  {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
                  {profileInfo?.specification} разработчик
                </span>
              ) : (
-                <span>{profileInfo?.fio || profileInfo?.username}</span>
+                <span>
+                  {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
+                </span>
              )}
            </p>
          </div>
--- a/src/pages/ProjectTracker/ProjectTracker.jsx
+++ b/src/pages/ProjectTracker/ProjectTracker.jsx
@ -23,7 +23,8 @@ import {
  setToggleTab
 } from "@redux/projectsTrackerSlice";

-import { removeLast, urlForLocal } from "@utils/helper";
+import { urlForLocal } from "@utils/helper";
+import { caseOfNum } from "@utils/helper";

 import { apiRequest } from "@api/request";

@ -43,6 +44,7 @@ import TrackerSelectColumn from "@components/TrackerSelectColumn/TrackerSelectCo

 import arrow from "assets/icons/arrows/arrowCalendar.png";
 import arrowDown from "assets/icons/arrows/selectArrow.png";
+import calendarIcon from "assets/icons/calendar.svg";
 import category from "assets/icons/category.svg";
 import close from "assets/icons/close.png";
 import commentsBoard from "assets/icons/commentsBoard.svg";
@ -62,6 +64,7 @@ export const ProjectTracker = () => {
  const dispatch = useDispatch();
  const projectId = useParams();

+  const currentDate = new Date().getFullYear();
  const [openColumnSelect, setOpenColumnSelect] = useState({});
  const [selectedTab, setSelectedTab] = useState(0);
  const [priorityTask, setPriorityTask] = useState(0);
@ -609,7 +612,7 @@ export const ProjectTracker = () => {
                                key={user.user_id}
                                onClick={() => executorFilter(user)}
                              >
-                                <p>{removeLast(user.user?.fio)}</p>
+                                <p>{user.user?.fio}</p>
                                <img
                                  src={
                                    user.user?.avatar
@ -907,7 +910,10 @@ export const ProjectTracker = () => {
                                    }
                                  }}
                                >
-                                  <p className="task__board__item__title">
+                                  <p
+                                    className="task__board__item__title"
+                                    style={{ color: titleColor }}
+                                  >
                                    {task.title}
                                  </p>
                                </div>
@ -949,7 +955,7 @@ export const ProjectTracker = () => {
                                  {task.dead_line && (
                                    <div className="tasks__board__item__dead-line">
                                      <p>⌛</p>
-                                      <span style={{ color: titleColor }}>
+                                      <span>
                                        {getCorrectDate(task.dead_line)}
                                      </span>
                                    </div>
@ -967,7 +973,7 @@ export const ProjectTracker = () => {
                                      alt="avatar"
                                    />
                                    <span>
-                                      {removeLast(task.executor?.fio) ||
+                                      {task.executor?.fio ||
                                        "Исполнитель не назначен"}
                                    </span>
                                  </div>
--- a/src/pages/Summary/Summary.jsx
+++ b/src/pages/Summary/Summary.jsx
@ -107,7 +107,7 @@ export const Summary = () => {
                alt="avatar"
              />
              <p className="summary__name">
-                {profileInfo?.fio || profileInfo?.username},{" "}
+                {profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
                {profileInfo.specification} разработчик
              </p>
            </div>
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@ -91,11 +91,3 @@ export function copyProjectLink(projectId) {
    `https://itguild.info/tracker/project/${projectId}`
  );
 }
-
-export function removeLast(string = " ") {
-  let arr = string.trim().split(" ");
-  if (arr.length > 2) {
-    return arr.slice(0, -1).join(" ");
-  }
-  return string;
-}