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

Moving components out of a folder UI

Browse Source
This commit is contained in:
MaxOvs19 2023-05-29 09:37:18 +03:00
parent 85accc3111
commit 3b605280b2
10 changed files with 292 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.js
View File

@ -12,7 +12,7 @@ import Home from "./pages/Home/Home";
import Candidate from "./components/Candidate/Candidate";
import Calendar from "./components/Calendar/Calendar";
import ReportForm from "./components/ReportForm/ReportForm";
import FreeDevelopers from "./components/UI/FreeDevelopers/FreeDevelopers";
import FreeDevelopers from "./components/FreeDevelopers/FreeDevelopers";
import { TicketFullScreen } from "./components/UI/TicketFullScreen/TicketFullScreen";
import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar";
import Article from "./pages/Article/Article";

0
src/components/UI/ModalLayout/ModalLayout.jsx → src/components/Common/ModalLayout/ModalLayout.jsx
View File

1
src/components/UI/ModalLayout/modalLayout.scss → src/components/Common/ModalLayout/modalLayout.scss
View File

@ -15,7 +15,6 @@
position: relative;
background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%);
border-radius: 24px;
padding: 60px 60px 30px 60px;
display: flex;
flex-direction: column;

16
src/components/UI/FreeDevelopers/FreeDevelopers.jsx → src/components/FreeDevelopers/FreeDevelopers.jsx
View File

@ -1,15 +1,15 @@
import React from "react";
import { Link } from "react-router-dom";
import AuthHeader from "../../AuthHeader/AuthHeader";
import SideBar from "../../SideBar/SideBar";
import { Footer } from "../../Footer/Footer";
import { scrollToForm } from "../../../helper";
import { ProfileBreadcrumbs } from "../../ProfileBreadcrumbs/ProfileBreadcrumbs";
import Button from "../../Common/Button/Button";
import AuthHeader from "../AuthHeader/AuthHeader";
import SideBar from "../SideBar/SideBar";
import { Footer } from "../Footer/Footer";
import { scrollToForm } from "../../helper";
import { ProfileBreadcrumbs } from "../ProfileBreadcrumbs/ProfileBreadcrumbs";
import Button from "../Common/Button/Button";
import mockWorker from "../../../assets/images/mock/mokPerson.png";
import arrow from "../../../assets/icons/arrows/arrow_left.png";
import mockWorker from "../../assets/images/mock/mokPerson.png";
import arrow from "../../assets/icons/arrows/arrow_left.png";
import "./freeDevelopers.scss";

0
src/components/UI/FreeDevelopers/freeDevelopers.scss → src/components/FreeDevelopers/freeDevelopers.scss
View File

28
src/components/UI/ModalAspirant/ModalAspirant.jsx
View File

@ -1,7 +1,8 @@
import React, { useState } from "react";
import { Link } from "react-router-dom";
import ModalLayout from "../ModalLayout/ModalLayout";
import ModalLayout from "../../Common/ModalLayout/ModalLayout";
import Button from "../../Common/Button/Button";
import avatar from "../../../assets/images/mock/mokPerson.png";
import logoTg from "../../../assets/icons/tgLogo.svg";
@ -26,23 +27,18 @@ export const ModalAspirant = ({ active, setActive, level }) => {
}
};
// TODO: Исправить стили тут, и заменить в модалках
return (
<ModalLayout
active={active}
setActive={setActive}
styles={"modal-aspt__content"}
>
<div className="aspt-decs">
<ModalLayout active={active} setActive={setActive} styles={"aspirant"}>
<div className="aspirant-decs">
<h1>Выбранный кандидат</h1>
<div className="aspt-decs__avatar">
<div className="aspt-decs__avatar_title">
<div className="aspirant-decs__avatar">
<div className="aspirant-decs__avatar_title">
<img src={avatar}></img>
<p>
{level.spec} {level.skils}, {level.level}{" "}
</p>
</div>
<div className="aspt-decs__avatar_back">
<div className="aspirant-decs__avatar_back">
<Link to={"/profile/catalog"}>
<div>
<img src={arrow}></img>
@ -52,9 +48,9 @@ export const ModalAspirant = ({ active, setActive, level }) => {
</div>
</div>
<div className="aspt-decs__telega">
<div className="aspirant-decs__telega">
<h4>Есть вопросы?</h4>
<div className="aspt-decs__telega-logo">
<div className="aspirant-decs__telega-logo">
<img src={logoTg}></img>
<p>Напишите нам в Телеграм. Мы с удовольствием ответим!</p>
</div>
@ -78,11 +74,11 @@ export const ModalAspirant = ({ active, setActive, level }) => {
onChange={(e) => setTime(e.target.value)}
></input>
</div>
<button onClick={send}>Отправить</button>
<Button onClick={send} styles="form-interview__submit">
Отправить
</Button>
</div>
<span className="exit" onClick={() => setActive(false)}></span>
<ModalLayout active={modalSend} setActive={setModalSend} styles={"send"}>
<div className="send">
<img src={interview}></img>

33
src/components/UI/ModalAspirant/modalAspirant.scss
View File

@ -1,27 +1,12 @@
.modal-aspt {
z-index: 99;
height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.11);
position: fixed;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
transform: scale(0);
&__content {
position: relative;
.aspirant {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
background: #ffffff;
border: 1px solid #dde2e4;
border-radius: 8px;
padding: 0;
.aspt-decs {
&-decs {
padding: 54px 25px 51px 61px;
border-right: 1px solid #f1f1f1;
@ -134,15 +119,10 @@
margin-bottom: 10px;
}
button {
&__submit {
width: 174px;
height: 46px;
color: white;
border: none;
font-size: 18px;
line-height: 32px;
background: #52b709;
border-radius: 44px;
}
.input {
@ -164,11 +144,6 @@
}
}
}
}
.modal-aspt.active {
transform: scale(1);
}
.send {
display: flex;

36
src/components/UI/ModalRegistration/ModalRegistration.jsx
View File

@ -1,5 +1,8 @@
import React from "react";
import ModalLayout from "../../Common/ModalLayout/ModalLayout";
import Button from "../../Common/Button/Button";
import telegramLogo from "../../../assets/icons/tgLogo.svg";
import doc from "../../../assets/icons/doc.svg";
import anyMoment from "../../../assets/icons/anyMoment.svg";
@ -8,19 +11,12 @@ import "./modalRegistration.scss";
export const ModalRegistration = ({ active, setActive }) => {
return (
<div
className={active ? "modal-registration active" : "modal-registration"}
onClick={() => setActive(false)}
>
<div
className="modal-registration__content"
onClick={(e) => e.stopPropagation()}
>
<div className="body-reg__left">
<ModalLayout active={active} setActive={setActive} styles={"registration"}>
<div className="registration-body__left">
<h2>
Подключайтесь к <p>itguild.</p>
</h2>
<p className="body-reg__left-desc">
<p className="registration-body__left-desc">
Зарегистрируйтесь и назначайте собеседования любым специалистам без
задержек
</p>
@ -41,15 +37,20 @@ export const ModalRegistration = ({ active, setActive }) => {
</div>
</div>
<div className="button-box">
<button onClick={(e) => e.preventDefault()}>Отправить</button>
<Button
onClick={(e) => e.preventDefault()}
styles={"button-box__submit"}
>
Отправить
</Button>
<h5>
У вас уже есть аккаунт? <p>Войти</p>
</h5>
</div>
</div>
<div className="body-reg__right">
<div className="registration-body__right">
<h4>Отказ от специалиста в любой момент</h4>
<div className="body-reg__right-text">
<div className="registration-body__right-text">
<img src={anyMoment}></img>
<p>
Поменяйте, откажитесь или возьмите еще специалиста в любой момент
@ -57,7 +58,7 @@ export const ModalRegistration = ({ active, setActive }) => {
</p>
</div>
<h4>100% постоплата</h4>
<div className="body-reg__right-text">
<div className="registration-body__right-text">
<img src={doc}></img>
<p>
Договор не подразумевает какую‑либо оплату до того, как вы
@ -65,14 +66,13 @@ export const ModalRegistration = ({ active, setActive }) => {
</p>
</div>
<h4>Есть вопросы?</h4>
<div className="body-reg__right-text">
<div className="registration-body__right-text">
<img src={telegramLogo}></img>
<p>Напишите нам в Телеграм. Мы с удовольствием ответим!</p>
</div>
</div>
<span onClick={() => setActive(false)}></span>
</div>
</div>
<span onClick={() => setActive(false)} className="exit"></span>
</ModalLayout>
);
};

54
src/components/UI/ModalRegistration/modalRegistration.scss
View File

@ -1,29 +1,15 @@
.modal-registration {
z-index: 9;
height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.11);
position: fixed;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
transform: scale(0);
&__content {
position: relative;
.registration {
background: white;
display: flex;
flex-direction: row;
padding: 0;
justify-content: space-between;
border: 1px solid #dde2e4;
border-radius: 8px;
width: 1088px;
height: 529px;
.body-reg {
&-body {
&__left {
padding: 60px 0 30px 77px;
@ -84,15 +70,10 @@
flex-direction: row;
margin-top: 10px;
button {
&__submit {
width: 174px;
height: 46px;
background: #52b709;
border-radius: 44px;
border: none;
font-size: 18px;
line-height: 32px;
color: white;
margin-right: 55px;
}
@ -144,31 +125,4 @@
}
}
}
span {
cursor: pointer;
position: absolute;
top: 30px;
right: 36px;
&:before,
&:after {
content: "";
position: absolute;
width: 16px;
height: 2px;
background: #263238;
}
&:before {
transform: rotate(45deg);
}
&:after {
transform: rotate(-45deg);
}
}
}
}
.modal-registration.active {
transform: scale(1);
}

5
src/pages/PartnerBid/PartnerBid.jsx
View File

@ -13,11 +13,10 @@ import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileB
import { Footer } from "../../components/Footer/Footer";
import { Navigation } from "../../components/Navigation/Navigation";
import { Loader } from "../../components/Loader/Loader";
import ModalLayout from "../../components/UI/ModalLayout/ModalLayout";
import { apiRequest } from "../../api/request";
import ModalLayout from "../../components/Common/ModalLayout/ModalLayout";
import { getCorrectDate } from "../../components/Calendar/calendarHelper";
import { apiRequest } from "../../api/request";
import { urlForLocal } from "../../helper";
import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png";