Переписываю спорные решения
This commit is contained in:
@ -6,7 +6,7 @@ import {selectedTest, selectUserInfo} from "../../../redux/quizSlice";
|
||||
|
||||
export const HeaderPageTestsQuiz = ({isVisibilityButton}) => {
|
||||
|
||||
const test = useSelector(selectedTest)
|
||||
const test = useSelector(selectedTest);
|
||||
const userInfo = useSelector(selectUserInfo);
|
||||
|
||||
return (
|
||||
@ -23,8 +23,8 @@ export const HeaderPageTestsQuiz = ({isVisibilityButton}) => {
|
||||
</div>
|
||||
</div>
|
||||
{isVisibilityButton &&
|
||||
<Link to={'/quiz-instruction'} className='quiz-btn quiz-btn_restriction'>Пройти</Link>}
|
||||
<Link to={'/quiz/instruction'} className='quiz-btn quiz-btn_restriction'>Пройти</Link>}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
};
|
@ -1,5 +1,4 @@
|
||||
import {Link} from 'react-router-dom'
|
||||
import {CodeSnippetlighter} from '../../../pages/CodeSnippetPage'
|
||||
import comment from './../../../images/comment.jpg'
|
||||
import './quiz.scss'
|
||||
import {useEffect, useState} from "react";
|
||||
@ -19,7 +18,6 @@ export const Instruction = () => {
|
||||
|
||||
apiRequest('/user-questionnaire/get-question-number', {
|
||||
params: {user_questionnaire_uuid: test.uuid},
|
||||
|
||||
}
|
||||
).then((res)=> setCountQuestions(res.question_number))
|
||||
|
||||
@ -39,7 +37,7 @@ export const Instruction = () => {
|
||||
e
|
||||
lit, sed do eiusmod tempo
|
||||
</div>
|
||||
<Link to="/quiz-test" className='instruction__btn quiz-btn quiz-btn_restriction'>Далее</Link>
|
||||
<Link to="/quiz/test" className='instruction__btn quiz-btn quiz-btn_restriction'>Далее</Link>
|
||||
<div className="instruction__info">
|
||||
<div className="instruction__icon">
|
||||
<img src={comment} alt=""/>
|
||||
|
@ -7,7 +7,7 @@ import {setSelectedTest} from "../../../redux/quizSlice";
|
||||
export const MyTestsQuiz = ({listTests}) => {
|
||||
|
||||
const formationEndingOfScore = (score) => {
|
||||
const lastNumber = score % 10
|
||||
const lastNumber = score % 10;
|
||||
if(score === 11 ||score === 12 ||score === 13 ||score === 14 ){
|
||||
return 'баллов'
|
||||
}else if(lastNumber === 2 || lastNumber === 3 || lastNumber === 4 ){
|
||||
@ -17,10 +17,10 @@ export const MyTestsQuiz = ({listTests}) => {
|
||||
}else{
|
||||
return 'баллов'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const dispatch = useDispatch()
|
||||
const recordSelectedTest = (item) => dispatch(setSelectedTest(item))
|
||||
const dispatch = useDispatch();
|
||||
const recordSelectedTest = (item) => dispatch(setSelectedTest(item));
|
||||
|
||||
return (
|
||||
<div className="my-tests">
|
||||
@ -35,10 +35,10 @@ export const MyTestsQuiz = ({listTests}) => {
|
||||
{item.questionnaire_title}
|
||||
</h3>
|
||||
<div className="item-test__body test-data">
|
||||
<Link to={'/quiz-interjacent'} className='quiz-btn'
|
||||
<Link to={'/quiz/interjacent'} className='quiz-btn'
|
||||
onClick={() => recordSelectedTest(item)}>Пройти</Link>
|
||||
</div>
|
||||
</article>
|
||||
</article>;
|
||||
case 2:
|
||||
return <article className="my-tests__item item-test" key={item.questionnaire_title}>
|
||||
<h3 className="item-test__name-test">
|
||||
@ -52,7 +52,7 @@ export const MyTestsQuiz = ({listTests}) => {
|
||||
<div className="test-data__hr"></div>
|
||||
<div className="test-data__score quiz-text">{item.score} {formationEndingOfScore(item.score)}</div>
|
||||
</div>
|
||||
</article>
|
||||
</article>;
|
||||
case 3:
|
||||
return <article className="my-tests__item item-test" key={item.questionnaire_title}>
|
||||
<h3 className="item-test__name-test">
|
||||
@ -61,7 +61,7 @@ export const MyTestsQuiz = ({listTests}) => {
|
||||
<div className="item-test__body test-data">
|
||||
<div className='quiz-btn'>На проверке</div>
|
||||
</div>
|
||||
</article>
|
||||
</article>;
|
||||
default:
|
||||
break
|
||||
}
|
||||
@ -70,4 +70,4 @@ export const MyTestsQuiz = ({listTests}) => {
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
};
|
@ -2,20 +2,15 @@ import React, {useEffect, useState} from 'react'
|
||||
import {useNavigate} from "react-router-dom"
|
||||
import {useSelector, useDispatch} from 'react-redux'
|
||||
|
||||
import {
|
||||
fetchGetAnswers,
|
||||
selectAnswer,
|
||||
selectedTest
|
||||
} from '../../../redux/quizSlice'
|
||||
|
||||
import {useRequest} from "../../../hooks/useRequest";
|
||||
import {Progressbar} from './ProgressbarQuiz'
|
||||
import {GetOptionTask} from './GetOptionTask'
|
||||
|
||||
import {fetchUserAnswersMany, fetchUserAnswerOne} from './../../../redux/quizSlice'
|
||||
|
||||
import {
|
||||
fetchUserAnswersMany, fetchUserAnswerOne, fetchGetAnswers, selectAnswer, selectedTest
|
||||
} from './../../../redux/quizSlice'
|
||||
|
||||
import './quiz.scss'
|
||||
import {useRequest} from "../../../hooks/useRequest";
|
||||
|
||||
export const TaskQuiz = () => {
|
||||
|
||||
@ -38,11 +33,12 @@ export const TaskQuiz = () => {
|
||||
useEffect(() => {
|
||||
apiRequest(`/question/get-questions?uuid=${dataTest.uuid}`)
|
||||
.then((response) => {
|
||||
console.log(response)
|
||||
setQuestions(response);
|
||||
dispatch(fetchGetAnswers(response[0].id));
|
||||
setStripValue((+index + 1) * 100 / response.length)
|
||||
})
|
||||
}, [dispatch]);
|
||||
}, [dispatch, apiRequest]);
|
||||
|
||||
const nextQuestion = async (e) => {
|
||||
e.preventDefault();
|
||||
@ -70,7 +66,7 @@ export const TaskQuiz = () => {
|
||||
setCheckedValues([]);
|
||||
setInputValue('')
|
||||
} else {
|
||||
navigate(`/quiz-result`);
|
||||
navigate(`/quiz/result`);
|
||||
alert("Тест пройден!")
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user