Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 82fb0d8030 | |||
| cc79d1956b | |||
| 55c4ae7d53 | |||
| de33066cbe |
Generated
+44
-3
@@ -8,8 +8,10 @@
|
|||||||
"name": "store-client",
|
"name": "store-client",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"immer": "^11.1.8",
|
||||||
"react": "^19.1.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.1.0"
|
"react-dom": "^19.1.0",
|
||||||
|
"zustand": "^5.0.14"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.25.0",
|
"@eslint/js": "^9.25.0",
|
||||||
@@ -1367,7 +1369,7 @@
|
|||||||
"version": "19.1.6",
|
"version": "19.1.6",
|
||||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.6.tgz",
|
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.6.tgz",
|
||||||
"integrity": "sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==",
|
"integrity": "sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==",
|
||||||
"dev": true,
|
"devOptional": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"csstype": "^3.0.2"
|
"csstype": "^3.0.2"
|
||||||
@@ -1619,7 +1621,7 @@
|
|||||||
"version": "3.1.3",
|
"version": "3.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
||||||
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
||||||
"dev": true,
|
"devOptional": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
@@ -2054,6 +2056,16 @@
|
|||||||
"node": ">= 4"
|
"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": {
|
"node_modules/import-fresh": {
|
||||||
"version": "3.3.1",
|
"version": "3.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
|
||||||
@@ -2794,6 +2806,35 @@
|
|||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"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
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -10,8 +10,10 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"immer": "^11.1.8",
|
||||||
"react": "^19.1.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.1.0"
|
"react-dom": "^19.1.0",
|
||||||
|
"zustand": "^5.0.14"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.25.0",
|
"@eslint/js": "^9.25.0",
|
||||||
|
|||||||
+5
-61
@@ -1,67 +1,11 @@
|
|||||||
import React, { useState, useReducer, useRef, memo } from 'react'
|
import Quiz from './components/Quiz'
|
||||||
|
|
||||||
function tasksReducer(state, action) {
|
|
||||||
switch(action.type) {
|
|
||||||
case 'ADD_TASK':
|
|
||||||
return [...state, action.payload]
|
|
||||||
case 'TOGGLE_TASK':
|
|
||||||
return state.map(task => task.id === action.payload ? {...task, complite: !task.complite} : task)
|
|
||||||
case 'REMOVE_TASK':
|
|
||||||
return state.filter(task => task.id !== action.payload)
|
|
||||||
default:
|
|
||||||
return state
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const TaskList = memo(function TaskList({tasks, onToggle, onRemove}) {
|
|
||||||
console.log("Rendred")
|
|
||||||
return (
|
|
||||||
<ul>
|
|
||||||
{tasks.map(({id, text, complite}) => (
|
|
||||||
<li key={id}
|
|
||||||
style={{textDecoration: complite ? 'line-through' : 'none' }}>
|
|
||||||
<input type="checkbox" checked={complite} onChange={()=>onToggle(id)} />
|
|
||||||
{text}
|
|
||||||
<button onClick={()=> onRemove(id)} style={{marginLeft: 10}}>
|
|
||||||
Удалить
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const [tasks, dispatch] = useReducer(tasksReducer,[])
|
|
||||||
const [input,setInput] = useState('')
|
|
||||||
const [error,setError] = useState('')
|
|
||||||
const inputRef = useRef(null)
|
|
||||||
|
|
||||||
const addTask = () => {
|
|
||||||
if (input.trim() === '') {
|
|
||||||
setError('Пустой текст задачи')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
setError('')
|
|
||||||
dispatch({
|
|
||||||
type: 'ADD_TASK',
|
|
||||||
payload: {id: Date.now(), text: input.trim(), complite: false }
|
|
||||||
})
|
|
||||||
setInput('')
|
|
||||||
inputRef.current.focus()
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{padding: 20}}>
|
<>
|
||||||
<h1>Список дел</h1>
|
<h1>Практика по созданию списка задач</h1>
|
||||||
<input ref={inputRef} value={input} onChange={e => setInput(e.target.value)} />
|
<Quiz />
|
||||||
<button onClick={addTask}>Добавить</button>
|
</>
|
||||||
{error && <p style={{color: 'red'}}>{error}</p>}
|
|
||||||
|
|
||||||
<TaskList tasks={tasks}
|
|
||||||
onToggle={id => dispatch({type: 'TOGGLE_TASK', payload: id})}
|
|
||||||
onRemove={id => dispatch({type: 'REMOVE_TASK', payload: id})} />
|
|
||||||
</div>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
const Result = ({questions, userAswers, onRestart}) => {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<h2>Результат</h2>
|
||||||
|
<button onClick={onRestart}>Начать заново</button>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
export default Result
|
||||||
@@ -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
|
||||||
@@ -4,7 +4,5 @@ import { createRoot } from 'react-dom/client'
|
|||||||
import App from './App.jsx'
|
import App from './App.jsx'
|
||||||
|
|
||||||
createRoot(document.getElementById('root')).render(
|
createRoot(document.getElementById('root')).render(
|
||||||
<StrictMode>
|
|
||||||
<App />
|
<App />
|
||||||
</StrictMode>
|
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user