apuc/guild_front
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed imports in pages

Browse Source
This commit is contained in:
MaxOvs19 committed 2023-05-30 10:54:47 +03:00
1 parent 11b91ef627
commit 09babcb096
57 files changed
+340 -344
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/request.js
+1 -1
View File
@@ -1,5 +1,5 @@
import axios from "axios"; import axios from "axios";
import { getToken, urlHasParams } from "../utils/helper"; import { getToken, urlHasParams } from "@utils/helper";
const instance = axios.create({ const instance = axios.create({
baseURL: process.env.REACT_APP_API_URL, baseURL: process.env.REACT_APP_API_URL,
src/components/AuthBox/AuthBox.jsx
+1 -1
View File
@@ -8,7 +8,7 @@ import { setRole } from "@redux/roleSlice";
import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration"; import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration";
import ModalErrorLogin from "@components/Modal/ModalErrorLogin/ModalErrorLogin"; 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 { apiRequest } from "@api/request";
import ellipse from "assets/icons/ellipse.png"; import ellipse from "assets/icons/ellipse.png";
src/components/Calendar/Calendar.jsx
+1 -1
View File
@@ -4,7 +4,7 @@ import { Link, Navigate, useNavigate } from "react-router-dom";
import CalendarComponent from "./CalendarComponent"; import CalendarComponent from "./CalendarComponent";
import { currentMonth } from "./calendarHelper"; import { currentMonth } from "./calendarHelper";
import { Footer } from "@components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { LogoutButton } from "@components/LogoutButton/LogoutButton"; import { LogoutButton } from "@components/LogoutButton/LogoutButton";
import { urlForLocal } from "@utils/helper"; import { urlForLocal } from "@utils/helper";
import { selectCurrentCandidate } from "@redux/outstaffingSlice"; import { selectCurrentCandidate } from "@redux/outstaffingSlice";
src/components/Candidate/Candidate.jsx
+1 -1
View File
@@ -6,7 +6,7 @@ import SkillSection from "@components/SkillSection/SkillSection";
import Sidebar from "@components/CandidateSidebar/CandidateSidebar"; import Sidebar from "@components/CandidateSidebar/CandidateSidebar";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import { import {
src/components/UI/CardArticle/CardArticle.jsx → src/components/CardArticle/CardArticle.jsx
View File
File renamed without changes.
src/components/UI/CardArticle/cardArticle.scss → src/components/CardArticle/cardArticle.scss
View File
File renamed without changes.
src/components/AuthHeader/AuthHeader.jsx → src/components/Common/AuthHeader/AuthHeader.jsx
View File
File renamed without changes.
src/components/AuthHeader/authHeader.scss → src/components/Common/AuthHeader/authHeader.scss
View File
File renamed without changes.
src/components/Footer/Footer.jsx → src/components/Common/Footer/Footer.jsx
View File
File renamed without changes.
src/components/Footer/footer.scss → src/components/Common/Footer/footer.scss
View File
File renamed without changes.
src/components/Loader/Loader.jsx → src/components/Common/Loader/Loader.jsx
View File
File renamed without changes.
src/components/Loader/loader.scss → src/components/Common/Loader/loader.scss
View File
File renamed without changes.
src/components/Form/Form.jsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { useParams, useNavigate } from "react-router-dom";
import PhoneInput from "react-phone-input-2"; import PhoneInput from "react-phone-input-2";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import Swal from "sweetalert2"; import Swal from "sweetalert2";
import withReactContent from "sweetalert2-react-content"; import withReactContent from "sweetalert2-react-content";
src/components/FreeDevelopers/FreeDevelopers.jsx
+2 -2
View File
@@ -3,9 +3,9 @@ import { Link } from "react-router-dom";
import { scrollToForm } from "@utils/helper"; 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 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 { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import BaseButton from "@components/Common/BaseButton/BaseButton"; import BaseButton from "@components/Common/BaseButton/BaseButton";
src/components/LogoutButton/LogoutButton.jsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { useLogout } from "@hooks/useLogout"; import { useLogout } from "@hooks/useLogout";
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { getRole } from "@redux/roleSlice"; import { getRole } from "@redux/roleSlice";
import "./logoutButton.scss"; import "./logoutButton.scss";
src/components/UI/ModalSelect/ModalSelect.jsx → src/components/Modal/ModalSelect/ModalSelect.jsx
View File
File renamed without changes.
src/components/UI/ModalSelect/modalSelect.scss → src/components/Modal/ModalSelect/modalSelect.scss
View File
File renamed without changes.
src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+1 -1
View File
@@ -7,7 +7,7 @@ import { urlForLocal } from "@utils/helper";
import { modalToggle, setProjectBoardFetch } from "@redux/projectsTrackerSlice"; import { modalToggle, setProjectBoardFetch } from "@redux/projectsTrackerSlice";
import { getCorrectDate } from "@components/Calendar/calendarHelper"; 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 ModalLayout from "@components/Common/ModalLayout/ModalLayout";
import BaseButton from "@components/Common/BaseButton/BaseButton"; import BaseButton from "@components/Common/BaseButton/BaseButton";
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+3 -3
View File
@@ -4,12 +4,12 @@ import { useDispatch, useSelector } from "react-redux";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { getCorrectDate } from "@components/Calendar/calendarHelper";
import BaseButton from "@components/Common/BaseButton/BaseButton"; 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 { Navigation } from "@components/Navigation/Navigation";
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { import {
deletePersonOnProject, deletePersonOnProject,
src/components/UI/TrackerModal/TrackerModal.jsx → src/components/Modal/TrackerModal/TrackerModal.jsx
View File
File renamed without changes.
src/components/UI/TrackerModal/trackerModal.scss → src/components/Modal/TrackerModal/trackerModal.scss
View File
File renamed without changes.
src/components/ProfileCalendar/ProfileCalendar.jsx
+2 -2
View File
@@ -13,10 +13,10 @@ import {
import { getReports } from "@components/Calendar/calendarHelper"; import { getReports } from "@components/Calendar/calendarHelper";
import { ProfileCalendarComponent } from "./ProfileCalendarComponent"; import { ProfileCalendarComponent } from "./ProfileCalendarComponent";
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import moment from "moment"; import moment from "moment";
src/components/ProfileHeader/ProfileHeader.jsx
+1 -1
View File
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { useNavigate, NavLink } from "react-router-dom"; import { useNavigate, NavLink } from "react-router-dom";
import { useDispatch, useSelector } from "react-redux"; 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 { apiRequest } from "@api/request";
import { auth, setProfileInfo } from "@redux/outstaffingSlice"; import { auth, setProfileInfo } from "@redux/outstaffingSlice";
import { getRole } from "@redux/roleSlice"; import { getRole } from "@redux/roleSlice";
src/components/ProjectTiket/ProjectTiket.jsx
+2 -2
View File
@@ -5,8 +5,8 @@ import { Link } from "react-router-dom";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
import { deleteProject, modalToggle } from "@redux/projectsTrackerSlice"; import { deleteProject, modalToggle } from "@redux/projectsTrackerSlice";
import { ModalSelect } from "@components/UI/ModalSelect/ModalSelect"; import { ModalSelect } from "@components/Modal/ModalSelect/ModalSelect";
import TrackerModal from "@components/UI/TrackerModal/TrackerModal"; import TrackerModal from "@components/Modal/TrackerModal/TrackerModal";
import link from "assets/icons/link.svg"; import link from "assets/icons/link.svg";
import archiveSet from "assets/icons/archive.svg"; import archiveSet from "assets/icons/archive.svg";
src/components/ReportForm/ReportForm.jsx
+2 -2
View File
@@ -10,8 +10,8 @@ import {
import ru from "date-fns/locale/ru"; import ru from "date-fns/locale/ru";
registerLocale("ru", ru); registerLocale("ru", ru);
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { Footer } from "@components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
src/components/Select/TagSelect.jsx
+1 -1
View File
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import { useSelector, useDispatch } from "react-redux"; import { useSelector, useDispatch } from "react-redux";
import Select from "react-select"; import Select from "react-select";
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
import { import {
selectedItems, selectedItems,
src/components/ShortReport/ShortReport.jsx
+1 -1
View File
@@ -13,7 +13,7 @@ import {
getSendRequest, getSendRequest,
setSendRequest, setSendRequest,
} from "@redux/reportSlice"; } from "@redux/reportSlice";
import { Loader } from "@components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import "./shortReport.scss"; import "./shortReport.scss";
src/pages/ActPage/ActPage.jsx
+2 -2
View File
@@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { ActContent } from "../../components/features/bookkeeping/ActContent/ActContent"; import { ActContent } from "@components/features/bookkeeping/ActContent/ActContent";
import { BookkeepingTemplete } from "../../components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete"; import { BookkeepingTemplete } from "@components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete";
export const ActPage = () => { export const ActPage = () => {
return ( return (
src/pages/Article/Article.jsx
+12 -12
View File
@@ -1,19 +1,19 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import SideBar from "../../components/SideBar/SideBar"; 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 { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import CardArticle from "../../components/UI/CardArticle/CardArticle"; import CardArticle from "@components/CardArticle/CardArticle";
import mockImgArticle from "../../assets/images/mock/mockImgArticle.png"; import mockImgArticle from "assets/images/mock/mockImgArticle.png";
import rightArrow from "../../assets/icons/arrows/left-arrow.png"; import rightArrow from "assets/icons/arrows/left-arrow.png";
import yandexZen from "../../assets/icons/yandexZen.svg"; import yandexZen from "assets/icons/yandexZen.svg";
import cardCalendar from "../../assets/icons/cardCalendar.svg"; import cardCalendar from "assets/icons/cardCalendar.svg";
import cardImg1 from "../../assets/images/mock/cardArticleItem.png"; import cardImg1 from "assets/images/mock/cardArticleItem.png";
import cardImg2 from "../../assets/images/mock/cardArticleItem2.png"; import cardImg2 from "assets/images/mock/cardArticleItem2.png";
import cardImg3 from "../../assets/images/mock/cardArticleItem3.png"; import cardImg3 from "assets/images/mock/cardArticleItem3.png";
import "./article.scss"; import "./article.scss";
src/pages/AuthForCandidate/AuthForCandidate.jsx
+20 -20
View File
@@ -2,28 +2,28 @@ import React, { useEffect, useRef, useState } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { loading, selectIsLoading } from "../../redux/loaderSlice"; import { loading, selectIsLoading } from "@redux/loaderSlice";
import { apiRequest } from "../../api/request"; import { apiRequest } from "@api/request";
import { auth, selectAuth, setUserInfo } from "../../redux/outstaffingSlice"; import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice";
import { setRole } from "../../redux/roleSlice"; import { setRole } from "@redux/roleSlice";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import SideBar from "../../components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import CategoriesItem from "../../components/CategoriesItem/CategoriesItem"; import CategoriesItem from "@components/CategoriesItem/CategoriesItem";
import StepsForCandidate from "../../components/StepsForCandidate/StepsForCandidate"; import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg";
import FrontendImg from "../../assets/images/partnerProfile/PersonalFrontend.svg"; import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg";
import ArchitectureImg from "../../assets/images/partnerProfile/PersonalArchitecture.svg"; import ArchitectureImg from "assets/images/partnerProfile/PersonalArchitecture.svg";
import DesignImg from "../../assets/images/partnerProfile/PersonalDesign.svg"; import DesignImg from "assets/images/partnerProfile/PersonalDesign.svg";
import TestImg from "../../assets/images/partnerProfile/PersonalTesters.svg"; import TestImg from "assets/images/partnerProfile/PersonalTesters.svg";
import AdminImg from "../../assets/images/partnerProfile/PersonalAdmin.svg"; import AdminImg from "assets/images/partnerProfile/PersonalAdmin.svg";
import ManageImg from "../../assets/images/partnerProfile/PersonalMng.svg"; import ManageImg from "assets/images/partnerProfile/PersonalMng.svg";
import CopyImg from "../../assets/images/partnerProfile/PersonalCopy.svg"; import CopyImg from "assets/images/partnerProfile/PersonalCopy.svg";
import SmmImg from "../../assets/images/partnerProfile/PersonalSMM.svg"; import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg";
import authImg from "../../assets/images/partnerProfile/authCandidateFormImg.png"; import authImg from "assets/images/partnerProfile/authCandidateFormImg.png";
import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; import arrowBtn from "assets/icons/arrows/arrowRight.svg";
import "./authForCandidate.scss"; import "./authForCandidate.scss";
src/pages/AuthForDevelopers/AuthForDevelopers.jsx
+16 -15
View File
@@ -1,22 +1,23 @@
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { useSelector } from "react-redux"; 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 { Link, useNavigate } from "react-router-dom";
import { scrollToForm } from "../../utils/helper";
import arrow from "../../assets/icons/arrows/arrow__login_page.png"; import { selectAuth } from "@redux/outstaffingSlice";
import medium from "../../assets/images/medium_male_big.png"; import { scrollToForm } from "@utils/helper";
import cross from "../../assets/images/cross.png";
import text from "../../assets/images/Body_Text.png"; import { Footer } from "@components/Common/Footer/Footer";
import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; import SideBar from "@components/SideBar/SideBar";
import vector from "../../assets/images/Vector_Smart_Object.png"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import vectorBlack from "../../assets/images/Vector_Smart_Object_black.png"; 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"; import "./authForDevelopers.scss";
src/pages/AuthForPartners/AuthForPartners.jsx
+16 -16
View File
@@ -1,23 +1,23 @@
import React, { useEffect } from "react"; 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 { useSelector } from "react-redux";
import { selectAuth } from "../../redux/outstaffingSlice";
import { Link, useNavigate } from "react-router-dom"; import { Link, useNavigate } from "react-router-dom";
import { scrollToForm } from "../../utils/helper";
import arrow from "../../assets/icons/arrows/arrow__login_page.png"; import { selectAuth } from "@redux/outstaffingSlice";
import authImg from "../../assets/images/auth_img.png"; import { scrollToForm } from "@utils/helper";
import cross from "../../assets/images/cross.png";
import text from "../../assets/images/Body_Text.png"; import { Footer } from "@components/Common/Footer/Footer";
import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; import { AuthBox } from "@components/AuthBox/AuthBox";
import vector from "../../assets/images/Vector_Smart_Object.png"; import SideBar from "@components/SideBar/SideBar";
import vectorBlack from "../../assets/images/Vector_Smart_Object_black.png"; 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"; import "./authForPartners.scss";
src/pages/Blog/Blog.jsx
+12 -12
View File
@@ -1,18 +1,18 @@
import React, { useState } from "react"; import React, { useState } from "react";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import SideBar from "../../components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import CardArticle from "../../components/UI/CardArticle/CardArticle"; import CardArticle from "@components/CardArticle/CardArticle";
import blogArrow from "../../assets/icons/arrows/blogArrow.svg"; import blogArrow from "assets/icons/arrows/blogArrow.svg";
import cardImg1 from "../../assets/images/mock/cardArticleItem.png"; import cardImg1 from "assets/images/mock/cardArticleItem.png";
import cardImg2 from "../../assets/images/mock/cardArticleItem2.png"; import cardImg2 from "assets/images/mock/cardArticleItem2.png";
import cardImg3 from "../../assets/images/mock/cardArticleItem3.png"; import cardImg3 from "assets/images/mock/cardArticleItem3.png";
import cardImg4 from "../../assets/images/mock/cardArticleItem4.png"; import cardImg4 from "assets/images/mock/cardArticleItem4.png";
import cardImg5 from "../../assets/images/mock/cardArticleItem5.png"; import cardImg5 from "assets/images/mock/cardArticleItem5.png";
import cardImg6 from "../../assets/images/mock/cardArticleItem6.png"; import cardImg6 from "assets/images/mock/cardArticleItem6.png";
import "./blog.scss"; import "./blog.scss";
src/pages/Bookkeeping.js
+7 -10
View File
@@ -1,18 +1,15 @@
import React from 'react'; import React from "react";
import { BookkeepingTemplete } from "../components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete" import { BookkeepingTemplete } from "@components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete";
import { BookkeepingContent } from "../components/features/bookkeeping/BookkeepingContent/BookkeepingContent" import { BookkeepingContent } from "@components/features/bookkeeping/BookkeepingContent/BookkeepingContent";
const Bookkeeping = () => { const Bookkeeping = () => {
return( return (
<div> <div>
<BookkeepingTemplete> <BookkeepingTemplete>
<BookkeepingContent></BookkeepingContent> <BookkeepingContent></BookkeepingContent>
</BookkeepingTemplete> </BookkeepingTemplete>
</div> </div>
) );
} };
export default Bookkeeping
export default Bookkeeping;
src/pages/FormPage/FormPage.jsx
+10 -10
View File
@@ -3,21 +3,21 @@ import { useDispatch, useSelector } from "react-redux";
import { useParams, useNavigate, Navigate } from "react-router-dom"; import { useParams, useNavigate, Navigate } from "react-router-dom";
import SVG from "react-inlinesvg"; import SVG from "react-inlinesvg";
import { LEVELS, SKILLS } from "../../utils/constants"; import { LEVELS, SKILLS } from "@utils/constants";
import { import {
currentCandidate, currentCandidate,
selectCurrentCandidate, selectCurrentCandidate,
} from "../../redux/outstaffingSlice"; } from "@redux/outstaffingSlice";
import { apiRequest } from "../../api/request"; import { apiRequest } from "@api/request";
import { urlForLocal } from "../../utils/helper"; import { urlForLocal } from "@utils/helper";
import Form from "../../components/Form/Form"; import Form from "@components/Form/Form";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { LogoutButton } from "../../components/LogoutButton/LogoutButton"; import { LogoutButton } from "@components/LogoutButton/LogoutButton";
import arrow from "../../assets/icons/arrows/left-arrow.png"; import arrow from "assets/icons/arrows/left-arrow.png";
import rectangle from "../../assets/images/rectangle_secondPage.png"; import rectangle from "assets/images/rectangle_secondPage.png";
import telegramIcon from "../../assets/icons/telegram-icon.svg"; import telegramIcon from "assets/icons/telegram-icon.svg";
import "./formPage.scss"; import "./formPage.scss";
src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx
+5 -5
View File
@@ -1,12 +1,12 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useNavigate, useParams } from "react-router"; import { useNavigate, useParams } from "react-router";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import SideBar from "../../components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import { Footer } from "../../components/Footer/Footer"; 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"; import "./FrequentlyAskedQuestion.scss";
src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx
+6 -6
View File
@@ -1,12 +1,12 @@
import React from "react"; import React from "react";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { FrequentlyAskedQuestionsItem } from "../../components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem"; import { FrequentlyAskedQuestionsItem } from "@components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import SideBar from "../../components/SideBar/SideBar"; 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"; import "./FrequentlyAskedQuestions.scss";
src/pages/Home/Home.jsx
+9 -8
View File
@@ -1,15 +1,16 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
import { apiRequest } from "../../api/request";
import { Navigate } from "react-router-dom"; import { Navigate } from "react-router-dom";
import { profiles, tags } from "../../redux/outstaffingSlice";
import Outstaffing from "../../components/Outstaffing/Outstaffing"; import { apiRequest } from "@api/request";
import Description from "../../components/Description/Description"; import { profiles, tags } from "@redux/outstaffingSlice";
import { Footer } from "../../components/Footer/Footer";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import Outstaffing from "@components/Outstaffing/Outstaffing";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import Description from "@components/Description/Description";
import { Navigation } from "../../components/Navigation/Navigation"; 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 = () => { const Home = () => {
if (localStorage.getItem("role_status") !== "18") { if (localStorage.getItem("role_status") !== "18") {
src/pages/PartnerAddRequest/PartnerAddRequest.js
+11 -11
View File
@@ -2,19 +2,19 @@ import React, { useEffect, useState } from "react";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { Link, Navigate, useNavigate } from "react-router-dom"; import { Link, Navigate, useNavigate } from "react-router-dom";
import { apiRequest } from "../../api/request"; import { apiRequest } from "@api/request";
import { getPartnerRequestInfo } from "../../redux/outstaffingSlice"; import { getPartnerRequestInfo } from "@redux/outstaffingSlice";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import arrowDown from "../../assets/icons/arrows/selectArrow.png"; import arrowDown from "assets/icons/arrows/selectArrow.png";
import processImg from "../../assets/images/partnerProfile/partnerAddRequestFirstImg.png"; import processImg from "assets/images/partnerProfile/partnerAddRequestFirstImg.png";
import reportImg from "../../assets/images/partnerProfile/partnerAddRequestSecondImg.png"; import reportImg from "assets/images/partnerProfile/partnerAddRequestSecondImg.png";
import documentsImg from "../../assets/images/partnerProfile/partnerAddRequestThirdInfo.png"; import documentsImg from "assets/images/partnerProfile/partnerAddRequestThirdInfo.png";
import deleteIcon from "../../assets/icons/close.png"; import deleteIcon from "assets/icons/close.png";
import "./partnerAddRequest.scss"; import "./partnerAddRequest.scss";
src/pages/PartnerBid/PartnerBid.jsx
+14 -15
View File
@@ -6,23 +6,22 @@ import {
getPartnerRequests, getPartnerRequests,
setPartnerRequestId, setPartnerRequestId,
setPartnerRequestInfo, setPartnerRequestInfo,
} from "../../redux/outstaffingSlice"; } from "@redux/outstaffingSlice";
import { apiRequest } from "@api/request";
import { urlForLocal } from "@utils/helper";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import { Loader } from "../../components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import ModalLayout from "../../components/Common/ModalLayout/ModalLayout"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
import { getCorrectDate } from "../../components/Calendar/calendarHelper"; import { getCorrectDate } from "@components/Calendar/calendarHelper";
import { apiRequest } from "../../api/request"; import arrowSwitchDate from "assets/icons/arrows/arrowViewReport.png";
import { urlForLocal } from "../../utils/helper"; import backEndImg from "assets/images/QualificationInfo.png";
import middle from "assets/images/QualificationInfoMiddle.png";
import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png"; import deleteBtn from "assets/images/deleteBtn.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"; import "./partnerBid.scss";
src/pages/PartnerEmployees/PartnerEmployees.js
+7 -7
View File
@@ -1,15 +1,15 @@
import React from "react"; import React from "react";
import { Link, Navigate } from "react-router-dom"; import { Link, Navigate } from "react-router-dom";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { getPartnerEmployees } from "../../redux/outstaffingSlice"; import { getPartnerEmployees } from "@redux/outstaffingSlice";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import imgInfo from "../../assets/images/emplInfo.png"; import imgInfo from "assets/images/emplInfo.png";
import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; import rightArrow from "assets/icons/arrows/arrowRight.svg";
import "./partnerEmployees.scss"; import "./partnerEmployees.scss";
src/pages/PartnerRequests/PartnerRequests.jsx
+10 -10
View File
@@ -4,18 +4,18 @@ import { useDispatch } from "react-redux";
import { import {
setPartnerRequestId, setPartnerRequestId,
setPartnerRequests, setPartnerRequests,
} from "../../redux/outstaffingSlice"; } from "@redux/outstaffingSlice";
import { apiRequest } from "../../api/request"; import { apiRequest } from "@api/request";
import { Navigation } from "../../components/Navigation/Navigation"; import { Navigation } from "@components/Navigation/Navigation";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { SliderWorkers } from "../../components/SliderWorkers/SliderWorkers"; import { SliderWorkers } from "@components/SliderWorkers/SliderWorkers";
import { Loader } from "../../components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import BaseButton from "../../components/Common/BaseButton/BaseButton"; import BaseButton from "@components/Common/BaseButton/BaseButton";
import cursorImg from "../../assets/icons/cursorImg.svg"; import cursorImg from "assets/icons/cursorImg.svg";
import "./partnerRequests.scss"; import "./partnerRequests.scss";
src/pages/PartnerSettings/PartnerSettings.jsx
+7 -7
View File
@@ -1,13 +1,13 @@
import React from "react"; import React from "react";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { Navigation } from "../../components/Navigation/Navigation"; import { Navigation } from "@components/Navigation/Navigation";
import BaseButton from "../../components/Common/BaseButton/BaseButton"; import BaseButton from "@components/Common/BaseButton/BaseButton";
import kontur from "../../assets/images/logo/konturLogo.png"; import kontur from "assets/images/logo/konturLogo.png";
import astral from "../../assets/images/logo/astralLogo.png"; import astral from "assets/images/logo/astralLogo.png";
import "./partnerSettings.scss"; import "./partnerSettings.scss";
src/pages/PartnerTreaties/PartnerTreaties.js
+13 -13
View File
@@ -1,19 +1,19 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import mainTabImg from "../../assets/icons/mainTreaties.png"; import mainTabImg from "assets/icons/mainTreaties.png";
import actImg from "../../assets/icons/actTreaties.png"; import actImg from "assets/icons/actTreaties.png";
import checkImg from "../../assets/icons/checkTreaties.png"; import checkImg from "assets/icons/checkTreaties.png";
import arrowDown from "../../assets/icons/arrows/arrowDown.png"; import arrowDown from "assets/icons/arrows/arrowDown.png";
import logoAstral from "../../assets/images/logo/astralLogo.png"; import logoAstral from "assets/images/logo/astralLogo.png";
import arrowItem from "../../assets/icons/arrows/arrowCheck.png"; import arrowItem from "assets/icons/arrows/arrowCheck.png";
import lock from "../../assets/icons/lock.svg"; import lock from "assets/icons/lock.svg";
import lockDone from "../../assets/icons/lockDone.svg"; import lockDone from "assets/icons/lockDone.svg";
import avatarMok from "../../assets/images/avatarMok.png"; import avatarMok from "assets/images/avatarMok.png";
import "./partnerTreaties.scss"; import "./partnerTreaties.scss";
src/pages/PartnerСategories/PartnerСategories.jsx
+15 -15
View File
@@ -3,23 +3,23 @@ import { Link } from "react-router-dom";
import { Navigate } from "react-router-dom"; import { Navigate } from "react-router-dom";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; 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 BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg";
import FrontendImg from "../../assets/images/partnerProfile/PersonalFrontend.svg"; import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg";
import ArchitectureImg from "../../assets/images/partnerProfile/PersonalArchitecture.svg"; import ArchitectureImg from "assets/images/partnerProfile/PersonalArchitecture.svg";
import DesignImg from "../../assets/images/partnerProfile/PersonalDesign.svg"; import DesignImg from "assets/images/partnerProfile/PersonalDesign.svg";
import TestImg from "../../assets/images/partnerProfile/PersonalTesters.svg"; import TestImg from "assets/images/partnerProfile/PersonalTesters.svg";
import AdminImg from "../../assets/images/partnerProfile/PersonalAdmin.svg"; import AdminImg from "assets/images/partnerProfile/PersonalAdmin.svg";
import ManageImg from "../../assets/images/partnerProfile/PersonalMng.svg"; import ManageImg from "assets/images/partnerProfile/PersonalMng.svg";
import CopyImg from "../../assets/images/partnerProfile/PersonalCopy.svg"; import CopyImg from "assets/images/partnerProfile/PersonalCopy.svg";
import SmmImg from "../../assets/images/partnerProfile/PersonalSMM.svg"; import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg";
import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; import rightArrow from "assets/icons/arrows/arrowRight.svg";
import avatarImg from "../../assets/images/avatarMok.png"; import avatarImg from "assets/images/avatarMok.png";
import "./partnerСategories.scss"; import "./partnerСategories.scss";
import { Navigation } from "../../components/Navigation/Navigation"; import { Navigation } from "../../components/Navigation/Navigation";
src/pages/Payouts/Payouts.js
+2 -2
View File
@@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { Navigation } from "../../components/Navigation/Navigation"; import { Navigation } from "@components/Navigation/Navigation";
export const Payouts = () => { export const Payouts = () => {
return ( return (
src/pages/Profile/Profile.js
+13 -13
View File
@@ -1,21 +1,21 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { getProfileInfo } from "../../redux/outstaffingSlice"; import { getProfileInfo } from "@redux/outstaffingSlice";
import { urlForLocal } from "../../utils/helper"; import { urlForLocal } from "@utils/helper";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { CardControl } from "../../components/CardControl/CardControl"; import { CardControl } from "@components/CardControl/CardControl";
import { Navigation } from "../../components/Navigation/Navigation"; import { Navigation } from "@components/Navigation/Navigation";
import reportsIcon from "../../assets/images/reports.png"; import reportsIcon from "assets/images/reports.png";
import summaryIcon from "../../assets/icons/summaryIcon.png"; import summaryIcon from "assets/icons/summaryIcon.png";
import timerIcon from "../../assets/icons/timerIcon.png"; import timerIcon from "assets/icons/timerIcon.png";
import paymentIcon from "../../assets/icons/paymentIcon.png"; import paymentIcon from "assets/icons/paymentIcon.png";
import settingIcon from "../../assets/icons/settingIcon.png"; import settingIcon from "assets/icons/settingIcon.png";
import avatarMok from "../../assets/images/avatarMok.png"; import avatarMok from "assets/images/avatarMok.png";
import "./profile.scss"; import "./profile.scss";
src/pages/ProfileCandidate/ProfileCandidate.js
+10 -10
View File
@@ -1,16 +1,16 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { CardControl } from "../../components/CardControl/CardControl"; import { CardControl } from "@components/CardControl/CardControl";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import settingIcon from "../../assets/icons/settingIcon.png"; import settingIcon from "assets/icons/settingIcon.png";
import reportsIcon from "../../assets/images/reports.png"; import reportsIcon from "assets/images/reports.png";
import noteIcon from "../../assets/images/note.png"; import noteIcon from "assets/images/note.png";
import questionIcon from "../../assets/images/question.png"; import questionIcon from "assets/images/question.png";
import medium_male from "../../assets/images/medium_male.png"; import medium_male from "assets/images/medium_male.png";
import "./ProfileCandidate.scss"; import "./ProfileCandidate.scss";
src/pages/ProjectTracker/ProjectTracker.js
+20 -20
View File
@@ -1,14 +1,9 @@
import React, { useEffect, useRef, useState } from "react"; import React, { useEffect, useRef, useState } from "react";
import { Link, useParams } from "react-router-dom"; 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 { useDispatch, useSelector } from "react-redux";
import { apiRequest } from "../../api/request"; import { apiRequest } from "@api/request";
import { import {
getProjectBoard, getProjectBoard,
getBoarderLoader, getBoarderLoader,
@@ -20,21 +15,26 @@ import {
setColumnName, setColumnName,
setColumnId, setColumnId,
deletePersonOnProject, deletePersonOnProject,
} from "../../redux/projectsTrackerSlice"; } from "@redux/projectsTrackerSlice";
import ModalTicket from "../../components/Modal/Tracker/ModalTicket/ModalTicket"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import TrackerModal from "../../components/UI/TrackerModal/TrackerModal"; 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 project from "assets/icons/trackerProject.svg";
import tasks from "../../assets/icons/trackerTasks.svg"; import tasks from "assets/icons/trackerTasks.svg";
import archive from "../../assets/icons/archiveTracker.svg"; import archive from "assets/icons/archiveTracker.svg";
import selectArrow from "../../assets/icons/arrows/select.svg"; import selectArrow from "assets/icons/arrows/select.svg";
import commentsBoard from "../../assets/icons/commentsBoard.svg"; import commentsBoard from "assets/icons/commentsBoard.svg";
import filesBoard from "../../assets/icons/filesBoard.svg"; import filesBoard from "assets/icons/filesBoard.svg";
import arrow from "../../assets/icons/arrows/arrowCalendar.png"; import arrow from "assets/icons/arrows/arrowCalendar.png";
import del from "../../assets/icons/delete.svg"; import del from "assets/icons/delete.svg";
import edit from "../../assets/icons/edit.svg"; import edit from "assets/icons/edit.svg";
import close from "../../assets/icons/closeProjectPersons.svg"; import close from "assets/icons/closeProjectPersons.svg";
export const ProjectTracker = () => { export const ProjectTracker = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
src/pages/RegistrationForCandidate/RegistrationForCandidate.js
+6 -6
View File
@@ -1,12 +1,12 @@
import React from "react"; import React from "react";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import SideBar from "../../components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import StepsForCandidate from "../../components/StepsForCandidate/StepsForCandidate"; import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg";
import arrowBtn from "../../assets/icons/arrows/arrowRight.svg"; import arrowBtn from "assets/icons/arrows/arrowRight.svg";
import "./registationForCandidate.scss"; import "./registationForCandidate.scss";
src/pages/SingleReportPage/SingleReportPage.js
+5 -5
View File
@@ -2,12 +2,12 @@ import React from "react";
import { useNavigate } from "react-router"; import { useNavigate } from "react-router";
import SVG from "react-inlinesvg"; import SVG from "react-inlinesvg";
import { TaskItem } from "../../components/TaskItem/TaskItem"; import { TaskItem } from "@components/TaskItem/TaskItem";
import { LogoutButton } from "../../components/LogoutButton/LogoutButton"; import { LogoutButton } from "@components/LogoutButton/LogoutButton";
import arrowLeft from "../../assets/icons/arrows/left-arrow.png"; import arrowLeft from "assets/icons/arrows/left-arrow.png";
import dateArrowIcon from "../../assets/icons/arrows/dateArrow.svg"; import dateArrowIcon from "assets/icons/arrows/dateArrow.svg";
import calendarIcon from "../../assets/icons/calendar.svg"; import calendarIcon from "assets/icons/calendar.svg";
import "./singleReportPage.scss"; import "./singleReportPage.scss";
src/pages/Summary/Summary.js
+11 -10
View File
@@ -2,17 +2,18 @@ import React, { useEffect, useState } from "react";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { Navigate } from "react-router-dom"; import { Navigate } from "react-router-dom";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { apiRequest } from "@api/request";
import { getProfileInfo } from "../../redux/outstaffingSlice"; import { urlForLocal } from "@utils/helper";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { getProfileInfo } from "@redux/outstaffingSlice";
import { Footer } from "../../components/Footer/Footer";
import { urlForLocal } from "../../utils/helper";
import { apiRequest } from "../../api/request";
import { Navigation } from "../../components/Navigation/Navigation";
import arrow from "../../assets/icons/arrows/left-arrow.png"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import gitImgItem from "../../assets/icons/gitItemImg.svg"; 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"; import "./summary.scss";
src/pages/Tracker/Tracker.js
+16 -16
View File
@@ -7,24 +7,24 @@ import {
setToggleTab, setToggleTab,
getToggleTab, getToggleTab,
modalToggle, modalToggle,
} from "../../redux/projectsTrackerSlice"; } from "@redux/projectsTrackerSlice";
import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { apiRequest } from "../../api/request"; import { Navigation } from "@components/Navigation/Navigation";
import { Navigation } from "../../components/Navigation/Navigation"; import TrackerModal from "@components/Modal/TrackerModal/TrackerModal";
import TrackerModal from "../../components/UI/TrackerModal/TrackerModal"; import ProjectTiket from "@components/ProjectTiket/ProjectTiket";
import ProjectTiket from "../../components/ProjectTiket/ProjectTiket"; import { getCorrectDate } from "@components/Calendar/calendarHelper";
import { urlForLocal } from "../../utils/helper"; import { Loader } from "@components/Common/Loader/Loader";
import { getCorrectDate } from "../../components/Calendar/calendarHelper";
import { Loader } from "../../components/Loader/Loader";
import project from "../../assets/icons/trackerProject.svg"; import project from "assets/icons/trackerProject.svg";
import tasks from "../../assets/icons/trackerTasks.svg"; import tasks from "assets/icons/trackerTasks.svg";
import archive from "../../assets/icons/archiveTracker.svg"; import archive from "assets/icons/archiveTracker.svg";
import search from "../../assets/icons/serchIcon.png"; import search from "assets/icons/serchIcon.png";
import noProjects from "../../assets/images/noProjects.png"; import noProjects from "assets/images/noProjects.png";
import "./tracker.scss"; import "./tracker.scss";
src/pages/ViewReport/ViewReport.jsx
+9 -9
View File
@@ -1,21 +1,21 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { Link, Navigate, useParams } from "react-router-dom"; import { Link, Navigate, useParams } from "react-router-dom";
import { Loader } from "../../components/Loader/Loader"; import { Loader } from "@components/Common/Loader/Loader";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; 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 { Navigation } from "@components/Navigation/Navigation";
import { apiRequest } from "../../api/request"; import { apiRequest } from "@api/request";
import { import {
getCorrectDate, getCorrectDate,
getCreatedDate, getCreatedDate,
hourOfNum, hourOfNum,
} from "../../components/Calendar/calendarHelper"; } from "@components/Calendar/calendarHelper";
import arrow from "../../assets/icons/arrows/left-arrow.png"; import arrow from "assets/icons/arrows/left-arrow.png";
import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png"; import arrowSwitchDate from "assets/icons/arrows/arrowViewReport.png";
import "./viewReport.scss"; import "./viewReport.scss";
src/pages/quiz/PassingTests.js
+9 -10
View File
@@ -1,17 +1,16 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { completedTestSelector, selectedTest } from "@redux/quizSlice";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { QuizPassingInformation } from "../../components/features/quiz/Quiz-passing-information"; import { QuizPassingInformation } from "@components/features/quiz/Quiz-passing-information";
import { CardIntroduction } from "../../components/features/quiz/Card-introduction"; import { CardIntroduction } from "@components/features/quiz/Card-introduction";
import { TaskQuiz } from "../../components/features/quiz/Task"; import { TaskQuiz } from "@components/features/quiz/Task";
import { BlockCompletedTest } from "../../components/features/quiz/BlockCompletedTest"; import { BlockCompletedTest } from "@components/features/quiz/BlockCompletedTest";
import { completedTestSelector, selectedTest } from "../../redux/quizSlice";
export const PassingTests = () => { export const PassingTests = () => {
//const selectedTest = useSelector(selectedTest) //const selectedTest = useSelector(selectedTest)
src/pages/quiz/QuizPage.js
+18 -21
View File
@@ -1,29 +1,26 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { import { questionnairesSelector, setQuestionnaires } from "@redux/quizSlice";
questionnairesSelector, import { apiRequest } from "@api/request";
setQuestionnaires,
} from "../../redux/quizSlice";
import { apiRequest } from "../../api/request";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { SelectedCategory } from "../../components/features/quiz/SelectedCategory"; import { SelectedCategory } from "@components/features/quiz/SelectedCategory";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import { CardAvailableTest } from "../../components/features/quiz/CardAviableTest"; import { CardAvailableTest } from "@components/features/quiz/CardAviableTest";
import CategoriesItem from "../../components/CategoriesItem/CategoriesItem"; import CategoriesItem from "@components/CategoriesItem/CategoriesItem";
import BackEndImg from "../../assets/images/partnerProfile/personalBackEnd.svg"; import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg";
import FrontendImg from "../../assets/images/partnerProfile/PersonalFrontend.svg"; import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg";
import ArchitectureImg from "../../assets/images/partnerProfile/PersonalArchitecture.svg"; import ArchitectureImg from "assets/images/partnerProfile/PersonalArchitecture.svg";
import DesignImg from "../../assets/images/partnerProfile/PersonalDesign.svg"; import DesignImg from "assets/images/partnerProfile/PersonalDesign.svg";
import TestImg from "../../assets/images/partnerProfile/PersonalTesters.svg"; import TestImg from "assets/images/partnerProfile/PersonalTesters.svg";
import AdminImg from "../../assets/images/partnerProfile/PersonalAdmin.svg"; import AdminImg from "assets/images/partnerProfile/PersonalAdmin.svg";
import ManageImg from "../../assets/images/partnerProfile/PersonalMng.svg"; import ManageImg from "assets/images/partnerProfile/PersonalMng.svg";
import CopyImg from "../../assets/images/partnerProfile/PersonalCopy.svg"; import CopyImg from "assets/images/partnerProfile/PersonalCopy.svg";
import SmmImg from "../../assets/images/partnerProfile/PersonalSMM.svg"; import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg";
import "./quiz-page.scss"; import "./quiz-page.scss";
src/pages/quiz/QuizReportPage.js
+8 -7
View File
@@ -2,13 +2,14 @@ import React from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { selectedTest } from "../../redux/quizSlice"; import { selectedTest } from "@redux/quizSlice";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader";
import { HeadBottom } from "../../components/features/Candidate-lk/HeadBottom"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { QuizReport } from "../../components/features/quiz/QuizReport"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { Footer } from "../../components/Footer/Footer"; import { QuizReport } from "@components/features/quiz/QuizReport";
import { AlertResult } from "../../components/features/quiz/AlertResult"; import { Footer } from "@components/Common/Footer/Footer";
import { AlertResult } from "@components/features/quiz/AlertResult";
export const QuizReportPage = () => { export const QuizReportPage = () => {
const test = useSelector(selectedTest); const test = useSelector(selectedTest);