add alerts
This commit is contained in:
parent
deac5ec94d
commit
9b01381af1
@ -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 {
|
||||
|
@ -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";
|
||||
|
@ -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"
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
|
||||
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
|
||||
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
|
||||
: activePeriod
|
||||
? "Выберите диапазон на календаре"
|
||||
: "Выбрать диапазон"}
|
||||
? "Выберите диапазон на календаре"
|
||||
: "Выбрать диапазон"}
|
||||
</span>
|
||||
<span>
|
||||
{totalRangeHours
|
||||
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
|
||||
: endDate
|
||||
? "0 часов"
|
||||
: ""}
|
||||
? "0 часов"
|
||||
: ""}
|
||||
</span>
|
||||
{endDate && (
|
||||
<BaseButton
|
||||
|
@ -68,6 +68,11 @@ export const ProjectTicket = ({ project, index }) => {
|
||||
});
|
||||
});
|
||||
}
|
||||
// showNotification({
|
||||
// show: true,
|
||||
// text: "Проект успешно удален",
|
||||
// type: "success"
|
||||
// });
|
||||
|
||||
function closeAcceptModal() {
|
||||
setAcceptModalOpen(false);
|
||||
@ -135,7 +140,16 @@ export const ProjectTicket = ({ project, index }) => {
|
||||
<img src={edit}></img>
|
||||
<p>редактировать</p>
|
||||
</div>
|
||||
<div onClick={() => copyProjectLink(project.id)}>
|
||||
<div
|
||||
onClick={() => {
|
||||
copyProjectLink(project.id);
|
||||
showNotification({
|
||||
show: true,
|
||||
text: "Ссылка скопирована в буфер обмена",
|
||||
type: "copy"
|
||||
});
|
||||
}}
|
||||
>
|
||||
<img src={link}></img>
|
||||
<p>скопировать ссылку</p>
|
||||
</div>
|
||||
|
@ -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";
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user