From 1234427b1236dd67a18a727063ecbacd042aa3ae Mon Sep 17 00:00:00 2001 From: Z1chi Date: Tue, 10 Jan 2023 18:48:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D1=8E=20=D0=B2?= =?UTF-8?q?=D0=B0=D1=80=D0=BD=D0=B8=D0=BD=D0=B3=D0=B8=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B5,=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=85=D0=BE=D0=B6=D1=83=D1=81=D1=8C=20=D0=BF=D1=80=D0=B8=D1=82?= =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=BC,=20=D1=81=D0=BE=D0=BA=D1=80=D0=B0?= =?UTF-8?q?=D1=89=D0=B0=D1=8E=20=D0=BA=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/helper.js | 24 ++++++++++------- src/pages/FormPage.js | 24 ++++++++--------- src/pages/SingleReportPage.js | 6 ++--- src/pages/Summary.js | 20 +++++++------- src/pages/quiz/QuizTestPage.js | 5 ++-- src/pages/quiz/ResultPage.js | 4 +-- src/redux/quizSlice.js | 48 ++++++++++++++++------------------ 7 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/helper.js b/src/helper.js index 125dac68..26057185 100644 --- a/src/helper.js +++ b/src/helper.js @@ -1,14 +1,20 @@ export function createMarkup(text) { - return {__html: text.split('

').join('

')} + return {__html: text.split('

').join('

')} } export function transformHtml(text) { - let startHtml = {__html: text.split('

').join('

').split('
')} - startHtml = startHtml.__html.filter((el)=> { - return (el != null && el != "" || el === 0) - }) - const finalHtml = startHtml.map((item) => { - return `

Описание опыта работы

${item.split('

')[0]}

` - }) - return {__html: finalHtml.join('')} + let startHtml = {__html: text.split('

').join('

').split('
')}; + startHtml = startHtml.__html.filter((el) => + el !== null && el !== "" || el === 0 + ); + const finalHtml = startHtml.map((item) => + `
+
+

Описание опыта работы

+ +
+
${item.split('

')[0]}

+
` + ); + return {__html: finalHtml.join('')} } diff --git a/src/pages/FormPage.js b/src/pages/FormPage.js index 1feeec31..07dcfb3f 100644 --- a/src/pages/FormPage.js +++ b/src/pages/FormPage.js @@ -1,6 +1,6 @@ -import React, { useState } from 'react' +import React from 'react' import { useDispatch, useSelector } from 'react-redux' -import { useHistory, useParams, Link } from 'react-router-dom' +import { useHistory, useParams } from 'react-router-dom' import { currentCandidate, selectCurrentCandidate, @@ -22,14 +22,14 @@ import { getRole } from '../redux/roleSlice' const goBack = (history) => { history.goBack() -} +}; const FormPage = () => { - const params = useParams() - const history = useHistory() - const dispatch = useDispatch() - const candidate = useSelector(selectCurrentCandidate) - const role = useSelector(getRole) + const params = useParams(); + const history = useHistory(); + const dispatch = useDispatch(); + const candidate = useSelector(selectCurrentCandidate); + const role = useSelector(getRole); if (!candidate.id) { fetchGet({ @@ -56,7 +56,7 @@ const FormPage = () => {
- + candidate avatar
@@ -66,7 +66,7 @@ const FormPage = () => {
- + rectangle Выбранный кандидат
@@ -84,7 +84,7 @@ const FormPage = () => { Заявка на собеседование через телеграм
- +
@@ -94,6 +94,6 @@ const FormPage = () => { ) -} +}; export default FormPage diff --git a/src/pages/SingleReportPage.js b/src/pages/SingleReportPage.js index c79ebe3b..f721a0fa 100644 --- a/src/pages/SingleReportPage.js +++ b/src/pages/SingleReportPage.js @@ -22,7 +22,7 @@ const tasks = [ text: 'Задача «83 – Навигационная система – Поиск по почтовому индексу – Добавить экран поиска по почтовому индексу» не может быть завершена, т.к. работа над задачей «82 – Навигационная система – Разработать модуль поиска по почтовому индексу» ещё не начата', hours: 3 } -] +]; const SingleReportPage = () => { return ( @@ -30,7 +30,7 @@ const SingleReportPage = () => {
- + arrowLeft
Вернуться к списку @@ -103,6 +103,6 @@ const SingleReportPage = () => {
) -} +}; export default SingleReportPage diff --git a/src/pages/Summary.js b/src/pages/Summary.js index cb3694a2..d9fbd30a 100644 --- a/src/pages/Summary.js +++ b/src/pages/Summary.js @@ -1,9 +1,9 @@ import React, {useEffect, useState} from 'react'; -import { ProfileHeader } from "../components/Profile/ProfileHeader"; +import {ProfileHeader} from "../components/Profile/ProfileHeader"; import {getProfileInfo} from "../redux/outstaffingSlice"; -import { useSelector } from "react-redux"; +import {useSelector} from "react-redux"; import {transformHtml} from "../helper"; -import { Footer } from '../components/Footer/Footer' +import {Footer} from '../components/Footer/Footer' import arrow from "../images/right-arrow.png"; import rightArrow from "../images/arrowRight.png" @@ -13,16 +13,16 @@ import '../components/Profile/summary.scss' import {fetchGet} from "../server/server"; export const Summary = () => { - const profileInfo = useSelector(getProfileInfo) + const profileInfo = useSelector(getProfileInfo); const [openGit, setOpenGit] = useState(false); - const [gitInfo, setGitInfo] = useState([]) + const [gitInfo, setGitInfo] = useState([]); useEffect(() => { fetchGet({ link: `${process.env.REACT_APP_API_URL}/api/profile/portfolio-projects?card_id=${localStorage.getItem('cardId')}`, }).then((responseGit) => { setGitInfo(responseGit) }) - }, []) + }, []); return(
@@ -35,7 +35,7 @@ export const Summary = () => {
}
- + avatar

{profileInfo.fio} {profileInfo.specification}

{!openGit && @@ -80,11 +80,11 @@ export const Summary = () => {
- +

{itemGit.main_stack}

- + arrowRight @@ -97,5 +97,5 @@ export const Summary = () => {