From b75b8463350b7e194566ff0f63ee56fb2e6fe001 Mon Sep 17 00:00:00 2001 From: Mikola Date: Wed, 7 Feb 2024 18:54:21 +0300 Subject: [PATCH 1/4] active links in nav, delete report, loaders in report, changes routes --- src/App.js | 16 ++-- src/components/Calendar/Calendar.jsx | 2 +- src/components/Navigation/Navigation.jsx | 9 ++- .../ProfileCalendar/ProfileCalendar.jsx | 2 +- .../ProfileCalendarComponent.jsx | 6 +- src/components/ReportForm/ReportForm.jsx | 17 +++-- src/components/ShortReport/ShortReport.jsx | 2 +- .../features/quiz/CardAviableTest.jsx | 4 +- src/pages/Quiz/PassingTests.js | 12 +-- src/pages/Quiz/QuizPage.js | 8 +- src/pages/Quiz/QuizReportPage.js | 4 +- src/pages/ViewReport/ViewReport.jsx | 44 +++++++---- src/pages/ViewReport/viewReport.scss | 73 +++++-------------- 13 files changed, 91 insertions(+), 108 deletions(-) diff --git a/src/App.js b/src/App.js index 09f15c57..ebacc0f0 100644 --- a/src/App.js +++ b/src/App.js @@ -106,22 +106,15 @@ const App = () => { } /> } /> - } /> } /> - - } /> - } /> - } /> - - } /> } /> } /> - } /> + } /> + } /> } /> - } /> } /> }/> } /> @@ -133,6 +126,11 @@ const App = () => { } /> } /> } /> + + } /> + } /> + } /> + { img
- +
diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index 3d5758f7..4270c886 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/src/components/Navigation/Navigation.jsx @@ -1,5 +1,5 @@ -import React, { useEffect, useState } from "react"; -import { useDispatch, useSelector } from "react-redux"; +import React, { useState } from "react"; +import { useSelector } from "react-redux"; import { NavLink } from "react-router-dom"; import { getProfileInfo } from "@redux/outstaffingSlice"; @@ -9,9 +9,9 @@ import { urlForLocal } from "@utils/helper"; import avatarMok from "assets/images/avatarMok.png"; export const Navigation = () => { - const dispatch = useDispatch(); const profileInfo = useSelector(getProfileInfo); + const currentPath = window.location.pathname; const [user] = useState( localStorage.getItem("role_status") === "18" ? "partner" : "developer" ); @@ -35,7 +35,7 @@ export const Navigation = () => { name: "Выплаты" }, { - path: "/Quiz", + path: "/quiz", name: "Тесты" }, { @@ -81,6 +81,7 @@ export const Navigation = () => { key={index} end to={link.path === "/Quiz" ? link.path : `/profile${link.path}`} + className={currentPath. includes(link.path) ? 'active' : ''} > {link.name} diff --git a/src/components/ProfileCalendar/ProfileCalendar.jsx b/src/components/ProfileCalendar/ProfileCalendar.jsx index e4077d09..6875cce9 100644 --- a/src/components/ProfileCalendar/ProfileCalendar.jsx +++ b/src/components/ProfileCalendar/ProfileCalendar.jsx @@ -98,7 +98,7 @@ export const ProfileCalendar = () => { {profileInfo.specification} разработчик

- + + {isFetching ? + : + + }

Всего за день:{" "} diff --git a/src/components/ShortReport/ShortReport.jsx b/src/components/ShortReport/ShortReport.jsx index 8e76afb4..355bdd1e 100644 --- a/src/components/ShortReport/ShortReport.jsx +++ b/src/components/ShortReport/ShortReport.jsx @@ -80,7 +80,7 @@ export const ShortReport = () => {

Ваши отчеты - просмотр отчета за день

- Посмотреть подробный отчет + Посмотреть подробный отчет
diff --git a/src/components/features/quiz/CardAviableTest.jsx b/src/components/features/quiz/CardAviableTest.jsx index 9a807ec3..fc96db86 100644 --- a/src/components/features/quiz/CardAviableTest.jsx +++ b/src/components/features/quiz/CardAviableTest.jsx @@ -9,7 +9,7 @@ export const CardAvailableTest = ({ title, description, path, status }) => { return (
{ {status === 2 && (

Получить отчет по тестированию

- Отчет по тесту + Отчет по тесту
)}
diff --git a/src/pages/Quiz/PassingTests.js b/src/pages/Quiz/PassingTests.js index 7eeb83bb..bbf8ea2b 100644 --- a/src/pages/Quiz/PassingTests.js +++ b/src/pages/Quiz/PassingTests.js @@ -120,12 +120,12 @@ export const PassingTests = () => { ))}
)} - {!startTest && ( -
- ИЛИ выполните тестовое задание, без - прохождения тестов -
- )} + {/*{!startTest && (*/} + {/*
*/} + {/* ИЛИ выполните тестовое задание, без*/} + {/* прохождения тестов*/} + {/*
*/} + {/*)}*/} )} {completedTest && ( diff --git a/src/pages/Quiz/QuizPage.js b/src/pages/Quiz/QuizPage.js index 56778627..3778f4f8 100644 --- a/src/pages/Quiz/QuizPage.js +++ b/src/pages/Quiz/QuizPage.js @@ -144,10 +144,10 @@ export const QuizPage = () => {

Анкет нет

)} -
- ИЛИ выполните тестовое задание, без - прохождения тестов -
+ {/*
*/} + {/* ИЛИ выполните тестовое задание, без*/} + {/* прохождения тестов*/} + {/*
*/} )} {selectedCategory && ( diff --git a/src/pages/Quiz/QuizReportPage.js b/src/pages/Quiz/QuizReportPage.js index accf14be..7a30b1e8 100644 --- a/src/pages/Quiz/QuizReportPage.js +++ b/src/pages/Quiz/QuizReportPage.js @@ -42,8 +42,8 @@ export const QuizReportPage = () => {
diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx index d9e5ffe6..74ee0f3d 100644 --- a/src/pages/ViewReport/ViewReport.jsx +++ b/src/pages/ViewReport/ViewReport.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Link, Navigate, useParams } from "react-router-dom"; +import { Link, useParams } from "react-router-dom"; import { apiRequest } from "@api/request"; @@ -27,9 +27,11 @@ export const ViewReport = () => { const [taskText, setTaskText] = useState([]); const [difficulties, setDifficulties] = useState([]); const [tomorrowTask, setTomorrowTask] = useState([]); + const [taskId, setTaskId] = useState('') const [totalHours, setTotalHours] = useState(0); const [currentDay] = useState(new Date()); const [loader, setLoader] = useState(false); + const [deleteLoader, setDeleteLoader] = useState(false) function getReportFromDate(day) { setLoader(true); @@ -39,6 +41,7 @@ export const ViewReport = () => { apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then( (res) => { let spendTime = 0; + setTaskId(res[0]?.id) for (const item of res) { if (item.difficulties) { setDifficulties((prevArray) => [...prevArray, item.difficulties]); @@ -65,6 +68,18 @@ export const ViewReport = () => { nextReportDay.setDate(nextReportDay.getDate() + 1); } + function deleteReport() { + setDeleteLoader(true) + apiRequest(`reports/delete?id=${taskId}`, { + method: "DELETE" + }).then((res) => { + setDeleteLoader(false) + if (res) { + window.location.replace("/profile/calendar") + } + }); + } + function nextDay() { getReportFromDate(getCreatedDate(nextReportDay)); previousReportDay.setDate(previousReportDay.getDate() + 2); @@ -110,22 +125,23 @@ export const ViewReport = () => { #

Вернуться

- {/*
-

- {getCorrectDate(dateReport.id)} -

-

- Вами потрачено на работу:{" "} - - {totalHours} {hourOfNum(totalHours)} - -

-
*/} + {localStorage.getItem("role_status") !== "18" && +
+ + {deleteLoader ? : + + } +
+ }
previousDay()}>
arrow @@ -141,7 +157,7 @@ export const ViewReport = () => { getCreatedDate(currentDay) === params.date ? "disable" : "" }`} > - +
arrow
diff --git a/src/pages/ViewReport/viewReport.scss b/src/pages/ViewReport/viewReport.scss index 87cb5070..8cfdae69 100644 --- a/src/pages/ViewReport/viewReport.scss +++ b/src/pages/ViewReport/viewReport.scss @@ -64,71 +64,34 @@ height: 72px; justify-content: space-between; - @media (max-width: 540px) { - padding: 10px 15px; - height: 60px; - } - - @media (max-width: 500px) { - column-gap: 0; - justify-content: space-between; - } - - &__date { - font-weight: 500; - font-size: 22px; - line-height: 32px; + button { color: #000000; - - @media (max-width: 660px) { - font-size: 16px; - } - - @media (max-width: 490px) { - font-size: 12px; - } - } - - &__hours { - font-weight: 400; font-size: 15px; + font-weight: 500; line-height: 32px; - color: #000000; - - @media (max-width: 660px) { - font-size: 11px; - } - - span { - color: #52B709; - font-weight: 700; - } + padding: 8px 24px; } - &__progressBar { - max-width: 390px; - width: 100%; - background: #F1F1F1; + &__edit { + background: #E1FCCF; + border-radius: 44px; + border: none; + } + + &__delete { + background: white; border-radius: 12px; - height: 8px; - position: relative; - - span { - position: absolute; - height: 100%; - left: 0; - width: 60%; - background: #52B709; - border-radius: 12px; - } + border: 1px dashed #8BCC60; } - &__total { - font-weight: 400; - font-size: 12px; - line-height: 32px; + .disable { + pointer-events: none; + opacity: 0.5; } + .loader { + max-width: 150px; + } } h3 { From 1fd6a736521086001bf1e7a2dc216021b83e0a46 Mon Sep 17 00:00:00 2001 From: Mikola Date: Wed, 7 Feb 2024 18:54:55 +0300 Subject: [PATCH 2/4] active links in nav, delete report, loaders in report, changes routes --- src/components/Navigation/Navigation.jsx | 3 +- .../ProfileCalendarComponent.jsx | 12 ++--- src/components/ReportForm/ReportForm.jsx | 11 ++--- src/components/ShortReport/ShortReport.jsx | 4 +- .../features/quiz/CardAviableTest.jsx | 6 ++- src/pages/ViewReport/ViewReport.jsx | 45 ++++++++++++------- 6 files changed, 51 insertions(+), 30 deletions(-) diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index 4270c886..dc48a5dc 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/src/components/Navigation/Navigation.jsx @@ -9,7 +9,6 @@ import { urlForLocal } from "@utils/helper"; import avatarMok from "assets/images/avatarMok.png"; export const Navigation = () => { - const profileInfo = useSelector(getProfileInfo); const currentPath = window.location.pathname; const [user] = useState( @@ -81,7 +80,7 @@ export const Navigation = () => { key={index} end to={link.path === "/Quiz" ? link.path : `/profile${link.path}`} - className={currentPath. includes(link.path) ? 'active' : ''} + className={currentPath.includes(link.path) ? "active" : ""} > {link.name} diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 84d4f66f..8cab6dd5 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -98,7 +98,9 @@ export const ProfileCalendarComponent = React.memo( if (userId) { return `/profile/calendar/view/${date.created_at}/${userId}`; } - return `/profile/calendar/view/${date.created_at}/${localStorage.getItem("id")}`; + return `/profile/calendar/view/${ + date.created_at + }/${localStorage.getItem("id")}`; } } @@ -282,15 +284,15 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите диапазон на календаре" - : "Выбрать диапазон"} + ? "Выберите диапазон на календаре" + : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && ( { }; const handler = () => { - setIsFetching(true) + setIsFetching(true); for (let input of inputs) { if (!input.task || !input.hours_spent) { setReportSuccess("Заполните задачи"); setTimeout(() => setReportSuccess(""), 2000); - setIsFetching(false) + setIsFetching(false); return; } } @@ -294,15 +294,16 @@ const ReportForm = () => {
- {isFetching ? - : + {isFetching ? ( + + ) : ( - } + )}

Всего за день:{" "} diff --git a/src/components/ShortReport/ShortReport.jsx b/src/components/ShortReport/ShortReport.jsx index 355bdd1e..c4b7238e 100644 --- a/src/components/ShortReport/ShortReport.jsx +++ b/src/components/ShortReport/ShortReport.jsx @@ -80,7 +80,9 @@ export const ShortReport = () => {

Ваши отчеты - просмотр отчета за день

- Посмотреть подробный отчет + + Посмотреть подробный отчет +
diff --git a/src/components/features/quiz/CardAviableTest.jsx b/src/components/features/quiz/CardAviableTest.jsx index fc96db86..a1c6d289 100644 --- a/src/components/features/quiz/CardAviableTest.jsx +++ b/src/components/features/quiz/CardAviableTest.jsx @@ -9,7 +9,11 @@ export const CardAvailableTest = ({ title, description, path, status }) => { return (
{ const [taskText, setTaskText] = useState([]); const [difficulties, setDifficulties] = useState([]); const [tomorrowTask, setTomorrowTask] = useState([]); - const [taskId, setTaskId] = useState('') + const [taskId, setTaskId] = useState(""); const [totalHours, setTotalHours] = useState(0); const [currentDay] = useState(new Date()); const [loader, setLoader] = useState(false); - const [deleteLoader, setDeleteLoader] = useState(false) + const [deleteLoader, setDeleteLoader] = useState(false); function getReportFromDate(day) { setLoader(true); @@ -41,7 +41,7 @@ export const ViewReport = () => { apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then( (res) => { let spendTime = 0; - setTaskId(res[0]?.id) + setTaskId(res[0]?.id); for (const item of res) { if (item.difficulties) { setDifficulties((prevArray) => [...prevArray, item.difficulties]); @@ -69,13 +69,13 @@ export const ViewReport = () => { } function deleteReport() { - setDeleteLoader(true) + setDeleteLoader(true); apiRequest(`reports/delete?id=${taskId}`, { method: "DELETE" }).then((res) => { - setDeleteLoader(false) + setDeleteLoader(false); if (res) { - window.location.replace("/profile/calendar") + window.location.replace("/profile/calendar"); } }); } @@ -125,23 +125,32 @@ export const ViewReport = () => { #

Вернуться

- {localStorage.getItem("role_status") !== "18" && + {localStorage.getItem("role_status") !== "18" && (
- - {deleteLoader ? : - + {deleteLoader ? ( + + ) : ( + - } + )}
- } + )}
previousDay()}>
arrow @@ -157,7 +166,11 @@ export const ViewReport = () => { getCreatedDate(currentDay) === params.date ? "disable" : "" }`} > - +
arrow
From 5b44a97329560f2edd748efb479a17c423a9298e Mon Sep 17 00:00:00 2001 From: Victor Batischev Date: Thu, 8 Feb 2024 15:42:08 +0300 Subject: [PATCH 3/4] fix quiz and tracker modal styles --- .../{downloadExel.svg => downloadExcel.svg} | 0 .../Modal/ModalSelect/ModalSelect.jsx | 1 - .../Modal/ModalSelect/modalSelect.scss | 17 +++---- .../ProjectTicket/ProjectTicket.jsx | 4 +- .../ProjectTicket/projectTicket.scss | 4 +- src/components/features/quiz/quiz.scss | 45 +++++-------------- .../ProfileCandidate/ProfileCandidate.js | 4 +- src/pages/Quiz/PassingTests.js | 10 +---- src/pages/Tracker/Tracker.jsx | 6 +-- 9 files changed, 31 insertions(+), 60 deletions(-) rename src/assets/images/{downloadExel.svg => downloadExcel.svg} (100%) diff --git a/src/assets/images/downloadExel.svg b/src/assets/images/downloadExcel.svg similarity index 100% rename from src/assets/images/downloadExel.svg rename to src/assets/images/downloadExcel.svg diff --git a/src/components/Modal/ModalSelect/ModalSelect.jsx b/src/components/Modal/ModalSelect/ModalSelect.jsx index 68726efd..4aae3e92 100644 --- a/src/components/Modal/ModalSelect/ModalSelect.jsx +++ b/src/components/Modal/ModalSelect/ModalSelect.jsx @@ -5,7 +5,6 @@ import "./modalSelect.scss"; export const ModalSelect = ({ active, children }) => { return (
- ... {children}
); diff --git a/src/components/Modal/ModalSelect/modalSelect.scss b/src/components/Modal/ModalSelect/modalSelect.scss index 5a1f6aa3..46bb17a2 100644 --- a/src/components/Modal/ModalSelect/modalSelect.scss +++ b/src/components/Modal/ModalSelect/modalSelect.scss @@ -1,29 +1,30 @@ .project { &__settings { position: absolute; - padding: 32px 23px 10px 11px; + padding: 0 10px; background: #e1fccf; border-radius: 12px; transform: scale(0); - bottom: -40px; - right: -120px; + bottom: -30px; + right: -130px; @media (max-width: 1050px) { - right: 10px; - padding-top: 10px; - bottom: -75px; + right: 5px; + bottom: -30px; } &-menu { font-size: 14px; - line-height: 38px; + padding: 5px 0; div { display: flex; align-items: center; + padding: 2px 0; img { - margin-right: 12px; + width: 12px; + margin-right: 5px; } p:hover { diff --git a/src/components/ProjectTicket/ProjectTicket.jsx b/src/components/ProjectTicket/ProjectTicket.jsx index bbdc5b58..92cd283f 100644 --- a/src/components/ProjectTicket/ProjectTicket.jsx +++ b/src/components/ProjectTicket/ProjectTicket.jsx @@ -109,7 +109,7 @@ export const ProjectTicket = ({ project, index }) => { to={`/profile/statistics/${project.id}`} className="project__statistics" > - Просмотреть статистику + Посмотреть статистику {
-

ссылка на проект

+

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

{ diff --git a/src/components/ProjectTicket/projectTicket.scss b/src/components/ProjectTicket/projectTicket.scss index 766aa818..19425b18 100644 --- a/src/components/ProjectTicket/projectTicket.scss +++ b/src/components/ProjectTicket/projectTicket.scss @@ -80,8 +80,8 @@ position: absolute; font-size: 21px; color: #6f6f6f; - right: 26px; - top: 10px; + right: 15px; + top: 0px; } &__avatar { diff --git a/src/components/features/quiz/quiz.scss b/src/components/features/quiz/quiz.scss index 0f3e3cd5..2112f703 100644 --- a/src/components/features/quiz/quiz.scss +++ b/src/components/features/quiz/quiz.scss @@ -31,16 +31,14 @@ $maxWidthContainer: 1123; } .quiz-btn { display: flex; - font-family: "Lab Grotesque"; align-items: center; justify-content: center; - // box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21); + box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21); white-space: nowrap; background: #406128; border-radius: 44px; color: #fff; outline: none; - //border: 2px solid #52b709; border: none; transition: 0 all ease 0.8s; padding: 7px 51px; @@ -48,11 +46,6 @@ $maxWidthContainer: 1123; font-size: 14px; text-decoration: none; line-height: 200%; - // &:hover{ - // text-decoration: none; - // color: #52b709; - // background: #fff; - // } &_back { background: #dddddd; color: #000; @@ -68,13 +61,11 @@ $maxWidthContainer: 1123; } } .quiz-title_h3 { - font-family: "Lab Grotesque"; font-weight: 700; font-size: 18px; line-height: 156%; color: #52b709; } -//============================================= .error-msg { text-align: center; @@ -140,7 +131,6 @@ $maxWidthContainer: 1123; .form-task__group { display: block; margin-bottom: 13px; - font-family: "Lab Grotesque"; label { font-weight: 400; font-size: 15px; @@ -312,9 +302,9 @@ $maxWidthContainer: 1123; } .card-introduction { - padding: 0px 25px; + padding: 0px 20px; margin: 0px 0px 50px 0px; - flex: 0 1 33.333%; + flex: 0 1 33%; @media (max-width: 850px) { flex: 0 1 50%; } @@ -324,14 +314,13 @@ $maxWidthContainer: 1123; &__body { display: flex; - gap: 20px; + gap: 10px; } &__title { font-weight: 900; - font-size: 14px; - line-height: 171%; + font-size: 18px; color: #52b709; - margin: 0 0 30px 0; + margin-bottom: 10px; } &__icon { flex: 0 0 25px; @@ -343,8 +332,8 @@ $maxWidthContainer: 1123; } &__text { font-weight: 400; - font-size: 12px; - line-height: 200%; + font-size: 15px; + line-height: 20px; color: #000000; } } @@ -352,20 +341,8 @@ $maxWidthContainer: 1123; .quiz-passing-information { background: #fff; border-radius: 12px; - &__container { - // @media (max-width: 600px) { - // display: block; - // } - // @media (max-width: 600px) { - // display: block; - // } - // @media (max-width: 600px) { - // display: block; - // } - } &__main { - //flex: 1 1 auto; - padding: 35px 45px; + padding: 30px; height: 100%; display: grid; grid-template-columns: 1fr 1.2fr 1.2fr 0.6fr; @@ -388,7 +365,7 @@ $maxWidthContainer: 1123; } &__text { font-weight: 400; - font-size: 12px; + font-size: 14px; line-height: 167%; color: #6f6f6f; span { @@ -399,7 +376,7 @@ $maxWidthContainer: 1123; &__timer, &__attempt { display: flex; - gap: 23px; + gap: 10px; align-items: center; } diff --git a/src/pages/ProfileCandidate/ProfileCandidate.js b/src/pages/ProfileCandidate/ProfileCandidate.js index e3003f1a..26cedde9 100644 --- a/src/pages/ProfileCandidate/ProfileCandidate.js +++ b/src/pages/ProfileCandidate/ProfileCandidate.js @@ -70,7 +70,7 @@ export const ProfileCandidate = () => {
-
Интсрукция:
+
Инструкция:
{ alt="" />
- Тесты itguild предназначены для того, чтобы подтверждать + Тесты ITguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя.
diff --git a/src/pages/Quiz/PassingTests.js b/src/pages/Quiz/PassingTests.js index bbf8ea2b..2745638b 100644 --- a/src/pages/Quiz/PassingTests.js +++ b/src/pages/Quiz/PassingTests.js @@ -10,7 +10,6 @@ import { Footer } from "@components/Common/Footer/Footer"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom"; import { BlockCompletedTest } from "@components/features/quiz/BlockCompletedTest"; import { CardIntroduction } from "@components/features/quiz/Card-introduction"; import { QuizPassingInformation } from "@components/features/quiz/Quiz-passing-information"; @@ -43,12 +42,12 @@ export const PassingTests = () => { { title: "Зачем?", description: - "Тесты itguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя." + "Тесты ITguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя." }, { title: "Почему именно тестирование?", description: - "Тесты itguild заменяют первое техническое собеседование по любой вакансии." + "Тесты ITguild заменяют первое техническое собеседование по любой вакансии." }, { title: "Какие тесты нужно проходить?", @@ -138,11 +137,6 @@ export const PassingTests = () => { )}
- {/**/}
); }; diff --git a/src/pages/Tracker/Tracker.jsx b/src/pages/Tracker/Tracker.jsx index 310a3f20..2bc379dd 100644 --- a/src/pages/Tracker/Tracker.jsx +++ b/src/pages/Tracker/Tracker.jsx @@ -33,7 +33,7 @@ import project from "assets/icons/trackerProject.svg"; import tasks from "assets/icons/trackerTasks.svg"; import archive from "assets/images/archiveIcon.png"; import mockAvatar from "assets/images/avatarMok.png"; -import downloadExel from "assets/images/downloadExel.svg"; +import downloadExcel from "assets/images/downloadExcel.svg"; import noProjects from "assets/images/noProjects.png"; import statusTimeTask from "assets/images/statusTimeTask.svg"; @@ -305,8 +305,8 @@ export const Tracker = () => {

Сверка пройдена

- # -

Скачать Exel отчет

+ # +

Скачать Excel отчет

From 51ae926a2f066b4e973107de8950c667c628ce56 Mon Sep 17 00:00:00 2001 From: Victor Batischev Date: Thu, 8 Feb 2024 16:39:22 +0300 Subject: [PATCH 4/4] quiz styles --- .../ProfileCalendarComponent.jsx | 8 +- src/components/ReportForm/ReportForm.jsx | 2 +- src/components/StarRating/StarRating.js | 2 +- src/components/features/quiz/AlertResult.jsx | 6 +- src/components/features/quiz/QuizReport.jsx | 2 +- src/components/features/quiz/quiz.scss | 91 ++++++++----------- src/pages/Quiz/quiz-page.scss | 6 +- src/pages/Tracker/Tracker.jsx | 2 +- 8 files changed, 50 insertions(+), 69 deletions(-) diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 8cab6dd5..a68d7c15 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -284,15 +284,15 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите диапазон на календаре" - : "Выбрать диапазон"} + ? "Выберите диапазон на календаре" + : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && ( { className="report-form__footer-btn" onClick={() => handler()} > - Отпаравить + Отправить )}

diff --git a/src/components/StarRating/StarRating.js b/src/components/StarRating/StarRating.js index 446336e4..913ae7bf 100644 --- a/src/components/StarRating/StarRating.js +++ b/src/components/StarRating/StarRating.js @@ -6,7 +6,7 @@ const StarRating = ({ countStars = 1, countActiveStars = 1, color = "#52B709", - size = 61 + size = 40 }) => { const [shadedStars, setShadedStars] = useState([]); const [noShadedStars, setNoShadedStars] = useState([]); diff --git a/src/components/features/quiz/AlertResult.jsx b/src/components/features/quiz/AlertResult.jsx index dcac3961..71eda511 100644 --- a/src/components/features/quiz/AlertResult.jsx +++ b/src/components/features/quiz/AlertResult.jsx @@ -17,14 +17,14 @@ export const AlertResult = ({ info }) => { className="alert-result__text" style={{ color: successTest ? "#52B709" : "#5B6871" }} > - Благодарим Вас за прохождение теста "{info.questionnaire_title}". Ваши - результаты проверены, готовы пригласить Вас в команду + Благодарим Вас за прохождение теста "{info.questionnaire_title}". + Ваши результаты проверены, готовы пригласить Вас в команду

{!successTest && (
)} diff --git a/src/components/features/quiz/QuizReport.jsx b/src/components/features/quiz/QuizReport.jsx index 0e05ccce..ec9b3423 100644 --- a/src/components/features/quiz/QuizReport.jsx +++ b/src/components/features/quiz/QuizReport.jsx @@ -35,7 +35,7 @@ export const QuizReport = ({ info }) => {
Статус:
-
Пройдено!
+
Пройден!
diff --git a/src/components/features/quiz/quiz.scss b/src/components/features/quiz/quiz.scss index 2112f703..12e02b8d 100644 --- a/src/components/features/quiz/quiz.scss +++ b/src/components/features/quiz/quiz.scss @@ -425,10 +425,10 @@ $maxWidthContainer: 1123; &__container { display: block; - @include adaptiv-value("padding-top", 30, 20, 1); - @include adaptiv-value("padding-bottom", 30, 20, 1); - @include adaptiv-value("padding-right", 28, 18, 1); - @include adaptiv-value("padding-left", 28, 18, 1); + @include adaptiv-value("padding-top", 15, 15, 1); + @include adaptiv-value("padding-bottom", 15, 15, 1); + @include adaptiv-value("padding-right", 15, 15, 1); + @include adaptiv-value("padding-left", 15, 15, 1); } &:hover { @@ -440,8 +440,8 @@ $maxWidthContainer: 1123; &__top-head { display: flex; align-items: center; - gap: 19px; - margin: 0 0 24px 0; + gap: 10px; + margin-bottom: 15px; } &__title { font-weight: 500; @@ -459,9 +459,8 @@ $maxWidthContainer: 1123; p { flex: 0 1 66%; - font-weight: 700; - font-size: 12px; - line-height: 20px; + font-weight: 500; + font-size: 13px; color: #000000; margin-bottom: 0; @@ -485,7 +484,7 @@ $maxWidthContainer: 1123; border-radius: 12px; padding: 13px 16px; position: absolute; - bottom: 20px; + bottom: 0px; left: 0; display: flex; align-items: center; @@ -494,8 +493,7 @@ $maxWidthContainer: 1123; gap: 10px; p { font-weight: 500; - font-size: 14px; - line-height: 129%; + font-size: 13px; color: #000000; } a { @@ -554,27 +552,20 @@ $maxWidthContainer: 1123; color: #52b709; } - // .block-completed-test__text - &__text { max-width: 386px; margin: 0 26px 0 0; - font-weight: 400; - font-size: 12px; - line-height: 200%; + font-weight: 500; + font-size: 13px; color: #000000; } - // .block-completed-test__button - &__button { display: block; } } .report { - // .report__row - &__row { display: flex; align-items: center; @@ -586,36 +577,37 @@ $maxWidthContainer: 1123; } } - // .report__column - &__column { &:first-child { background: #ffffff; flex: 0 1 22%; - border-radius: 12px; + border-radius: 12px 0 0 12px; @media (max-width: 1000px) { flex: 0 1 50%; } + @media (max-width: 600px) { + border-radius: 12px 12px 0 0; + } } - height: 128px; - border-radius: 0px 12px 0px 0px; + height: 90px; flex: 0 1 26%; display: flex; justify-content: center; align-items: center; background: #e1fccf; - gap: 21px; + gap: 10px; &:last-child { - flex-direction: column; - gap: 0; - } - @media (max-width: 1000px) { - flex: 0 1 50%; + border-radius: 0 12px 12px 0; + gap: 10px; + @media (max-width: 1000px) { + flex: 0 1 50%; + } + @media (max-width: 600px) { + border-radius: 0 0 12px 12px; + } } } - // .report__job-title - &__job-title { font-weight: 500; font-size: 18px; @@ -623,22 +615,17 @@ $maxWidthContainer: 1123; color: #000000; } - // .report__value - &__value { font-weight: 700; font-size: 52px; line-height: 56%; color: #52b709; - // .report__value_false &_false { color: #5b6871; } } - // .report__text - &__text { font-weight: 400; font-size: 16px; @@ -646,26 +633,20 @@ $maxWidthContainer: 1123; color: #000000; } - // .report__status-text - &__status-text { - font-weight: 400; - font-size: 12px; - line-height: 200%; + font-weight: 500; + font-size: 15px; color: #000000; - width: 50%; } - // .report__status - &__status { background: #1458dd; - border-radius: 44px; + border-radius: 5px; font-weight: 500; font-size: 16px; line-height: 200%; color: #ffffff; - padding: 7px 34px; + padding: 7px 14px; max-width: 154px; } } @@ -673,19 +654,19 @@ $maxWidthContainer: 1123; .alert-result { display: flex; align-items: center; - @include adaptiv-value("padding-top", 39, 20, 1); - @include adaptiv-value("padding-bottom", 39, 20, 1); - @include adaptiv-value("padding-right", 61, 20, 1); - @include adaptiv-value("padding-left", 61, 20, 1); + @include adaptiv-value("padding-top", 20, 20, 1); + @include adaptiv-value("padding-bottom", 20, 20, 1); + @include adaptiv-value("padding-right", 20, 20, 1); + @include adaptiv-value("padding-left", 20, 20, 1); background: #fff; - gap: 30px; + gap: 10px; border-radius: 10px; @media (max-width: 900px) { flex-wrap: wrap; } &__column { display: flex; - @include adaptiv-value("gap", 44, 14, 1); + @include adaptiv-value("gap", 20, 20, 1); align-items: center; @media (max-width: 900px) { flex: 1 1 auto; diff --git a/src/pages/Quiz/quiz-page.scss b/src/pages/Quiz/quiz-page.scss index 7b34b243..9c98c911 100644 --- a/src/pages/Quiz/quiz-page.scss +++ b/src/pages/Quiz/quiz-page.scss @@ -17,12 +17,12 @@ } &__block { background: #e1fccf; - border-radius: 12px 12px 0px 0px; + border-radius: 12px; font-weight: 400; - font-size: 18px; + font-size: 23px; line-height: 178%; color: #000000; - padding: 20px 51px; + padding: 20px; margin: 0 0 16px 0; } &__cards-test { diff --git a/src/pages/Tracker/Tracker.jsx b/src/pages/Tracker/Tracker.jsx index 2bc379dd..0f2c2c34 100644 --- a/src/pages/Tracker/Tracker.jsx +++ b/src/pages/Tracker/Tracker.jsx @@ -306,7 +306,7 @@ export const Tracker = () => {
# -

Скачать Excel отчет

+

Скачать Excel-отчет