diff --git a/src/components/Modal/ModalRegistration/modalRegistration.scss b/src/components/Modal/ModalRegistration/modalRegistration.scss index 0ba642bc..86fa8b64 100644 --- a/src/components/Modal/ModalRegistration/modalRegistration.scss +++ b/src/components/Modal/ModalRegistration/modalRegistration.scss @@ -23,6 +23,7 @@ display: flex; flex-direction: column; width: 65%; + align-items: center; @media (max-width: 1106px) { width: 100%; @@ -115,6 +116,8 @@ .input-container { margin: 0 0 20px 0; width: 100%; + display: flex; + flex-direction: column; } span { diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 16a1b505..2f8331b1 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -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/crossWhite.svg"; 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"; diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index 305d3e63..0704694b 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -125,6 +125,11 @@ export const TrackerModal = ({ } }).then(() => { dispatch(setProjectBoardFetch(projectBoard.id)); + showNotification({ + show: true, + text: "Колонка создана", + type: "success" + }); }); setValueColumn(""); setActive(false); @@ -219,6 +224,11 @@ export const TrackerModal = ({ }).then(() => { setActive(false); dispatch(editProjectName({ id: projectId, name: projectName })); + showNotification({ + show: true, + text: "Название проекта успешно изменено", + type: "success" + }); }); } @@ -269,6 +279,11 @@ export const TrackerModal = ({ }).then(() => { setActive(false); dispatch(editColumnName({ id: columnId, title: columnName })); + showNotification({ + show: true, + text: "Колонка создана", + type: "success" + }); }); } @@ -323,6 +338,11 @@ export const TrackerModal = ({ }).then((el) => { setActive(false); setEmailWorker(""); + showNotification({ + show: true, + text: "Приглашение отправлено", + type: "success" + }); }); } diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index ed947e10..0ccc2649 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите диапазон на календаре" - : "Выбрать диапазон"} + ? "Выберите диапазон на календаре" + : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && ( { }); }); } + // showNotification({ + // show: true, + // text: "Проект успешно удален", + // type: "success" + // }); function closeAcceptModal() { setAcceptModalOpen(false); @@ -135,7 +140,16 @@ export const ProjectTicket = ({ project, index }) => {

редактировать

-
copyProjectLink(project.id)}> +
{ + copyProjectLink(project.id); + showNotification({ + show: true, + text: "Ссылка скопирована в буфер обмена", + type: "copy" + }); + }} + >

скопировать ссылку

diff --git a/src/components/features/quiz/HeaderQuiz.jsx b/src/components/features/quiz/HeaderQuiz.jsx index ec3d81f0..65b58291 100644 --- a/src/components/features/quiz/HeaderQuiz.jsx +++ b/src/components/features/quiz/HeaderQuiz.jsx @@ -1,12 +1,12 @@ import React from "react"; import { useDispatch, useSelector } from "react-redux"; -import { Loader } from "@components/common/Loader/Loader"; - 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"; diff --git a/src/components/features/quiz/Instructions.jsx b/src/components/features/quiz/Instructions.jsx index d43bdf33..8b798a25 100644 --- a/src/components/features/quiz/Instructions.jsx +++ b/src/components/features/quiz/Instructions.jsx @@ -6,10 +6,11 @@ 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"; -import { Loader } from "@components/common/Loader/Loader"; export const Instruction = () => { const [countQuestions, setCountQuestions] = useState(null); diff --git a/src/components/features/quiz/Results.jsx b/src/components/features/quiz/Results.jsx index c12b36d8..70d779fa 100644 --- a/src/components/features/quiz/Results.jsx +++ b/src/components/features/quiz/Results.jsx @@ -1,12 +1,12 @@ import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { Loader } from "@components/common/Loader/Loader"; - 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);