diff --git a/src/App.js b/src/App.js index e7bdf589..49a266eb 100644 --- a/src/App.js +++ b/src/App.js @@ -25,8 +25,8 @@ import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSett import Article from "./pages/Article/Article"; import FormPage from "./pages/FormPage/FormPage"; import SingleReportPage from "./pages/SingleReportPage/SingleReportPage"; -import { QuizPage } from "./pages/quiz/QuizPage"; -import { QuizReportPage } from "./pages/quiz/QuizReportPage"; +import { QuizPage } from "./pages/Quiz/QuizPage"; +import { QuizReportPage } from "./pages/Quiz/QuizReportPage"; import { Profile } from "./pages/Profile/Profile.js"; import { Summary } from "./pages/Summary/Summary"; import { ViewReport } from "./pages/ViewReport/ViewReport"; @@ -42,7 +42,7 @@ import { PartnerEmployees } from "./pages/PartnerEmployees/PartnerEmployees"; import { AuthForCandidate } from "./pages/AuthForCandidate/AuthForCandidate"; import { RegistrationForCandidate } from "./pages/RegistrationForCandidate/RegistrationForCandidate"; import { ProfileCandidate } from "./pages/ProfileCandidate/ProfileCandidate"; -import { PassingTests } from "./pages/quiz/PassingTests"; +import { PassingTests } from "./pages/Quiz/PassingTests"; import Blog from "./pages/Blog/Blog"; import Statistics from "@pages/Statistics/Statistics"; import { ProjectTracker } from "./pages/ProjectTracker/ProjectTracker"; diff --git a/src/api/request.js b/src/api/request.js index b1685709..4c07b441 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -51,10 +51,10 @@ export const apiRequest = ( }; const RequestError = (code, msg, data) => { - const description = msg ? `- ${msg}` : ""; + const descriptionMessage = msg ? `- ${msg}` : ""; this.name = "RequestError"; - this.message = `API returned: ${code}${description}.`; + this.message = `API returned: ${code}${descriptionMessage}.`; this.code = code; this.description = msg; this.data = data; diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index 55896cc9..d634ff6b 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -592,12 +592,12 @@ export const ModalTiсket = ({ return (
{ - if (e.target.className.includes("modal-tiket")) setActive(false); + if (e.target.className.includes("modal-ticket")) setActive(false); }} > -
+

diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index c0545033..92e56b86 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -1,4 +1,4 @@ -.modal-tiket { +.modal-ticket { z-index: 9; height: 100%; width: 100%; @@ -11,11 +11,11 @@ justify-content: center; } -.modal-tiket.active { +.modal-ticket.active { display: flex; } -.modal-tiket__content { +.modal-ticket__content { background: #ffffff; border-radius: 8px; display: flex; diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 178e5f1f..299380d9 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -659,7 +659,7 @@ export const TicketFullScreen = () => {

-
+
{editOpen ? ( diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index 11adeda3..4850b042 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -65,7 +65,7 @@ export const TrackerModal = ({ const [projectName, setProjectName] = useState(defautlInput); const [valueColumn, setValueColumn] = useState(""); const [nameProject, setNameProject] = useState(""); - const [valueTiket, setValueTiket] = useState(""); + const [valueTicket, setValueTicket] = useState(""); const [descriptionTicket, setDescriptionTicket] = useState(""); const [workers, setWorkers] = useState([]); const [selectWorkersOpen, setSelectWorkersOpen] = useState(false); @@ -127,8 +127,8 @@ export const TrackerModal = ({ setActive(false); } - function createTiket() { - if (!valueTiket || !descriptionTicket) { + function createTicket() { + if (!valueTicket || !descriptionTicket) { showNotification({ show: true, text: "Введите название и описание", @@ -141,7 +141,7 @@ export const TrackerModal = ({ method: "POST", data: { project_id: projectBoard.id, - title: valueTiket, + title: valueTicket, description: descriptionTicket, status: 1, user_id: localStorage.getItem("id"), @@ -180,14 +180,14 @@ export const TrackerModal = ({ }).then(() => { dispatch(setProjectBoardFetch(projectBoard.id)); setActive(false); - setValueTiket(""); + setValueTicket(""); setDescriptionTicket(""); setSelectedExecutorTask("Выберите исполнителя задачи"); setSelectedPriority(null); }); } else { setActive(false); - setValueTiket(""); + setValueTicket(""); setDescriptionTicket(""); dispatch(setProjectBoardFetch(projectBoard.id)); } @@ -507,8 +507,8 @@ export const TrackerModal = ({ setValueTiket(e.target.value)} + value={valueTicket} + onChange={(e) => setValueTicket(e.target.value)} placeholder="Название задачи" />
@@ -713,7 +713,7 @@ export const TrackerModal = ({
- + Создать
diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTicket/ProjectTicket.jsx similarity index 96% rename from src/components/ProjectTiket/ProjectTiket.jsx rename to src/components/ProjectTicket/ProjectTicket.jsx index 5b6f5586..3df75116 100644 --- a/src/components/ProjectTiket/ProjectTiket.jsx +++ b/src/components/ProjectTicket/ProjectTicket.jsx @@ -20,9 +20,9 @@ import edit from "assets/icons/edit.svg"; import link from "assets/icons/link.svg"; import avatarProject from "assets/images/avatarMok.png"; -import "./projectTiket.scss"; +import "./projectTicket.scss"; -export const ProjectTiket = ({ project, index }) => { +export const ProjectTicket = ({ project, index }) => { const [modalSelect, setModalSelect] = useState(false); const [modalAdd, setModalAdd] = useState(false); const [modalDelete, setModalDelete] = useState(false); @@ -81,7 +81,7 @@ export const ProjectTiket = ({ project, index }) => {
{project.name}
@@ -177,4 +177,4 @@ export const ProjectTiket = ({ project, index }) => { ); }; -export default ProjectTiket; +export default ProjectTicket; diff --git a/src/components/ProjectTiket/projectTiket.scss b/src/components/ProjectTicket/projectTicket.scss similarity index 98% rename from src/components/ProjectTiket/projectTiket.scss rename to src/components/ProjectTicket/projectTicket.scss index 1ab51b3e..5027d0a2 100644 --- a/src/components/ProjectTiket/projectTiket.scss +++ b/src/components/ProjectTicket/projectTicket.scss @@ -96,7 +96,7 @@ margin-left: 56px; } - &__open-traker { + &__open-tracker { padding: 17px 26px 16px; } diff --git a/src/pages/Bookkeeping.js b/src/pages/Bookkeeping.js deleted file mode 100644 index 3ed7a617..00000000 --- a/src/pages/Bookkeeping.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from "react"; - -import { BookkeepingContent } from "@components/features/bookkeeping/BookkeepingContent/BookkeepingContent"; -import { BookkeepingTemplete } from "@components/features/bookkeeping/BookkeepingTemplete/BookkeepingTemplete"; - -const Bookkeeping = () => { - return ( -
- - - -
- ); -}; - -export default Bookkeeping; diff --git a/src/pages/Tracker/Tracker.jsx b/src/pages/Tracker/Tracker.jsx index e21cb09f..4cc58f76 100644 --- a/src/pages/Tracker/Tracker.jsx +++ b/src/pages/Tracker/Tracker.jsx @@ -22,7 +22,7 @@ import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -import ProjectTiket from "@components/ProjectTiket/ProjectTiket"; +import ProjectTicket from "@components/ProjectTicket/ProjectTicket"; import addProjectImg from "assets/icons/addProjectImg.svg"; import archiveTrackerProjects from "assets/icons/archiveTrackerProjects.svg"; @@ -189,7 +189,7 @@ export const Tracker = () => { !loader && projects?.map((project, index) => { return project.status !== 10 ? ( - + ) : ( "" );