From 76334aec99b324f7176dcf5c998f90ff2d5bc564 Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Mon, 27 Mar 2023 19:08:01 +0300 Subject: [PATCH] Fixed auth page and tracker --- src/components/SideBar/sidebar.scss | 9 +++- src/components/SliderWorkers/SliderWorkers.js | 4 +- src/components/UI/ModalCreate/ModalCreate.js | 20 +++++---- .../AuthForDevelopers/AuthForDevelopers.js | 11 ++++- .../AuthForDevelopers/authForDevelopers.scss | 1 + src/pages/AuthForPartners/AuthForPartners.js | 11 ++++- .../AuthForPartners/authForPartners.scss | 2 + src/pages/Tracker/Tracker.js | 44 ++++++++++++++++--- src/pages/Tracker/tracker.scss | 4 ++ 9 files changed, 86 insertions(+), 20 deletions(-) diff --git a/src/components/SideBar/sidebar.scss b/src/components/SideBar/sidebar.scss index bb6591f5..7fdc5822 100644 --- a/src/components/SideBar/sidebar.scss +++ b/src/components/SideBar/sidebar.scss @@ -135,9 +135,10 @@ line-height: 32px; color: #000000; } + span { - font-size: 5px; - margin-left: 41px; + font-size: 12px; + margin-left: 0px; } } @@ -194,6 +195,10 @@ width: 424px; left: 140px; + @media (max-width: 1440px) { + left: 79px; + } + @media (max-width: 1024px) { left: 0; width: 100%; diff --git a/src/components/SliderWorkers/SliderWorkers.js b/src/components/SliderWorkers/SliderWorkers.js index 8d1385af..dd58feab 100644 --- a/src/components/SliderWorkers/SliderWorkers.js +++ b/src/components/SliderWorkers/SliderWorkers.js @@ -33,9 +33,11 @@ export const SliderWorkers = ({}) => { const settings = { infinite: true, - speed: 300, + speed: 1000, slidesToShow: 3, slidesToScroll: 1, + autoplay: true, + autoplaySpeed: 4500, }; if (window.innerWidth < 575) { diff --git a/src/components/UI/ModalCreate/ModalCreate.js b/src/components/UI/ModalCreate/ModalCreate.js index 04a2894c..c6fd5af0 100644 --- a/src/components/UI/ModalCreate/ModalCreate.js +++ b/src/components/UI/ModalCreate/ModalCreate.js @@ -1,6 +1,6 @@ import React, { useState } from "react"; import { useDispatch } from "react-redux"; -import { setProject } from "../../../redux/projectsTrackerSlice"; +import { setProject } from "../../../redux/projectsTrackerSlice"; import "./ModalCreate.scss"; @@ -9,13 +9,17 @@ export const ModalCreate = ({ active, setActive, title }) => { const dispatch = useDispatch(); function createName() { - let newItem = { - name: inputValue, - count: 0, - }; - dispatch(setProject(newItem)); - setActive(false); - setInputValue("") + if (inputValue === "") { + return; + } else { + let newItem = { + name: inputValue, + count: 0, + }; + dispatch(setProject(newItem)); + setActive(false); + setInputValue(""); + } } return ( diff --git a/src/pages/AuthForDevelopers/AuthForDevelopers.js b/src/pages/AuthForDevelopers/AuthForDevelopers.js index e3075654..f2e96efb 100644 --- a/src/pages/AuthForDevelopers/AuthForDevelopers.js +++ b/src/pages/AuthForDevelopers/AuthForDevelopers.js @@ -31,6 +31,13 @@ const AuthForDevelopers = () => { } }, [getToken]); + function scrollToForm() { + window.scrollTo({ + top: 850, + behavior: "smooth", + }); + } + return (
@@ -44,13 +51,13 @@ const AuthForDevelopers = () => { />
-
+
scrollToForm()}>
diff --git a/src/pages/AuthForDevelopers/authForDevelopers.scss b/src/pages/AuthForDevelopers/authForDevelopers.scss index 25b5d894..d41efce7 100644 --- a/src/pages/AuthForDevelopers/authForDevelopers.scss +++ b/src/pages/AuthForDevelopers/authForDevelopers.scss @@ -25,6 +25,7 @@ &__arrow { margin-top: 360px; + z-index: 99; } @media (max-width: 575.98px) { diff --git a/src/pages/AuthForPartners/AuthForPartners.js b/src/pages/AuthForPartners/AuthForPartners.js index aeabb704..24183f3e 100644 --- a/src/pages/AuthForPartners/AuthForPartners.js +++ b/src/pages/AuthForPartners/AuthForPartners.js @@ -30,6 +30,13 @@ const AuthForPartners = () => { } }, [getToken]); + function scrollToForm() { + window.scrollTo({ + top: 850, + behavior: "smooth", + }); + } + return (
@@ -39,13 +46,13 @@ const AuthForPartners = () => {
-
+
scrollToForm()}>
diff --git a/src/pages/AuthForPartners/authForPartners.scss b/src/pages/AuthForPartners/authForPartners.scss index acee7572..11929021 100644 --- a/src/pages/AuthForPartners/authForPartners.scss +++ b/src/pages/AuthForPartners/authForPartners.scss @@ -25,6 +25,7 @@ &__arrow { margin-top: 360px; + cursor: pointer; } @media (max-width: 575.98px) { @@ -286,6 +287,7 @@ align-items: center; &__arrow { + cursor: pointer; margin: 49px 0 43px 0; width: 48px; height: 48px; diff --git a/src/pages/Tracker/Tracker.js b/src/pages/Tracker/Tracker.js index 51c63cce..7ce93de3 100644 --- a/src/pages/Tracker/Tracker.js +++ b/src/pages/Tracker/Tracker.js @@ -238,6 +238,7 @@ export const Tracker = () => { const [modalCreateColl, setModalCreateColl] = useState(false); const [modalCreateTiket, setModalCreateTiket] = useState(false); const [valueTiket, setValueTiket] = useState(""); + const [valueColl, setValueColl] = useState(""); // const [selectedTab, setSelectedTab] = useState({ @@ -376,6 +377,19 @@ export const Tracker = () => { } }); setModalCreateTiket(false); + setValueTiket(""); + } + + function createTab() { + let newTab = { + name: valueColl, + open: false, + tasks: [], + }; + + tabTaskMok.unshift(newTab); + setValueColl(""); + setModalCreateColl(false); } return ( @@ -445,12 +459,32 @@ export const Tracker = () => { } >
-

Проект : Разработка трекера

+
setModalCreateColl(false)} + > +
e.stopPropagation()} + > +
+

Введите название карточки

+
+ setValueColl(e.target.value)} + > +
+
+ +
+
setModalCreateColl(true)} diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index f77f2df1..ca126279 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -333,6 +333,8 @@ } &__item { + width: 328px; + height: 154px; padding: 16px; position: relative; box-shadow: 0px 3px 2px -2px rgba(0, 0, 0, 0.06), @@ -443,6 +445,8 @@ position: relative; display: flex; justify-content: space-between; + min-width: 300px; + span { color: #6f6f6f; font-weight: 500;