fix style names
This commit is contained in:
parent
78249348eb
commit
66e6b4c7d7
@ -25,8 +25,8 @@ import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSett
|
|||||||
import Article from "./pages/Article/Article";
|
import Article from "./pages/Article/Article";
|
||||||
import FormPage from "./pages/FormPage/FormPage";
|
import FormPage from "./pages/FormPage/FormPage";
|
||||||
import SingleReportPage from "./pages/SingleReportPage/SingleReportPage";
|
import SingleReportPage from "./pages/SingleReportPage/SingleReportPage";
|
||||||
import { QuizPage } from "./pages/quiz/QuizPage";
|
import { QuizPage } from "./pages/Quiz/QuizPage";
|
||||||
import { QuizReportPage } from "./pages/quiz/QuizReportPage";
|
import { QuizReportPage } from "./pages/Quiz/QuizReportPage";
|
||||||
import { Profile } from "./pages/Profile/Profile.js";
|
import { Profile } from "./pages/Profile/Profile.js";
|
||||||
import { Summary } from "./pages/Summary/Summary";
|
import { Summary } from "./pages/Summary/Summary";
|
||||||
import { ViewReport } from "./pages/ViewReport/ViewReport";
|
import { ViewReport } from "./pages/ViewReport/ViewReport";
|
||||||
@ -42,7 +42,7 @@ import { PartnerEmployees } from "./pages/PartnerEmployees/PartnerEmployees";
|
|||||||
import { AuthForCandidate } from "./pages/AuthForCandidate/AuthForCandidate";
|
import { AuthForCandidate } from "./pages/AuthForCandidate/AuthForCandidate";
|
||||||
import { RegistrationForCandidate } from "./pages/RegistrationForCandidate/RegistrationForCandidate";
|
import { RegistrationForCandidate } from "./pages/RegistrationForCandidate/RegistrationForCandidate";
|
||||||
import { ProfileCandidate } from "./pages/ProfileCandidate/ProfileCandidate";
|
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 Blog from "./pages/Blog/Blog";
|
||||||
import Statistics from "@pages/Statistics/Statistics";
|
import Statistics from "@pages/Statistics/Statistics";
|
||||||
import { ProjectTracker } from "./pages/ProjectTracker/ProjectTracker";
|
import { ProjectTracker } from "./pages/ProjectTracker/ProjectTracker";
|
||||||
|
@ -51,10 +51,10 @@ export const apiRequest = (
|
|||||||
};
|
};
|
||||||
|
|
||||||
const RequestError = (code, msg, data) => {
|
const RequestError = (code, msg, data) => {
|
||||||
const description = msg ? `- ${msg}` : "";
|
const descriptionMessage = msg ? `- ${msg}` : "";
|
||||||
|
|
||||||
this.name = "RequestError";
|
this.name = "RequestError";
|
||||||
this.message = `API returned: ${code}${description}.`;
|
this.message = `API returned: ${code}${descriptionMessage}.`;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
this.description = msg;
|
this.description = msg;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
|
@ -592,12 +592,12 @@ export const ModalTiсket = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={active ? "modal-tiket active" : "modal-tiket"}
|
className={active ? "modal-ticket active" : "modal-ticket"}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
if (e.target.className.includes("modal-tiket")) setActive(false);
|
if (e.target.className.includes("modal-ticket")) setActive(false);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="modal-tiket__content">
|
<div className="modal-ticket__content">
|
||||||
<div className="content">
|
<div className="content">
|
||||||
<h3 className="title-project">
|
<h3 className="title-project">
|
||||||
<img src={category} className="title-project__category"></img>
|
<img src={category} className="title-project__category"></img>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.modal-tiket {
|
.modal-ticket {
|
||||||
z-index: 9;
|
z-index: 9;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -11,11 +11,11 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal-tiket.active {
|
.modal-ticket.active {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal-tiket__content {
|
.modal-ticket__content {
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -659,7 +659,7 @@ export const TicketFullScreen = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="modal-tiket__content ticket">
|
<div className="modal-ticket__content ticket">
|
||||||
<div className="content ticket-whith">
|
<div className="content ticket-whith">
|
||||||
<div className="content__task">
|
<div className="content__task">
|
||||||
{editOpen ? (
|
{editOpen ? (
|
||||||
|
@ -65,7 +65,7 @@ export const TrackerModal = ({
|
|||||||
const [projectName, setProjectName] = useState(defautlInput);
|
const [projectName, setProjectName] = useState(defautlInput);
|
||||||
const [valueColumn, setValueColumn] = useState("");
|
const [valueColumn, setValueColumn] = useState("");
|
||||||
const [nameProject, setNameProject] = useState("");
|
const [nameProject, setNameProject] = useState("");
|
||||||
const [valueTiket, setValueTiket] = useState("");
|
const [valueTicket, setValueTicket] = useState("");
|
||||||
const [descriptionTicket, setDescriptionTicket] = useState("");
|
const [descriptionTicket, setDescriptionTicket] = useState("");
|
||||||
const [workers, setWorkers] = useState([]);
|
const [workers, setWorkers] = useState([]);
|
||||||
const [selectWorkersOpen, setSelectWorkersOpen] = useState(false);
|
const [selectWorkersOpen, setSelectWorkersOpen] = useState(false);
|
||||||
@ -127,8 +127,8 @@ export const TrackerModal = ({
|
|||||||
setActive(false);
|
setActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function createTiket() {
|
function createTicket() {
|
||||||
if (!valueTiket || !descriptionTicket) {
|
if (!valueTicket || !descriptionTicket) {
|
||||||
showNotification({
|
showNotification({
|
||||||
show: true,
|
show: true,
|
||||||
text: "Введите название и описание",
|
text: "Введите название и описание",
|
||||||
@ -141,7 +141,7 @@ export const TrackerModal = ({
|
|||||||
method: "POST",
|
method: "POST",
|
||||||
data: {
|
data: {
|
||||||
project_id: projectBoard.id,
|
project_id: projectBoard.id,
|
||||||
title: valueTiket,
|
title: valueTicket,
|
||||||
description: descriptionTicket,
|
description: descriptionTicket,
|
||||||
status: 1,
|
status: 1,
|
||||||
user_id: localStorage.getItem("id"),
|
user_id: localStorage.getItem("id"),
|
||||||
@ -180,14 +180,14 @@ export const TrackerModal = ({
|
|||||||
}).then(() => {
|
}).then(() => {
|
||||||
dispatch(setProjectBoardFetch(projectBoard.id));
|
dispatch(setProjectBoardFetch(projectBoard.id));
|
||||||
setActive(false);
|
setActive(false);
|
||||||
setValueTiket("");
|
setValueTicket("");
|
||||||
setDescriptionTicket("");
|
setDescriptionTicket("");
|
||||||
setSelectedExecutorTask("Выберите исполнителя задачи");
|
setSelectedExecutorTask("Выберите исполнителя задачи");
|
||||||
setSelectedPriority(null);
|
setSelectedPriority(null);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
setActive(false);
|
setActive(false);
|
||||||
setValueTiket("");
|
setValueTicket("");
|
||||||
setDescriptionTicket("");
|
setDescriptionTicket("");
|
||||||
dispatch(setProjectBoardFetch(projectBoard.id));
|
dispatch(setProjectBoardFetch(projectBoard.id));
|
||||||
}
|
}
|
||||||
@ -507,8 +507,8 @@ export const TrackerModal = ({
|
|||||||
<input
|
<input
|
||||||
maxLength="100"
|
maxLength="100"
|
||||||
className="name-project"
|
className="name-project"
|
||||||
value={valueTiket}
|
value={valueTicket}
|
||||||
onChange={(e) => setValueTiket(e.target.value)}
|
onChange={(e) => setValueTicket(e.target.value)}
|
||||||
placeholder="Название задачи"
|
placeholder="Название задачи"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@ -713,7 +713,7 @@ export const TrackerModal = ({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<BaseButton styles={"button-add"} onClick={createTiket}>
|
<BaseButton styles={"button-add"} onClick={createTicket}>
|
||||||
Создать
|
Создать
|
||||||
</BaseButton>
|
</BaseButton>
|
||||||
</div>
|
</div>
|
||||||
|
@ -20,9 +20,9 @@ import edit from "assets/icons/edit.svg";
|
|||||||
import link from "assets/icons/link.svg";
|
import link from "assets/icons/link.svg";
|
||||||
import avatarProject from "assets/images/avatarMok.png";
|
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 [modalSelect, setModalSelect] = useState(false);
|
||||||
const [modalAdd, setModalAdd] = useState(false);
|
const [modalAdd, setModalAdd] = useState(false);
|
||||||
const [modalDelete, setModalDelete] = useState(false);
|
const [modalDelete, setModalDelete] = useState(false);
|
||||||
@ -81,7 +81,7 @@ export const ProjectTiket = ({ project, index }) => {
|
|||||||
<div className={`project project-${project.id}`} key={index}>
|
<div className={`project project-${project.id}`} key={index}>
|
||||||
<Link
|
<Link
|
||||||
to={`/tracker/project/${project.id}`}
|
to={`/tracker/project/${project.id}`}
|
||||||
className="project__open-traker"
|
className="project__open-tracker"
|
||||||
>
|
>
|
||||||
<div className="project__link">{project.name}</div>
|
<div className="project__link">{project.name}</div>
|
||||||
|
|
||||||
@ -177,4 +177,4 @@ export const ProjectTiket = ({ project, index }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ProjectTiket;
|
export default ProjectTicket;
|
@ -96,7 +96,7 @@
|
|||||||
margin-left: 56px;
|
margin-left: 56px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__open-traker {
|
&__open-tracker {
|
||||||
padding: 17px 26px 16px;
|
padding: 17px 26px 16px;
|
||||||
}
|
}
|
||||||
|
|
@ -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 (
|
|
||||||
<div>
|
|
||||||
<BookkeepingTemplete>
|
|
||||||
<BookkeepingContent></BookkeepingContent>
|
|
||||||
</BookkeepingTemplete>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Bookkeeping;
|
|
@ -22,7 +22,7 @@ import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
|
|||||||
import { Navigation } from "@components/Navigation/Navigation";
|
import { Navigation } from "@components/Navigation/Navigation";
|
||||||
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
|
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
|
||||||
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
|
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 addProjectImg from "assets/icons/addProjectImg.svg";
|
||||||
import archiveTrackerProjects from "assets/icons/archiveTrackerProjects.svg";
|
import archiveTrackerProjects from "assets/icons/archiveTrackerProjects.svg";
|
||||||
@ -189,7 +189,7 @@ export const Tracker = () => {
|
|||||||
!loader &&
|
!loader &&
|
||||||
projects?.map((project, index) => {
|
projects?.map((project, index) => {
|
||||||
return project.status !== 10 ? (
|
return project.status !== 10 ? (
|
||||||
<ProjectTiket key={index} project={project} />
|
<ProjectTicket key={index} project={project} />
|
||||||
) : (
|
) : (
|
||||||
""
|
""
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user