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

Compare commits

base: apuc:c972df0656717d4d1ea0c2f07a11b8382d7a3f3c
Branches Tags
apuc:main
apuc:fixes_tasks
apuc:developer_resume
apuc:page_under_construction
apuc:vacancy
apuc:summary_fix
apuc:current-design
..
compare: apuc:1576b2321501d8c406ab2b8193eca628ed2fa265
Branches Tags
apuc:main
apuc:fixes_tasks
apuc:developer_resume
apuc:page_under_construction
apuc:vacancy
apuc:summary_fix
apuc:current-design

No commits in common. "c972df0656717d4d1ea0c2f07a11b8382d7a3f3c" and "1576b2321501d8c406ab2b8193eca628ed2fa265" have entirely different histories.
c972df0656 ... 1576b23215

34 changed files with 179 additions and 380 deletions
Show Stats Expand all files Collapse all files

4
src/components/Candidate/Candidate.jsx
View File

@ -91,10 +91,10 @@ const Candidate = () => {
const { header, img, classes } = setStyles();
return (
<div className="candidate">
<div className="candidate__wrapper">
<ProfileHeader />
<Navigation />
<div className="container">
<div className="container candidate">
<ProfileBreadcrumbs
links={[
{ name: "Главная", link: "/profile" },

18
src/components/Candidate/candidate.scss
View File

@ -1,24 +1,22 @@
@use "sass:math";
.candidate {
display: flex;
flex-direction: column;
min-height: 100vh;
background: #f1f1f1;
padding-top: 23px;
z-index: 0;
.container {
margin-top: 23px;
display: flex;
flex-direction: column;
flex: 1;
&__wrapper {
background: #f1f1f1;
min-height: 100vh;
}
.profile-breadcrumbs {
position: relative;
z-index: -1;
}
.row {
position: relative;
z-index: -1;
}
&__header {
@ -34,11 +32,13 @@
.col-xl-8 {
position: relative;
z-index: -1;
}
&__main {
margin-top: 60px;
position: relative;
z-index: -1;
&-description {
padding-left: 16px;

2
src/components/Common/AuthHeader/AuthHeader.jsx
View File

@ -25,7 +25,7 @@ export const AuthHeader = () => {
</NavLink>
</li>
<li>
<NavLink to={"/profile"}>Кабинет разработчика</NavLink>
<NavLink to={"/auth"}>Кабинет разработчика</NavLink>
</li>
<li>
<NavLink to={"/tracker-intro"}>Трекер</NavLink>

5
src/components/Common/AuthHeader/authHeader.scss
View File

@ -25,7 +25,6 @@
background: #ffffff;
.auth-nav {
height: 35px;
display: flex;
flex-direction: row;
justify-content: space-between;
@ -49,13 +48,11 @@
text-decoration: none;
}
a:focus,
a.active {
a:focus, a.active {
color: #000000;
}
.candidate {
background: transparent;
color: #1458dd;
}
}

11
src/components/FreeDevelopers/freeDevelopers.scss
View File

@ -1,7 +1,6 @@
.free-dev {
display: flex;
flex-direction: column;
min-height: 100vh;
overflow: hidden;
position: relative;
background-color: #f1f1f1;
.link {
@ -29,11 +28,7 @@
}
&_page {
display: flex;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;
margin: 24px 0 30px 0;
}
&__title {

2
src/components/Modal/ModalRegistration/ModalRegistration.jsx
View File

@ -137,7 +137,7 @@ export const ModalRegistration = ({ active, setActive }) => {
<div className="button-box">
{loader ? (
<Loader />
<Loader style={"green"} />
) : (
<BaseButton
onClick={async (e) => {

3
src/components/Modal/ModalRegistration/modalRegistration.scss
View File

@ -23,7 +23,6 @@
display: flex;
flex-direction: column;
width: 65%;
align-items: center;
@media (max-width: 1106px) {
width: 100%;
@ -116,8 +115,6 @@
.input-container {
margin: 0 0 20px 0;
width: 100%;
display: flex;
flex-direction: column;
}
span {

4
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
View File

@ -35,8 +35,8 @@ import arrow from "assets/icons/arrows/arrowCalendar.png";
import arrowStart from "assets/icons/arrows/arrowStart.png";
import arrowDown from "assets/icons/arrows/selectArrow.png";
import calendarIcon from "assets/icons/calendar.svg";
import close from "assets/icons/close.png";
import fileDelete from "assets/icons/closeProjectPersons.svg";
import close from "assets/icons/crossWhite.svg";
import del from "assets/icons/delete.svg";
import edit from "assets/icons/edit.svg";
import file from "assets/icons/fileModal.svg";
@ -971,7 +971,7 @@ export const TicketFullScreen = () => {
/>
</div>
<div className="time">
<p>⏱</p>
<img src={watch}></img>
<p>
{correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}:

2
src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
View File

@ -49,6 +49,8 @@
.fullscreen-workers {
@media (max-width: 880px) {
background: #dff1ff;
.workers_box {
@media (max-width: 880px) {
flex-direction: inherit !important;

20
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -125,11 +125,6 @@ export const TrackerModal = ({
}
}).then(() => {
dispatch(setProjectBoardFetch(projectBoard.id));
showNotification({
show: true,
text: "Колонка создана",
type: "success"
});
});
setValueColumn("");
setActive(false);
@ -224,11 +219,6 @@ export const TrackerModal = ({
}).then(() => {
setActive(false);
dispatch(editProjectName({ id: projectId, name: projectName }));
showNotification({
show: true,
text: "Название проекта успешно изменено",
type: "success"
});
});
}
@ -279,11 +269,6 @@ export const TrackerModal = ({
}).then(() => {
setActive(false);
dispatch(editColumnName({ id: columnId, title: columnName }));
showNotification({
show: true,
text: "Колонка создана",
type: "success"
});
});
}
@ -338,11 +323,6 @@ export const TrackerModal = ({
}).then((el) => {
setActive(false);
setEmailWorker("");
showNotification({
show: true,
text: "Приглашение отправлено",
type: "success"
});
});
}

7
src/components/OutstaffingBlock/outstaffingBlock.scss
View File

@ -1,3 +1,6 @@
.container {
max-width: 1160px !important;
}
.catalog {
background: #f1f1f1;
height: 100%;
@ -11,10 +14,6 @@
}
}
.container {
max-width: 1160px !important;
}
.outstaffing-block__selected .outstaffing-block__img {
background-color: #52b70999;
color: #f9f9f9;

2
src/components/ProfileHeader/profileHeader.scss
View File

@ -17,7 +17,7 @@
justify-content: space-between;
align-items: center;
height: 100%;
z-index: 9;
z-index: 9999;
max-width: 1160px;
width: 100%;
margin: 0 auto;

16
src/components/ProjectTicket/ProjectTicket.jsx
View File

@ -68,11 +68,6 @@ export const ProjectTicket = ({ project, index }) => {
});
});
}
// showNotification({
// show: true,
// text: "Проект успешно удален",
// type: "success"
// });
function closeAcceptModal() {
setAcceptModalOpen(false);
@ -140,16 +135,7 @@ export const ProjectTicket = ({ project, index }) => {
<img src={edit}></img>
<p>редактировать</p>
</div>
<div
onClick={() => {
copyProjectLink(project.id);
showNotification({
show: true,
text: "Ссылка скопирована в буфер обмена",
type: "copy"
});
}}
>
<div onClick={() => copyProjectLink(project.id)}>
<img src={link}></img>
<p>скопировать ссылку</p>
</div>

2
src/components/SideBar/SideBar.jsx
View File

@ -50,7 +50,7 @@ export const SideBar = () => {
<Link to={"/auth"}>Вход для партнеров</Link>
</li>
<li>
<Link to={"/profile"}>Кабинет разработчика</Link>
<Link to={"/auth"}>Кабинет разработчика</Link>
</li>
<li>
<Link to={"/tracker-intro"}>Трекер</Link>

4
src/components/features/quiz/HeaderQuiz.jsx
View File

@ -5,8 +5,6 @@ import { selectUserInfo } from "@redux/quizSlice";
import { urlForLocal } from "@utils/helper";
import { Loader } from "@components/common/Loader/Loader";
// import { apiRequest } from "@api/request";
import "./quiz.scss";
@ -23,7 +21,7 @@ export const HeaderQuiz = ({ header }) => {
<div className="header-quiz">
<div className="header-quiz__container">
{!userInfo ? (
<Loader />
<h2>Loading...</h2>
) : (
<>
{header && (

4
src/components/features/quiz/Instructions.jsx
View File

@ -6,8 +6,6 @@ import { selectedTest } from "@redux/quizSlice";
import { apiRequest } from "@api/request";
import { Loader } from "@components/common/Loader/Loader";
import comment from "assets/icons/comment.jpg";
import "./quiz.scss";
@ -26,7 +24,7 @@ export const Instruction = () => {
<div className="instruction">
<div className="instruction__container">
{!countQuestions ? (
<Loader />
<h2>Loading...</h2>
) : (
<>
<h3 className="instruction__title quiz-title_h3">

4
src/components/features/quiz/Results.jsx
View File

@ -5,8 +5,6 @@ import { fetchResultTest, selectResult, selectedTest } from "@redux/quizSlice";
import { apiRequest } from "@api/request";
import { Loader } from "@components/common/Loader/Loader";
export const Results = () => {
const result = useSelector(selectResult);
const test = useSelector(selectedTest);
@ -23,7 +21,7 @@ export const Results = () => {
return (
<div className={"result _container"}>
{!result ? (
<Loader />
<h1 style={{ display: "block" }}>Ожидайте результата...</h1>
) : (
<div className="result__body">
<div className="result__text">Благодарим за прохождение теста</div>

1
src/components/features/quiz/quiz.scss
View File

@ -566,6 +566,7 @@ $maxWidthContainer: 1123;
align-items: center;
width: 100%;
height: 100%;
flex-wrap: wrap;
@media (max-width: 600px) {
display: block;
}

10
src/pages/Article/article.scss
View File

@ -1,16 +1,6 @@
.article-blog {
display: flex;
flex-direction: column;
min-height: 100vh;
background: #f1f1f1;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;
}
&__breadcrumbs {
margin-top: 30px;

14
src/pages/AuthForCandidate/authForCandidate.scss
View File

@ -1,15 +1,7 @@
.auth-candidate {
display: flex;
flex-direction: column;
min-height: 100vh;
background: #f1f1f1;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;
}
overflow: hidden;
position: relative;
background-color: #f1f1f1;
&__start {
margin-top: 60px;

10
src/pages/Blog/blog.scss
View File

@ -1,16 +1,6 @@
.blog {
display: flex;
flex-direction: column;
min-height: 100vh;
background: #f1f1f1;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;
}
&__breadcrumbs {
margin-top: 30px;

8
src/pages/CatalogSpecialists/CatalogSpecialists.jsx
View File

@ -145,10 +145,9 @@ const CatalogSpecialists = () => {
}
];
return (
<div className="catalog-specialists">
<section className="catalog-specialists">
<AuthHeader />
<SideBar />
<div className="catalog-specialists__content container">
<div className="container catalog-specialists__wrapper">
<ProfileBreadcrumbs
links={[
{ name: "Главная", link: "/auth" },
@ -202,8 +201,9 @@ const CatalogSpecialists = () => {
})}
</div>
</div>
<SideBar />
<Footer />
</div>
</section>
);
};

16
src/pages/CatalogSpecialists/catalogSpecialists.scss
View File

@ -4,20 +4,8 @@
flex-direction: column;
min-height: 100vh;
&__content {
display: flex;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;
@media (max-width: 1375px) {
padding-top: 100px;
}
@media (max-width: 1000px) {
background-color: white;
}
&__wrapper {
padding-top: 24px;
}
&__head {

12
src/pages/CompanyInfo/companyInfo.scss
View File

@ -1,15 +1,7 @@
.company-info {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content {
display: flex;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;
background-color: #f1f1f1;
padding-top: 60px;
@media (max-width: 1375px) {
padding-top: 120px;

3
src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx
View File

@ -83,7 +83,8 @@ export const FrequentlyAskedQuestions = () => {
<div className="frequently-asked-questions">
<AuthHeader />
<SideBar />
<div className="container">
<div className="frequently-asked-questions__container container">
<ProfileBreadcrumbs
links={[
{ name: "Главная", link: "/auth" },

9
src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss
View File

@ -8,12 +8,9 @@
margin-top: 80px;
}
.container {
display: flex;
flex-direction: column;
flex: 1;
max-width: 1160px;
margin-top: 23px;
&__container {
flex: 1 1 auto;
margin: 30px 0;
}
&__about {

3
src/pages/PartnerAddRequest/partnerAddRequest.scss
View File

@ -7,9 +7,6 @@
.container {
max-width: 1160px;
margin-top: 23px;
display: flex;
flex-direction: column;
flex: 1;
@media (max-width: 570px) {
margin-top: 0;

2
src/pages/PartnerSettings/partnerSettings.scss
View File

@ -225,7 +225,7 @@
&__report,
&__login {
width: 100%;
width: 60%;
}
&__report {

13
src/pages/RegistrationForCandidate/registationForCandidate.scss
View File

@ -1,15 +1,6 @@
.registration-candidate {
display: flex;
flex-direction: column;
min-height: 100vh;
background: #f1f1f1;
.container {
max-width: 1160px;
display: flex;
flex-direction: column;
flex: 1;
}
position: relative;
background-color: #f1f1f1;
&__start {
display: flex;

10
src/pages/RegistrationSetting/registrationSetting.scss
View File

@ -1,15 +1,9 @@
.registration-setting {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content {
display: flex;
flex-direction: column;
flex: 1;
background-color: #f1f1f1;
color: #000000;
padding: 50px 0 0;
min-height: 100vh;
@media (max-width: 1375px) {
padding-top: 100px;

85
src/pages/Statistics/Statistics.jsx
View File

@ -1,16 +1,12 @@
import React, { useEffect, useState } from "react";
import React from "react";
import { useDispatch } from "react-redux";
import { Link, useParams } from "react-router-dom";
import { Link } from "react-router-dom";
import { setToggleTab } from "@redux/projectsTrackerSlice";
import { copyProjectLink } from "@utils/helper";
import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
@ -27,21 +23,6 @@ import "./statistics.scss";
const Statistics = () => {
const dispatch = useDispatch();
const params = useParams();
const [projectStatistic, setProjectStatistic] = useState(null);
const [projectInfo, setProjectInfo] = useState(null);
const [loader, setLoader] = useState(true);
useEffect(() => {
apiRequest(`/project/get-project?project_id=${params.id}`).then((res) => {
setProjectInfo(res);
});
apiRequest(`/project/statistic?project_id=${params.id}`).then((res) => {
setProjectStatistic(res);
setLoader(false);
});
}, []);
const teams = [
{
@ -91,9 +72,6 @@ const Statistics = () => {
/>
<h2 className="tracker__title">Управление проектами с трекером</h2>
</div>
{loader ? (
<Loader />
) : (
<div className="tracker__tabs">
<div className="tracker__tabs__head">
<Link
@ -146,42 +124,29 @@ const Statistics = () => {
<div className="statistics-info">
<div className="statistics-info__head">
<p>Проект: </p>
<h1>{projectInfo?.name}</h1>
<h1>{"Разработка трекера"}</h1>
</div>
<div className="statistics-info__team">
<div className="project-info">
<div className="project-info__creator">
<span className="return-text">Создатель проекта:</span>
<div>
<p>{projectInfo?.owner_info?.fio}</p>{" "}
<img
src={
projectInfo?.owner_info?.avatar
? urlForLocal(projectInfo.owner_info.avatar)
: mockAvatar
}
alt="#"
/>
<p>{"Василий Тарасов"}</p>{" "}
<img src={mockAvatar} alt="#" />
</div>
</div>
<div className="project-info__tasks">
<div className="task-quantity">
<p>Открытые задачи</p>
<span className="task-quantity_open">
{projectStatistic?.open_tasks_count}
</span>
<span className="task-quantity_open">{4}</span>
</div>
<div className="task-quantity">
<p>Задач в работе</p>
<span className="task-quantity_work">
{projectStatistic?.task_on_work_count}
</span>
<span className="task-quantity_work">{5}</span>
</div>
<div className="task-quantity">
<p>Закрыто задач</p>
<span className="task-quantity_closed">
{projectStatistic?.closed_task_count}
</span>
<span className="task-quantity_closed">{434}</span>
</div>
</div>
</div>
@ -190,45 +155,36 @@ const Statistics = () => {
<span className="return-text">Участники проекта:</span>
</div>
<div className="list-team__head">
<p className="head__name">Имя</p>
<p className="head__email">Почта</p>
<p className="head__role">Роль</p>
<p className="head__status">Статус</p>
<p>Имя</p>
<p>Почта</p>
<p>Роль</p>
<p>Статус</p>
</div>
<div className="list-team__body">
{projectStatistic?.participants.map((person, index) => {
{teams.map((item) => {
return (
<>
<div className="list-team__item" key={index}>
<div className="list-team__item">
<div className="person-name">
<img
src={
person.avatar
? urlForLocal(person.avatar)
: mockAvatar
}
alt="avatar"
/>
<p>{person.username}</p>
<img src={item.avatar} alt="#" />
<p>{item.name}</p>
</div>
<div className="person-email">
<img src={emailImg} alt="#" />
<p>{person.email}</p>
<p>{item.email}</p>
</div>
<p className="person-type">
{person.role ? person.role : "-"}
</p>
<p className="person-type">{item.role}</p>
{/* <span className="status status-active"> */}
<span
className={
person.status
item.status
? "status status-active"
: "status status-none"
}
>
{person.status ? "Активно" : "Не активно"}
{item.status ? "Активно" : "Не активно"}
</span>
</div>
</>
@ -245,7 +201,6 @@ const Statistics = () => {
</div>
</div>
</div>
)}
</div>
<Footer />
</div>

40
src/pages/Statistics/statistics.scss
View File

@ -144,11 +144,6 @@
line-height: 32px;
margin-right: 19px;
}
img {
max-width: 36px;
max-height: 36px;
}
}
}
@ -245,7 +240,7 @@
&__head {
display: flex;
justify-content: space-between;
margin-right: 55px;
margin-right: 123px;
p {
color: #5b6871;
@ -260,30 +255,6 @@
@media (max-width: 650px) {
display: none;
}
.head {
&__name {
max-width: 270px;
width: 100%;
}
&__email {
max-width: 270px;
width: 100%;
}
&__role {
max-width: 168px;
width: 100%;
text-align: center;
}
&__status {
text-align: center;
max-width: 152px;
width: 100%;
}
}
}
&__item {
@ -299,18 +270,14 @@
&-name {
display: flex;
align-items: center;
max-width: 270px;
width: 100%;
width: 202px;
img {
margin-right: 10px;
max-width: 36px;
max-height: 36px;
}
}
&-email {
max-width: 270px;
width: 100%;
width: 235px;
align-items: center;
display: flex;
@ -325,7 +292,6 @@
&-type {
width: 168px;
text-align: center;
}
@media (max-width: 850px) {

1
src/pages/TrackerAuth/trackerAuth.scss
View File

@ -8,6 +8,7 @@
display: flex;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;

10
src/pages/TrackerRegistration/trackerRegistration.scss
View File

@ -1,15 +1,9 @@
.tracker-registration {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content {
display: flex;
flex-direction: column;
flex: 1;
background-color: #f1f1f1;
color: #000000;
padding: 50px 0 0;
min-height: 100vh;
@media (max-width: 1375px) {
padding-top: 100px;