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

hide payouts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

8
src/components/ProfileHeader/ProfileHeader.jsx
View File

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

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

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

6
src/pages/Auth/Auth.jsx
View File

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

11
src/pages/PartnerRequests/PartnerRequests.jsx
View File

@ -15,7 +15,6 @@ 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";
import { SliderWorkers } from "@components/SliderWorkers/SliderWorkers";
import cursorImg from "assets/icons/cursorImg.svg";
@ -114,16 +113,6 @@ export const PartnerRequests = () => {
</p>
</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>

12
src/pages/Profile/Profile.jsx
View File

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

2
src/pages/ProjectTracker/ProjectTracker.jsx
View File

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

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

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