apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed auth page and tracker

Browse Source
This commit is contained in:
MaxOvs19 2023-03-27 19:08:01 +03:00
parent fc51fbdb09
commit 76334aec99
9 changed files with 86 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/SideBar/sidebar.scss
View File

@ -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%;

4
src/components/SliderWorkers/SliderWorkers.js
View File

@ -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) {

20
src/components/UI/ModalCreate/ModalCreate.js
View File

@ -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 (

11
src/pages/AuthForDevelopers/AuthForDevelopers.js
View File

@ -31,6 +31,13 @@ const AuthForDevelopers = () => {
}
}, [getToken]);
function scrollToForm() {
window.scrollTo({
top: 850,
behavior: "smooth",
});
}
return (
<section className="auth-developers">
<AuthHeader />
@ -44,13 +51,13 @@ const AuthForDevelopers = () => {
/>
<div className="container">
<div className="change-mode">
<div className="change-mode__arrow">
<div className="change-mode__arrow" onClick={() => scrollToForm()}>
<img src={arrowBtn}></img>
</div>
<div className="buttons">
<Link to={"/authdev"}>
<button className="change-mode__developersForDev">
Для разработчика
Для разработчиков
</button>
</Link>
<Link to={"/auth"}>

1
src/pages/AuthForDevelopers/authForDevelopers.scss
View File

@ -25,6 +25,7 @@
&__arrow {
margin-top: 360px;
z-index: 99;
}
@media (max-width: 575.98px) {

11
src/pages/AuthForPartners/AuthForPartners.js
View File

@ -30,6 +30,13 @@ const AuthForPartners = () => {
}
}, [getToken]);
function scrollToForm() {
window.scrollTo({
top: 850,
behavior: "smooth",
});
}
return (
<section className="auth-partners">
<AuthHeader />
@ -39,13 +46,13 @@ const AuthForPartners = () => {
<img className="auth-partners__vector-black" src={vectorBlack} alt="" />
<div className="container">
<div className="change-mode">
<div className="change-mode__arrow">
<div className="change-mode__arrow" onClick={() => scrollToForm()}>
<img src={arrowBtn}></img>
</div>
<div className="buttons">
<Link to={"/authdev"}>
<button className="change-mode__developersForPart">
Для разработчика
Для разработчиков
</button>
</Link>
<Link to={"/auth"}>

2
src/pages/AuthForPartners/authForPartners.scss
View File

@ -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;

44
src/pages/Tracker/Tracker.js
View File

@ -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 = () => {
}
>
<div className="tasks__head">
<ModalCreate
active={modalCreateColl}
setActive={setModalCreateColl}
title={"Добавить колонку: "}
/>
<h4>Проект : Разработка трекера</h4>
<div
className={
modalCreateColl ? "modal-project active" : "modal-project"
}
onClick={() => setModalCreateColl(false)}
>
<div
className="modal-project__content"
onClick={(e) => e.stopPropagation()}
>
<div className="title-project">
<h4>Введите название карточки</h4>
<div className="input-container">
<input
className="name-project"
value={valueColl}
onChange={(e) => setValueColl(e.target.value)}
></input>
</div>
</div>
<button className="create-project" onClick={createTab}>
Создать
</button>
</div>
</div>
<span
className="tasks__head__add"
onClick={() => setModalCreateColl(true)}

4
src/pages/Tracker/tracker.scss
View File

@ -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;