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

small fixes

Browse Source
This commit is contained in:
Victor Batischev 2024-03-18 18:47:31 +03:00
parent f180586eb3
commit 882bdfcc24
10 changed files with 144 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

904
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
src/components/ProfileHeader/ProfileHeader.jsx
View File

@ -143,9 +143,6 @@ export const ProfileHeader = () => {
</div>
<div className={active ? "auth-body active" : "auth-body"}>
{/* <div className="auth-body__title">
<img src={ITguild}></img>
</div> */}
<nav className="auth-body__navigation">
<div className="profile-header__personal-info">
<h3 className="profile-header__personal-info-name">

2
src/hooks/useFormValidation.js
View File

@ -99,7 +99,7 @@ export const useFormValidation = (
setLoader(false);
if ("errors" in data) {
return showNotificationError(
"Аккаунт с таким логином или email уже существуе"
"Аккаунт с таким логином или email уже существует"
);
}
if (!data.id) {

9
src/pages/PartnerEmployees/PartnerEmployees.jsx
View File

@ -1,6 +1,6 @@
import React from "react";
import { useSelector } from "react-redux";
import { Link, Navigate } from "react-router-dom";
import { Link } from "react-router-dom";
import { getPartnerEmployees } from "@redux/outstaffingSlice";
@ -16,12 +16,7 @@ import "./partnerEmployees.scss";
export const PartnerEmployees = () => {
const partnerEmployees = useSelector(getPartnerEmployees);
// if (
// localStorage.getItem("role_status") !== "18" ||
// !partnerEmployees.length
// ) {
// return <Navigate to="/profile/categories" replace />;
// }
return (
<div className="partner-employees">
<ProfileHeader />

1
src/pages/PartnerSettings/partnerSettings.scss
View File

@ -139,7 +139,6 @@
&__body {
display: flex;
flex-direction: row;
justify-content: space-around;
margin-top: 50px;
}

30
src/pages/Profile/Profile.jsx
View File

@ -11,7 +11,7 @@ import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import paymentIcon from "assets/icons/paymentIcon.png";
// import paymentIcon from "assets/icons/paymentIcon.png";
import settingIcon from "assets/icons/settingIcon.png";
import summaryIcon from "assets/icons/summaryIcon.png";
import timerIcon from "assets/icons/timerIcon.png";
@ -100,17 +100,10 @@ export const Profile = () => {
<div className="container">
<ProfileBreadcrumbs links={[{ name: "Главная", link: "/profile" }]} />
<h2 className="profile__title">
{user === "developer" ? (
<span>
<p>Добрый день,&nbsp;</p>
{profileInfo?.fio || profileInfo?.username}
</span>
) : (
<span>
<p>Добрый день,&nbsp;</p>
{profileInfo?.fio || profileInfo?.username}
</span>
)}
<span>
<p>Добрый день,&nbsp;</p>
{profileInfo?.fio || profileInfo?.username}
</span>
</h2>
<div className="summary__info">
<div className="summary__person">
@ -122,14 +115,11 @@ export const Profile = () => {
alt="avatar"
/>
<p className="summary__name">
{user === "developer" ? (
<span>
{profileInfo?.fio || profileInfo?.username},{" "}
{profileInfo?.specification} разработчик
</span>
) : (
<span>{profileInfo?.fio || profileInfo?.username}</span>
)}
<span>
{profileInfo?.fio || profileInfo?.username},
{user === "developer" &&
` ${profileInfo?.specification} разработчик`}
</span>
</p>
</div>
</div>

2
src/pages/Quiz/QuizReportPage.jsx
View File

@ -11,7 +11,6 @@ import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { AlertResult } from "@components/features/quiz/AlertResult";
import { QuizReport } from "@components/features/quiz/QuizReport";
@ -41,7 +40,6 @@ export const QuizReportPage = () => {
<div className="quiz-report-page">
<ProfileHeader />
<Navigation />
{/*<HeadBottom />*/}
<div className="quiz-report-page__container">
<ProfileBreadcrumbs
links={[

1
src/pages/RegistrationForCandidate/RegistrationForCandidate.jsx
View File

@ -81,7 +81,6 @@ export const RegistrationForCandidate = () => {
<img src={arrowBtn} alt="img" />
</Link>
</div>
{/* форма регистрации */}
<form
className="registration-candidate__form"
onSubmit={handleSubmit}

2
src/pages/Statistics/Statistics.jsx
View File

@ -211,8 +211,6 @@ const Statistics = () => {
<p className="person-type">
{person.role ? person.role : "-"}
</p>
{/* <span className="status status-active"> */}
<span
className={
person.status

7
src/pages/TrackerAuth/TrackerAuth.jsx
View File

@ -3,8 +3,6 @@ import React, { useState } from "react";
import AuthBlock from "@components/AuthBlock/AuthBlock";
import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
import { Footer } from "@components/Common/Footer/Footer";
import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
import { ModalReset } from "@components/Modal/ModalReset/ModalReset";
import ModalResetPassword from "@components/Modal/ModalResetPassword/ModalResetPassword";
import SideBar from "@components/SideBar/SideBar";
@ -35,11 +33,6 @@ export const TrackerAuth = () => {
/>
</div>
<ModalResetPassword active={modalResetOpen} setActive={setModalReset} />
{/*{modalResetOpen && (*/}
{/* <ModalLayout active={modalResetOpen} setActive={setModalReset}>*/}
{/* <ModalReset setModalReset={setModalReset} />*/}
{/* </ModalLayout>*/}
{/*)}*/}
</div>
<Footer />
</div>