- {userInfo.photo && 
}
+ {userInfo.photo && })
}
{test.questionnaire_title}
diff --git a/src/components/features/quiz/HeaderQuiz.js b/src/components/features/quiz/HeaderQuiz.js
index 727260c4..743019c5 100644
--- a/src/components/features/quiz/HeaderQuiz.js
+++ b/src/components/features/quiz/HeaderQuiz.js
@@ -1,8 +1,9 @@
import React, {useEffect} from 'react'
import {useDispatch, useSelector} from 'react-redux'
import {selectUserInfo, setQuestionnairesList, setUserInfo} from "../../../redux/quizSlice";
-import './quiz.scss'
import {apiRequest} from "../../../api/request";
+import {urlForLocal} from "../../../helper";
+import './quiz.scss'
export const HeaderQuiz = ({header}) => {
@@ -13,12 +14,12 @@ export const HeaderQuiz = ({header}) => {
useEffect(() => {
dispatch(setUserInfo(userId))
- }, [dispatch]);
+ }, [userId, dispatch]);
useEffect(() => {
apiRequest(`/user-questionnaire/questionnaires-list?user_id=${userId}`)
.then(res => dispatch(setQuestionnairesList(res)))
- }, [dispatch]);
+ }, [userId, dispatch]);
return (
@@ -30,7 +31,7 @@ export const HeaderQuiz = ({header}) => {
{header &&
- ,
- document.getElementById('root')
-)
+ReactDOM.createRoot(document.getElementById("root"))
+ .render(
+
+ ,
+ );
diff --git a/src/pages/FormPage/FormPage.js b/src/pages/FormPage/FormPage.js
index 1598701f..8d3e757f 100644
--- a/src/pages/FormPage/FormPage.js
+++ b/src/pages/FormPage/FormPage.js
@@ -1,12 +1,12 @@
-import React from 'react'
+import React, {useEffect} from 'react'
import {useDispatch, useSelector} from 'react-redux'
import {useParams, useNavigate} from 'react-router-dom'
import SVG from 'react-inlinesvg'
-import {WithLogout} from '../../hoc/withLogout'
-
import Form from '../../components/Form/Form'
import {Footer} from '../../components/Footer/Footer'
+import {LogoutButton} from "../../components/LogoutButton/LogoutButton";
+
import arrow from '../../images/right-arrow.png'
import rectangle from '../../images/rectangle_secondPage.png'
@@ -16,12 +16,10 @@ import {LEVELS, SKILLS} from '../../constants/constants'
import {currentCandidate, selectCurrentCandidate} from '../../redux/outstaffingSlice'
-import './formPage.scss'
import {apiRequest} from "../../api/request";
-import {LogoutButton} from "../../components/LogoutButton/LogoutButton";
-
-
+import {urlForLocal} from "../../helper";
+import './formPage.scss'
const FormPage = () => {
const params = useParams();
@@ -29,23 +27,22 @@ const FormPage = () => {
const dispatch = useDispatch();
const candidate = useSelector(selectCurrentCandidate);
-
-
const goBack = () => {
navigate(-1)
};
- if (!candidate.id) {
- apiRequest('/profile', {
- params: Number(params.id)
- })
- .then((el) => dispatch(currentCandidate(el)))
- }
+ useEffect(()=> {
+ if (!candidate.id) {
+ apiRequest('/profile', {
+ params: Number(params.id)
+ })
+ .then((el) => dispatch(currentCandidate(el)))
+ }
+ }, []);
+
return (
Добрый день, {userInfo.fio}
}
-
+
{userInfo.fio}
{userInfo.position_name}
diff --git a/src/components/features/quiz/MyTestsQuiz.js b/src/components/features/quiz/MyTestsQuiz.js
index e5763076..48557440 100644
--- a/src/components/features/quiz/MyTestsQuiz.js
+++ b/src/components/features/quiz/MyTestsQuiz.js
@@ -1,8 +1,9 @@
import {Link} from 'react-router-dom'
import calendarImage from './../../../images/calendar.svg'
-import './quiz.scss'
import {useDispatch} from "react-redux";
import {setSelectedTest} from "../../../redux/quizSlice";
+import {urlForLocal} from "../../../helper";
+import './quiz.scss'
export const MyTestsQuiz = ({listTests}) => {
@@ -46,7 +47,7 @@ export const MyTestsQuiz = ({listTests}) => {
- 
+ })
{item.testing_date}
diff --git a/src/hoc/withLogout.js b/src/hoc/withLogout.js
deleted file mode 100644
index 04fe076f..00000000
--- a/src/hoc/withLogout.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { LogoutButton } from '../components/LogoutButton/LogoutButton';
-
-export const WithLogout = (props) => {
- return (
-
- {props.children}
-
- )
-};
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index f0769642..4ca77d4c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,14 +1,14 @@
import React from 'react'
-import ReactDOM from 'react-dom'
-import { store } from './store/store'
-import { Provider } from 'react-redux'
+import ReactDOM from 'react-dom/client'
+import {store} from './store/store'
+import {Provider} from 'react-redux'
import App from './App'
import './index.css'
-ReactDOM.render(
-
-
-
@@ -60,7 +57,7 @@ const FormPage = () => {
- 
+ {candidate.photo && })
}
diff --git a/src/pages/quiz/QuizTestPage.js b/src/pages/quiz/QuizTestPage.js
index c2bab0c8..75076762 100644
--- a/src/pages/quiz/QuizTestPage.js
+++ b/src/pages/quiz/QuizTestPage.js
@@ -3,15 +3,18 @@ import {HeaderPageTestsQuiz} from '../../components/features/quiz/HeaderPageTest
import {TaskQuiz} from '../../components/features/quiz/Task'
import {useSelector} from "react-redux";
import {selectedTest} from "../../redux/quizSlice";
-import React from "react";
+import React, {useEffect} from "react";
export const QuizTestPage = () => {
- let navigate = useNavigate()
- const test = useSelector(selectedTest)
+ let navigate = useNavigate();
+ const test = useSelector(selectedTest);
+
+ useEffect(() => {
+ if (!test) {
+ navigate('/quiz')
+ }
+ }, []);
- if (!test) {
- navigate('/quiz')
- }
return (
<>
diff --git a/src/redux/quizSlice.js b/src/redux/quizSlice.js
index 54f4e33b..34dfdd66 100644
--- a/src/redux/quizSlice.js
+++ b/src/redux/quizSlice.js
@@ -1,111 +1,71 @@
import {createAsyncThunk, createSlice} from '@reduxjs/toolkit';
-import {fetchGet} from './../server/server'
-import axios from "axios";
+
+import {apiRequest} from "../api/request";
const initialState = {
- // questions: [],
- answer: [],
- result: null,
- isLoading: false,
- dataQuestionnairesOfUser: [],
- passedTests: [],
- selectedTest: null,
- userInfo: null
+ // questions: [],
+ answer: [],
+ result: null,
+ isLoading: false,
+ dataQuestionnairesOfUser: [],
+ passedTests: [],
+ selectedTest: null,
+ userInfo: null
};
export const setUserInfo = createAsyncThunk(
- 'userInfo',
- async (id) => {
- try{
- return await fetchGet({
- link: `${process.env.REACT_APP_API_URL}/api/profile/get-main-data?user_id=${id}`,
- Origin: `${process.env.REACT_APP_BASE_URL}`,
- }
- )
- }catch (e) {
- console.log(e)
- }
- }
+ 'userInfo',
+ (id) =>
+ apiRequest(`/profile/get-main-data?user_id=${id}`)
);
export const fetchUserAnswersMany = createAsyncThunk(
- 'answersUserMany',
- async (checkedValues) => {
- try{
- const response = await axios.post(`${process.env.REACT_APP_API_URL}/api/user-response/set-responses`,
- {"userResponses": checkedValues}, {
- headers: {
- Authorization: `Bearer ${localStorage.getItem('auth_token')}`,
- }
- });
- return response.data
- }catch (e) {
- console.log(e)
- }
- }
+ 'answersUserMany',
+ (checkedValues) =>
+ apiRequest('/user-response/set-responses', {method: 'POST', data: {"userResponses": checkedValues}})
);
+
export const fetchUserAnswerOne = createAsyncThunk(
- 'answersUserOne',
- async (checkedValues) => {
- try{
- const response = await axios.post(`${process.env.REACT_APP_API_URL}/api/user-response/set-response`,
- checkedValues[0], {
- headers: {
- Authorization: `Bearer ${localStorage.getItem('auth_token')}`,
- }
- });
- return response.data
- }catch (e) {
- console.log(e)
- }
- }
+ 'answersUserOne',
+ (checkedValues) =>
+ apiRequest('/user-response/set-response', {method: 'POST', data: checkedValues[0]})
);
+
export const fetchGetAnswers = createAsyncThunk(
- 'answers',
- async (question_id) => {
- return await fetchGet({
- link: `${process.env.REACT_APP_API_URL}/api/answer/get-answers?question_id=${question_id}`,
- Origin: `${process.env.REACT_APP_BASE_URL}`,
- }
- )
- }
+ 'answers',
+ (question_id) =>
+ apiRequest(`/answer/get-answers?question_id=${question_id}`)
);
export const fetchResultTest = createAsyncThunk(
- 'result',
- async (uuid) => {
- return await fetchGet({
- link: `${process.env.REACT_APP_API_URL}/api/user-questionnaire/questionnaire-completed?user_questionnaire_uuid=${uuid}`,
- Origin: `${process.env.REACT_APP_BASE_URL}`,
- }
- )
-
- }
+ 'result',
+ (uuid) =>
+ apiRequest(`/user-questionnaire/questionnaire-completed?user_questionnaire_uuid=${uuid}`)
);
export const quizSlice = createSlice({
- name: 'quiz',
- initialState,
- reducers: {
- setQuestionnairesList: (state, action) => {
- state.dataQuestionnairesOfUser = action.payload;
- state.passedTests = action.payload.filter(item => item.status === 2)
- },
- setSelectedTest: (state, action) => {
- state.selectedTest = action.payload
- },
- },
- extraReducers: {
- [setUserInfo.fulfilled]: (state, action) => {
- state.userInfo = action.payload;
- },
- [fetchGetAnswers.fulfilled]: (state, action) => {
- state.answer = action.payload;
- },
- [fetchResultTest.fulfilled]: (state, action) => {
- state.result = action.payload;
- },
- },
+ name: 'quiz',
+ initialState,
+ reducers: {
+ setQuestionnairesList: (state, action) => {
+ state.dataQuestionnairesOfUser = action.payload;
+ state.passedTests = action.payload.filter(item => item.status === 2)
+ },
+ setSelectedTest: (state, action) => {
+ state.selectedTest = action.payload
+ },
+ },
+ extraReducers: {
+ [setUserInfo.fulfilled]: (state, action) => {
+ state.userInfo = action.payload;
+ },
+ [fetchGetAnswers.fulfilled]: (state, action) => {
+ state.answer = action.payload;
+ },
+ [fetchResultTest.fulfilled]: (state, action) => {
+ state.result = action.payload;
+ },
+ },
});
export const {setQuestionnairesList, setSelectedTest} = quizSlice.actions;
diff --git a/src/server/authRedirect.js b/src/server/authRedirect.js
deleted file mode 100644
index 3b09919a..00000000
--- a/src/server/authRedirect.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export const withAuthRedirect =
- (actionCall) =>
- ({ link, params, history, role, logout, body }) => {
- // const linkWithParams = params
- // ? `${link}?${new URLSearchParams(params)}`
- // : link;
- // return actionCall(linkWithParams, body)
- // .then((res) => {
- // if (res.status && res.status === 401) {
- // localStorage.clear();
- // logout && logout();
- // history.push(role === 'ROLE_DEV' ? '/authdev' : '/auth')
- // }
- //
- // return res
- // })
- // .catch((err) => {
- // localStorage.clear();
- // logout && logout();
- // history.push(role === 'ROLE_DEV' ? '/authdev' : '/auth')
- // })
- };
diff --git a/src/server/server.js b/src/server/server.js
deleted file mode 100644
index 5f73d246..00000000
--- a/src/server/server.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { withAuthRedirect } from './authRedirect'
-
-
-export const fetchGet = withAuthRedirect(async (link) => {
- try {
- const response = await fetch(link, {
- method: 'GET',
- headers: {
- Authorization: `Bearer ${localStorage.getItem('auth_token')}`
- }
- });
- let data = await response.json();
-
- return data
- } catch (error) {
- console.log('Query error', error)
- }
-});