small edits

This commit is contained in:
Никита Губарь 2024-07-29 16:12:38 +03:00
parent 4084c52a9b
commit 0a8ed604a0
8 changed files with 69 additions and 47 deletions

View File

@ -4,6 +4,7 @@ import { Link, NavLink } from "react-router-dom";
import { BurgerButton } from "@components/BurgerMenu/burgerButton"; import { BurgerButton } from "@components/BurgerMenu/burgerButton";
import { BurgerMenu } from "@components/BurgerMenu/burgerMenu"; import { BurgerMenu } from "@components/BurgerMenu/burgerMenu";
import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration";
import authIcon from "assets/icons/authIcon.svg"; import authIcon from "assets/icons/authIcon.svg";
@ -11,9 +12,12 @@ import "./authHeader.scss";
export const AuthHeader = () => { export const AuthHeader = () => {
const [actionMenu, setActionMenu] = useState(false); const [actionMenu, setActionMenu] = useState(false);
const [modalReg, setModalReg] = useState(false);
return ( return (
<div className="auth-header"> <div className="auth-header">
<BurgerMenu active={actionMenu} /> <BurgerMenu active={actionMenu} />
<ModalRegistration active={modalReg} setActive={setModalReg} />
<div className="auth-header__navigation"> <div className="auth-header__navigation">
<div className="auth__logo"> <div className="auth__logo">
<div> <div>
@ -29,19 +33,16 @@ export const AuthHeader = () => {
<div className="auth-nav"> <div className="auth-nav">
<ul> <ul>
<li> <li>
<NavLink to={"/auth"}>кейсы</NavLink> <NavLink to={"/"}>кейсы</NavLink>
</li> </li>
<li> <li>
<NavLink to={"/stack"}>стек</NavLink> <NavLink to={"/stack"}>аутстафинг</NavLink>
</li> </li>
<li> <li>
<NavLink to={"/tracker-intro"}>как это работает</NavLink> <NavLink to={"/tracker-intro"}>трекер</NavLink>
</li> </li>
<li> <li>
<NavLink to={"/auth-candidate"}>отзывы</NavLink> <NavLink to={"/auth-candidate"}>работа в IT</NavLink>
</li>
<li>
<NavLink to={"/profile"}>наши продукты</NavLink>
</li> </li>
</ul> </ul>
</div> </div>
@ -49,8 +50,14 @@ export const AuthHeader = () => {
<button className="signIn"> <button className="signIn">
<Link to="/auth">войти</Link> <Link to="/auth">войти</Link>
</button> </button>
<button className="signUp"> <button
<Link to="/auth">регистрация</Link> className="signUp"
onClick={(e) => {
e.preventDefault();
setModalReg(true);
}}
>
регистрация
</button> </button>
</div> </div>
</div> </div>

View File

@ -130,9 +130,7 @@
} }
.signUp { .signUp {
a { color: #a7ca60;
color: #a7ca60;
}
border: 1px solid #a7ca60; border: 1px solid #a7ca60;
background: none; background: none;

View File

@ -7,6 +7,7 @@
border: 1px solid #dde2e4; border: 1px solid #dde2e4;
border-radius: 8px; border-radius: 8px;
width: 60%; width: 60%;
font-family: "LabGrotesque", sans-serif;
@media (max-width: 1375px) { @media (max-width: 1375px) {
width: 80%; width: 80%;
@ -110,7 +111,14 @@
border-radius: 8px; border-radius: 8px;
border: none; border: none;
margin-bottom: 5px; margin-bottom: 5px;
padding-left: 20px; font-size: 15px;
font-weight: 400;
line-height: 18px;
font-style: normal;
letter-spacing: normal;
text-align: left;
padding: 16px 15px 16px 22px;
outline: none;
} }
.input-container { .input-container {

View File

@ -331,6 +331,7 @@ export const TrackerModal = ({
status: 19 status: 19
} }
}).then((res) => { }).then((res) => {
console.log(res);
if (!Array.isArray(res.name)) { if (!Array.isArray(res.name)) {
const result = { ...res, columns: [] }; const result = { ...res, columns: [] };
dispatch(setProject(result)); dispatch(setProject(result));

View File

@ -63,8 +63,8 @@ export const ProjectTicket = ({ project, index }) => {
dispatch(deleteProject(project)); dispatch(deleteProject(project));
showNotification({ showNotification({
show: true, show: true,
text: "Проект успешно был перемещен в архив", text: "Проект успешно удален",
type: "archive" type: "success"
}); });
}); });
} }

View File

@ -43,6 +43,8 @@ const Statistics = () => {
}); });
}, []); }, []);
useEffect(() => {}, [projectInfo]);
const teams = [ const teams = [
{ {
avatar: mockAvatar, avatar: mockAvatar,
@ -121,7 +123,7 @@ const Statistics = () => {
<img src={link} alt="#" /> <img src={link} alt="#" />
<span <span
className="return-text" className="return-text"
onClick={() => copyProjectLink("62")} onClick={() => copyProjectLink(projectInfo.id)}
> >
ссылка на проект ссылка на проект
</span> </span>
@ -190,38 +192,36 @@ const Statistics = () => {
<div className="list-team__body"> <div className="list-team__body">
{projectStatistic?.participants.map((person, index) => { {projectStatistic?.participants.map((person, index) => {
return ( return (
<> <div className="list-team__item" key={index}>
<div className="list-team__item" key={index}> <div className="person-name">
<div className="person-name"> <img
<img src={
src={ person.avatar
person.avatar ? urlForLocal(person.avatar)
? urlForLocal(person.avatar) : mockAvatar
: mockAvatar
}
alt="avatar"
/>
<p>{person.username}</p>
</div>
<div className="person-email">
<img src={emailImg} alt="#" />
<p>{person.email}</p>
</div>
<p className="person-type">
{person.role ? person.role : "-"}
</p>
<span
className={
person.status
? "status status-active"
: "status status-none"
} }
> alt="avatar"
{person.status ? "Активно" : "Не активно"} />
</span> <p>{person.username}</p>
</div> </div>
</> <div className="person-email">
<img src={emailImg} alt="#" />
<p>{person.email}</p>
</div>
<p className="person-type">
{person.role ? person.role : "-"}
</p>
<span
className={
person.status
? "status status-active"
: "status status-none"
}
>
{person.status ? "Активно" : "Не активно"}
</span>
</div>
); );
})} })}
</div> </div>

View File

@ -15,6 +15,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: 15px 0 0 0; margin: 15px 0 0 0;
padding: 0 20px;
&__return { &__return {
img { img {
@ -106,6 +107,7 @@
border-radius: 12px; border-radius: 12px;
background: #f1f1f1; background: #f1f1f1;
padding-left: 31px; padding-left: 31px;
margin: 0 10px;
p { p {
color: #5b6871; color: #5b6871;

View File

@ -85,7 +85,13 @@ export const Summary = () => {
skill: selectedSkills.map((item) => item.skill_id) skill: selectedSkills.map((item) => item.skill_id)
} }
} }
}).then(() => {}); }).then(() => {
showNotification({
show: true,
text: "Изменения успешно сохранены",
type: "success"
});
});
} }
function editSummary() { function editSummary() {