small fix

This commit is contained in:
Victor Batischev 2024-01-30 17:40:40 +03:00
parent 6caed581e9
commit c59d2100d2
9 changed files with 35 additions and 33 deletions

View File

@ -75,7 +75,7 @@ const Calendar = () => {
}} }}
/> />
<p className="calendar__hours"> <p className="calendar__hours">
{month} : <span> 60 часов </span> {month}: <span> 60 часов </span>
</p> </p>
</div> </div>
</div> </div>

View File

@ -127,7 +127,7 @@ const Candidate = () => {
<img src={rightArrow} alt="" /> <img src={rightArrow} alt="" />
</div> </div>
<div className="candidate__arrow-sp"> <div className="candidate__arrow-sp">
<span>Вернуться к списку</span> <span>К списку кандидатов</span>
</div> </div>
</div> </div>
</div> </div>

View File

@ -601,7 +601,7 @@ export const ModalTiсket = ({
<div className="content"> <div className="content">
<h3 className="title-project"> <h3 className="title-project">
<img src={category} className="title-project__category"></img> <img src={category} className="title-project__category"></img>
Проект: {projectName} {projectName}
<Link <Link
to={`/tracker/task/${task.id}`} to={`/tracker/task/${task.id}`}
className="title-project__full" className="title-project__full"
@ -758,14 +758,18 @@ export const ModalTiсket = ({
<div className="workers"> <div className="workers">
<div className="workers_box task__info"> <div className="workers_box task__info">
<span className="exit" onClick={() => setActive(false)}></span> <span className="exit" onClick={() => setActive(false)}></span>
<p className="workers__creator">Создатель : {task.user?.fio}</p> <p className="workers__creator">Создатель: {task.user?.fio}</p>
{executor ? ( {executor ? (
<>
<h5>Исполнитель: </h5>
<div className="executor"> <div className="executor">
<p>Исполнитель: {executor.fio}</p> <p>{executor.fio}</p>
<img <img
src={ src={
executor?.avatar ? urlForLocal(executor.avatar) : avatarMok executor?.avatar
? urlForLocal(executor.avatar)
: avatarMok
} }
alt="avatar" alt="avatar"
/> />
@ -775,6 +779,7 @@ export const ModalTiсket = ({
onClick={() => deleteTaskExecutor()} onClick={() => deleteTaskExecutor()}
/> />
</div> </div>
</>
) : ( ) : (
<div className="add-worker moreItems "> <div className="add-worker moreItems ">
<button <button
@ -817,7 +822,7 @@ export const ModalTiсket = ({
{Boolean(members.length) && ( {Boolean(members.length) && (
<div className="members"> <div className="members">
<p>Участники:</p> <h5>Участники:</h5>
<div className="members__list"> <div className="members__list">
{members.map((member) => { {members.map((member) => {
return ( return (
@ -912,7 +917,7 @@ export const ModalTiсket = ({
</div> </div>
<div className="time"> <div className="time">
<img src={watch}></img> <img src={watch}></img>
<span>Длительность : </span> <span>Длительность: </span>
<p> <p>
{correctTimerTime(currentTimerCount.hours)}: {correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}: {correctTimerTime(currentTimerCount.minute)}:

View File

@ -679,12 +679,12 @@ export const TicketFullScreen = () => {
<div className="tracker__tabs__content content-tabs"> <div className="tracker__tabs__content content-tabs">
<div className="tasks__head"> <div className="tasks__head">
<div className="tasks__head__wrapper tasks__head__wrapper__fullScreen"> <div className="tasks__head__wrapper tasks__head__wrapper__fullScreen">
<h5>Проект : {projectInfo.name}</h5> <h5>{projectInfo.name}</h5>
<TrackerModal <TrackerModal
active={modalAddWorker} active={modalAddWorker}
setActive={setModalAddWorker} setActive={setModalAddWorker}
></TrackerModal> />
<div className="tasks__head__persons"> <div className="tasks__head__persons">
<div className="projectPersons"> <div className="projectPersons">
@ -777,7 +777,7 @@ export const TicketFullScreen = () => {
className="link" className="link"
> >
<div className="tasks__head__back"> <div className="tasks__head__back">
<p>Вернуться на проект</p> <p>К списку задач</p>
<img src={arrow} alt="arrow" /> <img src={arrow} alt="arrow" />
</div> </div>
</Link> </Link>

View File

@ -265,9 +265,7 @@ export const TrackerModal = ({
} }
function createProject() { function createProject() {
if (nameProject === "") { if (nameProject !== "") {
return;
} else {
apiRequest("/project/create", { apiRequest("/project/create", {
method: "POST", method: "POST",
data: { data: {
@ -788,7 +786,7 @@ export const TrackerModal = ({
</div> </div>
</div> </div>
<BaseButton styles={"button-add"} onClick={createTab}> <BaseButton styles={"button-add"} onClick={createTab}>
Создать Добавить
</BaseButton> </BaseButton>
</div> </div>
)} )}

View File

@ -64,7 +64,7 @@ export const ProjectTiket = ({ project, index }) => {
dispatch(deleteProject(project)); dispatch(deleteProject(project));
showNotification({ showNotification({
show: true, show: true,
text: "Проект успешно была перемещена в архив", text: "Проект успешно был перемещен в архив",
type: "archive" type: "archive"
}); });
}); });

View File

@ -489,7 +489,7 @@ export const ProjectTracker = () => {
<div className="tracker__tabs__content__tasks tasks active__content"> <div className="tracker__tabs__content__tasks tasks active__content">
<div className="tasks__head"> <div className="tasks__head">
<div className="tasks__head__wrapper"> <div className="tasks__head__wrapper">
<h5>Проект : {projectBoard.name}</h5> <h5>{projectBoard.name}</h5>
<div className="tasks__head__add"> <div className="tasks__head__add">
<BaseButton <BaseButton
@ -765,7 +765,7 @@ export const ProjectTracker = () => {
)} )}
</div> </div>
<Link to="/profile/tracker" className="tasks__head__back"> <Link to="/profile/tracker" className="tasks__head__back">
<p>Вернуться на проекты</p> <p>К списку проектов</p>
<img src={arrow} alt="arrow" /> <img src={arrow} alt="arrow" />
</Link> </Link>
</div> </div>

View File

@ -114,7 +114,7 @@ const Statistics = () => {
<img src={arrow} alt="#" /> <img src={arrow} alt="#" />
<Link to={`/profile/tracker`} className="return-text"> <Link to={`/profile/tracker`} className="return-text">
вернуться на все проекты К списку проектов
</Link> </Link>
</div> </div>
</div> </div>

View File

@ -234,8 +234,7 @@ export const Tracker = () => {
> >
<img src={addProjectImg} alt="#"></img> <img src={addProjectImg} alt="#"></img>
<p className="createProjectBtn__text"> <p className="createProjectBtn__text">
Ставьте задачи, следите за прогрессом, ведите учёт рабочего Добавить проект
времени
</p> </p>
</BaseButton> </BaseButton>
</> </>