Skip to content

GitLab

Commit 7f033e75 authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

Merge branch 'Sangjune' into jiwon

parents 5d6fa361 b52542d2
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 7f033e75
......@@ -4,6 +4,10 @@
/node_modules
/.pnp
.pnp.js
/jiwon
/sangjune
/minsu
/yeonwoo
# testing
/coverage
......
debug.log
View file @ 7f033e75
......@@ -19,3 +19,32 @@
[0727/174144.098:WARNING:process_reader_win.cc(156)] Thread 16272 should be suspended, but previous_suspend_count is 0
[0727/174144.098:WARNING:process_reader_win.cc(156)] Thread 13996 should be suspended, but previous_suspend_count is 0
[0727/174144.098:WARNING:process_reader_win.cc(156)] Thread 10612 should be suspended, but previous_suspend_count is 0
[0729/110349.951:WARNING:process_reader_win.cc(156)] Thread 2292 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 18864 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 3744 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 21340 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 20560 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 9024 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 9020 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 20104 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 13404 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 11816 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 15876 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 13308 should be suspended, but previous_suspend_count is 0
[0729/110349.952:WARNING:process_reader_win.cc(156)] Thread 21484 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 8960 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 1556 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 19248 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 16692 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 14368 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 14404 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 18436 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 20284 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 18644 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 10036 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 17740 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 9980 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 20444 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 19408 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 3364 should be suspended, but previous_suspend_count is 0
[0729/110349.953:WARNING:process_reader_win.cc(156)] Thread 14464 should be suspended, but previous_suspend_count is 0
package-lock.json
View file @ 7f033e75
......@@ -3651,8 +3651,11 @@
},
"@testing-library/jest-dom": {
"version": "4.2.4",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-4.2.4.tgz",
"integrity": "sha512-j31Bn0rQo12fhCWOUWy9fl7wtqkp7In/YP2p5ZFyRuiiB9Qs3g+hS4gAmDWONbAHcRmVooNJ5eOHQDCOmUFXHg==",
=======
>>>>>>> Sangjune
"requires": {
"@babel/runtime": "^7.5.1",
"chalk": "^2.4.1",
......@@ -3677,8 +3680,6 @@
},
"@testing-library/react": {
"version": "9.5.0",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.5.0.tgz",
"integrity": "sha512-di1b+D0p+rfeboHO5W7gTVeZDIK5+maEgstrZbWZSSvxDyfDRkkyBE1AJR5Psd6doNldluXlCWqXriUfqu/9Qg==",
"requires": {
"@babel/runtime": "^7.8.4",
"@testing-library/dom": "^6.15.0",
......@@ -3686,9 +3687,7 @@
}
},
"@testing-library/user-event": {
"version": "7.2.1",
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-7.2.1.tgz",
"integrity": "sha512-oZ0Ib5I4Z2pUEcoo95cT1cr6slco9WY7yiPpG+RGNkj8YcYgJnM7pXmYmorNOReh8MIGcKSqXyeGjxnr8YiZbA=="
"version": "7.2.1"
},
"@types/babel__core": {
"version": "7.1.9",
......@@ -3779,9 +3778,9 @@
"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
},
"@types/node": {
"version": "14.0.27",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
"integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="
"version": "14.0.26",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz",
"integrity": "sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="
},
"@types/parse-json": {
"version": "4.0.0",
......@@ -5091,11 +5090,14 @@
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
},
<<<<<<< HEAD
"bootstrap": {
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.1.tgz",
"integrity": "sha512-bxUooHBSbvefnIZfjD0LE8nfdPKrtiFy2sgrxQwUZ0UpFzpjVbVMUxaGIoo9XWT4B2LG1HX6UQg0UMOakT0prQ=="
},
=======
>>>>>>> Sangjune
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
......@@ -9488,11 +9490,14 @@
"supports-color": "^6.1.0"
}
},
<<<<<<< HEAD
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
=======
>>>>>>> Sangjune
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
......@@ -11132,11 +11137,14 @@
"ts-pnp": "^1.1.6"
}
},
<<<<<<< HEAD
"popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
},
=======
>>>>>>> Sangjune
"portfinder": {
"version": "1.0.27",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.27.tgz",
......@@ -12319,8 +12327,11 @@
},
"react": {
"version": "16.13.1",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
"integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
=======
>>>>>>> Sangjune
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
......@@ -12532,8 +12543,11 @@
},
"react-dom": {
"version": "16.13.1",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
"integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
=======
>>>>>>> Sangjune
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
......@@ -12570,8 +12584,11 @@
},
"react-router-dom": {
"version": "5.2.0",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
"integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
=======
>>>>>>> Sangjune
"requires": {
"@babel/runtime": "^7.1.2",
"history": "^4.9.0",
......@@ -12594,8 +12611,11 @@
},
"react-scripts": {
"version": "3.4.1",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.1.tgz",
"integrity": "sha512-JpTdi/0Sfd31mZA6Ukx+lq5j1JoKItX7qqEK4OiACjVQletM1P38g49d9/D0yTxp9FrSF+xpJFStkGgKEIRjlQ==",
=======
>>>>>>> Sangjune
"requires": {
"@babel/core": "7.9.0",
"@svgr/webpack": "4.3.3",
......
src/End.js
View file @ 7f033e75
......@@ -6,13 +6,15 @@ import tr from './img/img_end.jpg';
// import { Link } from 'react-router-dom';
function End() {
let k = []
let a = []
for (let i = 0; i < 3; i++) {
if (localStorage.getItem(i + '번문제답') === localStorage.getItem(i + '번문제정답')) {
k[i] = ['O', 1]
if (localStorage.getItem('답' + (i + 1)) === localStorage.getItem('정답' + (i + 1))) {
a[i] = 1
localStorage.setItem('채점' + (i + 1), 'O')
}
else {
k[i] = ['X', 0]
a[i] = 0
localStorage.setItem('채점' + (i + 1), 'X')
}
}
......@@ -20,18 +22,20 @@ function End() {
<>
<div className="card" >
<div className='card-header'>
-채점표-
-채점표-
<div className='card-body'>
<h3 className='card-title'>이름 : {localStorage.getItem('name')}</h3>
<p className='card-text'>Quiz 1 : {k[0][0]}</p>
<p className='card-text'>Quiz 2 : {k[1][0]}</p>
<p className='card-text'>Quiz 3 : {k[2][0]}</p>
<p className='card-text'>Total Score : {k[0][1] + k[1][1] + k[2][1]}</p>
</div>
<div className="Box text-center">
<img src={tr} alt="수고" />
</div>
<h3 className='card-title'>이름 : {localStorage.getItem('name')}</h3>
<p className='card-text'>Quiz 1 : {localStorage.getItem('채점1')}</p>
<p className='card-text'>Quiz 2 : {localStorage.getItem('채점2')}</p>
<p className='card-text'>Quiz 3 : {localStorage.getItem('채점3')}</p>
<p className='card-text'>Total Score : {a[0] + a[1] + a[2]}</p>
</div>
<div style={{ marginTop: '100px' }} className="Box text-center">
<img src={tr} alt="수고" />
</div>
</div>
</div>
</>
......
src/Home.js
View file @ 7f033e75
import React from 'react'
import { Link } from 'react-router-dom';
import './Home.css';
// import bg from './img_study.jpg'
function Home() {
return (
<div className="container my-con">
<div className="container">
<div >
<p className="text-center font-weight-bold">이름을 입력하세요</p>
<div className="text-center">이름을 입력하세요</div>
<div>
<div>
<input className="inputBox" onChange={(event) => sessionStorage.setItem('name', event.target.value)} />
</div>
<div>
<Link to="/quiz">
<button className="QuizStart" onClick={checking}>Quiz Start !</button>
<button className="btn btn-dark" onClick={checking}>Quiz Start !</button>
</Link>
</div>
</div>
......@@ -27,14 +27,16 @@ function Home() {
)
}
function checking() {
if (sessionStorage.getItem('name') === null || sessionStorage.getItem('name').length === 0) {
if (localStorage.getItem('name') === null || localStorage.getItem('name').length === 0) {
alert('이름을 입력하세요')
}
else {
alert('입력하신 이름은' + sessionStorage.getItem('name') + '입니다.')
alert('입력하신 이름은' + localStorage.getItem('name') + '입니다.')
}
}
export default Home;
src/Quiz.js
View file @ 7f033e75
......@@ -5,46 +5,37 @@ import logo from './img/img_question.png'
import fight from './img/img_quiz.png'
const QnA = [
{ Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], A: "", N: 1 },
{ Q: "3 + 3 = ?", Choose: [2, 4, 6, 8], A: "", N: 2 },
{ Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], A: "", N: 3 }
{ Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], A: "4", N: 1 },
{ Q: "3 + 3 = ?", Choose: [2, 4, 6, 8], A: "3", N: 2 },
{ Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], A: "2", N: 3 }
]
function Quiz() {
let [question, setQuestionss] = useState({
let [question, setQuestion] = useState({
...QnA[0],
i: 0,
page: 0,
})
let [selected, setSelected] = useState("") //선택한 답을 보여줄 것들
function setQuestion() {
setQuestionss({ ...QnA[question.i + 1], i: question.i + 1, page: question.page + 1 })
function handleQuestion() {
setQuestion({ ...QnA[question.i + 1], i: question.i + 1, page: question.page + 1 })
}
let handleChange = (ev) => {
ev.preventDefault() //새로고침 안되도록
setSelected(ev.target.value) //selected값 변경
let slt = ev.target.value //slt에 선택한값 받아옴
let count = question.Choose.length //이거 정확히 뭘로할지 모르겠어요 ㅜㅜ
// let checked_index = -1;
let checked_value = '';
checked_value = slt;
//localStorage.setItem('번문제 답' + checked_value, checked_value)
for (let i = 0; i < count; i++) {
if (ev.target.checked) { //이거 맞는지도 잘..
// checked_index = i;
checked_value = slt;
localStorage.setItem(question.i + 1 + '번문제 답', checked_value)
}
}
let checked_number = ev.target.id;
localStorage.setItem('답'+(question.N), Number(checked_number)+1)
localStorage.setItem('정답' + (question.N), QnA[question.N-1].A)
}
return (
<>
<div style={{fontSize:'80px', marginBottom:'100px', textAlign:"center", backgroundColor:'yellow'}}>미적분학 퀴즈</div>
<img src={fight} style={{ position: "absolute", top: "65px",left: "1050px", top:'200px' }} alt="lion" />
<div style={{ fontSize: '80px', marginBottom: '100px', textAlign: "center", backgroundColor: 'yellow' }}>미적분학 퀴즈</div>
<img src={fight} style={{ position: "absolute", left: "1050px", top: '200px' }} alt="lion" />
<div className="Quiz" >
<h1><img src={logo} style={{ marginLeft: "450px" }} width='75' height='75' alt='question' /> <span style={{ fontSize: "75px", marginLeft: "30px" }}>{question.Q}</span></h1>
{/* <div style={{ marginTop: "30px", marginBottom: "30px", marginLeft:'450px', fontSize:'40px' }}>정답을 선택하세요</div> */}
......@@ -53,7 +44,7 @@ function Quiz() {
<form>
{question.Choose.map((a, index) =>
<div key={index}>
<input type="radio" name='answer' id={'answer' + a} value={a} onClick={handleChange} style={{ marginLeft: "475px", width: "25px", height: "25px" }} />
<input type="radio" name='answer' id={index} value={a} onClick={handleChange} style={{ marginLeft: "475px", width: "25px", height: "25px" }} />
<label htmlFor={a} style={{ fontSize: "40px", marginLeft: "22px" }}>{a}</label>
</div>
)}
......@@ -61,12 +52,26 @@ function Quiz() {
</form>
<p style={{ fontSize: "40px", marginLeft: "480px" }}>Answer :<span style={{ color: "green", fontWeight: "bold", fontSize: "90px", marginLeft: "30px" }}> {selected}</span> {/* 선택한 값 보여줌 */}<span style={{ marginLeft: "50px" }}> {(question.page === QnA.length - 1)
? <Link to="/end">제출</Link>
: <button type="button" onClick={setQuestion} style={{ width: "85px", height: "40px" }} >다음</button>
: <button type="button" onClick={handleQuestion} style={{ width: "85px", height: "40px" }} >다음</button>
}</span>
</p>
</div>
{/* 마지막 질문일 경우 /end페이지로 이동, 그렇지 않을경우는 this.handleQuestion발생 */}
{/* {(question.page === QnA.length - 1)
? <Link to="/end">제출</Link>
: <button type="button" onClick={handleQuestion} >다음</button>
} */}
{/* <input onKeyPress="this.enterkey()"/> */}
<p style={{ textAlign: "center", fontSize: "30px", color: "crimson" }}>
<Timer
initialTime={3600000}
......
src/img/img_end.jpg
View replaced file @ 5d6fa361 View file @ 7f033e75
src/img/img_end.jpg

46.8 KB | W: | H:

src/img/img_end.jpg

17.1 KB | W: | H:

src/img/img_end.jpg
src/img/img_end.jpg
src/img/img_end.jpg
src/img/img_end.jpg
  • 2-up
  • Swipe
  • Onion skin
src/img/img_question.png
View replaced file @ 5d6fa361 View file @ 7f033e75
src/img/img_question.png

46.8 KB | W: | H:

src/img/img_question.png

4.07 KB | W: | H:

src/img/img_question.png
src/img/img_question.png
src/img/img_question.png
src/img/img_question.png
  • 2-up
  • Swipe
  • Onion skin
src/img/img_quiz.png
View replaced file @ 5d6fa361 View file @ 7f033e75
src/img/img_quiz.png

46.8 KB | W: | H:

src/img/img_quiz.png

59.1 KB | W: | H:

src/img/img_quiz.png
src/img/img_quiz.png
src/img/img_quiz.png
src/img/img_quiz.png
  • 2-up
  • Swipe
  • Onion skin
src/img/img_study.jpg
View replaced file @ 5d6fa361 View file @ 7f033e75
src/img/img_study.jpg

46.8 KB | W: | H:

src/img/img_study.jpg

175 KB | W: | H:

src/img/img_study.jpg
src/img/img_study.jpg
src/img/img_study.jpg
src/img/img_study.jpg
  • 2-up
  • Swipe
  • Onion skin
src/setupTests.js
View file @ 7f033e75
......@@ -3,3 +3,17 @@
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom/extend-expect';
<Segment color='blue'>
<Form>
<Form.Field>
정답
</Form.Field>
{this.rateScore.map(rate=>(
<Form.Field>
<Radio value={rate} checked={} onCange={}/>
{this.renderStar(rate)}
</Form.Field>
))}
</Form>
</Segment>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment