diff --git a/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx b/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx
index 5fe752e6..6efa3771 100644
--- a/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx
+++ b/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx
@@ -9,14 +9,14 @@ const AllTaskTableItem = ({ task, projects }) => {
e.target?.classList.toggle("open-desc-item");
e.target
.closest("td")
- ?.querySelector(".taskList__table__name-project")
+ ?.querySelector(".task-list__table__name-project")
.classList.toggle("hide-desc");
}
return (
-
+
{task.title}
{
}}
/>
-
+
Проект:
{projects?.map((project) => {
diff --git a/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss b/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss
index d8482e9f..4cf62943 100644
--- a/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss
+++ b/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss
@@ -3,7 +3,7 @@
transform: rotate(45deg) !important;
}
-.taskList {
+.task-list {
&__table {
margin-top: 20px;
font-size: 14px;
diff --git a/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx b/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx
index 56e0575b..9f57c34e 100644
--- a/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx
+++ b/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx
@@ -34,7 +34,7 @@ const AllTaskTableTracker = ({ filteredAllTasks, projects, loader }) => {
return (
<>
-
+
Задача |
diff --git a/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx b/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
index 71148cfd..13b046ad 100644
--- a/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
+++ b/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
@@ -26,7 +26,7 @@ const ArchiveTableTracker = ({ filterCompleteTasks, loader }) => {
) : (
-
+
В данном месяце у вас не было задач
|
diff --git a/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx b/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx
index 2247e071..e1418e6f 100644
--- a/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx
+++ b/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx
@@ -7,8 +7,8 @@ import "./archiveTasksItem.scss";
const ArchiveTasksItem = ({ task, index }) => {
return (
-
- {task.title}
+ |
+ {task.title}
{/* {
{/* }}*/}
{/*/>*/}
|
-
+ |
{new Date(
task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000
@@ -25,7 +25,7 @@ const ArchiveTasksItem = ({ task, index }) => {
.slice(11, 19)}
|
-
+ |
{getCorrectDate(task.updated_at)}
diff --git a/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss b/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss
index 3fc6237b..f214e04d 100644
--- a/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss
+++ b/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss
@@ -1,10 +1,10 @@
-.completeTask__title {
+.complete-task__title {
white-space: nowrap;
max-width: 250px;
text-overflow: ellipsis;
overflow: hidden;
}
-.archive__completeTask__time {
+.archive__complete-task__time {
text-align: center;
}
diff --git a/src/components/AuthBox/AuthBox.jsx b/src/components/AuthBox/AuthBox.jsx
index acda9724..27c5bf67 100644
--- a/src/components/AuthBox/AuthBox.jsx
+++ b/src/components/AuthBox/AuthBox.jsx
@@ -90,7 +90,7 @@ export const AuthBox = ({ title }) => {
-
+
{
-
diff --git a/src/components/CardControl/CardControl.scss b/src/components/CardControl/CardControl.scss
index f7d68f91..647d35dd 100644
--- a/src/components/CardControl/CardControl.scss
+++ b/src/components/CardControl/CardControl.scss
@@ -60,7 +60,7 @@
font-weight: 700;
}
}
- &Link {
+ &-link {
width: 48px;
height: 48px;
background: #ddeec6;
diff --git a/src/components/CatalogPersonCard/CatalogPersonCard.jsx b/src/components/CatalogPersonCard/CatalogPersonCard.jsx
index 4395c27a..b026e229 100644
--- a/src/components/CatalogPersonCard/CatalogPersonCard.jsx
+++ b/src/components/CatalogPersonCard/CatalogPersonCard.jsx
@@ -12,30 +12,30 @@ export const CatalogPersonCard = ({
description
}) => {
return (
-
-
-
+
+
+
- {level}
+ {level}
-
- {name}
- {salary} / час
-
+
+ {name}
+ {salary} / час
+
Разработка: {category}
-
+
{skills.map((item, index) => {
return (
-
- {description}
+ {description}
);
};
diff --git a/src/components/CatalogPersonCard/catalogPersonCard.scss b/src/components/CatalogPersonCard/catalogPersonCard.scss
index 6bae36b0..7192a92f 100644
--- a/src/components/CatalogPersonCard/catalogPersonCard.scss
+++ b/src/components/CatalogPersonCard/catalogPersonCard.scss
@@ -1,5 +1,5 @@
-.catalogPersonCard {
- background: #FFFFFF;
+.catalog-person-card {
+ background: #ffffff;
padding: 29px 32px;
border-radius: 8px;
display: flex;
@@ -25,7 +25,7 @@
bottom: -10px;
padding: 3.5px 19px;
border-radius: 44px;
- background: #1458DD;
+ background: #1458dd;
color: white;
font-size: 14px;
}
@@ -45,7 +45,7 @@
}
&__salary {
- color: #1458DD;
+ color: #1458dd;
font-weight: 700;
font-size: 18px;
line-height: 22px;
@@ -53,7 +53,7 @@
&__category {
span {
- color: #6F6F6F;
+ color: #6f6f6f;
font-size: 12px;
line-height: 18px;
font-weight: 400;
@@ -72,25 +72,25 @@
row-gap: 16px;
margin-top: 22px;
padding-bottom: 17px;
- border-bottom: 0.5px solid #B3DF93;
+ border-bottom: 0.5px solid #b3df93;
}
- &__skillItem {
+ &__skill-item {
display: flex;
justify-content: center;
align-items: center;
font-size: 12px;
- color: #6F6F6F;
+ color: #6f6f6f;
width: 62px;
height: 26px;
- border: 0.5px solid #8DC63F;
+ border: 0.5px solid #8dc63f;
border-radius: 44px;
}
&__description {
margin-top: 17px;
max-width: 245px;
- color: #6F6F6F;
+ color: #6f6f6f;
font-size: 12px;
line-height: 18px;
}
diff --git a/src/components/CategoriesItem/CategoriesItem.jsx b/src/components/CategoriesItem/CategoriesItem.jsx
index a91eeccc..a0f0900d 100644
--- a/src/components/CategoriesItem/CategoriesItem.jsx
+++ b/src/components/CategoriesItem/CategoriesItem.jsx
@@ -10,14 +10,16 @@ export const CategoriesItem = ({ img, title, skills, available, link }) => {
-
+
{title}
-
+
{skills}
diff --git a/src/components/CategoriesItem/categoriesItem.scss b/src/components/CategoriesItem/categoriesItem.scss
index eabcad44..f4e04353 100644
--- a/src/components/CategoriesItem/categoriesItem.scss
+++ b/src/components/CategoriesItem/categoriesItem.scss
@@ -1,4 +1,4 @@
-.categoriesItem {
+.categories-item {
display: flex;
flex-direction: column;
padding: 33px 32px 25px 28px;
diff --git a/src/components/FileTracker/FileTracker.jsx b/src/components/FileTracker/FileTracker.jsx
index 0d940f35..62ae64c7 100644
--- a/src/components/FileTracker/FileTracker.jsx
+++ b/src/components/FileTracker/FileTracker.jsx
@@ -24,14 +24,14 @@ const FileTracker = ({ file, setDeletedTask, taskId }) => {
return (
{
if (openImg) setOpenImg(!openImg);
}}
>
{
@@ -39,7 +39,7 @@ const FileTracker = ({ file, setDeletedTask, taskId }) => {
}}
/>
{!openImg && (
- deleteFile(file)}>
+ deleteFile(file)}>
)}
diff --git a/src/components/Modal/AcceptModal/AcceptModal.jsx b/src/components/Modal/AcceptModal/AcceptModal.jsx
index c39af125..f1486d57 100644
--- a/src/components/Modal/AcceptModal/AcceptModal.jsx
+++ b/src/components/Modal/AcceptModal/AcceptModal.jsx
@@ -6,10 +6,10 @@ import "./acceptModal.scss";
export const AcceptModal = ({ title, closeModal, agreeHandler }) => {
return (
-
-
- {title}
-
+
+
+ {title}
+
{
-
+
Ваше имя
{
/>
{validationErrors.username}
-
+
E-mail
{
-
+
Пароль
{
/>
{validationErrors.password}
-
+
Повторите пароль
{
return (
-
- Восстановление доступа
-
+
+ Восстановление доступа
+
Укажите e-mail, для которого хотите восстановить пароль.
-
+
setModalReset(false)}
src={close}
- className="modalReset__close"
+ className="modal-reset__close"
alt="close"
/>
diff --git a/src/components/Modal/ModalReset/modalReset.scss b/src/components/Modal/ModalReset/modalReset.scss
index c2c8deba..1b53c86f 100644
--- a/src/components/Modal/ModalReset/modalReset.scss
+++ b/src/components/Modal/ModalReset/modalReset.scss
@@ -1,8 +1,8 @@
-.modalReset {
+.modal-reset {
display: flex;
flex-direction: column;
border-radius: 20px;
- background: linear-gradient(180deg, #FFF 0%, #EBEBEB 100%);
+ background: linear-gradient(180deg, #fff 0%, #ebebeb 100%);
padding: 23px 110px 8px 36px;
row-gap: 29px;
position: relative;
@@ -28,7 +28,7 @@
padding: 8px 12px;
font-size: 15px;
border-radius: 8px;
- background-color: #EFF2F7;
+ background-color: #eff2f7;
outline: none;
border: none;
max-width: 300px;
@@ -37,9 +37,9 @@
&__submit {
border-radius: 44px;
- background: #52B709;
+ background: #52b709;
padding: 9px 46px;
- color: #FFF;
+ color: #fff;
font-size: 16px;
font-weight: 500;
line-height: 32px;
diff --git a/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx b/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx
index 72a90203..d3b093bf 100644
--- a/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx
+++ b/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx
@@ -117,16 +117,16 @@ export const ModalResetPassword = ({ active, setActive }) => {
};
return (
-
+
setActive(false)}
/>
- Восстановление пароля
+ Восстановление пароля
{!step ? (
-
+
Введите ваш e-mail:
{
) : (
) : (
-
+
setStep(false)}
- className="resetPassword__email__arrow"
+ className="reset-password__email__arrow"
/>
Введите код подтверждения:
{
placeholder="token"
/>
{inputsError.token && (
- Введите данные
+ Введите данные
)}
Введите новый пароль:
{
className={inputsError.password ? "error" : ""}
/>
{inputsError.password && (
- Минимум 6 символов
+ Минимум 6 символов
)}
{loader ? (
) : (
| |