Fixed imports all components

config/webpack/common.js

@@ -54,6 +54,7 @@ module.exports = {
       "@": `${paths.src}/modules`,
       assets: `${paths.src}/assets`,
       "@components": `${paths.src}/components`,
+      "@utils": `${paths.src}/utils`,
       "@pages": `${paths.src}/pages`,
       "@redux": `${paths.src}/redux`,
       "@store": `${paths.src}/store`,

jsconfig.json

@@ -4,11 +4,12 @@
     "paths": {
       "assets/*": ["./assets/*"],
       "@components/*": ["./components/*"],
+      "@utils/*": ["./utils/*"],
       "@pages/*": ["./pages/*"],
       "@redux/*": ["./redux/*"],
       "@store/*": ["./store/*"],
       "@api/*": ["./api/*"],
-      "@hooks/*": ["./api/*"]
+      "@hooks/*": ["./hooks/*"]
     }
   }
 }

src/api/request.js

@@ -1,7 +1,5 @@
-import axios from 'axios';
-import {getToken, urlHasParams} from "../helper";
-
-
+import axios from "axios";
+import { getToken, urlHasParams } from "../utils/helper";
 
 const instance = axios.create({
   baseURL: process.env.REACT_APP_API_URL,
@@ -10,40 +8,47 @@ const instance = axios.create({
   },
 });
 
-export const apiRequest = (url, {
-  method = 'get', params, data,
+export const apiRequest = (
+  url,
+  {
+    method = "get",
+    params,
+    data,
     headers = {
-    'Access-Control-Allow-Origin': '*',
-    'Content-Type': 'application/json'
+      "Access-Control-Allow-Origin": "*",
+      "Content-Type": "application/json",
     },
-} = {}) => {
-  const fullHeaders = {...headers, ...getToken()};
+  } = {}
+) => {
+  const fullHeaders = { ...headers, ...getToken() };
   let urWithParams = urlHasParams(url);
 
-
   return instance
     .request({
       url: urWithParams,
       method,
       params,
       data,
-        headers: {...fullHeaders},
+      headers: { ...fullHeaders },
     })
-      .then(response => new Promise(resolve => {
+    .then(
+      (response) =>
+        new Promise((resolve) => {
           if (response.data.redirect || response.status === 401) {
-          window.location.replace('/auth');
+            window.location.replace("/auth");
             localStorage.clear();
             // dispatch(auth(false));
           }
-        return resolve(response)
-      }))
-      .then(response => new Promise(resolve => resolve(response.data)))
+          return resolve(response);
+        })
+    )
+    .then((response) => new Promise((resolve) => resolve(response.data)));
 };
 
 const RequestError = (code, msg, data) => {
-  const description = msg ? `- ${msg}` : '';
+  const description = msg ? `- ${msg}` : "";
 
-  this.name = 'RequestError';
+  this.name = "RequestError";
   this.message = `API returned: ${code}${description}.`;
   this.code = code;
   this.description = msg;

src/components/AuthBox/AuthBox.jsx

@@ -1,18 +1,17 @@
 import React, { useEffect, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
-
 import { useDispatch, useSelector } from "react-redux";
-import { auth, selectAuth, setUserInfo } from "../../redux/outstaffingSlice";
-import { loading } from "../../redux/loaderSlice";
-import { setRole } from "../../redux/roleSlice";
-import { selectIsLoading } from "../../redux/loaderSlice";
 
-import ModalRegistration from "../Modal/ModalRegistration/ModalRegistration";
-import ModalErrorLogin from "../Modal/ModalErrorLogin/ModalErrorLogin";
-import { Loader } from "../Loader/Loader";
-import { apiRequest } from "../../api/request";
+import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice";
+import { loading, selectIsLoading } from "@redux/loaderSlice";
+import { setRole } from "@redux/roleSlice";
 
-import ellipse from "../../assets/icons/ellipse.png";
+import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration";
+import ModalErrorLogin from "@components/Modal/ModalErrorLogin/ModalErrorLogin";
+import { Loader } from "@components/Loader/Loader";
+import { apiRequest } from "@api/request";
+
+import ellipse from "assets/icons/ellipse.png";
 
 import "./authBox.scss";
 

src/components/AuthHeader/AuthHeader.jsx

@@ -1,8 +1,9 @@
 import React from "react";
 import { NavLink } from "react-router-dom";
-import { scrollToForm } from "../../helper";
 
-import userIcon from "../../assets/icons/userIcon.svg";
+import { scrollToForm } from "@utils/helper";
+
+import userIcon from "assets/icons/userIcon.svg";
 
 import "./authHeader.scss";
 

src/components/Calendar/Calendar.jsx

@@ -4,12 +4,12 @@ import { Link, Navigate, useNavigate } from "react-router-dom";
 
 import CalendarComponent from "./CalendarComponent";
 import { currentMonth } from "./calendarHelper";
-import { Footer } from "../Footer/Footer";
-import { LogoutButton } from "../LogoutButton/LogoutButton";
-import { urlForLocal } from "../../helper";
-import { selectCurrentCandidate } from "../../redux/outstaffingSlice";
+import { Footer } from "@components/Footer/Footer";
+import { LogoutButton } from "@components/LogoutButton/LogoutButton";
+import { urlForLocal } from "@utils/helper";
+import { selectCurrentCandidate } from "@redux/outstaffingSlice";
 
-import rectangle from "../../assets/images/rectangle_secondPage.png";
+import rectangle from "assets/images/rectangle_secondPage.png";
 
 import "./calendar.scss";
 

src/components/Calendar/CalendarComponent.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from "react";
 import { calendarHelper, currentMonthAndDay } from "./calendarHelper";
 
-import ellipse from "../../assets/icons/ellipse.png";
-import rectangle from "../../assets/images/rectangle__calendar.png";
-import calendarIcon from "../../assets/icons/calendar.svg";
+import ellipse from "assets/icons/ellipse.png";
+import rectangle from "assets/images/rectangle__calendar.png";
+import calendarIcon from "assets/icons/calendar.svg";
 
 import moment from "moment";
+
 import "moment/locale/ru";
 
 import "./calendarComponent.scss";

src/components/Candidate/Candidate.jsx

@@ -2,29 +2,28 @@ import React, { useEffect, useState } from "react";
 import { useParams, Link, useNavigate, Navigate } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 
-import SkillSection from "../SkillSection/SkillSection";
-import Sidebar from "../CandidateSidebar/CandidateSidebar";
-import { ProfileHeader } from "../ProfileHeader/ProfileHeader";
-import { ProfileBreadcrumbs } from "../ProfileBreadcrumbs/ProfileBreadcrumbs";
-import { Footer } from "../Footer/Footer";
-import { Navigation } from "../Navigation/Navigation";
+import SkillSection from "@components/SkillSection/SkillSection";
+import Sidebar from "@components/CandidateSidebar/CandidateSidebar";
+import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
+import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
+import { Footer } from "@components/Footer/Footer";
+import { Navigation } from "@components/Navigation/Navigation";
 
 import {
   currentCandidate,
   selectCurrentCandidate,
-} from "../../redux/outstaffingSlice";
+} from "@redux/outstaffingSlice";
 
-import { apiRequest } from "../../api/request";
-import { createMarkup } from "../../helper";
+import { apiRequest } from "@api/request";
+import { createMarkup } from "@utils/helper";
+import { LEVELS, SKILLS } from "@utils/constants";
 
-import gitImgItem from "../../assets/icons/gitItemImg.svg";
-import rectangle from "../../assets/images/rectangle_secondPage.png";
-import front from "../../assets/images/partnerProfile/front-end.webp";
-import back from "../../assets/images/partnerProfile/back-end.webp";
-import design from "../../assets/images/partnerProfile/design.webp";
-import rightArrow from "../../assets/icons/arrows/arrowRight.svg";
-
-import { LEVELS, SKILLS } from "../../constants/constants";
+import gitImgItem from "assets/icons/gitItemImg.svg";
+import rectangle from "assets/images/rectangle_secondPage.png";
+import front from "assets/images/partnerProfile/front-end.webp";
+import back from "assets/images/partnerProfile/back-end.webp";
+import design from "assets/images/partnerProfile/design.webp";
+import rightArrow from "assets/icons/arrows/arrowRight.svg";
 
 import "./candidate.scss";
 

src/components/CandidateSidebar/CandidateSidebar.jsx

@@ -1,10 +1,10 @@
 import React, { useState } from "react";
 
-import { Achievement } from "../Achievement/Achievement";
-import ModalAspirant from "../Modal/ModalAspirant/ModalAspirant";
+import { Achievement } from "@components/Achievement/Achievement";
+import ModalAspirant from "@components/Modal/ModalAspirant/ModalAspirant";
 
-import { urlForLocal } from "../../helper";
-import { LEVELS, SKILLS } from "../../constants/constants";
+import { urlForLocal } from "@utils/helper";
+import { LEVELS, SKILLS } from "@utils/constants";
 
 import "./candidateSidebar.scss";
 

src/components/CardControl/CardControl.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import rightArrow from "../../assets/icons/arrows/arrowRight.svg";
+import rightArrow from "assets/icons/arrows/arrowRight.svg";
 
 import "./CardControl.scss";
 

src/components/CategoriesItem/CategoriesItem.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import rightArrow from "../../assets/icons/arrows/arrowRight.svg";
+import rightArrow from "assets/icons/arrows/arrowRight.svg";
 
 import "./categoriesItem.scss";
 

src/components/Description/Description.jsx

@@ -4,13 +4,12 @@ import { Link } from "react-router-dom";
 
 import ErrorBoundary from "../../hoc/ErrorBoundary";
 
-import { LEVELS, SKILLS } from "../../constants/constants";
-import { selectProfiles } from "../../redux/outstaffingSlice";
+import { LEVELS, SKILLS } from "@utils/constants";
+import { urlForLocal } from "@utils/helper";
+import { selectProfiles } from "@redux/outstaffingSlice";
 
-import { urlForLocal } from "../../helper";
-
-import rectangle from "../../assets/images/rectangle_secondPage.png";
-import cursorImg from "../../assets/icons/cursorImg.svg";
+import rectangle from "assets/images/rectangle_secondPage.png";
+import cursorImg from "assets/icons/cursorImg.svg";
 
 import "./description.scss";
 

src/components/Footer/Footer.jsx

@@ -1,9 +1,9 @@
 import React from "react";
 
-import logo from "../../assets/images/logo/LogoITguild.svg";
-import vk from "../../assets/icons/vkLogo.svg";
-import tg from "../../assets/icons/tgFooter.svg";
-import email from "../../assets/icons/emailLogo.svg";
+import logo from "assets/images/logo/LogoITguild.svg";
+import vk from "assets/icons/vkLogo.svg";
+import tg from "assets/icons/tgFooter.svg";
+import email from "assets/icons/emailLogo.svg";
 
 import "./footer.scss";
 

src/components/Form/Form.jsx

@@ -2,8 +2,8 @@ import React, { useEffect, useState } from "react";
 import { useParams, useNavigate } from "react-router-dom";
 import PhoneInput from "react-phone-input-2";
 
-import { apiRequest } from "../../api/request";
-import { Loader } from "../Loader/Loader";
+import { apiRequest } from "@api/request";
+import { Loader } from "@components/Loader/Loader";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";
 

src/components/FreeDevelopers/FreeDevelopers.jsx

@@ -1,15 +1,16 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import AuthHeader from "../AuthHeader/AuthHeader";
-import SideBar from "../SideBar/SideBar";
-import { Footer } from "../Footer/Footer";
-import { scrollToForm } from "../../helper";
-import { ProfileBreadcrumbs } from "../ProfileBreadcrumbs/ProfileBreadcrumbs";
-import BaseButton from "../Common/BaseButton/BaseButton";
+import { scrollToForm } from "@utils/helper";
 
-import mockWorker from "../../assets/images/mock/mokPerson.png";
-import arrow from "../../assets/icons/arrows/arrow_left.png";
+import AuthHeader from "@components/AuthHeader/AuthHeader";
+import SideBar from "@components/SideBar/SideBar";
+import { Footer } from "@components/Footer/Footer";
+import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
+
+import mockWorker from "assets/images/mock/mokPerson.png";
+import arrow from "assets/icons/arrows/arrow_left.png";
 
 import "./freeDevelopers.scss";
 

src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import questionIcon from "./../../assets/images/faq/question.svg";
+import questionIcon from "assets/images/faq/question.svg";
 
 import "./FrequentlyAskedQuestionsItem.scss";
 

src/components/Header/Header.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { LogoutButton } from "../LogoutButton/LogoutButton";
+import { LogoutButton } from "@components/LogoutButton/LogoutButton";
 
 import "./header.scss";
 

src/components/LogoutButton/LogoutButton.jsx

@@ -2,9 +2,9 @@ import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 
-import { useLogout } from "../../hooks/useLogout";
-import { Loader } from "../Loader/Loader";
-import { getRole } from "../../redux/roleSlice";
+import { useLogout } from "@hooks/useLogout";
+import { Loader } from "@components/Loader/Loader";
+import { getRole } from "@redux/roleSlice";
 
 import "./logoutButton.scss";
 

src/components/Modal/ModalAspirant/ModalAspirant.jsx

@@ -1,13 +1,13 @@
 import React, { useState } from "react";
-
 import { Link } from "react-router-dom";
-import ModalLayout from "../../Common/ModalLayout/ModalLayout";
-import BaseButton from "../../Common/BaseButton/BaseButton";
 
-import avatar from "../../../assets/images/mock/mokPerson.png";
-import logoTg from "../../../assets/icons/tgLogo.svg";
-import arrow from "../../../assets/icons/arrows/left-arrow.png";
-import interview from "../../../assets/images/logo/interviewLogo.svg";
+import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
+
+import avatar from "assets/images/mock/mokPerson.png";
+import logoTg from "assets/icons/tgLogo.svg";
+import arrow from "assets/icons/arrows/left-arrow.png";
+import interview from "assets/images/logo/interviewLogo.svg";
 
 import "./modalAspirant.scss";
 

src/components/Modal/ModalErrorLogin/ModalErrorLogin.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import ModalLayout from "../../Common/ModalLayout/ModalLayout";
-import BaseButton from "../../Common/BaseButton/BaseButton";
+import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
 
 import "./modalErrorLogin.scss";
 

src/components/Modal/ModalRegistration/ModalRegistration.jsx

@@ -1,11 +1,11 @@
 import React from "react";
 
-import ModalLayout from "../../Common/ModalLayout/ModalLayout";
-import BaseButton from "../../Common/BaseButton/BaseButton";
+import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
 
-import telegramLogo from "../../../assets/icons/tgLogo.svg";
-import doc from "../../../assets/icons/doc.svg";
-import anyMoment from "../../../assets/icons/anyMoment.svg";
+import telegramLogo from "assets/icons/tgLogo.svg";
+import doc from "assets/icons/doc.svg";
+import anyMoment from "assets/icons/anyMoment.svg";
 
 import "./modalRegistration.scss";
 

src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx

@@ -1,31 +1,28 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
-
-import { apiRequest } from "../../../../api/request";
 import { useDispatch } from "react-redux";
-import { urlForLocal } from "../../../../helper";
-import {
-  modalToggle,
-  setProjectBoardFetch,
-} from "../../../../redux/projectsTrackerSlice";
-import { getCorrectDate } from "../../../../components/Calendar/calendarHelper";
 
-import TrackerModal from "../../../UI/TrackerModal/TrackerModal";
-import ModalLayout from "../../../Common/ModalLayout/ModalLayout";
-import BaseButton from "../../../Common/BaseButton/BaseButton";
+import { apiRequest } from "@api/request";
+import { urlForLocal } from "@utils/helper";
+import { modalToggle, setProjectBoardFetch } from "@redux/projectsTrackerSlice";
+import { getCorrectDate } from "@components/Calendar/calendarHelper";
 
-import category from "../../../../assets/icons/category.svg";
-import watch from "../../../../assets/icons/watch.svg";
-import file from "../../../../assets/icons/fileModal.svg";
-import arrow from "../../../../assets/icons/arrows/arrowStart.png";
-import link from "../../../../assets/icons/link.svg";
-import archive from "../../../../assets/icons/archive.svg";
-import del from "../../../../assets/icons/delete.svg";
-import edit from "../../../../assets/icons/edit.svg";
-import send from "../../../../assets/icons/send.svg";
-import plus from "../../../../assets/icons/plus.svg";
-import fullScreen from "../../../../assets/icons/arrows/inFullScreen.svg";
-import close from "../../../../assets/icons/closeProjectPersons.svg";
+import TrackerModal from "@components/UI/TrackerModal/TrackerModal";
+import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
+
+import category from "assets/icons/category.svg";
+import watch from "assets/icons/watch.svg";
+import file from "assets/icons/fileModal.svg";
+import arrow from "assets/icons/arrows/arrowStart.png";
+import link from "assets/icons/link.svg";
+import archive from "assets/icons/archive.svg";
+import del from "assets/icons/delete.svg";
+import edit from "assets/icons/edit.svg";
+import send from "assets/icons/send.svg";
+import plus from "assets/icons/plus.svg";
+import fullScreen from "assets/icons/arrows/inFullScreen.svg";
+import close from "assets/icons/closeProjectPersons.svg";
 
 import "./ModalTicket.scss";
 

src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx

@@ -1,14 +1,16 @@
 import React, { useEffect, useState } from "react";
-
-import { ProfileHeader } from "../../../ProfileHeader/ProfileHeader";
-import { ProfileBreadcrumbs } from "../../../ProfileBreadcrumbs/ProfileBreadcrumbs";
-import { Footer } from "../../../Footer/Footer";
 import { Link, useParams, useNavigate } from "react-router-dom";
-import TrackerModal from "../../../UI/TrackerModal/TrackerModal";
-import { Navigation } from "../../../Navigation/Navigation";
-import { Loader } from "../../../Loader/Loader";
-
 import { useDispatch, useSelector } from "react-redux";
+
+import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
+import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
+import { Footer } from "@components/Footer/Footer";
+import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
+import TrackerModal from "@components/UI/TrackerModal/TrackerModal";
+import { Navigation } from "@components/Navigation/Navigation";
+import { Loader } from "@components/Loader/Loader";
+
 import {
   deletePersonOnProject,
   modalToggle,
@@ -16,27 +18,25 @@ import {
   setToggleTab,
   getProjectBoard,
   getBoarderLoader,
-} from "../../../../redux/projectsTrackerSlice";
-import { apiRequest } from "../../../../api/request";
-import { urlForLocal } from "../../../../helper";
-import { getCorrectDate } from "../../../Calendar/calendarHelper";
-import BaseButton from "../../../Common/BaseButton/BaseButton";
+} from "@redux/projectsTrackerSlice";
+import { apiRequest } from "@api/request";
+import { urlForLocal } from "@utils/helper";
 
-import project from "../../../../assets/icons/trackerProject.svg";
-import watch from "../../../../assets/icons/watch.svg";
-import file from "../../../../assets/icons/fileModal.svg";
-import send from "../../../../assets/icons/send.svg";
-import arrow2 from "../../../../assets/icons/arrows/arrowStart.png";
-import plus from "../../../../assets/icons/plus.svg";
-import tasks from "../../../../assets/icons/trackerTasks.svg";
-import archive from "../../../../assets/icons/archiveTracker.svg";
-import selectArrow from "../../../../assets/icons/arrows/select.svg";
-import arrow from "../../../../assets/icons/arrows/arrowCalendar.png";
-import link from "../../../../assets/icons/link.svg";
-import archive2 from "../../../../assets/icons/archive.svg";
-import del from "../../../../assets/icons/delete.svg";
-import edit from "../../../../assets/icons/edit.svg";
-import close from "../../../../assets/icons/closeProjectPersons.svg";
+import project from "assets/icons/trackerProject.svg";
+import watch from "assets/icons/watch.svg";
+import file from "assets/icons/fileModal.svg";
+import send from "assets/icons/send.svg";
+import arrow2 from "assets/icons/arrows/arrowStart.png";
+import plus from "assets/icons/plus.svg";
+import tasks from "assets/icons/trackerTasks.svg";
+import archive from "assets/icons/archiveTracker.svg";
+import selectArrow from "assets/icons/arrows/select.svg";
+import arrow from "assets/icons/arrows/arrowCalendar.png";
+import link from "assets/icons/link.svg";
+import archive2 from "assets/icons/archive.svg";
+import del from "assets/icons/delete.svg";
+import edit from "assets/icons/edit.svg";
+import close from "assets/icons/closeProjectPersons.svg";
 
 import "./ticketFullScreen.scss";
 

src/components/Navigation/Navigation.jsx

@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from "react";
 import { NavLink } from "react-router-dom";
-import { urlForLocal } from "../../helper";
-import { apiRequest } from "../../api/request";
 import { useDispatch, useSelector } from "react-redux";
-import { getProfileInfo, setProfileInfo } from "../../redux/outstaffingSlice";
 
-import avatarMok from "../../assets/images/avatarMok.png";
+import { urlForLocal } from "@utils/helper";
+import { apiRequest } from "@api/request";
+import { getProfileInfo, setProfileInfo } from "@redux/outstaffingSlice";
+
+import avatarMok from "assets/images/avatarMok.png";
 
 export const Navigation = () => {
   const dispatch = useDispatch();

src/components/Outstaffing/Outstaffing.jsx

@@ -1,17 +1,18 @@
 import React from "react";
 import { useSelector, useDispatch } from "react-redux";
 
-import OutstaffingBlock from "../OutstaffingBlock/OutstaffingBlock";
-import TagSelect from "../Select/TagSelect";
+import OutstaffingBlock from "@components/OutstaffingBlock/OutstaffingBlock";
+import TagSelect from "@components/Select/TagSelect";
+
 import {
   selectTags,
   getPositionId,
   setPositionId,
-} from "../../redux/outstaffingSlice";
+} from "@redux/outstaffingSlice";
 
-import front from "../../assets/images/partnerProfile/front-end.webp";
-import back from "../../assets/images/partnerProfile/back-end.webp";
-import design from "../../assets/images/partnerProfile/design.webp";
+import front from "assets/images/partnerProfile/front-end.webp";
+import back from "assets/images/partnerProfile/back-end.webp";
+import design from "assets/images/partnerProfile/design.webp";
 
 import "./outstaffing.scss";
 

src/components/OutstaffingBlock/OutstaffingBlock.jsx

@@ -1,13 +1,9 @@
 import React from "react";
 import OutsideClickHandler from "react-outside-click-handler";
 import { useDispatch, useSelector } from "react-redux";
-import {
-  selectItems,
-  selectedItems,
-  profiles,
-} from "../../redux/outstaffingSlice";
 
-import { apiRequest } from "../../api/request";
+import { selectItems, selectedItems, profiles } from "@redux/outstaffingSlice";
+import { apiRequest } from "@api/request";
 
 import "./outstaffingBlock.scss";
 

src/components/ProfileCalendar/ProfileCalendar.jsx

@@ -2,23 +2,24 @@ import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { Link, Navigate } from "react-router-dom";
 
-import { getReports } from "../Calendar/calendarHelper";
-import moment from "moment";
-import { ProfileCalendarComponent } from "./ProfileCalendarComponent";
-import { Loader } from "../Loader/Loader";
-import { ProfileHeader } from "../ProfileHeader/ProfileHeader";
-import { ProfileBreadcrumbs } from "../ProfileBreadcrumbs/ProfileBreadcrumbs";
-import { Footer } from "../Footer/Footer";
-import { Navigation } from "../Navigation/Navigation";
-import { urlForLocal } from "../../helper";
-import { apiRequest } from "../../api/request";
-import { getProfileInfo } from "../../redux/outstaffingSlice";
+import { urlForLocal } from "@utils/helper";
+import { apiRequest } from "@api/request";
+import { getProfileInfo } from "@redux/outstaffingSlice";
 import {
   getRequestDates,
   setReportDate,
   setRequestDate,
-} from "../../redux/reportSlice";
+} from "@redux/reportSlice";
+import { getReports } from "@components/Calendar/calendarHelper";
 
+import { ProfileCalendarComponent } from "./ProfileCalendarComponent";
+import { Loader } from "@components/Loader/Loader";
+import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
+import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
+import { Footer } from "@components/Footer/Footer";
+import { Navigation } from "@components/Navigation/Navigation";
+
+import moment from "moment";
 import "moment/locale/ru";
 import "./profileCalendar.scss";
 

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -6,23 +6,23 @@ import {
   setReportDate,
   setRequestDate,
   setSendRequest,
-} from "../../redux/reportSlice";
+} from "@redux/reportSlice";
 import {
   calendarHelper,
   currentMonthAndDay,
   getReports,
   hourOfNum,
-} from "../Calendar/calendarHelper";
-import ShortReport from "../ShortReport/ShortReport";
+} from "@components/Calendar/calendarHelper";
+import ShortReport from "@components/ShortReport/ShortReport";
 
-import arrow from "../../assets/icons/arrows/arrowCalendar.png";
-import rectangle from "../../assets/images/rectangle__calendar.png";
-import calendarIcon from "../../assets/icons/calendar.svg";
+import arrow from "assets/icons/arrows/arrowCalendar.png";
+import rectangle from "assets/images/rectangle__calendar.png";
+import calendarIcon from "assets/icons/calendar.svg";
 
 import moment from "moment";
 
 import "moment/locale/ru";
-import "./../Calendar/calendarComponent.scss";
+import "@components/Calendar/calendarComponent.scss";
 
 export const ProfileCalendarComponent = React.memo(
   ({ value, setValueHandler, reports, totalHours }) => {

src/components/ProfileHeader/ProfileHeader.jsx

@@ -2,10 +2,10 @@ import React, { useEffect, useState } from "react";
 import { useNavigate, NavLink } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
 
-import { Loader } from "../Loader/Loader";
-import { apiRequest } from "../../api/request";
-import { auth, setProfileInfo } from "../../redux/outstaffingSlice";
-import { getRole } from "../../redux/roleSlice";
+import { Loader } from "@components/Loader/Loader";
+import { apiRequest } from "@api/request";
+import { auth, setProfileInfo } from "@redux/outstaffingSlice";
+import { getRole } from "@redux/roleSlice";
 
 import "./profileHeader.scss";
 

src/components/ProjectTiket/ProjectTiket.jsx

@@ -1,16 +1,17 @@
 import React, { useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
 import { Link } from "react-router-dom";
-import { apiRequest } from "../../api/request";
-import { deleteProject, modalToggle } from "../../redux/projectsTrackerSlice";
 
-import { ModalSelect } from "../UI/ModalSelect/ModalSelect";
-import TrackerModal from "../UI/TrackerModal/TrackerModal";
+import { apiRequest } from "@api/request";
+import { deleteProject, modalToggle } from "@redux/projectsTrackerSlice";
 
-import link from "../../assets/icons/link.svg";
-import archiveSet from "../../assets/icons/archive.svg";
-import del from "../../assets/icons/delete.svg";
-import edit from "../../assets/icons/edit.svg";
+import { ModalSelect } from "@components/UI/ModalSelect/ModalSelect";
+import TrackerModal from "@components/UI/TrackerModal/TrackerModal";
+
+import link from "assets/icons/link.svg";
+import archiveSet from "assets/icons/archive.svg";
+import del from "assets/icons/delete.svg";
+import edit from "assets/icons/edit.svg";
 
 import "./projectTiket.scss";
 

src/components/ProtectedRoute/ProtectedRoute.js

@@ -2,7 +2,7 @@ import React from "react";
 import { useSelector } from "react-redux";
 import { Route, Redirect } from "react-router-dom";
 
-import { selectAuth } from "../../redux/outstaffingSlice";
+import { selectAuth } from "@redux/outstaffingSlice";
 
 export const ProtectedRoute = ({ component: Component, ...rest }) => {
   const isAuth = useSelector(selectAuth);

src/components/ReportForm/ReportForm.jsx

@@ -10,19 +10,19 @@ import {
 import ru from "date-fns/locale/ru";
 registerLocale("ru", ru);
 
-import { Loader } from "../Loader/Loader";
-import { Footer } from "../Footer/Footer";
-import { ProfileHeader } from "../ProfileHeader/ProfileHeader";
-import { ProfileBreadcrumbs } from "../ProfileBreadcrumbs/ProfileBreadcrumbs";
+import { Loader } from "@components/Loader/Loader";
+import { Footer } from "@components/Footer/Footer";
+import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
+import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 
-import { apiRequest } from "../../api/request";
-import { Navigation } from "../Navigation/Navigation";
-import { getReportDate } from "../../redux/reportSlice";
+import { apiRequest } from "@api/request";
+import { Navigation } from "@components/Navigation/Navigation";
+import { getReportDate } from "@redux/reportSlice";
 
-import calendarIcon from "../../assets/icons/calendar.svg";
-import ellipse from "../../assets/icons/ellipse.png";
-import remove from "../../assets/icons/remove.svg";
-import arrow from "../../assets/icons/arrows/left-arrow.png";
+import calendarIcon from "assets/icons/calendar.svg";
+import ellipse from "assets/icons/ellipse.png";
+import remove from "assets/icons/remove.svg";
+import arrow from "assets/icons/arrows/left-arrow.png";
 
 import "./reportForm.scss";
 import "react-datepicker/dist/react-datepicker.css";

src/components/Select/TagSelect.jsx

@@ -2,15 +2,15 @@ import React, { useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import Select from "react-select";
 
-import { Loader } from "../Loader/Loader";
-import { apiRequest } from "../../api/request";
+import { Loader } from "@components/Loader/Loader";
+import { apiRequest } from "@api/request";
 import {
   selectedItems,
   selectItems,
   selectTags,
   profiles,
   setPositionId,
-} from "../../redux/outstaffingSlice";
+} from "@redux/outstaffingSlice";
 
 import "./tagSelect.scss";
 

src/components/ShortReport/ShortReport.jsx

@@ -2,18 +2,18 @@ import React, { useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { Link } from "react-router-dom";
 
-import { apiRequest } from "../../api/request";
+import { apiRequest } from "@api/request";
 import {
   getCorrectDate,
   getCreatedDate,
   hourOfNum,
-} from "../../components/Calendar/calendarHelper";
+} from "@components/Calendar/calendarHelper";
 import {
   getReportDate,
   getSendRequest,
   setSendRequest,
-} from "../../redux/reportSlice";
-import { Loader } from "../Loader/Loader";
+} from "@redux/reportSlice";
+import { Loader } from "@components/Loader/Loader";
 
 import "./shortReport.scss";
 

src/components/SideBar/SideBar.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
 
-import arrow from "../../assets/icons/sideBarArrow.svg";
-import LogoITguild from "../../assets/images/logo/LogoITguild.svg";
+import arrow from "assets/icons/sideBarArrow.svg";
+import LogoITguild from "assets/images/logo/LogoITguild.svg";
 
 import "./sidebar.scss";
 

src/components/SliderWorkers/SliderWorkers.jsx

@@ -2,9 +2,9 @@ import React, { useState } from "react";
 import Slider from "react-slick";
 import { Link } from "react-router-dom";
 
-import BaseButton from "../Common/BaseButton/BaseButton";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
 
-import mockWorker from "../../assets/images/mock/mokPerson.png";
+import mockWorker from "assets/images/mock/mokPerson.png";
 
 import "./sliderWorkers.scss";
 import "slick-carousel/slick/slick.css";

src/components/UI/CardArticle/CardArticle.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import cardCalendar from "../../../assets/icons/cardCalendar.svg";
+import cardCalendar from "assets/icons/cardCalendar.svg";
 
 import "./cardArticle.scss";
 

src/components/UI/TrackerModal/TrackerModal.jsx

@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from "react";
-
 import { useDispatch, useSelector } from "react-redux";
-import { apiRequest } from "../../../api/request";
-import { urlForLocal } from "../../../helper";
+
+import { apiRequest } from "@api/request";
+import { urlForLocal } from "@utils/helper";
 import {
   setColumnName,
   getProjectBoard,
@@ -14,9 +14,9 @@ import {
   getColumnName,
   getColumnId,
   addPersonToProject,
-} from "../../../redux/projectsTrackerSlice";
+} from "@redux/projectsTrackerSlice";
 
-import arrowDown from "../../../assets/icons/arrows/selectArrow.png";
+import arrowDown from "assets/icons/arrows/selectArrow.png";
 
 import "./trackerModal.scss";
 

src/components/features/Candidate-lk/HeadBottom.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import medium_male from "../../../assets/images/medium_male.png";
+import medium_male from "assets/images/medium_male.png";
 
 export const HeadBottom = () => {
   return (

src/components/features/quiz/AlertResult.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import suucessIcon from "../../../assets/images/quiz/success.png";
+import suucessIcon from "assets/images/quiz/success.png";
 
 export const AlertResult = () => {
   const successTest = false;

src/components/features/quiz/BlockCompletedTest.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import compltedImage from "../../../assets/images/quiz/compltedImage.png";
+import compltedImage from "assets/images/quiz/compltedImage.png";
 
 export const BlockCompletedTest = () => {
   const id = localStorage.getItem("id");

src/components/features/quiz/Card-introduction.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import questionIcon from "../../../assets/images/question.png";
+import questionIcon from "assets/images/question.png";
 
 import "./quiz.scss";
 

src/components/features/quiz/CardAviableTest.js

@@ -1,8 +1,9 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import rightArrow from "../../../assets/icons/arrows/arrowRight.svg";
-import StarRating from "../../StarRating/StarRating";
+import StarRating from "@components/StarRating/StarRating";
+
+import rightArrow from "assets/icons/arrows/arrowRight.svg";
 
 export const CardAvailableTest = ({ title, description, path, passedTest }) => {
   return (

src/components/features/quiz/GetOptionTask.js

@@ -1,6 +1,7 @@
 import React from "react";
 import { useSelector } from "react-redux";
-import { selectedTest } from "../../../redux/quizSlice";
+
+import { selectedTest } from "@redux/quizSlice";
 
 export const GetOptionTask = ({ type, answer, handleChange, inputValue }) => {
   const id = localStorage.getItem("id");

src/components/features/quiz/HeaderPageTests.js

@@ -1,8 +1,8 @@
 import { Link } from "react-router-dom";
 import { useSelector } from "react-redux";
 
-import { selectedTest, selectUserInfo } from "../../../redux/quizSlice";
-import { urlForLocal } from "../../../helper";
+import { selectedTest, selectUserInfo } from "@redux/quizSlice";
+import { urlForLocal } from "@utils/helper";
 
 import "./quiz.scss";
 

src/components/features/quiz/HeaderQuiz.js

@@ -1,9 +1,9 @@
 import React, { useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 
-import { selectUserInfo, setUserInfo } from "../../../redux/quizSlice";
-import { apiRequest } from "../../../api/request";
-import { urlForLocal } from "../../../helper";
+import { selectUserInfo, setUserInfo } from "@redux/quizSlice";
+import { apiRequest } from "@api/request";
+import { urlForLocal } from "@utils/helper";
 
 import "./quiz.scss";
 

src/components/features/quiz/Instructions.js

@@ -1,11 +1,11 @@
 import { Link } from "react-router-dom";
-import { apiRequest } from "../../../api/request";
-
 import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
-import { selectedTest } from "../../../redux/quizSlice";
 
-import comment from "./../../../assets/icons/comment.jpg";
+import { apiRequest } from "@api/request";
+import { selectedTest } from "@redux/quizSlice";
+
+import comment from "assets/icons/comment.jpg";
 
 import "./quiz.scss";
 

src/components/features/quiz/MyTestsQuiz.js

@@ -1,10 +1,10 @@
 import { Link } from "react-router-dom";
 import { useDispatch } from "react-redux";
 
-import { setSelectedTest } from "../../../redux/quizSlice";
-import { urlForLocal } from "../../../helper";
+import { setSelectedTest } from "@redux/quizSlice";
+import { urlForLocal } from "@utils/helper";
 
-import calendarImage from "./../../../assets/icons/calendar.svg";
+import calendarImage from "assets/icons/calendar.svg";
 
 import "./quiz.scss";
 

src/components/features/quiz/Quiz-passing-information.js

@@ -2,11 +2,11 @@ import React, { useEffect } from "react";
 import { useSelector } from "react-redux";
 import { useTimer } from "react-timer-hook";
 
-import StarRating from "../../StarRating/StarRating";
-import { completedTestSelector } from "../../../redux/quizSlice";
+import StarRating from "@components/StarRating/StarRating";
+import { completedTestSelector } from "@redux/quizSlice";
 
-import timer from "../../../assets/images/quiz/timer.png";
-import accempt from "../../../assets/images/quiz/accempt.png";
+import timer from "assets/images/quiz/timer.png";
+import accempt from "assets/images/quiz/accempt.png";
 
 export const QuizPassingInformation = ({ expiryTimestamp, setStartTest }) => {
   const { seconds, minutes, isRunning, start, pause, resume, restart } =

src/components/features/quiz/QuizReport.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import StarRating from "../../StarRating/StarRating";
+import StarRating from "@components/StarRating/StarRating";
 
 export const QuizReport = () => {
   return (

src/components/features/quiz/Results.js

@@ -1,12 +1,8 @@
 import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 
-import {
-  fetchResultTest,
-  selectedTest,
-  selectResult,
-} from "../../../redux/quizSlice";
-import { apiRequest } from "../../../api/request";
+import { fetchResultTest, selectedTest, selectResult } from "@redux/quizSlice";
+import { apiRequest } from "@api/request";
 
 export const Results = () => {
   const result = useSelector(selectResult);

src/components/features/quiz/SelectedCategory.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-import iconSpecialization from "../../../assets/images/partnerProfile/personalBackEnd.svg";
+import iconSpecialization from "assets/images/partnerProfile/personalBackEnd.svg";
 
 export const SelectedCategory = ({ setSelectedCategory }) => {
   return (

src/components/features/quiz/Task.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 
-import { apiRequest } from "../../../api/request";
+import { apiRequest } from "@api/request";
 import { HeaderQuiz } from "./HeaderQuiz";
 
 import { Progressbar } from "./ProgressbarQuiz";
@@ -16,9 +16,9 @@ import {
   questionsSelector,
   setAnswers,
   setCompleteTest,
-} from "./../../../redux/quizSlice";
+} from "@redux/quizSlice";
 
-import questionIcon from "../../../assets/images/question.png";
+import questionIcon from "assets/images/question.png";
 
 import "./quiz.scss";
 

src/pages/AuthForDevelopers/AuthForDevelopers.jsx

@@ -8,7 +8,7 @@ import SliderWorkers from "../../components/SliderWorkers/SliderWorkers";
 import { AuthBox } from "../../components/AuthBox/AuthBox";
 import { selectAuth } from "../../redux/outstaffingSlice";
 import { Link, useNavigate } from "react-router-dom";
-import { scrollToForm } from "../../helper";
+import { scrollToForm } from "../../utils/helper";
 
 import arrow from "../../assets/icons/arrows/arrow__login_page.png";
 import medium from "../../assets/images/medium_male_big.png";

src/pages/AuthForPartners/AuthForPartners.jsx

@@ -9,7 +9,7 @@ import SliderWorkers from "../../components/SliderWorkers/SliderWorkers";
 import { useSelector } from "react-redux";
 import { selectAuth } from "../../redux/outstaffingSlice";
 import { Link, useNavigate } from "react-router-dom";
-import { scrollToForm } from "../../helper";
+import { scrollToForm } from "../../utils/helper";
 
 import arrow from "../../assets/icons/arrows/arrow__login_page.png";
 import authImg from "../../assets/images/auth_img.png";

src/pages/FormPage/FormPage.jsx

@@ -3,13 +3,13 @@ import { useDispatch, useSelector } from "react-redux";
 import { useParams, useNavigate, Navigate } from "react-router-dom";
 import SVG from "react-inlinesvg";
 
-import { LEVELS, SKILLS } from "../../constants/constants";
+import { LEVELS, SKILLS } from "../../utils/constants";
 import {
   currentCandidate,
   selectCurrentCandidate,
 } from "../../redux/outstaffingSlice";
 import { apiRequest } from "../../api/request";
-import { urlForLocal } from "../../helper";
+import { urlForLocal } from "../../utils/helper";
 
 import Form from "../../components/Form/Form";
 import { Footer } from "../../components/Footer/Footer";

src/pages/PartnerBid/PartnerBid.jsx

@@ -17,7 +17,7 @@ import ModalLayout from "../../components/Common/ModalLayout/ModalLayout";
 import { getCorrectDate } from "../../components/Calendar/calendarHelper";
 
 import { apiRequest } from "../../api/request";
-import { urlForLocal } from "../../helper";
+import { urlForLocal } from "../../utils/helper";
 
 import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png";
 import backEndImg from "../../assets/images/QualificationInfo.png";

src/pages/Profile/Profile.js

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { useSelector } from "react-redux";
 
 import { getProfileInfo } from "../../redux/outstaffingSlice";
-import { urlForLocal } from "../../helper";
+import { urlForLocal } from "../../utils/helper";
 
 import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader";
 import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs";

src/pages/ProjectTracker/ProjectTracker.js

@@ -5,7 +5,7 @@ import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileB
 import { Footer } from "../../components/Footer/Footer";
 import { Navigation } from "../../components/Navigation/Navigation";
 import { Loader } from "../../components/Loader/Loader";
-import { urlForLocal } from "../../helper";
+import { urlForLocal } from "../../utils/helper";
 
 import { useDispatch, useSelector } from "react-redux";
 import { apiRequest } from "../../api/request";

src/pages/Summary/Summary.js

@@ -6,7 +6,7 @@ import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader";
 import { getProfileInfo } from "../../redux/outstaffingSlice";
 import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { Footer } from "../../components/Footer/Footer";
-import { urlForLocal } from "../../helper";
+import { urlForLocal } from "../../utils/helper";
 import { apiRequest } from "../../api/request";
 import { Navigation } from "../../components/Navigation/Navigation";
 

src/pages/Tracker/Tracker.js

@@ -16,7 +16,7 @@ import { apiRequest } from "../../api/request";
 import { Navigation } from "../../components/Navigation/Navigation";
 import TrackerModal from "../../components/UI/TrackerModal/TrackerModal";
 import ProjectTiket from "../../components/ProjectTiket/ProjectTiket";
-import { urlForLocal } from "../../helper";
+import { urlForLocal } from "../../utils/helper";
 import { getCorrectDate } from "../../components/Calendar/calendarHelper";
 import { Loader } from "../../components/Loader/Loader";