diff --git a/src/api/request.js b/src/api/request.js index 316dd5a3..9d4ed184 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -1,5 +1,5 @@ import axios from "axios"; -import { getToken, urlHasParams } from "../utils/helper"; +import { getToken, urlHasParams } from "@utils/helper"; const instance = axios.create({ baseURL: process.env.REACT_APP_API_URL, diff --git a/src/components/AuthBox/AuthBox.jsx b/src/components/AuthBox/AuthBox.jsx index 17c7e752..0dd8af66 100644 --- a/src/components/AuthBox/AuthBox.jsx +++ b/src/components/AuthBox/AuthBox.jsx @@ -8,7 +8,7 @@ import { setRole } from "@redux/roleSlice"; import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration"; import ModalErrorLogin from "@components/Modal/ModalErrorLogin/ModalErrorLogin"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import { apiRequest } from "@api/request"; import ellipse from "assets/icons/ellipse.png"; diff --git a/src/components/Calendar/Calendar.jsx b/src/components/Calendar/Calendar.jsx index 06d8bd9a..8b28333f 100644 --- a/src/components/Calendar/Calendar.jsx +++ b/src/components/Calendar/Calendar.jsx @@ -4,7 +4,7 @@ import { Link, Navigate, useNavigate } from "react-router-dom"; import CalendarComponent from "./CalendarComponent"; import { currentMonth } from "./calendarHelper"; -import { Footer } from "@components/Footer/Footer"; +import { Footer } from "@components/Common/Footer/Footer"; import { LogoutButton } from "@components/LogoutButton/LogoutButton"; import { urlForLocal } from "@utils/helper"; import { selectCurrentCandidate } from "@redux/outstaffingSlice"; diff --git a/src/components/Candidate/Candidate.jsx b/src/components/Candidate/Candidate.jsx index d91bb92f..387915d4 100644 --- a/src/components/Candidate/Candidate.jsx +++ b/src/components/Candidate/Candidate.jsx @@ -6,7 +6,7 @@ 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 { Footer } from "@components/Common/Footer/Footer"; import { Navigation } from "@components/Navigation/Navigation"; import { diff --git a/src/components/UI/CardArticle/CardArticle.jsx b/src/components/CardArticle/CardArticle.jsx similarity index 100% rename from src/components/UI/CardArticle/CardArticle.jsx rename to src/components/CardArticle/CardArticle.jsx diff --git a/src/components/UI/CardArticle/cardArticle.scss b/src/components/CardArticle/cardArticle.scss similarity index 100% rename from src/components/UI/CardArticle/cardArticle.scss rename to src/components/CardArticle/cardArticle.scss diff --git a/src/components/AuthHeader/AuthHeader.jsx b/src/components/Common/AuthHeader/AuthHeader.jsx similarity index 100% rename from src/components/AuthHeader/AuthHeader.jsx rename to src/components/Common/AuthHeader/AuthHeader.jsx diff --git a/src/components/AuthHeader/authHeader.scss b/src/components/Common/AuthHeader/authHeader.scss similarity index 100% rename from src/components/AuthHeader/authHeader.scss rename to src/components/Common/AuthHeader/authHeader.scss diff --git a/src/components/Footer/Footer.jsx b/src/components/Common/Footer/Footer.jsx similarity index 100% rename from src/components/Footer/Footer.jsx rename to src/components/Common/Footer/Footer.jsx diff --git a/src/components/Footer/footer.scss b/src/components/Common/Footer/footer.scss similarity index 100% rename from src/components/Footer/footer.scss rename to src/components/Common/Footer/footer.scss diff --git a/src/components/Loader/Loader.jsx b/src/components/Common/Loader/Loader.jsx similarity index 100% rename from src/components/Loader/Loader.jsx rename to src/components/Common/Loader/Loader.jsx diff --git a/src/components/Loader/loader.scss b/src/components/Common/Loader/loader.scss similarity index 100% rename from src/components/Loader/loader.scss rename to src/components/Common/Loader/loader.scss diff --git a/src/components/Form/Form.jsx b/src/components/Form/Form.jsx index 69e10625..b0d07445 100644 --- a/src/components/Form/Form.jsx +++ b/src/components/Form/Form.jsx @@ -3,7 +3,7 @@ import { useParams, useNavigate } from "react-router-dom"; import PhoneInput from "react-phone-input-2"; import { apiRequest } from "@api/request"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import Swal from "sweetalert2"; import withReactContent from "sweetalert2-react-content"; diff --git a/src/components/FreeDevelopers/FreeDevelopers.jsx b/src/components/FreeDevelopers/FreeDevelopers.jsx index 3e3ab98f..5b52026b 100644 --- a/src/components/FreeDevelopers/FreeDevelopers.jsx +++ b/src/components/FreeDevelopers/FreeDevelopers.jsx @@ -3,9 +3,9 @@ import { Link } from "react-router-dom"; import { scrollToForm } from "@utils/helper"; -import AuthHeader from "@components/AuthHeader/AuthHeader"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; import SideBar from "@components/SideBar/SideBar"; -import { Footer } from "@components/Footer/Footer"; +import { Footer } from "@components/Common/Footer/Footer"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import BaseButton from "@components/Common/BaseButton/BaseButton"; diff --git a/src/components/LogoutButton/LogoutButton.jsx b/src/components/LogoutButton/LogoutButton.jsx index 991a2f67..35438435 100644 --- a/src/components/LogoutButton/LogoutButton.jsx +++ b/src/components/LogoutButton/LogoutButton.jsx @@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom"; import { useSelector } from "react-redux"; import { useLogout } from "@hooks/useLogout"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import { getRole } from "@redux/roleSlice"; import "./logoutButton.scss"; diff --git a/src/components/UI/ModalSelect/ModalSelect.jsx b/src/components/Modal/ModalSelect/ModalSelect.jsx similarity index 100% rename from src/components/UI/ModalSelect/ModalSelect.jsx rename to src/components/Modal/ModalSelect/ModalSelect.jsx diff --git a/src/components/UI/ModalSelect/modalSelect.scss b/src/components/Modal/ModalSelect/modalSelect.scss similarity index 100% rename from src/components/UI/ModalSelect/modalSelect.scss rename to src/components/Modal/ModalSelect/modalSelect.scss diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index 494f2954..14a180b3 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -7,7 +7,7 @@ import { urlForLocal } from "@utils/helper"; import { modalToggle, setProjectBoardFetch } from "@redux/projectsTrackerSlice"; import { getCorrectDate } from "@components/Calendar/calendarHelper"; -import TrackerModal from "@components/UI/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; import BaseButton from "@components/Common/BaseButton/BaseButton"; diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index d13a8d33..ca6d101a 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -4,12 +4,12 @@ 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 { Footer } from "@components/Common/Footer/Footer"; import { getCorrectDate } from "@components/Calendar/calendarHelper"; import BaseButton from "@components/Common/BaseButton/BaseButton"; -import TrackerModal from "@components/UI/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; import { Navigation } from "@components/Navigation/Navigation"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import { deletePersonOnProject, diff --git a/src/components/UI/TrackerModal/TrackerModal.jsx b/src/components/Modal/TrackerModal/TrackerModal.jsx similarity index 100% rename from src/components/UI/TrackerModal/TrackerModal.jsx rename to src/components/Modal/TrackerModal/TrackerModal.jsx diff --git a/src/components/UI/TrackerModal/trackerModal.scss b/src/components/Modal/TrackerModal/trackerModal.scss similarity index 100% rename from src/components/UI/TrackerModal/trackerModal.scss rename to src/components/Modal/TrackerModal/trackerModal.scss diff --git a/src/components/ProfileCalendar/ProfileCalendar.jsx b/src/components/ProfileCalendar/ProfileCalendar.jsx index 7fa70b5d..e272205c 100644 --- a/src/components/ProfileCalendar/ProfileCalendar.jsx +++ b/src/components/ProfileCalendar/ProfileCalendar.jsx @@ -13,10 +13,10 @@ import { import { getReports } from "@components/Calendar/calendarHelper"; import { ProfileCalendarComponent } from "./ProfileCalendarComponent"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "@components/Footer/Footer"; +import { Footer } from "@components/Common/Footer/Footer"; import { Navigation } from "@components/Navigation/Navigation"; import moment from "moment"; diff --git a/src/components/ProfileHeader/ProfileHeader.jsx b/src/components/ProfileHeader/ProfileHeader.jsx index f842db27..179217da 100644 --- a/src/components/ProfileHeader/ProfileHeader.jsx +++ b/src/components/ProfileHeader/ProfileHeader.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import { useNavigate, NavLink } from "react-router-dom"; import { useDispatch, useSelector } from "react-redux"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import { apiRequest } from "@api/request"; import { auth, setProfileInfo } from "@redux/outstaffingSlice"; import { getRole } from "@redux/roleSlice"; diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTiket/ProjectTiket.jsx index 1aeaa07f..45156ac0 100644 --- a/src/components/ProjectTiket/ProjectTiket.jsx +++ b/src/components/ProjectTiket/ProjectTiket.jsx @@ -5,8 +5,8 @@ import { Link } from "react-router-dom"; import { apiRequest } from "@api/request"; import { deleteProject, modalToggle } from "@redux/projectsTrackerSlice"; -import { ModalSelect } from "@components/UI/ModalSelect/ModalSelect"; -import TrackerModal from "@components/UI/TrackerModal/TrackerModal"; +import { ModalSelect } from "@components/Modal/ModalSelect/ModalSelect"; +import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; import link from "assets/icons/link.svg"; import archiveSet from "assets/icons/archive.svg"; diff --git a/src/components/ReportForm/ReportForm.jsx b/src/components/ReportForm/ReportForm.jsx index 92c6713a..76e6b485 100644 --- a/src/components/ReportForm/ReportForm.jsx +++ b/src/components/ReportForm/ReportForm.jsx @@ -10,8 +10,8 @@ import { import ru from "date-fns/locale/ru"; registerLocale("ru", ru); -import { Loader } from "@components/Loader/Loader"; -import { Footer } from "@components/Footer/Footer"; +import { Loader } from "@components/Common/Loader/Loader"; +import { Footer } from "@components/Common/Footer/Footer"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; diff --git a/src/components/Select/TagSelect.jsx b/src/components/Select/TagSelect.jsx index 8436b9b0..63a81b15 100644 --- a/src/components/Select/TagSelect.jsx +++ b/src/components/Select/TagSelect.jsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import { useSelector, useDispatch } from "react-redux"; import Select from "react-select"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import { apiRequest } from "@api/request"; import { selectedItems, diff --git a/src/components/ShortReport/ShortReport.jsx b/src/components/ShortReport/ShortReport.jsx index eaf99899..558b739e 100644 --- a/src/components/ShortReport/ShortReport.jsx +++ b/src/components/ShortReport/ShortReport.jsx @@ -13,7 +13,7 @@ import { getSendRequest, setSendRequest, } from "@redux/reportSlice"; -import { Loader } from "@components/Loader/Loader"; +import { Loader } from "@components/Common/Loader/Loader"; import "./shortReport.scss"; diff --git a/src/pages/ActPage/ActPage.jsx b/src/pages/ActPage/ActPage.jsx index b95c7d9f..3514f512 100644 --- a/src/pages/ActPage/ActPage.jsx +++ b/src/pages/ActPage/ActPage.jsx @@ -1,7 +1,7 @@ import React from "react"; -import { ActContent } from "../../components/features/bookkeeping/ActContent/ActContent"; -import { BookkeepingTemplete } from "../../components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete"; +import { ActContent } from "@components/features/bookkeeping/ActContent/ActContent"; +import { BookkeepingTemplete } from "@components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete"; export const ActPage = () => { return ( diff --git a/src/pages/Article/Article.jsx b/src/pages/Article/Article.jsx index 2420e225..d95a8502 100644 --- a/src/pages/Article/Article.jsx +++ b/src/pages/Article/Article.jsx @@ -1,19 +1,19 @@ import React, { useState } from "react"; import { Link } from "react-router-dom"; -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 CardArticle from "../../components/UI/CardArticle/CardArticle"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SideBar from "@components/SideBar/SideBar"; +import { Footer } from "@components/Common/Footer/Footer"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import CardArticle from "@components/CardArticle/CardArticle"; -import mockImgArticle from "../../assets/images/mock/mockImgArticle.png"; -import rightArrow from "../../assets/icons/arrows/left-arrow.png"; -import yandexZen from "../../assets/icons/yandexZen.svg"; -import cardCalendar from "../../assets/icons/cardCalendar.svg"; -import cardImg1 from "../../assets/images/mock/cardArticleItem.png"; -import cardImg2 from "../../assets/images/mock/cardArticleItem2.png"; -import cardImg3 from "../../assets/images/mock/cardArticleItem3.png"; +import mockImgArticle from "assets/images/mock/mockImgArticle.png"; +import rightArrow from "assets/icons/arrows/left-arrow.png"; +import yandexZen from "assets/icons/yandexZen.svg"; +import cardCalendar from "assets/icons/cardCalendar.svg"; +import cardImg1 from "assets/images/mock/cardArticleItem.png"; +import cardImg2 from "assets/images/mock/cardArticleItem2.png"; +import cardImg3 from "assets/images/mock/cardArticleItem3.png"; import "./article.scss"; diff --git a/src/pages/AuthForCandidate/AuthForCandidate.jsx b/src/pages/AuthForCandidate/AuthForCandidate.jsx index 3bf9c08c..3b2fdab7 100644 --- a/src/pages/AuthForCandidate/AuthForCandidate.jsx +++ b/src/pages/AuthForCandidate/AuthForCandidate.jsx @@ -2,28 +2,28 @@ import React, { useEffect, useRef, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { useNavigate } from "react-router-dom"; -import { loading, selectIsLoading } from "../../redux/loaderSlice"; -import { apiRequest } from "../../api/request"; -import { auth, selectAuth, setUserInfo } from "../../redux/outstaffingSlice"; -import { setRole } from "../../redux/roleSlice"; +import { loading, selectIsLoading } from "@redux/loaderSlice"; +import { apiRequest } from "@api/request"; +import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice"; +import { setRole } from "@redux/roleSlice"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -import SideBar from "../../components/SideBar/SideBar"; -import CategoriesItem from "../../components/CategoriesItem/CategoriesItem"; -import StepsForCandidate from "../../components/StepsForCandidate/StepsForCandidate"; -import { Footer } from "../../components/Footer/Footer"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SideBar from "@components/SideBar/SideBar"; +import CategoriesItem from "@components/CategoriesItem/CategoriesItem"; +import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate"; +import { Footer } from "@components/Common/Footer/Footer"; -import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; -import FrontendImg from "../../assets/images/partnerProfile/PersonalFrontend.svg"; -import ArchitectureImg from "../../assets/images/partnerProfile/PersonalArchitecture.svg"; -import DesignImg from "../../assets/images/partnerProfile/PersonalDesign.svg"; -import TestImg from "../../assets/images/partnerProfile/PersonalTesters.svg"; -import AdminImg from "../../assets/images/partnerProfile/PersonalAdmin.svg"; -import ManageImg from "../../assets/images/partnerProfile/PersonalMng.svg"; -import CopyImg from "../../assets/images/partnerProfile/PersonalCopy.svg"; -import SmmImg from "../../assets/images/partnerProfile/PersonalSMM.svg"; -import authImg from "../../assets/images/partnerProfile/authCandidateFormImg.png"; -import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; +import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; +import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg"; +import ArchitectureImg from "assets/images/partnerProfile/PersonalArchitecture.svg"; +import DesignImg from "assets/images/partnerProfile/PersonalDesign.svg"; +import TestImg from "assets/images/partnerProfile/PersonalTesters.svg"; +import AdminImg from "assets/images/partnerProfile/PersonalAdmin.svg"; +import ManageImg from "assets/images/partnerProfile/PersonalMng.svg"; +import CopyImg from "assets/images/partnerProfile/PersonalCopy.svg"; +import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg"; +import authImg from "assets/images/partnerProfile/authCandidateFormImg.png"; +import arrowBtn from "assets/icons/arrows/arrowRight.svg"; import "./authForCandidate.scss"; diff --git a/src/pages/AuthForDevelopers/AuthForDevelopers.jsx b/src/pages/AuthForDevelopers/AuthForDevelopers.jsx index 6e4b18e8..de6ae380 100644 --- a/src/pages/AuthForDevelopers/AuthForDevelopers.jsx +++ b/src/pages/AuthForDevelopers/AuthForDevelopers.jsx @@ -1,22 +1,23 @@ import React, { useEffect } from "react"; import { useSelector } from "react-redux"; - -import { Footer } from "../../components/Footer/Footer"; -import SideBar from "../../components/SideBar/SideBar"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -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 "../../utils/helper"; -import arrow from "../../assets/icons/arrows/arrow__login_page.png"; -import medium from "../../assets/images/medium_male_big.png"; -import cross from "../../assets/images/cross.png"; -import text from "../../assets/images/Body_Text.png"; -import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; -import vector from "../../assets/images/Vector_Smart_Object.png"; -import vectorBlack from "../../assets/images/Vector_Smart_Object_black.png"; +import { selectAuth } from "@redux/outstaffingSlice"; +import { scrollToForm } from "@utils/helper"; + +import { Footer } from "@components/Common/Footer/Footer"; +import SideBar from "@components/SideBar/SideBar"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SliderWorkers from "@components/SliderWorkers/SliderWorkers"; +import { AuthBox } from "@components/AuthBox/AuthBox"; + +import arrow from "assets/icons/arrows/arrow__login_page.png"; +import medium from "assets/images/medium_male_big.png"; +import cross from "assets/images/cross.png"; +import text from "assets/images/Body_Text.png"; +import arrowBtn from "assets/icons/arrows/arrowRight.svg"; +import vector from "assets/images/Vector_Smart_Object.png"; +import vectorBlack from "assets/images/Vector_Smart_Object_black.png"; import "./authForDevelopers.scss"; diff --git a/src/pages/AuthForPartners/AuthForPartners.jsx b/src/pages/AuthForPartners/AuthForPartners.jsx index b50ca90a..c0b2615b 100644 --- a/src/pages/AuthForPartners/AuthForPartners.jsx +++ b/src/pages/AuthForPartners/AuthForPartners.jsx @@ -1,23 +1,23 @@ import React, { useEffect } from "react"; - -import { Footer } from "../../components/Footer/Footer"; -import { AuthBox } from "../../components/AuthBox/AuthBox"; -import SideBar from "../../components/SideBar/SideBar"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -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 "../../utils/helper"; -import arrow from "../../assets/icons/arrows/arrow__login_page.png"; -import authImg from "../../assets/images/auth_img.png"; -import cross from "../../assets/images/cross.png"; -import text from "../../assets/images/Body_Text.png"; -import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; -import vector from "../../assets/images/Vector_Smart_Object.png"; -import vectorBlack from "../../assets/images/Vector_Smart_Object_black.png"; +import { selectAuth } from "@redux/outstaffingSlice"; +import { scrollToForm } from "@utils/helper"; + +import { Footer } from "@components/Common/Footer/Footer"; +import { AuthBox } from "@components/AuthBox/AuthBox"; +import SideBar from "@components/SideBar/SideBar"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SliderWorkers from "@components/SliderWorkers/SliderWorkers"; + +import arrow from "assets/icons/arrows/arrow__login_page.png"; +import authImg from "assets/images/auth_img.png"; +import cross from "assets/images/cross.png"; +import text from "assets/images/Body_Text.png"; +import arrowBtn from "assets/icons/arrows/arrowRight.svg"; +import vector from "assets/images/Vector_Smart_Object.png"; +import vectorBlack from "assets/images/Vector_Smart_Object_black.png"; import "./authForPartners.scss"; diff --git a/src/pages/Blog/Blog.jsx b/src/pages/Blog/Blog.jsx index eefa436a..c2e853e0 100644 --- a/src/pages/Blog/Blog.jsx +++ b/src/pages/Blog/Blog.jsx @@ -1,18 +1,18 @@ import React, { useState } from "react"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -import SideBar from "../../components/SideBar/SideBar"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "../../components/Footer/Footer"; -import CardArticle from "../../components/UI/CardArticle/CardArticle"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SideBar from "@components/SideBar/SideBar"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import CardArticle from "@components/CardArticle/CardArticle"; -import blogArrow from "../../assets/icons/arrows/blogArrow.svg"; -import cardImg1 from "../../assets/images/mock/cardArticleItem.png"; -import cardImg2 from "../../assets/images/mock/cardArticleItem2.png"; -import cardImg3 from "../../assets/images/mock/cardArticleItem3.png"; -import cardImg4 from "../../assets/images/mock/cardArticleItem4.png"; -import cardImg5 from "../../assets/images/mock/cardArticleItem5.png"; -import cardImg6 from "../../assets/images/mock/cardArticleItem6.png"; +import blogArrow from "assets/icons/arrows/blogArrow.svg"; +import cardImg1 from "assets/images/mock/cardArticleItem.png"; +import cardImg2 from "assets/images/mock/cardArticleItem2.png"; +import cardImg3 from "assets/images/mock/cardArticleItem3.png"; +import cardImg4 from "assets/images/mock/cardArticleItem4.png"; +import cardImg5 from "assets/images/mock/cardArticleItem5.png"; +import cardImg6 from "assets/images/mock/cardArticleItem6.png"; import "./blog.scss"; diff --git a/src/pages/Bookkeeping.js b/src/pages/Bookkeeping.js index ad0a9c1d..992f96f6 100644 --- a/src/pages/Bookkeeping.js +++ b/src/pages/Bookkeeping.js @@ -1,18 +1,15 @@ -import React from 'react'; -import { BookkeepingTemplete } from "../components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete" -import { BookkeepingContent } from "../components/features/bookkeeping/BookkeepingContent/BookkeepingContent" - - +import React from "react"; +import { BookkeepingTemplete } from "@components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete"; +import { BookkeepingContent } from "@components/features/bookkeeping/BookkeepingContent/BookkeepingContent"; const Bookkeeping = () => { - return( -
- - - -
- ) -} - -export default Bookkeeping + return ( +
+ + + +
+ ); +}; +export default Bookkeeping; diff --git a/src/pages/FormPage/FormPage.jsx b/src/pages/FormPage/FormPage.jsx index 0f29db3a..064a0a32 100644 --- a/src/pages/FormPage/FormPage.jsx +++ b/src/pages/FormPage/FormPage.jsx @@ -3,21 +3,21 @@ import { useDispatch, useSelector } from "react-redux"; import { useParams, useNavigate, Navigate } from "react-router-dom"; import SVG from "react-inlinesvg"; -import { LEVELS, SKILLS } from "../../utils/constants"; +import { LEVELS, SKILLS } from "@utils/constants"; import { currentCandidate, selectCurrentCandidate, -} from "../../redux/outstaffingSlice"; -import { apiRequest } from "../../api/request"; -import { urlForLocal } from "../../utils/helper"; +} from "@redux/outstaffingSlice"; +import { apiRequest } from "@api/request"; +import { urlForLocal } from "@utils/helper"; -import Form from "../../components/Form/Form"; -import { Footer } from "../../components/Footer/Footer"; -import { LogoutButton } from "../../components/LogoutButton/LogoutButton"; +import Form from "@components/Form/Form"; +import { Footer } from "@components/Common/Footer/Footer"; +import { LogoutButton } from "@components/LogoutButton/LogoutButton"; -import arrow from "../../assets/icons/arrows/left-arrow.png"; -import rectangle from "../../assets/images/rectangle_secondPage.png"; -import telegramIcon from "../../assets/icons/telegram-icon.svg"; +import arrow from "assets/icons/arrows/left-arrow.png"; +import rectangle from "assets/images/rectangle_secondPage.png"; +import telegramIcon from "assets/icons/telegram-icon.svg"; import "./formPage.scss"; diff --git a/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx b/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx index b5100371..723fb495 100644 --- a/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx +++ b/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx @@ -1,12 +1,12 @@ import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import SideBar from "../../components/SideBar/SideBar"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -import { Footer } from "../../components/Footer/Footer"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import SideBar from "@components/SideBar/SideBar"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { Footer } from "@components/Common/Footer/Footer"; -import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; +import arrowBtn from "assets/icons/arrows/arrowRight.svg"; import "./FrequentlyAskedQuestion.scss"; diff --git a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx index 7a4bcb3c..43ad03ec 100644 --- a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx +++ b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx @@ -1,12 +1,12 @@ import React from "react"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "../../components/Footer/Footer"; -import { FrequentlyAskedQuestionsItem } from "../../components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -import SideBar from "../../components/SideBar/SideBar"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { FrequentlyAskedQuestionsItem } from "@components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SideBar from "@components/SideBar/SideBar"; -import arrow from "./../../assets/images/faq/arrow.svg"; +import arrow from "assets/images/faq/arrow.svg"; import "./FrequentlyAskedQuestions.scss"; diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx index b87133b8..b0425df0 100644 --- a/src/pages/Home/Home.jsx +++ b/src/pages/Home/Home.jsx @@ -1,15 +1,16 @@ import React, { useState, useEffect } from "react"; import { useDispatch } from "react-redux"; -import { apiRequest } from "../../api/request"; import { Navigate } from "react-router-dom"; -import { profiles, tags } from "../../redux/outstaffingSlice"; -import Outstaffing from "../../components/Outstaffing/Outstaffing"; -import Description from "../../components/Description/Description"; -import { Footer } from "../../components/Footer/Footer"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Navigation } from "../../components/Navigation/Navigation"; +import { apiRequest } from "@api/request"; +import { profiles, tags } from "@redux/outstaffingSlice"; + +import Outstaffing from "@components/Outstaffing/Outstaffing"; +import Description from "@components/Description/Description"; +import { Footer } from "@components/Common/Footer/Footer"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Navigation } from "@components/Navigation/Navigation"; const Home = () => { if (localStorage.getItem("role_status") !== "18") { diff --git a/src/pages/PartnerAddRequest/PartnerAddRequest.js b/src/pages/PartnerAddRequest/PartnerAddRequest.js index cf0693d9..9ab78be9 100644 --- a/src/pages/PartnerAddRequest/PartnerAddRequest.js +++ b/src/pages/PartnerAddRequest/PartnerAddRequest.js @@ -2,19 +2,19 @@ import React, { useEffect, useState } from "react"; import { useSelector } from "react-redux"; import { Link, Navigate, useNavigate } from "react-router-dom"; -import { apiRequest } from "../../api/request"; -import { getPartnerRequestInfo } from "../../redux/outstaffingSlice"; +import { apiRequest } from "@api/request"; +import { getPartnerRequestInfo } from "@redux/outstaffingSlice"; -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 { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; -import arrowDown from "../../assets/icons/arrows/selectArrow.png"; -import processImg from "../../assets/images/partnerProfile/partnerAddRequestFirstImg.png"; -import reportImg from "../../assets/images/partnerProfile/partnerAddRequestSecondImg.png"; -import documentsImg from "../../assets/images/partnerProfile/partnerAddRequestThirdInfo.png"; -import deleteIcon from "../../assets/icons/close.png"; +import arrowDown from "assets/icons/arrows/selectArrow.png"; +import processImg from "assets/images/partnerProfile/partnerAddRequestFirstImg.png"; +import reportImg from "assets/images/partnerProfile/partnerAddRequestSecondImg.png"; +import documentsImg from "assets/images/partnerProfile/partnerAddRequestThirdInfo.png"; +import deleteIcon from "assets/icons/close.png"; import "./partnerAddRequest.scss"; diff --git a/src/pages/PartnerBid/PartnerBid.jsx b/src/pages/PartnerBid/PartnerBid.jsx index 08414cbd..946e9788 100644 --- a/src/pages/PartnerBid/PartnerBid.jsx +++ b/src/pages/PartnerBid/PartnerBid.jsx @@ -6,23 +6,22 @@ import { getPartnerRequests, setPartnerRequestId, setPartnerRequestInfo, -} from "../../redux/outstaffingSlice"; +} from "@redux/outstaffingSlice"; +import { apiRequest } from "@api/request"; +import { urlForLocal } from "@utils/helper"; -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 { Loader } from "../../components/Loader/Loader"; -import ModalLayout from "../../components/Common/ModalLayout/ModalLayout"; -import { getCorrectDate } from "../../components/Calendar/calendarHelper"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; +import { Loader } from "@components/Common/Loader/Loader"; +import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; +import { getCorrectDate } from "@components/Calendar/calendarHelper"; -import { apiRequest } from "../../api/request"; -import { urlForLocal } from "../../utils/helper"; - -import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png"; -import backEndImg from "../../assets/images/QualificationInfo.png"; -import middle from "../../assets/images/QualificationInfoMiddle.png"; -import deleteBtn from "../../assets/images/deleteBtn.png"; +import arrowSwitchDate from "assets/icons/arrows/arrowViewReport.png"; +import backEndImg from "assets/images/QualificationInfo.png"; +import middle from "assets/images/QualificationInfoMiddle.png"; +import deleteBtn from "assets/images/deleteBtn.png"; import "./partnerBid.scss"; diff --git a/src/pages/PartnerEmployees/PartnerEmployees.js b/src/pages/PartnerEmployees/PartnerEmployees.js index 407be90b..a59cfb71 100644 --- a/src/pages/PartnerEmployees/PartnerEmployees.js +++ b/src/pages/PartnerEmployees/PartnerEmployees.js @@ -1,15 +1,15 @@ import React from "react"; import { Link, Navigate } from "react-router-dom"; import { useSelector } from "react-redux"; -import { getPartnerEmployees } from "../../redux/outstaffingSlice"; +import { getPartnerEmployees } from "@redux/outstaffingSlice"; -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 { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; -import imgInfo from "../../assets/images/emplInfo.png"; -import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; +import imgInfo from "assets/images/emplInfo.png"; +import rightArrow from "assets/icons/arrows/arrowRight.svg"; import "./partnerEmployees.scss"; diff --git a/src/pages/PartnerRequests/PartnerRequests.jsx b/src/pages/PartnerRequests/PartnerRequests.jsx index 0519bd99..88c5f2dd 100644 --- a/src/pages/PartnerRequests/PartnerRequests.jsx +++ b/src/pages/PartnerRequests/PartnerRequests.jsx @@ -4,18 +4,18 @@ import { useDispatch } from "react-redux"; import { setPartnerRequestId, setPartnerRequests, -} from "../../redux/outstaffingSlice"; -import { apiRequest } from "../../api/request"; +} from "@redux/outstaffingSlice"; +import { apiRequest } from "@api/request"; -import { Navigation } from "../../components/Navigation/Navigation"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { SliderWorkers } from "../../components/SliderWorkers/SliderWorkers"; -import { Loader } from "../../components/Loader/Loader"; -import { Footer } from "../../components/Footer/Footer"; -import BaseButton from "../../components/Common/BaseButton/BaseButton"; +import { Navigation } from "@components/Navigation/Navigation"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { SliderWorkers } from "@components/SliderWorkers/SliderWorkers"; +import { Loader } from "@components/Common/Loader/Loader"; +import { Footer } from "@components/Common/Footer/Footer"; +import BaseButton from "@components/Common/BaseButton/BaseButton"; -import cursorImg from "../../assets/icons/cursorImg.svg"; +import cursorImg from "assets/icons/cursorImg.svg"; import "./partnerRequests.scss"; diff --git a/src/pages/PartnerSettings/PartnerSettings.jsx b/src/pages/PartnerSettings/PartnerSettings.jsx index 358b0d46..3460e4e1 100644 --- a/src/pages/PartnerSettings/PartnerSettings.jsx +++ b/src/pages/PartnerSettings/PartnerSettings.jsx @@ -1,13 +1,13 @@ import React from "react"; -import { Footer } from "../../components/Footer/Footer"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { Navigation } from "../../components/Navigation/Navigation"; -import BaseButton from "../../components/Common/BaseButton/BaseButton"; +import { Footer } from "@components/Common/Footer/Footer"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { Navigation } from "@components/Navigation/Navigation"; +import BaseButton from "@components/Common/BaseButton/BaseButton"; -import kontur from "../../assets/images/logo/konturLogo.png"; -import astral from "../../assets/images/logo/astralLogo.png"; +import kontur from "assets/images/logo/konturLogo.png"; +import astral from "assets/images/logo/astralLogo.png"; import "./partnerSettings.scss"; diff --git a/src/pages/PartnerTreaties/PartnerTreaties.js b/src/pages/PartnerTreaties/PartnerTreaties.js index 3d5eafe9..61bd0ea5 100644 --- a/src/pages/PartnerTreaties/PartnerTreaties.js +++ b/src/pages/PartnerTreaties/PartnerTreaties.js @@ -1,19 +1,19 @@ import React, { useState } from "react"; -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 { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; -import mainTabImg from "../../assets/icons/mainTreaties.png"; -import actImg from "../../assets/icons/actTreaties.png"; -import checkImg from "../../assets/icons/checkTreaties.png"; -import arrowDown from "../../assets/icons/arrows/arrowDown.png"; -import logoAstral from "../../assets/images/logo/astralLogo.png"; -import arrowItem from "../../assets/icons/arrows/arrowCheck.png"; -import lock from "../../assets/icons/lock.svg"; -import lockDone from "../../assets/icons/lockDone.svg"; -import avatarMok from "../../assets/images/avatarMok.png"; +import mainTabImg from "assets/icons/mainTreaties.png"; +import actImg from "assets/icons/actTreaties.png"; +import checkImg from "assets/icons/checkTreaties.png"; +import arrowDown from "assets/icons/arrows/arrowDown.png"; +import logoAstral from "assets/images/logo/astralLogo.png"; +import arrowItem from "assets/icons/arrows/arrowCheck.png"; +import lock from "assets/icons/lock.svg"; +import lockDone from "assets/icons/lockDone.svg"; +import avatarMok from "assets/images/avatarMok.png"; import "./partnerTreaties.scss"; diff --git a/src/pages/PartnerСategories/PartnerСategories.jsx b/src/pages/PartnerСategories/PartnerСategories.jsx index 25eca3c8..5c5ceb24 100644 --- a/src/pages/PartnerСategories/PartnerСategories.jsx +++ b/src/pages/PartnerСategories/PartnerСategories.jsx @@ -3,23 +3,23 @@ import { Link } from "react-router-dom"; import { Navigate } from "react-router-dom"; import { useDispatch } from "react-redux"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "../../components/Footer/Footer"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; -import { setPartnerEmployees } from "../../redux/outstaffingSlice"; +import { setPartnerEmployees } from "@redux/outstaffingSlice"; -import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; -import FrontendImg from "../../assets/images/partnerProfile/PersonalFrontend.svg"; -import ArchitectureImg from "../../assets/images/partnerProfile/PersonalArchitecture.svg"; -import DesignImg from "../../assets/images/partnerProfile/PersonalDesign.svg"; -import TestImg from "../../assets/images/partnerProfile/PersonalTesters.svg"; -import AdminImg from "../../assets/images/partnerProfile/PersonalAdmin.svg"; -import ManageImg from "../../assets/images/partnerProfile/PersonalMng.svg"; -import CopyImg from "../../assets/images/partnerProfile/PersonalCopy.svg"; -import SmmImg from "../../assets/images/partnerProfile/PersonalSMM.svg"; -import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; -import avatarImg from "../../assets/images/avatarMok.png"; +import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; +import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg"; +import ArchitectureImg from "assets/images/partnerProfile/PersonalArchitecture.svg"; +import DesignImg from "assets/images/partnerProfile/PersonalDesign.svg"; +import TestImg from "assets/images/partnerProfile/PersonalTesters.svg"; +import AdminImg from "assets/images/partnerProfile/PersonalAdmin.svg"; +import ManageImg from "assets/images/partnerProfile/PersonalMng.svg"; +import CopyImg from "assets/images/partnerProfile/PersonalCopy.svg"; +import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg"; +import rightArrow from "assets/icons/arrows/arrowRight.svg"; +import avatarImg from "assets/images/avatarMok.png"; import "./partnerСategories.scss"; import { Navigation } from "../../components/Navigation/Navigation"; diff --git a/src/pages/Payouts/Payouts.js b/src/pages/Payouts/Payouts.js index 9079c289..08c1777b 100644 --- a/src/pages/Payouts/Payouts.js +++ b/src/pages/Payouts/Payouts.js @@ -1,7 +1,7 @@ import React from "react"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { Navigation } from "../../components/Navigation/Navigation"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { Navigation } from "@components/Navigation/Navigation"; export const Payouts = () => { return ( diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 5a71d350..28fcdcc9 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -1,21 +1,21 @@ import React, { useState } from "react"; import { useSelector } from "react-redux"; -import { getProfileInfo } from "../../redux/outstaffingSlice"; -import { urlForLocal } from "../../utils/helper"; +import { getProfileInfo } from "@redux/outstaffingSlice"; +import { urlForLocal } from "@utils/helper"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "../../components/Footer/Footer"; -import { CardControl } from "../../components/CardControl/CardControl"; -import { Navigation } from "../../components/Navigation/Navigation"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { CardControl } from "@components/CardControl/CardControl"; +import { Navigation } from "@components/Navigation/Navigation"; -import reportsIcon from "../../assets/images/reports.png"; -import summaryIcon from "../../assets/icons/summaryIcon.png"; -import timerIcon from "../../assets/icons/timerIcon.png"; -import paymentIcon from "../../assets/icons/paymentIcon.png"; -import settingIcon from "../../assets/icons/settingIcon.png"; -import avatarMok from "../../assets/images/avatarMok.png"; +import reportsIcon from "assets/images/reports.png"; +import summaryIcon from "assets/icons/summaryIcon.png"; +import timerIcon from "assets/icons/timerIcon.png"; +import paymentIcon from "assets/icons/paymentIcon.png"; +import settingIcon from "assets/icons/settingIcon.png"; +import avatarMok from "assets/images/avatarMok.png"; import "./profile.scss"; diff --git a/src/pages/ProfileCandidate/ProfileCandidate.js b/src/pages/ProfileCandidate/ProfileCandidate.js index f355173d..13011ad1 100644 --- a/src/pages/ProfileCandidate/ProfileCandidate.js +++ b/src/pages/ProfileCandidate/ProfileCandidate.js @@ -1,16 +1,16 @@ import React, { useState } from "react"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { CardControl } from "../../components/CardControl/CardControl"; -import { Footer } from "../../components/Footer/Footer"; -import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { CardControl } from "@components/CardControl/CardControl"; +import { Footer } from "@components/Common/Footer/Footer"; +import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom"; -import settingIcon from "../../assets/icons/settingIcon.png"; -import reportsIcon from "../../assets/images/reports.png"; -import noteIcon from "../../assets/images/note.png"; -import questionIcon from "../../assets/images/question.png"; -import medium_male from "../../assets/images/medium_male.png"; +import settingIcon from "assets/icons/settingIcon.png"; +import reportsIcon from "assets/images/reports.png"; +import noteIcon from "assets/images/note.png"; +import questionIcon from "assets/images/question.png"; +import medium_male from "assets/images/medium_male.png"; import "./ProfileCandidate.scss"; diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index f2aa550d..c22c64b4 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -1,14 +1,9 @@ import React, { useEffect, useRef, useState } from "react"; import { Link, useParams } from "react-router-dom"; -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 { Loader } from "../../components/Loader/Loader"; -import { urlForLocal } from "../../utils/helper"; +import { urlForLocal } from "@utils/helper"; import { useDispatch, useSelector } from "react-redux"; -import { apiRequest } from "../../api/request"; +import { apiRequest } from "@api/request"; import { getProjectBoard, getBoarderLoader, @@ -20,21 +15,26 @@ import { setColumnName, setColumnId, deletePersonOnProject, -} from "../../redux/projectsTrackerSlice"; +} from "@redux/projectsTrackerSlice"; -import ModalTicket from "../../components/Modal/Tracker/ModalTicket/ModalTicket"; -import TrackerModal from "../../components/UI/TrackerModal/TrackerModal"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; +import { Loader } from "@components/Common/Loader/Loader"; +import ModalTicket from "@components/Modal/Tracker/ModalTicket/ModalTicket"; +import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; -import project from "../../assets/icons/trackerProject.svg"; -import tasks from "../../assets/icons/trackerTasks.svg"; -import archive from "../../assets/icons/archiveTracker.svg"; -import selectArrow from "../../assets/icons/arrows/select.svg"; -import commentsBoard from "../../assets/icons/commentsBoard.svg"; -import filesBoard from "../../assets/icons/filesBoard.svg"; -import arrow from "../../assets/icons/arrows/arrowCalendar.png"; -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 tasks from "assets/icons/trackerTasks.svg"; +import archive from "assets/icons/archiveTracker.svg"; +import selectArrow from "assets/icons/arrows/select.svg"; +import commentsBoard from "assets/icons/commentsBoard.svg"; +import filesBoard from "assets/icons/filesBoard.svg"; +import arrow from "assets/icons/arrows/arrowCalendar.png"; +import del from "assets/icons/delete.svg"; +import edit from "assets/icons/edit.svg"; +import close from "assets/icons/closeProjectPersons.svg"; export const ProjectTracker = () => { const dispatch = useDispatch(); diff --git a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js index 6ec346d3..b7219c7b 100644 --- a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js +++ b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js @@ -1,12 +1,12 @@ import React from "react"; -import AuthHeader from "../../components/AuthHeader/AuthHeader"; -import SideBar from "../../components/SideBar/SideBar"; -import StepsForCandidate from "../../components/StepsForCandidate/StepsForCandidate"; -import { Footer } from "../../components/Footer/Footer"; +import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import SideBar from "@components/SideBar/SideBar"; +import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate"; +import { Footer } from "@components/Common/Footer/Footer"; -import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; -import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; +import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; +import arrowBtn from "assets/icons/arrows/arrowRight.svg"; import "./registationForCandidate.scss"; diff --git a/src/pages/SingleReportPage/SingleReportPage.js b/src/pages/SingleReportPage/SingleReportPage.js index ae14a03a..fea94347 100644 --- a/src/pages/SingleReportPage/SingleReportPage.js +++ b/src/pages/SingleReportPage/SingleReportPage.js @@ -2,12 +2,12 @@ import React from "react"; import { useNavigate } from "react-router"; import SVG from "react-inlinesvg"; -import { TaskItem } from "../../components/TaskItem/TaskItem"; -import { LogoutButton } from "../../components/LogoutButton/LogoutButton"; +import { TaskItem } from "@components/TaskItem/TaskItem"; +import { LogoutButton } from "@components/LogoutButton/LogoutButton"; -import arrowLeft from "../../assets/icons/arrows/left-arrow.png"; -import dateArrowIcon from "../../assets/icons/arrows/dateArrow.svg"; -import calendarIcon from "../../assets/icons/calendar.svg"; +import arrowLeft from "assets/icons/arrows/left-arrow.png"; +import dateArrowIcon from "assets/icons/arrows/dateArrow.svg"; +import calendarIcon from "assets/icons/calendar.svg"; import "./singleReportPage.scss"; diff --git a/src/pages/Summary/Summary.js b/src/pages/Summary/Summary.js index 499caa40..04778e14 100644 --- a/src/pages/Summary/Summary.js +++ b/src/pages/Summary/Summary.js @@ -2,17 +2,18 @@ import React, { useEffect, useState } from "react"; import { useSelector } from "react-redux"; import { Navigate } from "react-router-dom"; -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 "../../utils/helper"; -import { apiRequest } from "../../api/request"; -import { Navigation } from "../../components/Navigation/Navigation"; +import { apiRequest } from "@api/request"; +import { urlForLocal } from "@utils/helper"; +import { getProfileInfo } from "@redux/outstaffingSlice"; -import arrow from "../../assets/icons/arrows/left-arrow.png"; -import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; -import gitImgItem from "../../assets/icons/gitItemImg.svg"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; + +import arrow from "assets/icons/arrows/left-arrow.png"; +import rightArrow from "assets/icons/arrows/arrowRight.svg"; +import gitImgItem from "assets/icons/gitItemImg.svg"; import "./summary.scss"; diff --git a/src/pages/Tracker/Tracker.js b/src/pages/Tracker/Tracker.js index aaee8418..80fff115 100644 --- a/src/pages/Tracker/Tracker.js +++ b/src/pages/Tracker/Tracker.js @@ -7,24 +7,24 @@ import { setToggleTab, getToggleTab, modalToggle, -} from "../../redux/projectsTrackerSlice"; +} from "@redux/projectsTrackerSlice"; +import { urlForLocal } from "@utils/helper"; +import { apiRequest } from "@api/request"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "../../components/Footer/Footer"; -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 "../../utils/helper"; -import { getCorrectDate } from "../../components/Calendar/calendarHelper"; -import { Loader } from "../../components/Loader/Loader"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; +import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; +import ProjectTiket from "@components/ProjectTiket/ProjectTiket"; +import { getCorrectDate } from "@components/Calendar/calendarHelper"; +import { Loader } from "@components/Common/Loader/Loader"; -import project from "../../assets/icons/trackerProject.svg"; -import tasks from "../../assets/icons/trackerTasks.svg"; -import archive from "../../assets/icons/archiveTracker.svg"; -import search from "../../assets/icons/serchIcon.png"; -import noProjects from "../../assets/images/noProjects.png"; +import project from "assets/icons/trackerProject.svg"; +import tasks from "assets/icons/trackerTasks.svg"; +import archive from "assets/icons/archiveTracker.svg"; +import search from "assets/icons/serchIcon.png"; +import noProjects from "assets/images/noProjects.png"; import "./tracker.scss"; diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx index dc796b08..cb3864f3 100644 --- a/src/pages/ViewReport/ViewReport.jsx +++ b/src/pages/ViewReport/ViewReport.jsx @@ -1,21 +1,21 @@ import React, { useEffect, useState } from "react"; import { Link, Navigate, useParams } from "react-router-dom"; -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 { Loader } from "@components/Common/Loader/Loader"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { Navigation } from "@components/Navigation/Navigation"; -import { apiRequest } from "../../api/request"; +import { apiRequest } from "@api/request"; import { getCorrectDate, getCreatedDate, hourOfNum, -} from "../../components/Calendar/calendarHelper"; +} from "@components/Calendar/calendarHelper"; -import arrow from "../../assets/icons/arrows/left-arrow.png"; -import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png"; +import arrow from "assets/icons/arrows/left-arrow.png"; +import arrowSwitchDate from "assets/icons/arrows/arrowViewReport.png"; import "./viewReport.scss"; diff --git a/src/pages/quiz/PassingTests.js b/src/pages/quiz/PassingTests.js index 4d86f054..726c48b4 100644 --- a/src/pages/quiz/PassingTests.js +++ b/src/pages/quiz/PassingTests.js @@ -1,17 +1,16 @@ import React, { useState } from "react"; import { useSelector } from "react-redux"; import { Link } from "react-router-dom"; +import { completedTestSelector, selectedTest } from "@redux/quizSlice"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { Footer } from "../../components/Footer/Footer"; -import { QuizPassingInformation } from "../../components/features/quiz/Quiz-passing-information"; -import { CardIntroduction } from "../../components/features/quiz/Card-introduction"; -import { TaskQuiz } from "../../components/features/quiz/Task"; -import { BlockCompletedTest } from "../../components/features/quiz/BlockCompletedTest"; - -import { completedTestSelector, selectedTest } from "../../redux/quizSlice"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "@components/Common/Footer/Footer"; +import { QuizPassingInformation } from "@components/features/quiz/Quiz-passing-information"; +import { CardIntroduction } from "@components/features/quiz/Card-introduction"; +import { TaskQuiz } from "@components/features/quiz/Task"; +import { BlockCompletedTest } from "@components/features/quiz/BlockCompletedTest"; export const PassingTests = () => { //const selectedTest = useSelector(selectedTest) diff --git a/src/pages/quiz/QuizPage.js b/src/pages/quiz/QuizPage.js index 67311ba0..7c3228f3 100644 --- a/src/pages/quiz/QuizPage.js +++ b/src/pages/quiz/QuizPage.js @@ -1,29 +1,26 @@ import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { Link } from "react-router-dom"; -import { - questionnairesSelector, - setQuestionnaires, -} from "../../redux/quizSlice"; -import { apiRequest } from "../../api/request"; +import { questionnairesSelector, setQuestionnaires } from "@redux/quizSlice"; +import { apiRequest } from "@api/request"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { SelectedCategory } from "../../components/features/quiz/SelectedCategory"; -import { Footer } from "../../components/Footer/Footer"; -import { CardAvailableTest } from "../../components/features/quiz/CardAviableTest"; -import CategoriesItem from "../../components/CategoriesItem/CategoriesItem"; +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { SelectedCategory } from "@components/features/quiz/SelectedCategory"; +import { Footer } from "@components/Common/Footer/Footer"; +import { CardAvailableTest } from "@components/features/quiz/CardAviableTest"; +import CategoriesItem from "@components/CategoriesItem/CategoriesItem"; -import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; -import FrontendImg from "../../assets/images/partnerProfile/PersonalFrontend.svg"; -import ArchitectureImg from "../../assets/images/partnerProfile/PersonalArchitecture.svg"; -import DesignImg from "../../assets/images/partnerProfile/PersonalDesign.svg"; -import TestImg from "../../assets/images/partnerProfile/PersonalTesters.svg"; -import AdminImg from "../../assets/images/partnerProfile/PersonalAdmin.svg"; -import ManageImg from "../../assets/images/partnerProfile/PersonalMng.svg"; -import CopyImg from "../../assets/images/partnerProfile/PersonalCopy.svg"; -import SmmImg from "../../assets/images/partnerProfile/PersonalSMM.svg"; +import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; +import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg"; +import ArchitectureImg from "assets/images/partnerProfile/PersonalArchitecture.svg"; +import DesignImg from "assets/images/partnerProfile/PersonalDesign.svg"; +import TestImg from "assets/images/partnerProfile/PersonalTesters.svg"; +import AdminImg from "assets/images/partnerProfile/PersonalAdmin.svg"; +import ManageImg from "assets/images/partnerProfile/PersonalMng.svg"; +import CopyImg from "assets/images/partnerProfile/PersonalCopy.svg"; +import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg"; import "./quiz-page.scss"; diff --git a/src/pages/quiz/QuizReportPage.js b/src/pages/quiz/QuizReportPage.js index 0a73a44f..0f647ae4 100644 --- a/src/pages/quiz/QuizReportPage.js +++ b/src/pages/quiz/QuizReportPage.js @@ -2,13 +2,14 @@ import React from "react"; import { useNavigate } from "react-router-dom"; import { useSelector } from "react-redux"; -import { selectedTest } from "../../redux/quizSlice"; -import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; -import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; -import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; -import { QuizReport } from "../../components/features/quiz/QuizReport"; -import { Footer } from "../../components/Footer/Footer"; -import { AlertResult } from "../../components/features/quiz/AlertResult"; +import { selectedTest } from "@redux/quizSlice"; + +import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; +import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom"; +import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { QuizReport } from "@components/features/quiz/QuizReport"; +import { Footer } from "@components/Common/Footer/Footer"; +import { AlertResult } from "@components/features/quiz/AlertResult"; export const QuizReportPage = () => { const test = useSelector(selectedTest);