Compare commits

..

4 Commits

8 changed files with 159 additions and 92 deletions
+43 -70
View File
@@ -8,10 +8,10 @@
"name": "store-client",
"version": "0.0.0",
"dependencies": {
"immer": "^11.1.8",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-error-boundary": "^6.1.2",
"react-router-dom": "^7.17.0"
"zustand": "^5.0.14"
},
"devDependencies": {
"@eslint/js": "^9.25.0",
@@ -1369,7 +1369,7 @@
"version": "19.1.6",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.6.tgz",
"integrity": "sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==",
"dev": true,
"devOptional": true,
"license": "MIT",
"dependencies": {
"csstype": "^3.0.2"
@@ -1602,19 +1602,6 @@
"dev": true,
"license": "MIT"
},
"node_modules/cookie": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
"integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
"license": "MIT",
"engines": {
"node": ">=18"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
}
},
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -1634,7 +1621,7 @@
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
"dev": true,
"devOptional": true,
"license": "MIT"
},
"node_modules/debug": {
@@ -2069,6 +2056,16 @@
"node": ">= 4"
}
},
"node_modules/immer": {
"version": "11.1.8",
"resolved": "https://registry.npmjs.org/immer/-/immer-11.1.8.tgz",
"integrity": "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==",
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/immer"
}
},
"node_modules/import-fresh": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -2476,15 +2473,6 @@
"react": "^19.1.0"
}
},
"node_modules/react-error-boundary": {
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-6.1.2.tgz",
"integrity": "sha512-3DpCr5HVdZ0caUjYE/kIHBEJN0mNP3ZCgf16c48uJ5TbWjorKVp+YG8W3XqlJ7vJAVNw6wNIImyPXmFydwmyng==",
"license": "MIT",
"peerDependencies": {
"react": "^18.0.0 || ^19.0.0"
}
},
"node_modules/react-refresh": {
"version": "0.17.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
@@ -2495,44 +2483,6 @@
"node": ">=0.10.0"
}
},
"node_modules/react-router": {
"version": "7.17.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.17.0.tgz",
"integrity": "sha512-FDELK7rTMlCHO5+reyXsPlmfr7N1F91lPHsWYfMEGQm/KQ+F4JFM8jGoeQDmDvdTs93Fw9aSilH+uKRb4/jXvQ==",
"license": "MIT",
"dependencies": {
"cookie": "^1.0.1",
"set-cookie-parser": "^2.6.0"
},
"engines": {
"node": ">=20.0.0"
},
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18"
},
"peerDependenciesMeta": {
"react-dom": {
"optional": true
}
}
},
"node_modules/react-router-dom": {
"version": "7.17.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.17.0.tgz",
"integrity": "sha512-fyU2yjGups/hE6Xz0I5ZYbVL8Gx29eCjgpHaRaTaVU+OOAdfRX05KsvyRm0GO8YQwOkhpU3MurW1jyMUJn+zSw==",
"license": "MIT",
"dependencies": {
"react-router": "7.17.0"
},
"engines": {
"node": ">=20.0.0"
},
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18"
}
},
"node_modules/resolve-from": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -2606,12 +2556,6 @@
"semver": "bin/semver.js"
}
},
"node_modules/set-cookie-parser": {
"version": "2.7.2",
"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
"integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
"license": "MIT"
},
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2862,6 +2806,35 @@
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/zustand": {
"version": "5.0.14",
"resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.14.tgz",
"integrity": "sha512-/8tAspM5LMPr28b3fwLYrtdj77ECpfZviaP75CMTnwO8ISyaE4GDIG/9rDDYq/cH9D2Xw2A2RXglLInmVBQB/g==",
"license": "MIT",
"engines": {
"node": ">=12.20.0"
},
"peerDependencies": {
"@types/react": ">=18.0.0",
"immer": ">=9.0.6",
"react": ">=18.0.0",
"use-sync-external-store": ">=1.2.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"immer": {
"optional": true
},
"react": {
"optional": true
},
"use-sync-external-store": {
"optional": true
}
}
}
}
}
+2 -2
View File
@@ -10,10 +10,10 @@
"preview": "vite preview"
},
"dependencies": {
"immer": "^11.1.8",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-error-boundary": "^6.1.2",
"react-router-dom": "^7.17.0"
"zustand": "^5.0.14"
},
"devDependencies": {
"@eslint/js": "^9.25.0",
+3 -18
View File
@@ -1,25 +1,10 @@
import { Suspense, lazy } from 'react'
import { ErrorBoundary } from 'react-error-boundary'
const LazyComponent = lazy(() => import('./MyComponent'))
function ErrorFallBack({error, resetErrorBoundary }) {
return (
<div>
<h2>Что то сломалось</h2>
<button onClick={resetErrorBoundary}></button>
</div>
)
}
import Quiz from './components/Quiz'
function App() {
return (
<>
<ErrorBoundary FallBackComponent={ErrorFallBack}>
<Suspense fallback={<div>Загрузка ...</div>}>
<LazyComponent />
</Suspense>
</ErrorBoundary>
<h1>Практика по созданию списка задач</h1>
<Quiz />
</>
)
}
+31
View File
@@ -0,0 +1,31 @@
import { useState } from 'react'
const Question = ({question, onSubmit}) => {
const [selectedOption,setSelectedOption] = useState('')
const handleSubmit = () => {
console.log(selectedOption);
if (selectedOption) onSubmit(selectedOption);
}
return (
<div>
<h2>Вопрос {question.id}: {question.text}</h2>
<div>
{question.options.map((option, index)=>(
<label key={index}>
<input
type="radio"
name={`question-${question.id}`}
value={option}
checked={selectedOption === option}
onChange={() => setSelectedOption(option)} />
{option}
</label>
))}
</div>
<button onClick={handleSubmit} >Следующий вопрос</button>
</div>
)
}
export default Question
+35
View File
@@ -0,0 +1,35 @@
import useQuizStore from './store/useQuizStore'
import Question from './Question'
import Result from './Result'
const Quiz = () => {
const {
questions,
currentQuestion,
userAswers,
isFinished,
submitAnswer,
goToNextQuestion,
restartQuiz,
} = useQuizStore();
const handleAnswerSubmit = (anwser) => {
console.log('Yes')
submitAnswer(answer)
if (currentQuestion < questions.length - 1 ) {
goToNextQuestion()
}
}
if(isFinished) {
return (<Result />)
}
return (
<div className="quiz">
<Question
question={questions[currentQuestion]}
onSubmit={handleAnswerSubmit} />
</div>
)
}
export default Quiz
+9
View File
@@ -0,0 +1,9 @@
const Result = ({questions, userAswers, onRestart}) => {
return (
<div>
<h2>Результат</h2>
<button onClick={onRestart}>Начать заново</button>
</div>
)
}
export default Result
+36
View File
@@ -0,0 +1,36 @@
import { create } from 'zustand'
const useQuizStore = create(set => ({
questions: [
{
id:1,
text: 'Сколько будет 2+2?',
options: ['3','4','2'],
correctAnswer: '4',
},
{
id:2,
text: 'Столица России?',
options: ['Москва','Париж','Лондон'],
correctAnswer: 'Москва',
},
],
currentQuestion: 0,
userAnswer:[],
isFinished: false,
goToNextQuestion: () => set(state => ({
currentQuestion: state.currentQuestion + 1,
})),
submitAnswer: answer => set(state => {
const updatedAnswer = [...state.userAnswer, answer];
const isFinished = (state.currentQuestion >= state.questions.length - 1);
return {userAnswer: updatedAnswer, isFinished};
}),/*
restartQuiz: () => set({
currentQuestion: 0,
userAnswer: [],
isFinished: false
}), */
}))
export default useQuizStore
-2
View File
@@ -4,7 +4,5 @@ import { createRoot } from 'react-dom/client'
import App from './App.jsx'
createRoot(document.getElementById('root')).render(
<StrictMode>
<App />
</StrictMode>
)