Skip to content

GitLab

Commit 3fbe99fd authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

Merge branch 'Sangjune' into jiwon

parents bcee6e3e 67bc8294
Show whitespace changes
Inline Side-by-side
src/End.js
View file @ 3fbe99fd
...@@ -6,38 +6,51 @@ import tr from './img/img_end.jpg'; ...@@ -6,38 +6,51 @@ import tr from './img/img_end.jpg';
// import { Link } from 'react-router-dom'; // import { Link } from 'react-router-dom';
function End() { function End() {
let a = [] let scores = []
for (let i = 0; i < 3; i++) { let score = 0
if (localStorage.getItem('답' + (i + 1)) === localStorage.getItem('정답' + (i + 1))) { const answers = JSON.parse(localStorage.getItem('Answers'))
a[i] = 1 const solutions = JSON.parse(localStorage.getItem('Solutions'))
localStorage.setItem('채점' + (i + 1), 'O') for (let i = 0; i < answers.length; i++) {
if (answers[i] === solutions[i]) {
scores[i] = 1
} }
else { else {
a[i] = 0
localStorage.setItem('채점' + (i + 1), 'X') scores[i] = 0
} }
score += scores[i]
} }
return ( return (
<> <>
<div className="card" > <div className="container">
<div className='card-header'> <h2>채점표</h2>
-채점표- <table className="table table-bordered" >
<div className='card-body'> <thead>
<h3 className='card-title'>이름 : {localStorage.getItem('name')}</h3> <tr>
<th>응시자</th>
<th>{localStorage.getItem('name')}</th>
</tr>
</thead>
<tbody>
{scores.map((score, index) => {
return (score === 1) ? <tr><td>Quiz {index + 1}</td> <td> O </td></tr> : <tr><td>Quiz {index + 1}</td> <td> X</td></tr>
})}
<tr>
<td>총점</td>
<td>{score}점</td>
</tr>
</tbody>
</table>
</div>
<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 @ 3fbe99fd
// import bg from './img_study.jpg'
// import korea from './img_korea.jpg'
import React, { useState } from 'react' import React, { useState } from 'react'
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import './Home.css'
function Home() { function Home() {
const [name, setName] = useState('') const [name, setName] = useState('')
const [password, SetPassword] = useState('')
const [done, setDone] = useState(false) const [done, setDone] = useState(false)
const handleChange = (event) => { const handleChangename = (event) => {
setName(event.target.value) setName(event.target.value)
} }
const handleChangepassword = (event) => {
SetPassword(event.target.value)
}
function checking(event) { function checking() {
if (!name) { if (!name) {
alert('이름을 입력하세요') alert('이름을 입력하세요')
} }
else if (!password) {
alert('비밀번호를 입력하세요')
}
else if (password !== '0319') {
alert('유효한 비밀번호를 입력하세요')
}
else { else {
alert('입력하신 이름은' + name + '입니다.') alert('입력하신 이름은 ' + name + '입니다.')
localStorage.setItem('name', name) localStorage.setItem('name', name)
localStorage.setItem('password', password)
setDone(true) setDone(true)
} }
} }
return ( return (
<> <>
{done ? <Redirect to='/quiz' /> : ''} {done ? <Redirect to='/quiz' /> : ''}
<div className="container-fluid"> {/* <div style={{ backgroundImage: 'url(' + bg + ')', backgroundColor: "grey", backgroundSize: "100%", width: "100%", height: "880px", backgroundRepeat: 'no-repeat' }}>
<div className="h-100 text-center"> <div className="Main"></div> */}
<div className="mb-5"> <div style={{ fontSize: '70px', marginBottom: '100px', textAlign: 'center', backgroundColor: '#AE0E36' }}>
이름을 입력하세요 {/* <img alt='korea' src={korea} width='10%'/> */}
KOREA UNIVERSITY
</div> </div>
<input className="inputBox" onChange={handleChange} />
<div className='Box2'> <div className="d-flex justify-content-center ">
<button className="btn btn-dark" onClick={checking}>Quiz Start !</button>
<table className="table table-bordered dark-table" style={{ width: "400px" }}>
<thead className="text-center">
<tr style={{ height: "0 px" }}>정보 입력</tr>
</thead>
<tbody className="text-center">
<tr>
<td>이름 입력<input className="ml-2 inputBox" onChange={handleChangename} /></td>
</tr>
<tr>
<td>비밀번호<input type='password' className="ml-2 inputBox" onChange={handleChangepassword} /></td>
</tr>
<tr>
<td><button className="mt-4 btn btn-dark" onClick={checking}>Login</button></td>
</tr>
</tbody>
</table>
</div> </div>
{/* <div className="Box" style={{ border: 'solid', position: 'absolute', top: "300px", left: "68%"}} > */}
{/* <div className="Name" style={{boxShadow: '5px 5px 5px 5px gray', border: 'solid', fontSize: '30px', position: "absolute", top: "300px", left: "68%" }}>
이름(Name)
<input style={{ padding: '5px', border: 'solid', borderRight: 'none', borderBottom: 'none', borderTop: 'none', marginLeft: '105px', inlineSize: '160px', blockSize: '40px', fontSize: '40px' }} onChange={handleChangename} />
</div> </div>
{/* localStorage를 사용해야는지 localstorage를 사용해야하는지 */} <div className="Name" style={{ boxShadow: '5px 5px 5px 5px gray',border: 'solid', fontSize: '30px', position: "absolute", top: "360px", left: "68%" }}>
비밀번호(Password)
<input type='password' style={{ padding: '5px', border: 'solid', borderRight: 'none', borderBottom: 'none', borderTop: 'none', marginLeft: '0px', inlineSize: '160px', blockSize: '40px', fontSize: '40px' }} onChange={handleChangepassword} />
</div> </div>
<div className='Box2'>
<button style={{boxShadow: '5px 5px 5px 5px gray', marginLeft: '82%', marginTop: '10%', blockSize: '50px', inlineSize: '175px', fontSize: '35px' }} className="QuizStart" onClick={checking}>Start !</button>
</div> */}
<div>계산수학</div> {/* localStorage를 사용해야는지 localstorage를 사용해야하는지 */}
{/* </div> */}
{/* </div> */}
</> </>
) )
} }
export default Home; export default Home;
src/Quiz.js
View file @ 3fbe99fd
import React, { useState } from 'react' import React, { useState } from 'react'
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import Timer from 'react-compound-timer'; // 타이머쓰기위해 import import Timer from 'react-compound-timer'; // 타이머쓰기위해 import
import logo from './img/img_question.png' import logo from './img_question.png'
import fight from './img/img_quiz.png'
import './Quiz.css'
const QnA = [ const QnA = [
...@@ -12,6 +11,10 @@ const QnA = [ ...@@ -12,6 +11,10 @@ const QnA = [
{ Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], A: "2", N: 3 } { Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], A: "2", N: 3 }
] ]
let Answers = []
let Solutions = [4, 3, 2]
localStorage.setItem('Solutions', JSON.stringify(Solutions))
function Quiz() { function Quiz() {
const [question, setQuestion] = useState({ const [question, setQuestion] = useState({
...QnA[0], ...QnA[0],
...@@ -29,11 +32,9 @@ function Quiz() { ...@@ -29,11 +32,9 @@ function Quiz() {
let handleChange = (ev) => { let handleChange = (ev) => {
// ev.preventDefault() //새로고침 안되도록 // ev.preventDefault() //새로고침 안되도록
setSelected(ev.target.value) //selected값 변경 setSelected(ev.target.value) //selected값 변경
let checked_number = ev.target.id; Answers[question.N - 1] = Number(ev.target.id) + 1
localStorage.setItem('답' + (question.N), Number(checked_number) + 1)
localStorage.setItem('정답' + (question.N), QnA[question.N - 1].A)
localStorage.setItem('Answers', JSON.stringify(Answers))
} }
return ( return (
<div className="container-fluid position-absolute"> <div className="container-fluid position-absolute">
......
src/index.js
View file @ 3fbe99fd
...@@ -4,6 +4,7 @@ import './index.css'; ...@@ -4,6 +4,7 @@ import './index.css';
import App from './App'; import App from './App';
import 'bootstrap/dist/css/bootstrap.css'; import 'bootstrap/dist/css/bootstrap.css';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
import 'bootstrap/dist/css/bootstrap.css'
ReactDOM.render( ReactDOM.render(
<React.StrictMode> <React.StrictMode>
......
src/preQuiz.js
View file @ 3fbe99fd
import React from 'react'; import React, { useState } from 'react'
// import logo from './logo.svg'; import { Link } from 'react-router-dom';
import './Quiz.css'; import Timer from 'react-compound-timer'; // 타이머쓰기위해 import
import logo from './img/img_question.png'
import './Quiz.css'
const question = [ const QnA = [
{ Q: "6 X 4 ?", Choose: [6, 12, 18, 24], A: "" }, { Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], A: "4", N: 1 },
{ Q: "3 + 3 ?", Choose: [2, 4, 6, 8], A: "" }, { Q: "3 + 3 = ?", Choose: [2, 4, 6, 8], A: "3", N: 2 },
{ Q: "3 - 1 ?", Choose: [1, 2, 3, 4], A: "" } { Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], A: "2", N: 3 }
] ]
class Quiz extends React.Component { let Answers = []
constructor(props) { let Solutions = [4, 3, 2]
super(props) localStorage.setItem('Solutions', JSON.stringify(Solutions))
// this.setAnswer = this.setAnswer.bind(this)
this.setQuestion = this.setQuestion.bind(this) function Quiz() {
this.ShowQuiz = this.ShowQuiz.bind(this) const [question, setQuestion] = useState({
this.answerbox = this.answerbox.bind(this) ...QnA[0],
this.state = {
...question[0],
i: 0, i: 0,
page: 0, page: 0,
} })
// this.textInput = React.createRef() const [selected, setSelected] = useState("") //선택한 답을 보여줄 것들
// const [checked, setChecked] = useState(false)
function handleQuestion() {
setQuestion({ ...QnA[question.i + 1], i: question.i + 1, page: question.page + 1 })
// setChecked(false)
} }
ShowQuiz() {
this.setState({ page: 1 })
}
setQuestion() {
//값이 입력되지 않은채로 넘겨졌을 때 문제 해결 해야 함-sj-
this.setState({ ...question[this.state.i + 1], i: this.state.i + 1 })
} let handleChange = (ev) => {
//answerbox - answer박스의 값을 네임리스트로 받아와서 값을 localstorage에 저장 // ev.preventDefault() //새로고침 안되도록
answerbox() { setSelected(ev.target.value) //selected값 변경
let answers = document.getElementsByName('answer'); Answers[question.N - 1] = Number(ev.target.id) + 1
let count = answers.length
// var checked_index = -1;
var checked_value = '';
for (var i = 0; i < count; i++) { localStorage.setItem('Answers', JSON.stringify(Answers))
if (answers[i].checked) {
// checked_index = i;
checked_value = answers[i].value;
localStorage.setItem('answer-'+i, checked_value)
} }
}
// alert('선택된 항목 인덱스: ' + checked_index + '\n선택된 항목 값: ' + checked_value);
// if (document.getElementsByName("answer")[i].checked === true) {
// alert(document.getElementsByName("answer")[i].value);
// }
}
// setAnswer(e) {
// question[this.state.i]["A"] = e.target.value
// this.setState({ v: e.target.value })
// console.log(this.state)
// console.log(question)
// }
render() {
if (this.state.page === 1) {
this.answerbox()
if (this.state.i === question.length) {
return ( return (
<div> <div className="container-fluid position-absolute">
<h2>수고하셨습니다!</h2> <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>
) <div className="col-md-auto">
} <div className="h2 mt-2">
else { {question.Q}
return (
<div className="Quiz">
<h2>Q:{this.state.Q}</h2>
{this.state.Choose.map((a) =>
<div>
<input type="radio" name='answer' id={a} value={a} /*ref={this.textInput}*/ />
<label for={a}>{a}</label>
</div>)}
<div className="App">
정답을 입력하세요
</div> </div>
{/* <div> <div className="mt-2">
<input type="text" value={this.state.v} name="A" onChange={this.setAnswer} /> <form>
</div> */} {question.Choose.map((a, index) =>
<button type="button" onClick={setTimeout(this.setQuestion, 2000)}>다음</button> <div key={index}>
<input type="radio" name='answer' id={index} value={a} onClick={handleChange} />
<label className="font-weight-bold" htmlFor={a}>{a}</label>
</div> </div>
) )}
<input hidden type="submit" value="확인" /> {/*버튼 숨김*/}
</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">제출</button>
</Link>
: <button type="button" className="btn btn-outline-dark" onClick={handleQuestion}>다음</button>
} }
</div>
<p className="h3 text-center text-danger ">
<Timer
initialTime={3600000}
direction="backward"
checkpoints={[
{
time: 0,
callback: <Link to="/end">제출</Link>
// history.go(1)
} }
else { ]}
return ( >
<div className="Box"> {() => (
<div className="Main"> <>
<h1> Calculus</h1> <Timer.Minutes /> : <Timer.Seconds></Timer.Seconds> / 60 : 00 </>
)}
</Timer> {/* npm i react-compound-timer */}
</p>
</div>
</div>
<div className="col">
</div> </div>
<div className="Name">
이름을 입력하세요
<input onChange={(event) => { console.log(event.target.value) }} />
</div> </div>
<button className="QuizStart" onClick={this.ShowQuiz}>Quiz Start !</button>
</div> </div>
) )
}
}
} }
export default Quiz; export default Quiz;
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