diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..222861c3
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+ "tabWidth": 2,
+ "useTabs": false
+}
diff --git a/src/App.js b/src/App.js
index 467870cc..432bc36f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -15,6 +15,7 @@ import ReportForm from "./components/ReportForm/ReportForm";
import FreeDevelopers from "./components/UI/FreeDevelopers/FreeDevelopers";
import { TicketFullScreen } from "./components/UI/TicketFullScreen/TicketFullScreen";
import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar";
+import Article from "./pages/Article/Article";
import FormPage from "./pages/FormPage/FormPage.js";
import SingleReportPage from "./pages/SingleReportPage/SingleReportPage";
import { QuizPage } from "./pages/quiz/QuizPage";
@@ -35,13 +36,14 @@ 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 "./assets/global.scss";
-import "./fonts/stylesheet.css";
-import "bootstrap/dist/css/bootstrap.min.css";
-import { FREQUENTLY_ASKED_QUESTIONS_ROUTE, FREQUENTLY_ASKED_QUESTION_ROUTE } from "./constants/router-path";
+import Blog from "./pages/Blog/Blog";
+import { ProjectTracker } from "./pages/ProjectTracker/ProjectTracker";
import { FrequentlyAskedQuestions } from "./pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions";
import { FrequentlyAskedQuestion } from "./pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion";
+import "./assets/global.scss";
+import "./fonts/stylesheet.css";
+import "bootstrap/dist/css/bootstrap.min.css";
const App = () => {
return (
@@ -49,16 +51,19 @@ const App = () => {
{profileInfo.fio}, {profileInfo.specification} разработчик
-+ {profileInfo.fio}, {profileInfo.specification} разработчик +
+- {month} {totalHours} {hourOfNum(totalHours)} -
-+ {month} + + {totalHours} {hourOfNum(totalHours)}{" "} + +
+Пн
-Вт
-Ср
-Чт
-Пт
-Сб
-Вс
-Пн
+Вт
+Ср
+Чт
+Пт
+Сб
+Вс
+Открытые задачи
- {project.count} - + - setModalSettings(true)}> - ... - -редактировать
-ссылка на проект
-в архив
-удалить
-Открытые задачи
+ + {project.columns.reduce( + (accumulator, currentValue) => + accumulator + currentValue.tasks.length, + 0 + )} + + setModalSelect(true)}> + ... + +редактировать
+ссылка на проект
+в архив
+удалить
++ Вами потрачено на работу :{" "} + + {totalHours} {hourOfNum(totalHours)} + +
+
+ Какие задачи были выполнены? + |
+
+ Время + |
+
---|---|
+ + {index + 1}. {task.task} + + |
+
+
+ {task.hours}
+
+ + {hourOfNum(task.hours)} на задачу + + |
+
+ | + + Всего: {totalHours} {hourOfNum(totalHours)} + + | +
{item}
; + })} +{item}
; + })} ++ В этот день вы не заполняли отчет +
+Политика конфиденциальности
diff --git a/src/components/SideBar/sidebar.scss b/src/components/SideBar/sidebar.scss index 98864db8..8a0d6705 100644 --- a/src/components/SideBar/sidebar.scss +++ b/src/components/SideBar/sidebar.scss @@ -20,11 +20,13 @@ } .auth-title { + position: relative; display: flex; flex-direction: column; justify-content: space-between; align-items: center; height: 80%; + z-index: 9999; .text { display: flex; @@ -108,8 +110,10 @@ .auth-body { padding: 40px; - display: none; - z-index: -1; + visibility: hidden; + transition: 0.2s ease-in-out; + opacity: 0; + z-index: 99; position: absolute; top: 0; left: 0; @@ -173,6 +177,9 @@ } .auth-body.active { + visibility: visible; + transition: 0.1s ease-in-out; + opacity: 1; display: flex; width: 424px; left: 140px; @@ -184,6 +191,6 @@ @media (max-width: 1375px) { left: 0; width: 100%; - height: 535px; + height: 605px; } } diff --git a/src/components/SliderWorkers/SliderWorkers.js b/src/components/SliderWorkers/SliderWorkers.jsx similarity index 100% rename from src/components/SliderWorkers/SliderWorkers.js rename to src/components/SliderWorkers/SliderWorkers.jsx diff --git a/src/components/UI/CardArticle/CardArticle.jsx b/src/components/UI/CardArticle/CardArticle.jsx new file mode 100644 index 00000000..be8ca4b1 --- /dev/null +++ b/src/components/UI/CardArticle/CardArticle.jsx @@ -0,0 +1,22 @@ +import React from "react"; +import cardCalendar from "../../../images/cardCalendar.svg"; +import { Link } from "react-router-dom"; + +import "./cardArticle.scss"; + +export const CardArticle = ({ images, title, data, id }) => { + return ( +{data}
+{tiket.descriptions}
- -{tiket.descriptions}
+ {editOpen ? { + setInputsValue((prevValue) => ({...prevValue, description: e.target.value})) + }}/> :{inputsValue.description}
} +-