tracker tasks
This commit is contained in:
parent
617ca5af6e
commit
3b773e0008
14
src/assets/icons/authHead.svg
Normal file
14
src/assets/icons/authHead.svg
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<svg width="45" height="46" viewBox="0 0 45 46" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g clip-path="url(#clip0_1687_883)">
|
||||||
|
<path d="M36.5629 8.9648C35.0096 8.9648 33.7504 10.224 33.7504 11.7773V8.02727C33.7504 6.47398 32.4912 5.21478 30.9379 5.21478C29.3847 5.21478 28.1255 6.47398 28.1255 8.02727V4.27734C28.1255 2.72405 26.8662 1.46484 25.313 1.46484C23.7597 1.46484 22.5005 2.72405 22.5005 4.27734V8.02736C22.5005 6.47407 21.2413 5.21487 19.688 5.21487C18.1347 5.21487 16.8755 6.47407 16.8755 8.02736V27.7148L10.3655 24.4598C9.71469 24.1343 8.99697 23.9649 8.26924 23.9648C6.80912 23.9648 5.62549 25.1484 5.62549 26.6085V26.6198C5.624 27.3229 5.9027 27.9977 6.3999 28.4948L18.5236 40.6185C21.0709 43.1632 24.5248 44.5917 28.1255 44.5897C34.3386 44.5897 39.3754 39.5529 39.3754 33.3397V11.7773C39.3754 10.224 38.1162 8.9648 36.5629 8.9648Z" fill="#FFCC80"/>
|
||||||
|
<path d="M22.5 21.1525C23.0178 21.1525 23.4376 20.7327 23.4376 20.215V2.19629C22.8383 2.72152 22.4963 3.48072 22.5 4.27754V21.1525Z" fill="#FFB74D"/>
|
||||||
|
<path d="M28.125 21.1526C28.6428 21.1526 29.0626 20.7328 29.0626 20.215V5.94629C28.4633 6.47152 28.1213 7.23072 28.125 8.02753V21.1526Z" fill="#FFB74D"/>
|
||||||
|
<path d="M33.75 11.7775V21.1525C34.2678 21.1525 34.6876 20.7328 34.6876 20.215V9.69629C34.0883 10.2215 33.7463 10.9807 33.75 11.7775Z" fill="#FFB74D"/>
|
||||||
|
<path d="M28.1254 45.5273C24.2737 45.5385 20.5777 44.0079 17.8617 41.2766L5.73788 29.1529C4.33682 27.751 4.33743 25.4787 5.73937 24.0777C6.41059 23.4069 7.32017 23.0292 8.26912 23.0273C9.14179 23.028 10.0023 23.2309 10.7835 23.6198L15.9378 26.1979V8.0273C15.9389 5.95625 17.6187 4.27816 19.6898 4.2793C20.3474 4.27965 20.9933 4.45288 21.5628 4.78168V4.27728C21.5629 2.20632 23.2418 0.527344 25.3129 0.527344C27.384 0.527344 29.063 2.20632 29.063 4.27737V4.78177C30.8565 3.74624 33.15 4.36077 34.1856 6.15435C34.5144 6.72388 34.6876 7.36979 34.6879 8.02739V8.53179C36.4815 7.49627 38.775 8.1108 39.8105 9.90438C40.1393 10.4739 40.3126 11.1198 40.3129 11.7774V33.3398C40.3046 40.0673 34.8529 45.519 28.1254 45.5273ZM8.26912 24.9023C7.32263 24.9049 6.55755 25.6744 6.56027 26.6209C6.56159 27.0734 6.74176 27.5071 7.06169 27.8273L19.1873 39.951C21.5524 42.3294 24.7712 43.6624 28.1254 43.6522C33.8178 43.645 38.4307 39.0322 38.4379 33.3398V11.7773C38.4379 10.7418 37.5984 9.90236 36.5629 9.90236C35.5274 9.90236 34.6879 10.7418 34.6879 11.7773V20.2148C34.6879 20.7326 34.2682 21.1523 33.7504 21.1523C33.2326 21.1523 32.8129 20.7326 32.8129 20.2148V8.0273C32.8129 6.99177 31.9734 6.15233 30.9379 6.15233C29.9024 6.15233 29.063 6.99177 29.063 8.0273V20.2148C29.063 20.7326 28.6432 21.1523 28.1254 21.1523C27.6077 21.1523 27.1879 20.7326 27.1879 20.2148V4.27737C27.1879 3.24184 26.3485 2.4024 25.3129 2.4024C24.2774 2.4024 23.438 3.24184 23.438 4.27737V20.2148C23.438 20.7326 23.0182 21.1523 22.5004 21.1523C21.9827 21.1523 21.5629 20.7326 21.5629 20.2148V8.0273C21.5629 6.99177 20.7235 6.15233 19.6879 6.15233C18.6524 6.15233 17.813 6.99177 17.813 8.0273V27.7148C17.813 28.2325 17.3932 28.6523 16.8754 28.6522C16.7296 28.6522 16.5858 28.6182 16.4555 28.5529L9.93799 25.2979C9.41952 25.0394 8.84841 24.9039 8.26912 24.9023Z" fill="black"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<clipPath id="clip0_1687_883">
|
||||||
|
<rect width="45" height="45" fill="white" transform="translate(0 0.527344)"/>
|
||||||
|
</clipPath>
|
||||||
|
</defs>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 3.2 KiB |
3
src/assets/icons/passwordIcon.svg
Normal file
3
src/assets/icons/passwordIcon.svg
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<svg width="23" height="24" viewBox="0 0 23 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M8.71013 5.69514C8.6174 5.31138 8.85422 4.92619 9.23656 4.83488C13.7847 3.74066 18.3427 5.8963 22.791 11.2347C23.0107 11.4987 23.0121 11.8824 22.7924 12.1464C21.7224 13.4403 20.5783 14.6045 19.3927 15.6031C19.2586 15.7158 19.096 15.7714 18.9334 15.7714C18.7308 15.7714 18.5296 15.6844 18.3884 15.5175C18.133 15.2165 18.173 14.7671 18.474 14.5117C19.4541 13.6857 20.4056 12.7384 21.3087 11.6913C17.3655 7.13747 13.4209 5.30139 9.57039 6.22157C9.17093 6.31287 8.80143 6.07748 8.71013 5.69514ZM11.3223 8.05764C11.2695 8.44854 11.542 8.80805 11.9315 8.86084C13.1997 9.03203 14.2027 10.0364 14.3753 11.3018C14.4224 11.6599 14.7291 11.9195 15.08 11.9195C15.1114 11.9195 15.1442 11.9181 15.177 11.9138C15.5665 11.861 15.8404 11.5015 15.7876 11.1106C15.5308 9.20893 14.0243 7.70241 12.1226 7.44562C11.7374 7.39426 11.3736 7.66675 11.3223 8.05764ZM22.7482 21.886C23.0264 22.1642 23.0264 22.6164 22.7482 22.8946C22.6084 23.0344 22.4258 23.1043 22.2431 23.1043C22.0605 23.1043 21.8779 23.0344 21.7381 22.896L16.4068 17.5647C14.7861 18.3936 13.1612 18.8301 11.5391 18.8301C7.76998 18.8301 4.00795 16.5989 0.295862 12.1492C0.0761609 11.8853 0.0747342 11.5001 0.294435 11.2362C1.98214 9.20608 3.69695 7.65819 5.40463 6.56111L0.340088 1.49657C0.0618946 1.21838 0.0618946 0.766135 0.340088 0.487942C0.61828 0.209749 1.07052 0.209749 1.34872 0.487942L22.7482 21.886ZM8.69016 11.6913C8.69016 13.2648 9.96984 14.5445 11.5434 14.5445C12.0556 14.5445 12.552 14.3962 12.9857 14.1422L9.09104 10.2475C8.83567 10.6812 8.69016 11.172 8.69016 11.6913ZM15.3525 16.509L14.0172 15.1737C13.2996 15.6816 12.4336 15.9712 11.5434 15.9712C9.18377 15.9712 7.26353 14.0509 7.26353 11.6913C7.26353 10.7882 7.54885 9.93509 8.05959 9.21607L6.43465 7.59113C4.89532 8.53128 3.33316 9.89086 1.77813 11.6913C6.38757 17.0169 10.8415 18.6004 15.3525 16.509Z" fill="black"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/mock/avatarMoсk3.png
Normal file
BIN
src/assets/images/mock/avatarMoсk3.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
BIN
src/assets/images/mock/avatarMoсk4.png
Normal file
BIN
src/assets/images/mock/avatarMoсk4.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
BIN
src/assets/images/mock/avatarMoсk5.png
Normal file
BIN
src/assets/images/mock/avatarMoсk5.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
BIN
src/assets/images/mock/avatarMoсk6.png
Normal file
BIN
src/assets/images/mock/avatarMoсk6.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
@ -12,7 +12,8 @@ import { Loader } from "@components/Common/Loader/Loader";
|
|||||||
import ModalErrorLogin from "@components/Modal/ModalErrorLogin/ModalErrorLogin";
|
import ModalErrorLogin from "@components/Modal/ModalErrorLogin/ModalErrorLogin";
|
||||||
import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration";
|
import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration";
|
||||||
|
|
||||||
import ellipse from "assets/icons/ellipse.png";
|
import authHead from "assets/icons/authHead.svg"
|
||||||
|
import eyePassword from "assets/icons/passwordIcon.svg"
|
||||||
|
|
||||||
import "./authBox.scss";
|
import "./authBox.scss";
|
||||||
|
|
||||||
@ -27,6 +28,7 @@ export const AuthBox = ({ title }) => {
|
|||||||
const [error, setError] = useState(null);
|
const [error, setError] = useState(null);
|
||||||
const [modalError, setModalError] = useState(false);
|
const [modalError, setModalError] = useState(false);
|
||||||
const [modalReg, setModalReg] = useState(false);
|
const [modalReg, setModalReg] = useState(false);
|
||||||
|
const [showPassword, setShowPassword] = useState(false)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!localStorage.getItem("auth_token")) {
|
if (!localStorage.getItem("auth_token")) {
|
||||||
@ -73,23 +75,25 @@ export const AuthBox = ({ title }) => {
|
|||||||
return (
|
return (
|
||||||
<div className="auth-box">
|
<div className="auth-box">
|
||||||
<h2 className="auth-box__header">
|
<h2 className="auth-box__header">
|
||||||
Войти в <span>систему</span>
|
Вход <img src={authHead} alt='authImg' />
|
||||||
</h2>
|
</h2>
|
||||||
<div className="auth-box__title">
|
<div className="auth-box__title">
|
||||||
<img src={ellipse} alt="." />
|
|
||||||
<span>{title}</span>
|
<span>{title}</span>
|
||||||
</div>
|
</div>
|
||||||
<form ref={ref} className="auth-box__form">
|
<form ref={ref} className="auth-box__form">
|
||||||
<label htmlFor="login">Ваш логин:</label>
|
<label htmlFor="login">Ваш email *</label>
|
||||||
<input id="login" type="text" name="username" placeholder="Логин" />
|
<input id="login" type="text" name="username" placeholder="Логин" />
|
||||||
|
|
||||||
<label htmlFor="password">Пароль:</label>
|
<label htmlFor="password">Ваш пароль*</label>
|
||||||
|
<div className='inputWrapper'>
|
||||||
<input
|
<input
|
||||||
id="password"
|
id="password"
|
||||||
type="password"
|
type={showPassword ? "text" : "password"}
|
||||||
name="password"
|
name="password"
|
||||||
placeholder="Пароль"
|
placeholder="Пароль"
|
||||||
/>
|
/>
|
||||||
|
<img onClick={() => setShowPassword(!showPassword)} className='eye' src={eyePassword} alt='eye' />
|
||||||
|
</div>
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<div className="auth-box__form-error">
|
<div className="auth-box__form-error">
|
||||||
@ -111,18 +115,23 @@ export const AuthBox = ({ title }) => {
|
|||||||
>
|
>
|
||||||
{isLoading ? <Loader /> : "Войти"}
|
{isLoading ? <Loader /> : "Войти"}
|
||||||
</button>
|
</button>
|
||||||
|
<span className="auth-box__reset">
|
||||||
|
Вспомнить пароль
|
||||||
|
</span>
|
||||||
|
|
||||||
<ModalRegistration active={modalReg} setActive={setModalReg} />
|
<ModalRegistration active={modalReg} setActive={setModalReg} />
|
||||||
<button
|
</div>
|
||||||
className="auth-box__form-btn--role auth-box__auth-link"
|
<p className="auth-box__registration">
|
||||||
|
У вас еще нет аккаунта?
|
||||||
|
<span
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setModalReg(true);
|
setModalReg(true);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Регистрация
|
Зарегистрироваться
|
||||||
</button>
|
</span>
|
||||||
</div>
|
</p>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -9,8 +9,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__header {
|
&__header {
|
||||||
font-family: "GT Eesti Pro Display";
|
font-size: 50px;
|
||||||
font-size: 5.3em;
|
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
@ -35,7 +34,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__sign-in {
|
&__sign-in {
|
||||||
font-family: "GT Eesti Pro Display";
|
|
||||||
font-size: 5.3em;
|
font-size: 5.3em;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@ -45,7 +43,6 @@
|
|||||||
margin-top: 164px;
|
margin-top: 164px;
|
||||||
|
|
||||||
span {
|
span {
|
||||||
font-family: "GT Eesti Pro Display";
|
|
||||||
color: #52b709;
|
color: #52b709;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
letter-spacing: 0.56px;
|
letter-spacing: 0.56px;
|
||||||
@ -55,21 +52,14 @@
|
|||||||
|
|
||||||
&__title {
|
&__title {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
margin-bottom: 54px;
|
||||||
justify-content: center;
|
|
||||||
margin-top: 15px;
|
|
||||||
margin-bottom: 65px;
|
|
||||||
|
|
||||||
span {
|
span {
|
||||||
color: #18586e;
|
color: #8DC63F;
|
||||||
font-family: "GT Eesti Pro Display";
|
font-size: 50px;
|
||||||
font-size: 2em;
|
font-weight: 700;
|
||||||
font-weight: 500;
|
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
line-height: 16.81px;
|
|
||||||
text-align: left;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
img {
|
img {
|
||||||
@ -92,34 +82,46 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|
||||||
label {
|
label {
|
||||||
color: #48802d;
|
font-size: 16px;
|
||||||
font-family: "GT Eesti Pro Display";
|
font-weight: 400;
|
||||||
font-size: 2.4em;
|
|
||||||
font-weight: 500;
|
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
line-height: 16.81px;
|
line-height: 19.2px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 25px;
|
||||||
margin-left: 45px;
|
color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.inputWrapper {
|
||||||
|
width: 366px;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
.eye {
|
||||||
|
cursor: pointer;
|
||||||
|
position: absolute;
|
||||||
|
right: 20px;
|
||||||
|
top: 15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
input {
|
input {
|
||||||
max-width: 366px;
|
max-width: 366px;
|
||||||
height: 75px;
|
width: 100%;
|
||||||
box-shadow: 0 0 59px rgba(44, 44, 44, 0.05);
|
height: 52.5px;
|
||||||
border-radius: 37px;
|
//box-shadow: 0 0 59px rgba(44, 44, 44, 0.05);
|
||||||
border: 1px solid #c4c4c4;
|
border-radius: 8px;
|
||||||
|
//border: 1px solid #c4c4c4;
|
||||||
|
border: none;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
margin-bottom: 60px;
|
margin-bottom: 35px;
|
||||||
font-family: "GT Eesti Pro Display";
|
font-size: 15px;
|
||||||
font-size: 2.2em;
|
font-weight: 400;
|
||||||
font-weight: 300;
|
line-height: 18px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding-left: 45px;
|
padding: 16px 15px 16px 22px;
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,10 +132,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&-btn {
|
&-btn {
|
||||||
width: 268px;
|
width: 138px;
|
||||||
height: 75px;
|
height: 50px;
|
||||||
box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
|
//box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
|
||||||
border-radius: 38px;
|
border-radius: 44px;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
background-image: linear-gradient(to top, #6aaf5c 0%, #52b709 100%),
|
background-image: linear-gradient(to top, #6aaf5c 0%, #52b709 100%),
|
||||||
linear-gradient(
|
linear-gradient(
|
||||||
@ -145,12 +147,10 @@
|
|||||||
);
|
);
|
||||||
border: none;
|
border: none;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
font-family: "Muller";
|
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
font-size: 2.2em;
|
font-size: 2.2em;
|
||||||
font-weight: bold;
|
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
line-height: 71.88px;
|
line-height: 32px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 2px solid #6aaf5c;
|
border: 2px solid #6aaf5c;
|
||||||
margin-right: 1.5rem;
|
margin-right: 1.5rem;
|
||||||
@ -164,7 +164,8 @@
|
|||||||
//color: #6aaf5c !important;
|
//color: #6aaf5c !important;
|
||||||
|
|
||||||
.loader * {
|
.loader * {
|
||||||
fill: #6aaf5c;
|
fill: #fff !important;
|
||||||
|
max-width: 40px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -174,7 +175,6 @@
|
|||||||
border-radius: 38px;
|
border-radius: 38px;
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
border: 2px solid #6aaf5c;
|
border: 2px solid #6aaf5c;
|
||||||
font-family: "Muller";
|
|
||||||
font-size: 2em;
|
font-size: 2em;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
@ -186,9 +186,32 @@
|
|||||||
|
|
||||||
.loader * {
|
.loader * {
|
||||||
fill: #fff !important;
|
fill: #fff !important;
|
||||||
|
max-width: 40px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__reset {
|
||||||
|
color: #000000;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 16px;
|
||||||
|
cursor: pointer;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__registration {
|
||||||
|
color: #000000;
|
||||||
|
font-size: 17px;
|
||||||
|
font-weight: 400;
|
||||||
|
margin-top: 45px;
|
||||||
|
line-height: 32px;
|
||||||
|
|
||||||
|
span {
|
||||||
|
cursor: pointer;
|
||||||
|
color: #52B709;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 575.98px) {
|
@media (max-width: 575.98px) {
|
||||||
|
@ -25,7 +25,12 @@ export const AuthHeader = () => {
|
|||||||
</NavLink>
|
</NavLink>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="#">Кабинет разработчика</a>
|
<a
|
||||||
|
onClick={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
scrollToForm();
|
||||||
|
}}
|
||||||
|
>Кабинет разработчика</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="#">Школа</a>
|
<a href="#">Школа</a>
|
||||||
|
@ -113,6 +113,13 @@ export const ModalTiсket = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
function editTask() {
|
function editTask() {
|
||||||
|
if (!inputsValue.title || !inputsValue.description) {
|
||||||
|
return showNotification({
|
||||||
|
show: true,
|
||||||
|
text: "Заполните поля",
|
||||||
|
type: "error",
|
||||||
|
});
|
||||||
|
}
|
||||||
apiRequest("/task/update-task", {
|
apiRequest("/task/update-task", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
data: {
|
data: {
|
||||||
@ -121,6 +128,7 @@ export const ModalTiсket = ({
|
|||||||
description: inputsValue.description,
|
description: inputsValue.description,
|
||||||
},
|
},
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
|
setEditOpen(!editOpen);
|
||||||
dispatch(setProjectBoardFetch(projectId));
|
dispatch(setProjectBoardFetch(projectId));
|
||||||
showNotification({
|
showNotification({
|
||||||
show: true,
|
show: true,
|
||||||
@ -809,7 +817,6 @@ export const ModalTiсket = ({
|
|||||||
className={editOpen ? "edit" : ""}
|
className={editOpen ? "edit" : ""}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (editOpen) {
|
if (editOpen) {
|
||||||
setEditOpen(!editOpen);
|
|
||||||
editTask();
|
editTask();
|
||||||
} else {
|
} else {
|
||||||
setEditOpen(!editOpen);
|
setEditOpen(!editOpen);
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
z-index: 9;
|
z-index: 9;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: rgba(0, 0, 0, 0.11);
|
background-color: rgba(0, 0, 0, 0.8);
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
@ -126,12 +126,24 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.taskDescription {
|
.taskDescription {
|
||||||
display: -webkit-box;
|
max-height: 150px;
|
||||||
max-width: 550px;
|
overflow-y: auto;
|
||||||
overflow: hidden;
|
padding-right: 10px;
|
||||||
text-overflow: ellipsis;
|
|
||||||
-webkit-line-clamp: 7;
|
&::-webkit-scrollbar {
|
||||||
-webkit-box-orient: vertical;
|
width: 4px;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
background: #cbd9f9;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-track {
|
||||||
|
background: #c5c0c6;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.fullName {
|
.fullName {
|
||||||
|
@ -173,6 +173,13 @@ export const TicketFullScreen = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function editTask() {
|
function editTask() {
|
||||||
|
if (!inputsValue.title || !inputsValue.description) {
|
||||||
|
return showNotification({
|
||||||
|
show: true,
|
||||||
|
text: "Заполните поля",
|
||||||
|
type: "error",
|
||||||
|
});
|
||||||
|
}
|
||||||
apiRequest("/task/update-task", {
|
apiRequest("/task/update-task", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
data: {
|
data: {
|
||||||
@ -186,6 +193,7 @@ export const TicketFullScreen = () => {
|
|||||||
text: "Изменения сохранены",
|
text: "Изменения сохранены",
|
||||||
type: "success",
|
type: "success",
|
||||||
});
|
});
|
||||||
|
setEditOpen(!editOpen);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -985,7 +993,6 @@ export const TicketFullScreen = () => {
|
|||||||
className={editOpen ? "edit" : ""}
|
className={editOpen ? "edit" : ""}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (editOpen) {
|
if (editOpen) {
|
||||||
setEditOpen(!editOpen);
|
|
||||||
editTask();
|
editTask();
|
||||||
} else {
|
} else {
|
||||||
setEditOpen(!editOpen);
|
setEditOpen(!editOpen);
|
||||||
|
@ -133,13 +133,13 @@ export const TrackerModal = ({
|
|||||||
dispatch(setProjectBoardFetch(projectBoard.id));
|
dispatch(setProjectBoardFetch(projectBoard.id));
|
||||||
setActive(false);
|
setActive(false);
|
||||||
setValueTiket("");
|
setValueTiket("");
|
||||||
setDescriptionTicket("Описание задачи");
|
setDescriptionTicket("");
|
||||||
setSelectedExecutorTask("Выберите исполнителя задачи");
|
setSelectedExecutorTask("Выберите исполнителя задачи");
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
setActive(false);
|
setActive(false);
|
||||||
setValueTiket("");
|
setValueTiket("");
|
||||||
setDescriptionTicket("Описание задачи");
|
setDescriptionTicket("");
|
||||||
dispatch(setProjectBoardFetch(projectBoard.id));
|
dispatch(setProjectBoardFetch(projectBoard.id));
|
||||||
}
|
}
|
||||||
showNotification({
|
showNotification({
|
||||||
|
@ -7,6 +7,10 @@ import "slick-carousel/slick/slick.css";
|
|||||||
import BaseButton from "@components/Common/BaseButton/BaseButton";
|
import BaseButton from "@components/Common/BaseButton/BaseButton";
|
||||||
|
|
||||||
import mockWorker from "assets/images/mock/mokPerson.png";
|
import mockWorker from "assets/images/mock/mokPerson.png";
|
||||||
|
import avatarMockFirst from "assets/images/mock/avatarMoсk3.png"
|
||||||
|
import avatarMockSecond from "assets/images/mock/avatarMoсk4.png"
|
||||||
|
import avatarMockThird from "assets/images/mock/avatarMoсk5.png"
|
||||||
|
import avatarMockFourth from "assets/images/mock/avatarMoсk6.png"
|
||||||
|
|
||||||
import "./sliderWorkers.scss";
|
import "./sliderWorkers.scss";
|
||||||
|
|
||||||
@ -17,19 +21,19 @@ export const SliderWorkers = ({ title, titleInfo, subTitle }) => {
|
|||||||
skils: "React / Vue Front end, Middle разработчик",
|
skils: "React / Vue Front end, Middle разработчик",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
avatar: mockWorker,
|
avatar: avatarMockFirst,
|
||||||
skils: "Vue / React Front end, Senior разработчик",
|
skils: "Vue / React Front end, Senior разработчик",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
avatar: mockWorker,
|
avatar: avatarMockSecond,
|
||||||
skils: "NodeJs Fullstack, Middle разработчик",
|
skils: "NodeJs Fullstack, Middle разработчик",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
avatar: mockWorker,
|
avatar: avatarMockThird,
|
||||||
skils: "React / Vue Front end, Middle разработчик",
|
skils: "React / Vue Front end, Middle разработчик",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
avatar: mockWorker,
|
avatar: avatarMockFourth,
|
||||||
skils: "React / PHP Fullstack, Middle разработчик",
|
skils: "React / PHP Fullstack, Middle разработчик",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
@ -61,10 +61,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
font-size: 15px;
|
font-size: 17px;
|
||||||
|
font-weight: 700;
|
||||||
line-height: 22px;
|
line-height: 22px;
|
||||||
color: black;
|
color: black;
|
||||||
width: 160px;
|
width: 210px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__resume {
|
&__resume {
|
||||||
|
@ -69,7 +69,7 @@ const AuthForDevelopers = () => {
|
|||||||
<div className="row">
|
<div className="row">
|
||||||
<div className="col-12 col-xl-6">
|
<div className="col-12 col-xl-6">
|
||||||
<div className="auth-developers__box">
|
<div className="auth-developers__box">
|
||||||
<AuthBox title="Для разработчиков" />
|
<AuthBox title="для разработчиков" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="col-xl-2">
|
<div className="col-xl-2">
|
||||||
@ -93,7 +93,7 @@ const AuthForDevelopers = () => {
|
|||||||
<div>
|
<div>
|
||||||
{/* <img className='auth-specialists} src={specialists} alt="" /> */}
|
{/* <img className='auth-specialists} src={specialists} alt="" /> */}
|
||||||
<p className="auth-developers__specialists">
|
<p className="auth-developers__specialists">
|
||||||
20 Специалистов
|
300 Специалистов
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -67,7 +67,7 @@ const AuthForPartners = () => {
|
|||||||
<div className="row">
|
<div className="row">
|
||||||
<div className="col-12 col-xl-6">
|
<div className="col-12 col-xl-6">
|
||||||
<div className="auth-partners__box">
|
<div className="auth-partners__box">
|
||||||
<AuthBox title="Для партнёров" />
|
<AuthBox title="для партнёров" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="col-xl-2">
|
<div className="col-xl-2">
|
||||||
@ -92,7 +92,7 @@ const AuthForPartners = () => {
|
|||||||
<div>
|
<div>
|
||||||
{/* <img className='auth-specialists} src={specialists} alt="" /> */}
|
{/* <img className='auth-specialists} src={specialists} alt="" /> */}
|
||||||
<p className="auth-partners__specialists">
|
<p className="auth-partners__specialists">
|
||||||
20 Специалистов
|
300 Специалистов
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -574,7 +574,7 @@ export const ProjectTracker = () => {
|
|||||||
selectedTabTask(
|
selectedTabTask(
|
||||||
column.id,
|
column.id,
|
||||||
projectBoard?.columns && column.tasks.length
|
projectBoard?.columns && column.tasks.length
|
||||||
? column.tasks.at(-1).priority + 1
|
? column.tasks[0].priority - 1
|
||||||
: 1
|
: 1
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
|
Loading…
Reference in New Issue
Block a user