diff --git a/src/components/Candidate/Candidate.js b/src/components/Candidate/Candidate.js index af9c9415..8be534d8 100644 --- a/src/components/Candidate/Candidate.js +++ b/src/components/Candidate/Candidate.js @@ -1,7 +1,12 @@ import React from 'react'; import { useHistory, useParams } from 'react-router-dom'; import { useSelector, useDispatch } from 'react-redux'; -import { currentCandidate, selectCurrentCandidate, selectProfiles } from '../../redux/outstaffingSlice'; +import { + currentCandidate, + selectCurrentCandidate, + selectProfiles, + selectFilteredCandidates, +} from '../../redux/outstaffingSlice'; import style from './Candidate.module.css'; import arrow from '../../images/right-arrow.png'; import rectangle from '../../images/rectangle_secondPage.png'; @@ -18,14 +23,21 @@ const Candidate = () => { const dispatch = useDispatch(); const candidatesArr = useSelector(selectProfiles); + const filteredCandidates = useSelector(selectFilteredCandidates); - dispatch(currentCandidate(candidatesArr.find((el) => Number(el.id) === Number(candidateId)))); + dispatch( + currentCandidate( + filteredCandidates.length > 0 + ? filteredCandidates.find((el) => Number(el.id) === Number(candidateId)) + : candidatesArr.find((el) => Number(el.id) === Number(candidateId)) + ) + ); const currentCandidateObj = useSelector(selectCurrentCandidate); console.log('currentCandidateObj ', currentCandidateObj); - const { fio: name, position_id, skillValues, vc_text: text } = currentCandidateObj; + const { position_id, skillValues, vc_text: text } = currentCandidateObj; let classes; let header; @@ -88,7 +100,6 @@ const Candidate = () => {
-

{name}

# Описание опыта

{text ? ( @@ -96,7 +107,7 @@ const Candidate = () => { ) : (

Описание отсутствует...

)} - diff --git a/src/components/Candidate/Candidate.module.css b/src/components/Candidate/Candidate.module.css index dca9e629..da0ab9a8 100644 --- a/src/components/Candidate/Candidate.module.css +++ b/src/components/Candidate/Candidate.module.css @@ -182,104 +182,14 @@ margin: 20px 0px; } -.SectionOne > h3 { - font-family: 'GT Eesti Pro Display'; - font-size: 2.2em; - font-weight: 400; - font-style: normal; - letter-spacing: normal; - line-height: 36px; - text-align: left; -} - -.SectionOne > p { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 100; - font-style: normal; - letter-spacing: normal; - line-height: 28px; - text-align: left; -} - -.SectionOne > h4 { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 700; - font-style: normal; - letter-spacing: normal; - line-height: 36px; - text-align: left; -} - -.SectionTwo > p { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 400; - font-style: normal; - letter-spacing: normal; - line-height: 28px; - text-align: left; -} - -.SectionThree > h3 { - font-family: 'GT Eesti Pro Display'; - font-size: 2.2em; - font-weight: 400; - font-style: normal; - letter-spacing: normal; - line-height: 36px; - text-align: left; -} - -.SectionThree > p { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 100; - font-style: normal; - letter-spacing: normal; - line-height: 28px; - text-align: left; -} - -.SectionThree > h4 { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 700; - font-style: normal; - letter-spacing: normal; - line-height: 36px; - text-align: left; -} - -.SectionFour > p { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 400; - font-style: normal; - letter-spacing: normal; - line-height: 18px; - text-align: left; -} - -.SectionFive > p { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 400; - font-style: normal; - letter-spacing: normal; - line-height: 16px; - text-align: left; -} - @media (min-width: 576.98px) { - .SectionFive__btn { + .candidate__btn { display: none; } } @media (max-width: 575.98px) { - .SectionFive__btn { + .candidate__btn { display: block; width: 221px; height: 49px; diff --git a/src/components/Description/Description.js b/src/components/Description/Description.js index 4549db4b..d94b8cdc 100644 --- a/src/components/Description/Description.js +++ b/src/components/Description/Description.js @@ -3,7 +3,7 @@ import style from './Description.module.css'; import dog from '../../images/dog.jpg'; import rectangle from '../../images/rectangle_secondPage.png'; import { Link } from 'react-router-dom'; -import { LEVELS } from '../constants/constants'; +import { LEVELS, SKILLS } from '../constants/constants'; import { selectProfiles, selectFilteredCandidates } from '../../redux/outstaffingSlice'; import { useSelector } from 'react-redux'; @@ -27,7 +27,7 @@ const Description = ({ onLoadMore }) => {

- {el.fio} разработчик, {LEVELS[el.level]} + {SKILLS[el.position_id]}, {LEVELS[el.level]}

{el.vc_text ? ( @@ -60,7 +60,7 @@ const Description = ({ onLoadMore }) => {

- {el.fio} разработчик, {LEVELS[el.level]} + {SKILLS[el.position_id]}, {LEVELS[el.level]}

{el.vc_text ? ( diff --git a/src/components/Select/TagSelect.js b/src/components/Select/TagSelect.js index db0f9f11..85fd2a94 100644 --- a/src/components/Select/TagSelect.js +++ b/src/components/Select/TagSelect.js @@ -19,7 +19,7 @@ const TagSelect = () => { dispatch(filteredCandidates(el)) ); - dispatch(selectedItems([])); + // dispatch(selectedItems([])); }; return ( diff --git a/src/components/constants/constants.js b/src/components/constants/constants.js index 3b72d176..e8918c47 100644 --- a/src/components/constants/constants.js +++ b/src/components/constants/constants.js @@ -4,3 +4,12 @@ export const LEVELS = { 3: 'Middle+', 4: 'Senior', }; + +export const SKILLS = { + 1: 'Back end - разработчик', + 2: 'Front end - разработчик', + 3: 'Маркетолог', + 4: 'Smm - специалист', + 5: 'Дизайнер', + 6: 'Копирайтер', +};