trackerTask #12

Merged
nik.polishuk merged 4 commits from trackerTask into main 2024-02-01 23:15:29 +03:00
3 changed files with 20 additions and 21 deletions
Showing only changes of commit cf1bbf136e - Show all commits

View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import close from "assets/icons/closeProjectPersons.svg"; import close from "assets/icons/closeProjectPersons.svg";
import "./modalTrackerRegistration.scss"; import "./modalTrackerRegistration.scss";
@ -18,7 +18,7 @@ export const ModalTrackerRegistration = ({ setModalReset, email }) => {
<br /> <span>{email}</span> <br /> <span>{email}</span>
</p> </p>
<Link <Link
to={'/registration-setting'} to={"/registration-setting"}
onClick={() => setModalReset(false)} onClick={() => setModalReset(false)}
className="modalConfirmTracker__btn" className="modalConfirmTracker__btn"
> >

View File

@ -1,23 +1,24 @@
import React from "react"; import React from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { urlForLocal } from "@utils/helper"; import { urlForLocal } from "@utils/helper";
import rightArrow from "assets/icons/arrows/arrowRight.svg"; import rightArrow from "assets/icons/arrows/arrowRight.svg";
import "./partnerPersonCard.scss"; import "./partnerPersonCard.scss";
export const PartnerPersonCard = ({name, img, userId}) => { export const PartnerPersonCard = ({ name, img, userId }) => {
return ( return (
<div className="partnerPersonCard"> <div className="partnerPersonCard">
<div className="partnerPersonCard__img"> <div className="partnerPersonCard__img">
<img src={urlForLocal(img)} alt='avatar' /> <img src={urlForLocal(img)} alt="avatar" />
</div> </div>
<div className="partnerPersonCard__info"> <div className="partnerPersonCard__info">
<h2 className="partnerPersonCard__name">{name}</h2> <h2 className="partnerPersonCard__name">{name}</h2>
<Link className="partnerPersonCard__report" to={`calendar/${userId}`}> <Link className="partnerPersonCard__report" to={`calendar/${userId}`}>
Подробный отчет Подробный отчет
<div className="partnerPersonCard__more"> <div className="partnerPersonCard__more">
<img src={rightArrow} alt='arrow' /> <img src={rightArrow} alt="arrow" />
</div> </div>
</Link> </Link>
</div> </div>

View File

@ -1,13 +1,14 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { Navigate } from "react-router-dom";
import { useFormValidation } from "@hooks/useFormValidation";
import { useNotification } from "@hooks/useNotification";
import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import { Footer } from "@components/Common/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
import { ModalTrackerRegistration } from "@components/Modal/ModalTrackerRegistration/ModalTrackerRegistration"; import { ModalTrackerRegistration } from "@components/Modal/ModalTrackerRegistration/ModalTrackerRegistration";
import SideBar from "@components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import { useFormValidation } from "@hooks/useFormValidation";
import { useNotification } from "@hooks/useNotification";
import { Navigate } from "react-router-dom";
import arrowInfo from "assets/icons/trackerIntroInfo.svg"; import arrowInfo from "assets/icons/trackerIntroInfo.svg";
import authImg from "assets/images/partnerProfile/authCandidateFormImg.png"; import authImg from "assets/images/partnerProfile/authCandidateFormImg.png";
@ -42,16 +43,12 @@ export const TrackerRegistration = () => {
}); });
}; };
const { const { formData, validationErrors, handleChange, handleSubmit } =
formData, useFormValidation(
validationErrors,
handleChange,
handleSubmit,
} = useFormValidation(
apiEndpoint, apiEndpoint,
fields, fields,
showNotificationError, showNotificationError,
showNotificationTrue, showNotificationTrue
); );
return ( return (
@ -123,11 +120,12 @@ export const TrackerRegistration = () => {
e.preventDefault(); e.preventDefault();
const result = await handleSubmit(e); const result = await handleSubmit(e);
if (result === true) { if (result === true) {
setModalConfirm(true) setModalConfirm(true);
} }
}} }}
> >
Отправить</button> Отправить
</button>
<div className="tracker-registration__form__info"> <div className="tracker-registration__form__info">
<img src={authImg} alt="img" /> <img src={authImg} alt="img" />
<p> <p>