);
};
diff --git a/src/components/Candidate/SectionSkills.js b/src/components/Candidate/SectionSkills.js
index 0e05d935..103818f6 100644
--- a/src/components/Candidate/SectionSkills.js
+++ b/src/components/Candidate/SectionSkills.js
@@ -1,9 +1,9 @@
import React from 'react';
-import style from './Candidate.module.css';
+import './candidate.css';
const SectionSkills = ({ skillsArr }) => {
return (
-
+
Навыки:
{skillsArr && skillsArr.map((skills) => - {skills.skill.name}
)}
diff --git a/src/components/Candidate/Candidate.module.css b/src/components/Candidate/candidate.css
similarity index 98%
rename from src/components/Candidate/Candidate.module.css
rename to src/components/Candidate/candidate.css
index bbb577d9..f0a02aa8 100644
--- a/src/components/Candidate/Candidate.module.css
+++ b/src/components/Candidate/candidate.css
@@ -277,3 +277,7 @@
text-align: left;
line-height: 28px;
}
+
+.candidate + .logout-button{
+ top: 80px !important;
+}
\ No newline at end of file
diff --git a/src/components/Description/Description.module.css b/src/components/Description/Description.module.css
index d8f1cf54..c14fef86 100644
--- a/src/components/Description/Description.module.css
+++ b/src/components/Description/Description.module.css
@@ -154,7 +154,7 @@
}
.description__list {
- padding: 5px;
+ padding: 0;
list-style: none;
display: flex;
flex-wrap: wrap;
@@ -168,7 +168,7 @@
letter-spacing: normal;
text-align: left;
line-height: 36px;
- margin-left: 10px;
+ margin-right: 10px;
word-wrap: break-word;
}
diff --git a/src/components/Form/Form.js b/src/components/Form/Form.js
index d492fa30..d332e6c2 100644
--- a/src/components/Form/Form.js
+++ b/src/components/Form/Form.js
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
import style from './Form.module.css';
import { fetchForm } from '../../server/server';
-import arrow from '../../images/right-arrow.png';
import { useHistory, useParams, Redirect } from 'react-router-dom';
import PhoneInput from 'react-phone-input-2'
import 'react-phone-input-2/lib/style.css'
@@ -49,14 +48,12 @@ const Form = () => {
)
};
- const goBack = () => {
- history.goBack();
- };
+
console.log('s',status)
return (
-
+ <>
{status &&
{
/>}
-
goBack()}>
-
-
-
-
- Вернуться к кандидату
-
-
-
+ >
);
};
diff --git a/src/components/Form/Form.module.css b/src/components/Form/Form.module.css
index 97aa9649..b61f1d15 100644
--- a/src/components/Form/Form.module.css
+++ b/src/components/Form/Form.module.css
@@ -19,7 +19,7 @@
.form > input {
max-width: 366px;
- height: 75px;
+ height: 62px;
box-shadow: 0 0 59px rgba(44, 44, 44, 0.05);
border-radius: 37px;
border: 1px solid #c4c4c4;
@@ -39,7 +39,7 @@
.form > textarea {
max-width: 366px;
- height: 75px;
+ height: 62px;
margin-bottom: 40px;
box-shadow: 0 0 59px rgba(44, 44, 44, 0.05);
border-radius: 37px;
@@ -64,7 +64,7 @@ textarea {
}
.form__btn {
- width: 288px;
+ width: 332px;
height: 75px;
box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
border-radius: 38px;
@@ -86,12 +86,7 @@ textarea {
text-align: center;
}
-.form__arrow {
- display: flex;
- justify-content: flex-start;
- align-items: center;
- margin-top: 80px;
-}
+
@media (max-width: 575.98px) {
.form__arrow {
@@ -99,21 +94,7 @@ textarea {
}
}
-.form__arrow__img > img {
- cursor: pointer;
-}
-.form__arrow__sp > span {
- margin-left: 40px;
- margin-right: 120px;
- font-family: 'GT Eesti Pro Display';
- font-size: 1.8em;
- font-weight: 100;
- font-style: normal;
- letter-spacing: normal;
- line-height: 36px;
- text-align: left;
-}
@media (max-width: 575.98px) {
.form__arrow__sp > span {
diff --git a/src/components/LogoutButton/logoutButton.css b/src/components/LogoutButton/logoutButton.css
index 4f872af4..15c89138 100644
--- a/src/components/LogoutButton/logoutButton.css
+++ b/src/components/LogoutButton/logoutButton.css
@@ -1,5 +1,5 @@
.logout-button {
- position: fixed;
+ position: absolute;
top: 70px;
right: 2.5rem;
z-index: 100;
diff --git a/src/components/Outstaffing/Outstaffing.js b/src/components/Outstaffing/Outstaffing.js
index 059b4622..777ca784 100644
--- a/src/components/Outstaffing/Outstaffing.js
+++ b/src/components/Outstaffing/Outstaffing.js
@@ -27,7 +27,6 @@ const Outstaffing = () => {
return (
<>
-
@@ -43,7 +42,7 @@ const Outstaffing = () => {
tag.name === 'skills_front')}
img={front}
- header="Фронтенд"
+ header="Frontend"
positionId='2'
isSelected={positionId==='2'}
onSelect={id=>onSelectPosition(id)}
@@ -53,7 +52,7 @@ const Outstaffing = () => {
tag.name === 'skills_back')}
img={back}
- header="Бэкенд"
+ header="Backend"
positionId='1'
isSelected={positionId==='1'}
onSelect={id=>onSelectPosition(id)}
@@ -70,7 +69,6 @@ const Outstaffing = () => {
/>
-
>
diff --git a/src/components/ReportForm/ReportForm.js b/src/components/ReportForm/ReportForm.js
index fda03ab5..fe7b7a00 100644
--- a/src/components/ReportForm/ReportForm.js
+++ b/src/components/ReportForm/ReportForm.js
@@ -24,7 +24,6 @@ const ReportForm = () => {
return (
-
@@ -87,7 +86,6 @@ const ReportForm = () => {
-
);
};
diff --git a/src/components/Select/TagSelect.js b/src/components/Select/TagSelect.js
index 33567040..0da18aad 100644
--- a/src/components/Select/TagSelect.js
+++ b/src/components/Select/TagSelect.js
@@ -30,7 +30,6 @@ const TagSelect = () => {
return (
<>
-
Найти специалиста по навыкам
@@ -52,7 +51,6 @@ const TagSelect = () => {
-
>
);
diff --git a/src/hoc/withLogout.js b/src/hoc/withLogout.js
index c4b4ffda..76e702d8 100644
--- a/src/hoc/withLogout.js
+++ b/src/hoc/withLogout.js
@@ -2,8 +2,10 @@ import React from 'react';
import { LogoutButton } from '../components/LogoutButton/LogoutButton';
export const WithLogout = (props) => {
- return <>
-
- {props.children}
- >
+ return (
+
+ {props.children}
+
+
+ )
}
\ No newline at end of file
diff --git a/src/images/telegram-icon.svg b/src/images/telegram-icon.svg
new file mode 100644
index 00000000..78e1cb1f
--- /dev/null
+++ b/src/images/telegram-icon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index 802f4aa6..38d2390e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -22,3 +22,6 @@ h1 {
display: none;
}
+.container {
+ position: relative !important;
+}
\ No newline at end of file
diff --git a/src/pages/FormPage.js b/src/pages/FormPage.js
index 2f325117..471b3a06 100644
--- a/src/pages/FormPage.js
+++ b/src/pages/FormPage.js
@@ -1,7 +1,78 @@
import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory, useParams, } from 'react-router-dom';
+import { currentCandidate, selectCurrentCandidate } from '../redux/outstaffingSlice';
+import SVG from 'react-inlinesvg';
import { WithLogout } from '../hoc/withLogout';
import Form from '../components/Form/Form';
+import { LEVELS, SKILLS } from '../components/constants/constants';
+import { fetchItemsForId } from '../server/server';
-const FormPage = () =>
;
+import arrow from '../images/right-arrow.png';
+import rectangle from '../images/rectangle_secondPage.png';
+import telegramIcon from '../images/telegram-icon.svg';
+
+import './formPage.scss';
+
+const goBack = (history) => {
+ history.goBack();
+ };
+
+const FormPage = () => {
+ const params = useParams();
+ const history = useHistory();
+ const dispatch = useDispatch();
+ const candidate = useSelector(selectCurrentCandidate)
+
+ if(!candidate.id) {
+ fetchItemsForId(`${process.env.REACT_APP_API_URL}/api/profile/`, Number(params.id)).then((el) =>
+ dispatch(currentCandidate(el))
+ );
+ }
+
+ return (
+
+
+
+
goBack(history)}>
+
+
+
+
+ Вернуться к кандидату
+
+
+
+
+
+
+
+
+
+ {candidate.specification} {SKILLS[candidate.position_id]}, {LEVELS[candidate.level]}
+
+
+
+
Выбранный кандидат
+
+
+
+
+
+
+
+
Заявка на собеседование через телеграм
+
+
+
+
+
+
+
+ )
+}
export default FormPage;
diff --git a/src/pages/formPage.scss b/src/pages/formPage.scss
new file mode 100644
index 00000000..63cd27f4
--- /dev/null
+++ b/src/pages/formPage.scss
@@ -0,0 +1,126 @@
+.form-page {
+ &__arrow {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 80px;
+ margin-left: -32px;
+
+ &-img {
+ cursor: pointer;
+ }
+ }
+
+ &__candidate {
+ margin-top: 60px;
+ margin-left: 48px;
+ display: flex;
+ }
+
+ &__back-to-candidate {
+ margin-left: 40px;
+ margin-right: 120px;
+ font-family: 'GT Eesti Pro Display';
+ font-size: 1.8em;
+ font-weight: 100;
+ line-height: 36px;
+ }
+
+ &__avatar {
+ img {
+ width: 61px;
+ height: 61px;
+ }
+ margin-right: 16px;
+ }
+
+ &__position {
+ color: #000000;
+ font-family: "GT Eesti Pro Display";
+ font-size: 22px;
+ font-weight: 700;
+ line-height: 36px;
+ }
+
+ &__selected {
+ span {
+ color: #000000;
+ font-family: "GT Eesti Pro Display";
+ font-size: 10px;
+ font-weight: 300;
+ line-height: 22.38px;
+ }
+
+ img {
+ width: 152px;
+ margin-right: 18px;
+ }
+ }
+
+ &__interview {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ &__form {
+ width: 45%;
+ }
+
+ &__separator {
+ width: 10%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ }
+
+ &__line {
+ width: 3px;
+ height: 135px;
+ background-color: #e4f1f6;
+ margin-bottom: 26px;
+ }
+
+ &__option {
+ color: #000000;
+ font-family: "GT Eesti Pro Display";
+ font-size: 18px;
+ font-weight: 400;
+ font-style: normal;
+ letter-spacing: normal;
+ line-height: 36px;
+ text-align: center;
+ font-style: normal;
+ letter-spacing: normal;
+ line-height: normal;
+ }
+
+ &__telegram {
+ width: 45%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ &-text {
+ width: 225px;
+ color: #000000;
+ font-family: "GT Eesti Pro Display";
+ font-size: 18px;
+ font-weight: 400;
+ font-style: normal;
+ letter-spacing: normal;
+ line-height: 33px;
+ text-align: center;
+ font-style: normal;
+ letter-spacing: normal;
+ margin-bottom: 29px;
+ }
+ }
+}
+
+.form-page + .logout-button{
+ top: 0px !important;
+ right: 2.5rem;
+}
\ No newline at end of file