@@ -29,19 +33,16 @@ export const AuthHeader = () => {
-
- кейсы
+ кейсы
-
- стек
+ аутстафинг
-
- как это работает
+ трекер
-
- отзывы
-
- -
- наши продукты
+ работа в IT
@@ -49,8 +50,14 @@ export const AuthHeader = () => {
-
diff --git a/src/components/Common/AuthHeader/authHeader.scss b/src/components/Common/AuthHeader/authHeader.scss
index b10dfcd5..640f504c 100644
--- a/src/components/Common/AuthHeader/authHeader.scss
+++ b/src/components/Common/AuthHeader/authHeader.scss
@@ -130,9 +130,7 @@
}
.signUp {
- a {
- color: #a7ca60;
- }
+ color: #a7ca60;
border: 1px solid #a7ca60;
background: none;
diff --git a/src/components/Modal/ModalRegistration/modalRegistration.scss b/src/components/Modal/ModalRegistration/modalRegistration.scss
index a8ba7d92..2db4004e 100644
--- a/src/components/Modal/ModalRegistration/modalRegistration.scss
+++ b/src/components/Modal/ModalRegistration/modalRegistration.scss
@@ -7,6 +7,7 @@
border: 1px solid #dde2e4;
border-radius: 8px;
width: 60%;
+ font-family: "LabGrotesque", sans-serif;
@media (max-width: 1375px) {
width: 80%;
@@ -110,7 +111,14 @@
border-radius: 8px;
border: none;
margin-bottom: 5px;
- padding-left: 20px;
+ font-size: 15px;
+ font-weight: 400;
+ line-height: 18px;
+ font-style: normal;
+ letter-spacing: normal;
+ text-align: left;
+ padding: 16px 15px 16px 22px;
+ outline: none;
}
.input-container {
diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
index e6fedca0..f3d39789 100644
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@@ -331,6 +331,7 @@ export const TrackerModal = ({
status: 19
}
}).then((res) => {
+ console.log(res);
if (!Array.isArray(res.name)) {
const result = { ...res, columns: [] };
dispatch(setProject(result));
diff --git a/src/components/ProjectTicket/ProjectTicket.jsx b/src/components/ProjectTicket/ProjectTicket.jsx
index 0887ac3f..c6c86756 100644
--- a/src/components/ProjectTicket/ProjectTicket.jsx
+++ b/src/components/ProjectTicket/ProjectTicket.jsx
@@ -63,8 +63,8 @@ export const ProjectTicket = ({ project, index }) => {
dispatch(deleteProject(project));
showNotification({
show: true,
- text: "Проект успешно был перемещен в архив",
- type: "archive"
+ text: "Проект успешно удален",
+ type: "success"
});
});
}
diff --git a/src/pages/Statistics/Statistics.jsx b/src/pages/Statistics/Statistics.jsx
index 74f44134..c0980da8 100644
--- a/src/pages/Statistics/Statistics.jsx
+++ b/src/pages/Statistics/Statistics.jsx
@@ -43,6 +43,8 @@ const Statistics = () => {
});
}, []);
+ useEffect(() => {}, [projectInfo]);
+
const teams = [
{
avatar: mockAvatar,
@@ -121,7 +123,7 @@ const Statistics = () => {
copyProjectLink("62")}
+ onClick={() => copyProjectLink(projectInfo.id)}
>
ссылка на проект
@@ -190,38 +192,36 @@ const Statistics = () => {
{projectStatistic?.participants.map((person, index) => {
return (
- <>
-
-
-
-
{person.username}
-
-
-
-
{person.email}
-
-
-
- {person.role ? person.role : "-"}
-
-
+
+
- {person.status ? "Активно" : "Не активно"}
-
+ alt="avatar"
+ />
+
{person.username}
- >
+
+
+
{person.email}
+
+
+
+ {person.role ? person.role : "-"}
+
+
+ {person.status ? "Активно" : "Не активно"}
+
+
);
})}
diff --git a/src/pages/Statistics/statistics.scss b/src/pages/Statistics/statistics.scss
index adfaac12..60e78dff 100644
--- a/src/pages/Statistics/statistics.scss
+++ b/src/pages/Statistics/statistics.scss
@@ -15,6 +15,7 @@
display: flex;
justify-content: space-between;
margin: 15px 0 0 0;
+ padding: 0 20px;
&__return {
img {
@@ -106,6 +107,7 @@
border-radius: 12px;
background: #f1f1f1;
padding-left: 31px;
+ margin: 0 10px;
p {
color: #5b6871;
diff --git a/src/pages/Summary/Summary.jsx b/src/pages/Summary/Summary.jsx
index 20b1cfd4..dcfbe83e 100644
--- a/src/pages/Summary/Summary.jsx
+++ b/src/pages/Summary/Summary.jsx
@@ -85,7 +85,13 @@ export const Summary = () => {
skill: selectedSkills.map((item) => item.skill_id)
}
}
- }).then(() => {});
+ }).then(() => {
+ showNotification({
+ show: true,
+ text: "Изменения успешно сохранены",
+ type: "success"
+ });
+ });
}
function editSummary() {