diff --git a/src/components/Auth/Auth.js b/src/components/Auth/Auth.js index 1da29f5a..77acc782 100644 --- a/src/components/Auth/Auth.js +++ b/src/components/Auth/Auth.js @@ -2,103 +2,110 @@ import React from 'react'; import style from './Auth.module.css'; import ellipse from '../../images/ellipse.png'; import arrow from '../../images/arrow__login_page.png'; -import male from '../../images/medium_male_big.png'; +import authImg from '../../images/auth_img.png'; import cross from '../../images/cross.png'; import specialists from '../../images/specialists.png'; import text from '../../images/Body_Text.png'; import align from '../../images/align-left.png'; import phone from '../../images/phone.png'; import telegram from '../../images/telegram.png'; +import vector from '../../images/Vector_Smart_Object.png'; +import vectorBlack from '../../images/Vector_Smart_Object_black.png'; const Auth = ({ setAuthed }) => { return (
-
-
-
-
-

- Войти в систему -

-
- - Для партнеров +
+ + +
+
+
+
+

+ Войти в систему +

+
+ + Для партнеров +
+
+ + + + + + + +
-
- - - - - - - -
-
-
- -
-
-
-
- -

- Frontend разработчик,
Middle -

-
- -
-
-
- -
-
- -
+
+ +
+
+
+
+ +

+ Управление +
командой +

-
    -
  • Ruby on Rails
  • -
  • Php
  • -
  • Python
  • -
  • Vue.js
  • -
  • React. JS
  • -
-
+
+
+
+ +
+
+ +
+
- -
-
-
+
    +
  • Рабочее пространство
  • +
  • Управления задачами
  • + {/*
  • Python
  • +
  • Vue.js
  • +
  • React. JS
  • */} +
+
-
-
-
-
- -
-
- - © Адвего — биржа контента №1. Копирайтинг, рерайтинг, переводы, работа на дому: поставщик уникального - контента. 2021{' '} - +
-
-
- - +
+
+
+
+ +
+
+ + © Адвего — биржа контента №1. Копирайтинг, рерайтинг, переводы, работа на дому: поставщик + уникального контента. 2021{' '} + +
+
-
-
-
-

+7 495 156 78 98

-

Будни с 9:00 до 21:00

+
+
+ + +
+
+ +
+
+

+7 495 156 78 98

+

Будни с 9:00 до 21:00

+
diff --git a/src/components/Auth/Auth.module.css b/src/components/Auth/Auth.module.css index b2057d48..5a506be3 100644 --- a/src/components/Auth/Auth.module.css +++ b/src/components/Auth/Auth.module.css @@ -1,8 +1,53 @@ +/* .auth { + background-color: #f1f1f1; + background: url(../../images/Vector_Smart_Object.png)-302px -720px no-repeat, + url(../../images/Vector_Smart_Object_black.png) 1760px 480px no-repeat; +} */ + +.auth { + background-color: #f1f1f1; + position: relative; + overflow: hidden; +} + +.auth__background { + background-color: #f1f1f1; + position: relative; +} + +.vector, +.vectorBlack { + position: absolute; +} + +.vector { + top: -720px; + left: -320px; +} + +.vectorBlack { + top: 460px; + right: -224px; +} + +@media (max-width: 575.98px) { + .vector, + .vectorBlack { + display: none; + } +} + .auth__box { display: flex; flex-direction: column; align-self: center; - margin-bottom: 154px; + margin-bottom: 194px; +} + +@media (max-width: 575.98px) { + .auth__box { + margin-bottom: 44px; + } } .auth__title { @@ -13,7 +58,14 @@ letter-spacing: normal; line-height: 77.81px; text-align: left; - margin-top: 254px; + margin-top: 164px; +} + +@media (max-width: 575.98px) { + .auth__title { + text-align: center; + margin-top: 44px; + } } .auth__title > span { @@ -69,7 +121,7 @@ } .auth__form > input { - width: 366px; + max-width: 366px; height: 75px; box-shadow: 0 0 59px rgba(44, 44, 44, 0.05); border-radius: 37px; @@ -111,31 +163,69 @@ text-align: center; } +@media (max-width: 575.98px) { + .form__btn { + margin: 0 auto; + } +} + .auth__arrow { margin-top: 360px; } +@media (max-width: 575.98px) { + .auth__arrow { + display: none; + } +} + .auth__info { background-color: #e1fccf; - margin-top: 140px; - width: 310px; + margin-top: 70px; + max-width: 310px; padding-top: 30px; position: relative; padding-bottom: 160px; } +@media (max-width: 575.98px) { + .auth__info { + max-width: 380px; + } +} + +@media (max-width: 375.98px) { + .auth__info { + max-width: 340px; + } +} + .auth__info__box { display: flex; align-items: center; } +@media (max-width: 575.98px) { + .auth__info__box { + flex-direction: column; + justify-content: center; + } +} + .auth__info__box > img { - width: 165px; - height: 165px; + width: 150px; + height: 150px; margin-left: -84px; margin-right: 30px; } +@media (max-width: 575.98px) { + .auth__info__box > img { + margin-left: 0px; + margin-right: 0px; + } +} + .auth__info__box > h3 { font-family: 'GT Eesti Pro Display'; font-size: 2em; @@ -144,8 +234,12 @@ letter-spacing: normal; line-height: 36px; text-align: left; - position: absolute; - right: -14px; +} + +@media (max-width: 575.98px) { + .auth__info__box > h3 { + margin-top: 20px; + } } .auth__info__container { @@ -160,6 +254,12 @@ margin-top: 28px; } +@media (max-width: 575.98px) { + .auth__info__img { + margin-left: 8px; + } +} + .auth__info__img > div > img { margin-bottom: 40px; } @@ -172,7 +272,14 @@ list-style: none; margin-top: 110px; position: absolute; - right: -116px; + /* right: -116px; */ + left: 114px; +} + +@media (max-width: 575.98px) { + .info__list { + left: 34px; + } } .info__list__item { @@ -186,6 +293,14 @@ text-align: left; text-decoration: underline; text-transform: uppercase; + margin-bottom: 34px; +} + +@media (max-width: 575.98px) { + .info__list__item { + font-size: 2.6em; + margin-bottom: 14px; + } } .img__text { @@ -194,16 +309,35 @@ bottom: -84px; } +@media (max-width: 575.98px) { + .img__text { + right: -10px; + } +} + .auth__footer__left { display: flex; align-items: center; margin-bottom: 60px; } +@media (max-width: 575.98px) { + .auth__footer__left { + margin-top: 120px; + } +} + .footer__left__sp { padding: 0 100px 0 34px; } +@media (max-width: 575.98px) { + .footer__left__sp { + padding: 0; + margin-left: 10px; + } +} + .auth__footer__left > div > span { color: #18586e; font-family: 'GT Eesti Pro Display'; @@ -215,6 +349,12 @@ text-align: left; } +@media (max-width: 575.98px) { + .auth__footer__left > div > span { + font-size: 1.2em; + } +} + .auth__footer__icon { text-align: end; } @@ -223,12 +363,23 @@ margin-left: 20px; } +@media (max-width: 575.98px) { + .auth__footer__icon > img { + margin-left: 10px; + } +} + .auth__footer__right { display: flex; flex-direction: column; align-items: left; } +@media (max-width: 575.98px) { + .auth__footer__right { + margin-bottom: 20px; + } +} .phone { color: #003b65; font-family: 'CeraPro'; diff --git a/src/components/Candidate/Candidate.js b/src/components/Candidate/Candidate.js index e3877d78..55fa8146 100644 --- a/src/components/Candidate/Candidate.js +++ b/src/components/Candidate/Candidate.js @@ -16,18 +16,13 @@ const Candidate = () => { const history = useHistory(); const { id: candidateId } = useParams(); - console.log('candidateId', candidateId); const currentCandidate = candidatesList.find((el) => el.id === Number(candidateId)); const { name, img, header } = currentCandidate; - console.log(currentCandidate); - let classes; - console.log(classes); - if (name === 'Backend') { classes = style.back; console.log(classes); @@ -95,10 +90,6 @@ const Candidate = () => {
- - {/*

- Candidate name: {currentCandidate.name} -

*/}
); }; diff --git a/src/components/Candidate/Candidate.module.css b/src/components/Candidate/Candidate.module.css index 670c431b..b0c1b3cd 100644 --- a/src/components/Candidate/Candidate.module.css +++ b/src/components/Candidate/Candidate.module.css @@ -154,7 +154,7 @@ @media (max-width: 375.98px) { .candidate__main__description > h2 { - font-size: 2.8em; + font-size: 3em; } } diff --git a/src/components/Candidate/sections/Section.module.css b/src/components/Candidate/sections/Section.module.css index 1c78ea26..e59381ac 100644 --- a/src/components/Candidate/sections/Section.module.css +++ b/src/components/Candidate/sections/Section.module.css @@ -1,120 +1,157 @@ +.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 > 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 { + display: none; } +} - .SectionOne > p { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 100; - font-style: normal; +@media (max-width: 575.98px) { + .SectionFive__btn { + display: block; + width: 221px; + height: 49px; + box-shadow: 0 8px 20px rgba(82, 151, 34, 0.21); + border-radius: 24px; + background-color: #ffffff; + background-image: linear-gradient(to top, #6aaf5c 0%, #52b709 100%), + linear-gradient( + 36deg, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 0.16) 47%, + rgba(255, 255, 255, 0.17) 50%, + rgba(255, 255, 255, 0) 100% + ); + color: #ffffff; + font-family: 'Muller'; + font-size: 1.3em; letter-spacing: normal; - line-height: 28px; + line-height: 56.7px; text-align: left; - + border: none; + text-align: center; + margin: 28px auto; } +} - .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; - } +.SectionSkills { + border: 1px solid #69bf2c; + padding: 28px 40px 16px 30px; + margin-top: 60px; + border-radius: 10px; + margin-bottom: 60px; +} +@media (max-width: 575.98px) { .SectionSkills { - border: 1px solid #69bf2c; - padding: 28px 40px 16px 30px; - margin-top: 60px; - border-radius: 10px; - margin-bottom: 60px; - + display: none; } - - .SectionSkills > h3 { - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 700; - font-style: normal; - letter-spacing: normal; - line-height: 28px; - text-align: left; - } - - .SectionSkills > 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; - } \ No newline at end of file +} + +.SectionSkills > h3 { + font-family: 'GT Eesti Pro Display'; + font-size: 1.8em; + font-weight: 700; + font-style: normal; + letter-spacing: normal; + line-height: 28px; + text-align: left; +} + +.SectionSkills > 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; +} diff --git a/src/components/Candidate/sections/SectionFive.js b/src/components/Candidate/sections/SectionFive.js index 958e9346..cbf5f4cd 100644 --- a/src/components/Candidate/sections/SectionFive.js +++ b/src/components/Candidate/sections/SectionFive.js @@ -3,15 +3,20 @@ import style from './Section.module.css'; const SectionFive = () => { return ( -
-

Регистрации/авторизации;

-

Управления правами менеджеров отеля, назначение поставщиков

-

Управления описанием и профилем отелей;

-

Управления финансами, ценообразованием, квотами;

-

Переписки со своими менеджерами, а также с вышестоящими инстанциями;

-

Управления новостями отеля;

-

Просмотра расширенной статистики по заявкам и людям;

-
+ <> +
+

Регистрации/авторизации;

+

Управления правами менеджеров отеля, назначение поставщиков

+

Управления описанием и профилем отелей;

+

Управления финансами, ценообразованием, квотами;

+

Переписки со своими менеджерами, а также с вышестоящими инстанциями;

+

Управления новостями отеля;

+

Просмотра расширенной статистики по заявкам и людям;

+
+ + ); }; diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js index cbbc4170..992ef4b0 100644 --- a/src/components/Home/Home.js +++ b/src/components/Home/Home.js @@ -59,7 +59,6 @@ const Home = () => { const [candidates, setCandidates] = useState([]); const [selectedTab, setSelectedTab] = useState(''); - // const [active, setActive] = useState(false); useEffect(() => { setTabs(tabsList); @@ -68,11 +67,6 @@ const Home = () => { const handleBlockClick = (name) => { setSelectedTab(name); - // const screenWidth = window.screen.width; - - // if (screenWidth < 576) { - // setActive(true); - // } }; return ( diff --git a/src/components/Outstaffing/Outstaffing.module.css b/src/components/Outstaffing/Outstaffing.module.css index a81238b1..a57046b3 100644 --- a/src/components/Outstaffing/Outstaffing.module.css +++ b/src/components/Outstaffing/Outstaffing.module.css @@ -33,7 +33,7 @@ line-height: normal; } .outstaffing__box { - margin-top: 120px; + margin-top: 60px; display: flex; flex-direction: column; align-items: center; diff --git a/src/images/Vector_Smart_Object_black.png b/src/images/Vector_Smart_Object_black.png new file mode 100644 index 00000000..73c63704 Binary files /dev/null and b/src/images/Vector_Smart_Object_black.png differ diff --git a/src/images/auth_img.png b/src/images/auth_img.png new file mode 100644 index 00000000..4319c448 Binary files /dev/null and b/src/images/auth_img.png differ