diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index 040abb8d..acc2868e 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -1,8 +1,8 @@ import React from "react"; -import logo from "../../images/logoGuild.png"; +import logo from "../../images/LogoITguild.svg"; import vk from "../../images/vkLogo.svg"; -import tg from "../../images/tgFooter.png"; +import tg from "../../images/tgFooter.svg"; import email from "../../images/emailLogo.svg"; import "./footer.scss"; @@ -13,7 +13,7 @@ export const Footer = () => {
- logo + logo

Подберем и документально оформим IT-специалистов, после чего передадим исполнителей под ваше руководство. Вы получаете полное diff --git a/src/components/Footer/footer.scss b/src/components/Footer/footer.scss index e129c7f7..6680a50d 100644 --- a/src/components/Footer/footer.scss +++ b/src/components/Footer/footer.scss @@ -14,6 +14,10 @@ footer { row-gap: 15px; } + .logo { + width: 83px; + } + p { max-width: 620px; margin-left: 33px; diff --git a/src/images/PersonalAdmin.svg b/src/images/PersonalAdmin.svg new file mode 100644 index 00000000..c0c28229 --- /dev/null +++ b/src/images/PersonalAdmin.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/PersonalArchitecture.svg b/src/images/PersonalArchitecture.svg new file mode 100644 index 00000000..e64e4f3b --- /dev/null +++ b/src/images/PersonalArchitecture.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/images/PersonalCopy.svg b/src/images/PersonalCopy.svg new file mode 100644 index 00000000..12dee899 --- /dev/null +++ b/src/images/PersonalCopy.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/images/PersonalDesign.svg b/src/images/PersonalDesign.svg new file mode 100644 index 00000000..1efc40ab --- /dev/null +++ b/src/images/PersonalDesign.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/images/PersonalFrontend.svg b/src/images/PersonalFrontend.svg new file mode 100644 index 00000000..fef9d024 --- /dev/null +++ b/src/images/PersonalFrontend.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/images/PersonalMng.svg b/src/images/PersonalMng.svg new file mode 100644 index 00000000..c0095185 --- /dev/null +++ b/src/images/PersonalMng.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/images/PersonalSMM.svg b/src/images/PersonalSMM.svg new file mode 100644 index 00000000..2b714fb6 --- /dev/null +++ b/src/images/PersonalSMM.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/images/PersonalTesters.svg b/src/images/PersonalTesters.svg new file mode 100644 index 00000000..ade01be8 --- /dev/null +++ b/src/images/PersonalTesters.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/images/logoGuild.png b/src/images/logoGuild.png deleted file mode 100644 index c8fd34ad..00000000 Binary files a/src/images/logoGuild.png and /dev/null differ diff --git a/src/images/personalBackEnd.svg b/src/images/personalBackEnd.svg new file mode 100644 index 00000000..1e9e7bb9 --- /dev/null +++ b/src/images/personalBackEnd.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/images/tgFooter.png b/src/images/tgFooter.png deleted file mode 100644 index df2f027e..00000000 Binary files a/src/images/tgFooter.png and /dev/null differ diff --git a/src/images/tgFooter.svg b/src/images/tgFooter.svg new file mode 100644 index 00000000..2f482db1 --- /dev/null +++ b/src/images/tgFooter.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/pages/ActPage/ActPage.js b/src/pages/ActPage/ActPage.jsx similarity index 100% rename from src/pages/ActPage/ActPage.js rename to src/pages/ActPage/ActPage.jsx diff --git a/src/pages/AuthForCandidate/AuthForCandidate.jsx b/src/pages/AuthForCandidate/AuthForCandidate.jsx index a6610a4c..790832db 100644 --- a/src/pages/AuthForCandidate/AuthForCandidate.jsx +++ b/src/pages/AuthForCandidate/AuthForCandidate.jsx @@ -1,10 +1,11 @@ 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 { useDispatch, useSelector } from "react-redux"; -import { useNavigate } from "react-router-dom"; import AuthHeader from "../../components/AuthHeader/AuthHeader"; import SideBar from "../../components/SideBar/SideBar"; @@ -12,15 +13,15 @@ import CategoriesItem from "../../components/CategoriesItem/CategoriesItem"; import StepsForCandidate from "../../components/StepsForCandidate/StepsForCandidate"; import { Footer } from "../../components/Footer/Footer"; -import BackEndImg from "../../pages/PartnerСategories/images/personalBackEnd.png"; -import FrontendImg from "../../pages/PartnerСategories/images/PersonalFrontend.png"; -import ArchitectureImg from "../../pages/PartnerСategories/images/PersonalArchitecture.png"; -import DesignImg from "../../pages/PartnerСategories/images/PersonalDesign.png"; -import TestImg from "../../pages/PartnerСategories/images/PersonalTesters.png"; -import AdminImg from "../../pages/PartnerСategories/images/PersonalAdmin.png"; -import ManageImg from "../../pages/PartnerСategories/images/PersonalMng.png"; -import CopyImg from "../../pages/PartnerСategories/images/PersonalCopy.png"; -import SmmImg from "../../pages/PartnerСategories/images/PersonalSMM.png"; +import BackEndImg from "../../images/personalBackEnd.svg"; +import FrontendImg from "../../images/PersonalFrontend.svg"; +import ArchitectureImg from "../../images/PersonalArchitecture.svg"; +import DesignImg from "../../images/PersonalDesign.svg"; +import TestImg from "../../images/PersonalTesters.svg"; +import AdminImg from "../../images/PersonalAdmin.svg"; +import ManageImg from "../../images/PersonalMng.svg"; +import CopyImg from "../../images/PersonalCopy.svg"; +import SmmImg from "../../images/PersonalSMM.svg"; import authImg from "../../images/authCandidateFormImg.png"; import arrowBtn from "../../images/arrowRight.svg"; diff --git a/src/pages/PartnerСategories/PartnerСategories.js b/src/pages/PartnerСategories/PartnerСategories.js index 243a7f24..56f589ee 100644 --- a/src/pages/PartnerСategories/PartnerСategories.js +++ b/src/pages/PartnerСategories/PartnerСategories.js @@ -9,15 +9,15 @@ import { Footer } from "../../components/Footer/Footer"; import { setPartnerEmployees } from "../../redux/outstaffingSlice"; -import BackEndImg from "./images/personalBackEnd.png"; -import FrontendImg from "./images/PersonalFrontend.png"; -import ArchitectureImg from "./images/PersonalArchitecture.png"; -import DesignImg from "./images/PersonalDesign.png"; -import TestImg from "./images/PersonalTesters.png"; -import AdminImg from "./images/PersonalAdmin.png"; -import ManageImg from "./images/PersonalMng.png"; -import CopyImg from "./images/PersonalCopy.png"; -import SmmImg from "./images/PersonalSMM.png"; +import BackEndImg from "../../images/personalBackEnd.svg"; +import FrontendImg from "../../images/PersonalFrontend.svg"; +import ArchitectureImg from "../../images/PersonalArchitecture.svg"; +import DesignImg from "../../images/PersonalDesign.svg"; +import TestImg from "../../images/PersonalTesters.svg"; +import AdminImg from "../../images/PersonalAdmin.svg"; +import ManageImg from "../../images/PersonalMng.svg"; +import CopyImg from "../../images/PersonalCopy.svg"; +import SmmImg from "../../images/PersonalSMM.svg"; import rightArrow from "../../images/arrowRight.svg"; import avatarImg from "../PartnerEmployees/avatarMok.png"; diff --git a/src/pages/PartnerСategories/images/PersonalAdmin.png b/src/pages/PartnerСategories/images/PersonalAdmin.png deleted file mode 100644 index 53600b7e..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalAdmin.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalArchitecture.png b/src/pages/PartnerСategories/images/PersonalArchitecture.png deleted file mode 100644 index 73ae6750..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalArchitecture.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalCopy.png b/src/pages/PartnerСategories/images/PersonalCopy.png deleted file mode 100644 index fc0ad33c..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalCopy.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalDesign.png b/src/pages/PartnerСategories/images/PersonalDesign.png deleted file mode 100644 index fb9ba8ad..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalDesign.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalFrontend.png b/src/pages/PartnerСategories/images/PersonalFrontend.png deleted file mode 100644 index f3017256..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalFrontend.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalMng.png b/src/pages/PartnerСategories/images/PersonalMng.png deleted file mode 100644 index 70a0aa2c..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalMng.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalSMM.png b/src/pages/PartnerСategories/images/PersonalSMM.png deleted file mode 100644 index c271c43e..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalSMM.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/PersonalTesters.png b/src/pages/PartnerСategories/images/PersonalTesters.png deleted file mode 100644 index 7b225e35..00000000 Binary files a/src/pages/PartnerСategories/images/PersonalTesters.png and /dev/null differ diff --git a/src/pages/PartnerСategories/images/personalBackEnd.png b/src/pages/PartnerСategories/images/personalBackEnd.png deleted file mode 100644 index 0f878b22..00000000 Binary files a/src/pages/PartnerСategories/images/personalBackEnd.png and /dev/null differ diff --git a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js index 9dc4e994..2f2a937a 100644 --- a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js +++ b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js @@ -5,7 +5,7 @@ import SideBar from "../../components/SideBar/SideBar"; import StepsForCandidate from "../../components/StepsForCandidate/StepsForCandidate"; import { Footer } from "../../components/Footer/Footer"; -import BackEndImg from "../../pages/PartnerСategories/images/personalBackEnd.png"; +import BackEndImg from "../../images/personalBackEnd.svg"; import arrowBtn from "../../images/arrowRight.svg"; import "./registationForCandidate.scss"; diff --git a/src/pages/quiz/QuizPage.js b/src/pages/quiz/QuizPage.js index 6c9490d2..3e3d8b5f 100644 --- a/src/pages/quiz/QuizPage.js +++ b/src/pages/quiz/QuizPage.js @@ -1,144 +1,176 @@ -import React, { useEffect, useState } from 'react' +import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { questionnairesSelector, setQuestionnaires } from "../../redux/quizSlice"; -import { ProfileHeader } from '../../components/ProfileHeader/ProfileHeader'; -import { HeadBottom } from '../../components/features/Candidate-lk/HeadBottom'; -import { ProfileBreadcrumbs } from '../../components/ProfileBreadcrumbs/ProfileBreadcrumbs'; -import './quiz-page.scss' -import { SelectedCategory } from '../../components/features/quiz/SelectedCategory'; -import { Footer } from '../../components/Footer/Footer'; -import { Link } from 'react-router-dom'; -import { CardAvailableTest } from '../../components/features/quiz/CardAviableTest'; -import { apiRequest } from '../../api/request'; -import CategoriesItem from '../../components/CategoriesItem/CategoriesItem'; +import { Link } from "react-router-dom"; +import { + questionnairesSelector, + setQuestionnaires, +} from "../../redux/quizSlice"; +import { apiRequest } from "../../api/request"; -import BackEndImg from "../../pages/PartnerСategories/images/personalBackEnd.png" -import FrontendImg from "../../pages/PartnerСategories/images/PersonalFrontend.png" -import ArchitectureImg from "../../pages/PartnerСategories/images/PersonalArchitecture.png" -import DesignImg from "../../pages/PartnerСategories/images/PersonalDesign.png" -import TestImg from "../../pages/PartnerСategories/images/PersonalTesters.png" -import AdminImg from "../../pages/PartnerСategories/images/PersonalAdmin.png" -import ManageImg from "../../pages/PartnerСategories/images/PersonalMng.png" -import CopyImg from "../../pages/PartnerСategories/images/PersonalCopy.png" -import SmmImg from "../../pages/PartnerСategories/images/PersonalSMM.png" +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 BackEndImg from "../../images/personalBackEnd.svg"; +import FrontendImg from "../../images/PersonalFrontend.svg"; +import ArchitectureImg from "../../images/PersonalArchitecture.svg"; +import DesignImg from "../../images/PersonalDesign.svg"; +import TestImg from "../../images/PersonalTesters.svg"; +import AdminImg from "../../images/PersonalAdmin.svg"; +import ManageImg from "../../images/PersonalMng.svg"; +import CopyImg from "../../images/PersonalCopy.svg"; +import SmmImg from "../../images/PersonalSMM.svg"; + +import "./quiz-page.scss"; export const QuizPage = () => { + const questionnaires = useSelector(questionnairesSelector); + const dispatch = useDispatch(); + const [personalInfoItems] = useState([ + { + title: "Backend разработчики", + link: "/registration-candidate", + description: + "Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript", + available: true, + img: BackEndImg, + }, + { + title: "Frontend разработчики", + link: "/registration-candidate", + description: + "Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript", + available: true, + img: FrontendImg, + }, + { + title: "Архитектура проектов", + link: "/registration-candidate", + description: "Потоки данных ER ERP CRM CQRS UML BPMN", + available: true, + img: ArchitectureImg, + }, + { + title: "Дизайн проектов", + link: "/registration-candidate", + description: + "Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript", + available: true, + img: DesignImg, + }, + { + title: "Тестирование проектов", + link: "/registration-candidate", + description: "SQL Postman TestRail Kibana Ручное тестирование", + available: false, + img: TestImg, + }, + { + title: "Администрирование проектов", + link: "/registration-candidate", + description: "DevOps ELK Kubernetes Docker Bash Apache Oracle Git", + available: false, + img: AdminImg, + }, + { + title: "Управление проектом", + link: "/registration-candidate", + description: "Scrum Kanban Agile Miro CustDev", + available: false, + img: ManageImg, + }, + { + title: "Копирайтинг проектов", + link: "/registration-candidate", + description: "Теги Заголовок H1 Дескриптор Абзац Сценарий", + available: false, + img: CopyImg, + }, + { + title: "Реклама и SMM", + link: "/registration-candidate", + description: + "Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript", + available: false, + img: SmmImg, + }, + ]); + const userId = localStorage.getItem("id"); + const [selectedCategory, setsetSelectedCategory] = useState(false); - const questionnaires = useSelector(questionnairesSelector) - const dispatch = useDispatch() - const [personalInfoItems] = useState([ - { - title: 'Backend разработчики', - link: '/registration-candidate', - description: 'Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript', - available: true, - img: BackEndImg - }, - { - title: 'Frontend разработчики', - link: '/registration-candidate', - description: 'Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript', - available: true, - img: FrontendImg - }, - { - title: 'Архитектура проектов', - link: '/registration-candidate', - description: 'Потоки данных ER ERP CRM CQRS UML BPMN', - available: true, - img: ArchitectureImg - }, - { - title: 'Дизайн проектов', - link: '/registration-candidate', - description: 'Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript', - available: true, - img: DesignImg - }, - { - title: 'Тестирование проектов', - link: '/registration-candidate', - description: 'SQL Postman TestRail Kibana Ручное тестирование', - available: false, - img: TestImg - }, - { - title: 'Администрирование проектов', - link: '/registration-candidate', - description: 'DevOps ELK Kubernetes Docker Bash Apache Oracle Git', - available: false, - img: AdminImg - }, - { - title: 'Управление проектом', - link: '/registration-candidate', - description: 'Scrum Kanban Agile Miro CustDev', - available: false, - img: ManageImg - }, - { - title: 'Копирайтинг проектов', - link: '/registration-candidate', - description: 'Теги Заголовок H1 Дескриптор Абзац Сценарий', - available: false, - img: CopyImg - }, - { - title: 'Реклама и SMM', - link: '/registration-candidate', - description: 'Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript', - available: false, - img: SmmImg - }, - ]); - const userId = localStorage.getItem('id') - const [selectedCategory, setsetSelectedCategory] = useState(false) + useEffect(() => { + apiRequest( + `/user-questionnaire/questionnaires-list?user_id=${userId}` + ).then((res) => dispatch(setQuestionnaires(res))); + }, []); - useEffect(() => { - apiRequest(`/user-questionnaire/questionnaires-list?user_id=${userId}`) - .then(res => dispatch(setQuestionnaires(res))) - }, []) + return ( +

+ + +
+ +
+ {!selectedCategory ? "Тестирование" : "Замена специализации"} +
+ {!selectedCategory && ( + <> +
+ +
+
Доступные тесты
+
+ {questionnaires.length ? ( + questionnaires.map((item, index) => ( + + )) + ) : ( +

Анкет нет

+ )} +
+
+ ИЛИ выполните тестове задание , без + прохождения тестов +
+ + )} - return ( -
- - -
- -
{!selectedCategory ? 'Тестирование' : 'Замена специализации'}
- {!selectedCategory && <> -
- -
-
- Доступные тесты -
-
- { - questionnaires.length ? questionnaires.map((item, index) => ( - )) :

Анкет нет

- } -
-
- ИЛИ выполните тестове задание , без прохождения тестов -
- } - - {selectedCategory &&
- {personalInfoItems.map((item, index) => { - return - }) - } -
} -
-
+ {selectedCategory && ( +
+ {personalInfoItems.map((item, index) => { + return ( + + ); + })} +
+ )}
- ) -} \ No newline at end of file +
+ ); +};