d

src/Quiz.js

@@ -3,104 +3,95 @@ import { Link, Redirect } from 'react-router-dom';
 import Timer from 'react-compound-timer'; // 타이머쓰기위해 import
 import logo from './img_question.png'
 
-const localQnA=JSON.parse(localStorage.getItem('QnA'))
-console.log(localQnA)
 const QnA = [
     { Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], N: 1 },
     { Q: "3 + 3 = ?", Choose: [2, 4, 6, 8], N: 2 },
     { Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], N: 3 }
 ]
 
-let Answers = [0, 0, 0]
+let Answers = [0,0,0]
 localStorage.setItem('Answers', JSON.stringify(Answers))
 let Solutions = [4, 3, 2]
 localStorage.setItem('Solutions', JSON.stringify(Solutions))
 
 function Quiz() {
     const [question, setQuestion] = useState({
-        ...QnA[0],
-        i: 0,
-        page: 0,
+        ...QnA[0]
     })
-    const [selected, setSelected] = useState("")  //선택한 답을 보여줄 것들
-    // const [checked, setChecked] = useState(false)
+    const [selected, setSelected] = useState("")  //선택한 답을 보여줄 것
 
     const [timeout, settimeout] = useState(false)
 
     function handleQuestion() {
-        setQuestion({ ...QnA[question.i + 1], i: question.i + 1, page: question.page + 1 })
-        // setChecked(false)
+        setQuestion({ ...QnA[question.N]})
+        setSelected("") //페이지 넘어가면 selected 초기화
     }
 
     let handleChange = (ev) => {
-        // ev.preventDefault()  //새로고침 안되도록
         setSelected(ev.target.value)  //selected값 변경
         Answers[question.N - 1] = Number(ev.target.id) + 1
-
         localStorage.setItem('Answers', JSON.stringify(Answers))
     }
     return (
         <>
-            <div className="container-fluid">
-                <div className="text-center h2 font-weight-bold bg-warning py-2">미적분학 퀴즈</div>
-                <div className="row justify-content-md-center" >
-                    <div className="col text-right">
-                        <h1>
-                            <img src={logo} width='50' height='50' alt='question' />
-                        </h1>
+         <div className="container-fluid">
+            <div className="text-center h2 font-weight-bold bg-warning py-2">미적분학 퀴즈</div>
+            <div className="row justify-content-md-center" >
+                <div className="col text-right">
+                    <h1>
+                        <img src={logo} width='50' height='50' alt='question' />
+                    </h1>
+                </div>
+                <div className="col-md-auto">
+                    <div className="h2 mt-2">
+                        {question.Q}
                     </div>
-                    <div className="col-md-auto">
-                        <div className="h2 mt-2">
-                            {question.Q}
+                    <div className="mt-2">
+                        <form>
+                            {question.Choose.map((a, index) =>
+                                <div>
+                                    <input type="radio" name='answer' id={index} value={a} onChange={handleChange} checked={selected === String(a)} />
+                                    <label className="font-weight-bold" htmlFor={a}>{a}</label>
+                                </div>
+                            )}                          
+                        </form>
+                        <span className="h5 font-weight-bold"> Your Answer :</span>
+                        <span className="h2 font-weight-bold text-danger"> {selected}</span>  {/* 선택한 값 보여줌 */}
+                        <div className="text-center my-3"> {(question.N-1 === QnA.length - 1)
+                            ? <Link to="/end">
+                                <button className="btn btn-outline-success" onClick={localStorage.setItem('Solutions', JSON.stringify(Solutions))}>제출</button>
+                            </Link>
+                            : <button type="button" className="btn btn-outline-dark" onClick={handleQuestion}>다음</button>
+                        }
                         </div>
-                        <div className="mt-2">
-                            <form>
-                                {question.Choose.map((a, index) =>
-                                    <div key={index}>
-                                        <input type="radio" name='answer' id={index} value={a} onChange={handleChange} checked={parseInt(selected) === a} />
-                                        <label className="font-weight-bold" htmlFor={a}>{a}</label>
-                                    </div>
-                                )}
-                            </form>
-                            <span className="h5 font-weight-bold"> Your Answer :</span>
-                            <span className="h2 font-weight-bold text-danger"> {selected}</span>  {/* 선택한 값 보여줌 */}
-                            <div className="text-center my-3"> {(question.page === QnA.length - 1)
-                                ? <Link to="/end">
-                                    <button className="btn btn-outline-success" onClick={localStorage.setItem('Solutions', JSON.stringify(Solutions))}>제출</button>
-                                </Link>
-                                : <button type="button" className="btn btn-outline-dark" onClick={handleQuestion}>다음</button>
-                            }
-                            </div>
-                            <p className="h3 text-center text-danger ">
-                                <Timer
-                                    initialTime={36000}
-                                    direction="backward"
-                                    checkpoints={[
-                                        {
-                                            time: 1,
-                                            callback: () => alert('시간이 초과되었습니다.'),
-                                        },
-                                        {
-                                            time: 0,
-                                            callback: () => settimeout(true),
+                        <p className="h3 text-center text-danger ">
+                            <Timer
+                                initialTime={30010}
+                                direction="backward"
+                                checkpoints={[
+                                    {time:1,
+                                        callback:()=>alert('시간이 초과되었습니다.'),
+                                    },
+                                    {
+                                        time: 0,
+                                        callback: () => settimeout(true),
 
-                                        }
-                                    ]}
-                                >
-                                    {() => (
-                                        <>
-                                            <Timer.Minutes /> : <Timer.Seconds /> / 30 : 00
-                                        </>
-                                    )}
-                                </Timer>     {/* npm i react-compound-timer */}
-                            </p>
-                        </div>
-                    </div>
-                    <div className="col">
+                                    }
+                                ]}
+                            >
+                                {() => (
+                                    <>
+                                        <Timer.Minutes /> : <Timer.Seconds></Timer.Seconds> / 30 : 00                        </>
+                                )}
+                            </Timer>     {/* npm i react-compound-timer */}
+                        </p>
                     </div>
                 </div>
+                <div className="col">
+                </div>
             </div>
-            {timeout ? <Redirect to='/end' /> : ''}
+        </div>
+        {timeout ? <Redirect to='/end'/> : '' }
         </>
     )