Переписываю спорные решения

Фикс отправки отчета, проверка на массив в map в Description.js
This commit is contained in:
2023-01-20 16:20:06 +03:00
parent 642a8a9641
commit 56f63dbed2
50 changed files with 34327 additions and 9279 deletions

View File

@ -8,6 +8,7 @@ import authImg from '../../images/auth_img.png'
import cross from '../../images/cross.png'
import text from '../../images/Body_Text.png'
import vector from '../../images/Vector_Smart_Object.png'
import vectorBlack from '../../images/Vector_Smart_Object_black.png'
import { selectAuth } from '../../redux/outstaffingSlice'
import { useNavigate} from 'react-router-dom'
@ -30,7 +31,7 @@ const AuthForDevelopers = () => {
<img className='auth-developers__vector' src={vector} alt='' />
<img
className='auth-developers__vector-black'
src={'./images/Vector_Smart_Object_black.png'}
src={vectorBlack}
alt=''
/>
<div className='container'>

View File

@ -1,6 +1,6 @@
import React from 'react';
import { useNavigate } from 'react-router-dom';
import { WithLogout } from '../hoc/withLogout';
import { WithLogout } from '../HOC/withLogout';
import Calendar from '../components/Calendar/Calendar';
const CalendarPage = () => {

View File

@ -3,8 +3,8 @@ import {useDispatch, useSelector} from 'react-redux'
import {useParams, useNavigate} from 'react-router-dom'
import SVG from 'react-inlinesvg'
import {useRequest} from "../../hooks/useRequest";
import {WithLogout} from '../../hoc/withLogout'
import {useRequest} from "../../HOOks/useRequest";
import {WithLogout} from '../../HOC/withLogout'
import Form from '../../components/Form/Form'
import {Footer} from '../../components/Footer/Footer'
@ -18,6 +18,7 @@ import {LEVELS, SKILLS} from '../../constants/constants'
import {currentCandidate, selectCurrentCandidate} from '../../redux/outstaffingSlice'
import './formPage.scss'
import {apiRequest} from "../../api/request";
@ -29,7 +30,6 @@ const FormPage = () => {
const candidate = useSelector(selectCurrentCandidate);
const {apiRequest} = useRequest();
const goBack = () => {
navigate(-1)

View File

@ -7,9 +7,10 @@ import {Footer} from '../../components/Footer/Footer'
import {profiles, tags} from '../../redux/outstaffingSlice'
import {useRequest} from "../../hooks/useRequest";
import {useRequest} from "../../HOOks/useRequest";
import {LogoutButton} from "../../components/LogoutButton/LogoutButton";
import {Header} from "../../components/Header/Header";
import {apiRequest} from "../../api/request";
const Home = () => {
@ -19,8 +20,6 @@ const Home = () => {
const dispatch = useDispatch();
const {apiRequest} = useRequest();
useEffect(() => {
setIsLoadingMore(true);
apiRequest('/profile', {

View File

@ -7,11 +7,14 @@ import {Footer} from "../../components/Footer/Footer";
import {getProfileInfo} from "../../redux/outstaffingSlice";
import {urlForLocal} from "../../helper";
import reportsIcon from "../../images/reports.png"
import summaryIcon from "../../images/summaryIcon.png"
import timerIcon from "../../images/timerIcon.png"
import paymentIcon from "../../images/paymentIcon.png"
import settingIcon from "../../images/settingIcon.png"
import rightArrow from "../../images/arrowRight.png"
import './profile.scss'
@ -27,7 +30,7 @@ export const Profile = () => {
<h2 className='profile__title'>Добрый день, <span>{profileInfo.fio}</span></h2>
<div className='summary__info'>
<div className='summary__person'>
<img src={profileInfo.photo} className='summary__avatar' alt='avatar'/>
<img src={profileInfo.photo ? urlForLocal(profileInfo.photo) : ''} className='summary__avatar' alt='avatar'/>
<p className='summary__name'>{profileInfo.fio} {profileInfo.specification}</p>
</div>
</div>

View File

@ -1,5 +1,5 @@
import React from 'react'
import { WithLogout } from '../../hoc/withLogout'
import { WithLogout } from '../../HOC/withLogout'
import arrowLeft from '../../images/right-arrow.png'
import SVG from 'react-inlinesvg'

View File

@ -3,22 +3,22 @@ import {useSelector} from "react-redux";
import {ProfileHeader} from "../../components/ProfileHeader/ProfileHeader";
import {getProfileInfo} from "../../redux/outstaffingSlice";
import {Footer} from '../../components/Footer/Footer'
import {transformHtml} from "../../helper";
import {transformHtml, urlForLocal} from "../../helper";
import {useRequest} from "../../hooks/useRequest";
import {useRequest} from "../../HOOks/useRequest";
import arrow from "../../images/right-arrow.png";
import rightArrow from "../../images/arrowRight.png"
import gitImgItem from "../../images/gitItemImg.png"
import './summary.scss'
import {apiRequest} from "../../api/request";
export const Summary = () => {
const profileInfo = useSelector(getProfileInfo);
const [openGit, setOpenGit] = useState(false);
const [gitInfo, setGitInfo] = useState([]);
const {apiRequest} = useRequest();
useEffect(() => {
apiRequest(`/profile/portfolio-projects?card_id=${localStorage.getItem('cardId')}`)
.then(responseGit => setGitInfo(responseGit))
@ -35,7 +35,7 @@ export const Summary = () => {
</div>}
<div className='summary__info'>
<div className='summary__person'>
<img src={profileInfo.photo} className='summary__avatar' alt='avatar'/>
<img src={urlForLocal(profileInfo.photo)} className='summary__avatar' alt='avatar'/>
<p className='summary__name'>{profileInfo.fio} {profileInfo.specification}</p>
</div>
{!openGit &&