hide payouts

This commit is contained in:
Victor Batischev 2024-03-06 12:29:13 +03:00
parent f1a692f6c5
commit 4d148cc57d
10 changed files with 29 additions and 45 deletions

View File

@ -15,6 +15,7 @@ import {
caseOfNum, caseOfNum,
getCorrectRequestDate, getCorrectRequestDate,
getToken, getToken,
removeLast,
urlForLocal urlForLocal
} from "@utils/helper"; } from "@utils/helper";
@ -812,14 +813,14 @@ export const TicketFullScreen = () => {
<div className="workers fullscreen-workers"> <div className="workers fullscreen-workers">
<div className="workers_box task__info"> <div className="workers_box task__info">
<div className="workers__creator"> <div className="workers__creator">
Создатель: <p>{taskInfo.user?.fio}</p> Создатель: <p>{removeLast(taskInfo.user?.fio)}</p>
</div> </div>
{taskInfo.executor ? ( {taskInfo.executor ? (
<> <>
<h5>Исполнитель: </h5> <h5>Исполнитель: </h5>
<div className="executor"> <div className="executor">
<p>{taskInfo.executor.fio}</p> <p>{removeLast(taskInfo.executor.fio)}</p>
<img <img
src={ src={
taskInfo.executor?.avatar taskInfo.executor?.avatar
@ -858,7 +859,7 @@ export const TicketFullScreen = () => {
key={person.user_id} key={person.user_id}
onClick={() => taskExecutor(person)} onClick={() => taskExecutor(person)}
> >
<span>{person.user.fio}</span> <span>{removeLast(person.user.fio)}</span>
<img <img
src={ src={
person.user?.avatar person.user?.avatar
@ -881,7 +882,7 @@ export const TicketFullScreen = () => {
{taskInfo.taskUsers.map((member) => { {taskInfo.taskUsers.map((member) => {
return ( return (
<div className="worker" key={member.user_id}> <div className="worker" key={member.user_id}>
<p>{member.fio}</p> <p>{removeLast(member.fio)}</p>
<img <img
src={ src={
member?.avatar member?.avatar
@ -924,7 +925,7 @@ export const TicketFullScreen = () => {
key={person.user_id} key={person.user_id}
onClick={() => addMember(person)} onClick={() => addMember(person)}
> >
<span>{person.user.fio}</span> <span>{removeLast(person.user.fio)}</span>
<img <img
src={ src={
person.user?.avatar person.user?.avatar

View File

@ -713,7 +713,7 @@ export const TrackerModal = ({
src={urlForLocal(selectedExecutorTask.user.avatar)} src={urlForLocal(selectedExecutorTask.user.avatar)}
alt="avatar" alt="avatar"
/> />
<span>{selectedExecutorTask.user.fio}</span> <span>{removeLast(selectedExecutorTask.user.fio)}</span>
</> </>
) : ( ) : (
<span>{selectedExecutorTask}</span> <span>{selectedExecutorTask}</span>

View File

@ -29,10 +29,10 @@ export const Navigation = () => {
path: "/tracker", path: "/tracker",
name: "Трекер" name: "Трекер"
}, },
{ // {
path: "/payouts", // path: "/payouts",
name: "Выплаты" // name: "Выплаты"
}, // },
{ {
path: "/quiz", path: "/quiz",
name: "Тесты" name: "Тесты"
@ -61,10 +61,10 @@ export const Navigation = () => {
path: "/tracker", path: "/tracker",
name: "Трекер" name: "Трекер"
}, },
{ // {
path: "/treaties", // path: "/treaties",
name: "Договоры" // name: "Договоры"
}, // },
{ {
path: "/settings", path: "/settings",
name: "Настройки" name: "Настройки"

View File

@ -39,10 +39,10 @@ export const ProfileHeader = () => {
path: "/tracker", path: "/tracker",
name: "Трекер" name: "Трекер"
}, },
{ // {
path: "/payouts", // path: "/payouts",
name: "Выплаты" // name: "Выплаты"
}, // },
{ {
path: "/quiz", path: "/quiz",
name: "Тесты" name: "Тесты"

View File

@ -3,7 +3,7 @@ import { CKEditor } from "@ckeditor/ckeditor5-react";
import React, { useState } from "react"; import React, { useState } from "react";
import { getCorrectDate } from "@utils/calendarHelper"; import { getCorrectDate } from "@utils/calendarHelper";
import { urlForLocal } from "@utils/helper"; import { removeLast, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
@ -93,7 +93,7 @@ export const TrackerTaskComment = ({
} }
alt="avatar" alt="avatar"
/> />
<p>{comment.user.fio}</p> <p>{removeLast(comment.user.fio)}</p>
</div> </div>
<div className="comments__list__item__date"> <div className="comments__list__item__date">
<span>{getCorrectDate(comment.created_at)}</span> <span>{getCorrectDate(comment.created_at)}</span>

View File

@ -8,7 +8,6 @@ import { AuthBox } from "@components/AuthBox/AuthBox";
import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import { Footer } from "@components/Common/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import SideBar from "@components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import SliderWorkers from "@components/SliderWorkers/SliderWorkers";
import arrow from "assets/icons/arrows/arrow__login_page.png"; import arrow from "assets/icons/arrows/arrow__login_page.png";
import text from "assets/images/Body_Text.png"; import text from "assets/images/Body_Text.png";
@ -34,11 +33,6 @@ const Auth = () => {
return ( return (
<section className="auth-partners"> <section className="auth-partners">
<AuthHeader /> <AuthHeader />
<SliderWorkers
title={"Свободные разработчики"}
titleInfo={"для Вашей команды"}
subTitle={true}
/>
<div className="auth-partners__background"> <div className="auth-partners__background">
<img className="auth-partners__vector" src={vector} alt="" /> <img className="auth-partners__vector" src={vector} alt="" />
<img className="auth-partners__vector-black" src={vectorBlack} alt="" /> <img className="auth-partners__vector-black" src={vectorBlack} alt="" />

View File

@ -15,7 +15,6 @@ import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation"; import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { SliderWorkers } from "@components/SliderWorkers/SliderWorkers";
import cursorImg from "assets/icons/cursorImg.svg"; import cursorImg from "assets/icons/cursorImg.svg";
@ -114,16 +113,6 @@ export const PartnerRequests = () => {
</p> </p>
</div> </div>
</div> </div>
<div className="partner-requests__no-items__free-employees">
<SliderWorkers
title={"Свободные разработчики"}
titleInfo={"в нашей базе"}
/>
<p className="catalog-link">
Перейти в полный <Link to={"/profile/catalog"}>КАТАЛОГ</Link>{" "}
сотрудников
</p>
</div>
</div> </div>
)} )}
</div> </div>

View File

@ -45,12 +45,12 @@ export const Profile = () => {
title: "Трекер времени", title: "Трекер времени",
description: "Сколько времени занимает<br/> выполнение задач" description: "Сколько времени занимает<br/> выполнение задач"
}, },
{ // {
path: "profile/payouts", // path: "profile/payouts",
img: paymentIcon, // img: paymentIcon,
title: "Выплаты", // title: "Выплаты",
description: "У вас <span>подтвержден</span><br/> статус самозанятого" // description: "У вас <span>подтвержден</span><br/> статус самозанятого"
}, // },
{ {
path: "profile/settings", path: "profile/settings",
img: settingIcon, img: settingIcon,

View File

@ -568,7 +568,7 @@ export const ProjectTracker = () => {
</div> </div>
{selectedExecutor ? ( {selectedExecutor ? (
<div className="tasks__head__executor-selected"> <div className="tasks__head__executor-selected">
<p>{selectedExecutor.user.fio}</p> <p>{removeLast(selectedExecutor.user.fio)}</p>
<img <img
className="avatar" className="avatar"
src={ src={

View File

@ -153,7 +153,7 @@ const Statistics = () => {
<div className="project-info__creator"> <div className="project-info__creator">
<span className="return-text">Создатель проекта:</span> <span className="return-text">Создатель проекта:</span>
<div> <div>
<p>{projectInfo?.owner_info?.fio}</p>{" "} <p>{projectInfo?.owner_info?.fio}</p>
<img <img
src={ src={
projectInfo?.owner_info?.avatar projectInfo?.owner_info?.avatar