Skip to content

GitLab

Commit 77b88d35 authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

Merge branch 'Sangjune' into jiwon

parents 109ab3ca d6a42aaa
Show whitespace changes
Inline Side-by-side
package-lock.json
View file @ 77b88d35
...@@ -5092,9 +5092,9 @@ ...@@ -5092,9 +5092,9 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"bootstrap": { "bootstrap": {
"version": "4.5.1", "version": "4.5.2",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.1.tgz", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.2.tgz",
"integrity": "sha512-bxUooHBSbvefnIZfjD0LE8nfdPKrtiFy2sgrxQwUZ0UpFzpjVbVMUxaGIoo9XWT4B2LG1HX6UQg0UMOakT0prQ==" "integrity": "sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A=="
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
......
src/Admin.js
View file @ 77b88d35
import React, { useState } from 'react'; import React, { useState } from 'react';
// import { Link } from 'react-router-dom'; // import { Link } from 'react-router-dom';
function Admin() { function Admin() {
// let QnAadmin = []
// let Q = []
// let choose = []
// let N = []
const [question, setQuestion] = useState('') const [question, setQuestion] = useState('')
const [choose, setChoose] = useState('') const [choose, setChoose] = useState('')
const [answer, setAnswer] = useState('') const [answer, setAnswer] = useState('')
const [selectOption, setselectOption ] = useState('') const [password, setPassword] = useState('')
// const [done, setDone] = useState(false) const [adminpassword, setAdminPassword] = useState('')
const [time, setTime] = useState('')
const [addQuiz, setaddQuiz] = useState('')
const [selectOption, setselectOption] = useState('')
const [done, setDone] = useState(false)
const handleChangeQuestion = (event) => { const handleChangeQuestion = (event) => {
setQuestion(event.target.value) setQuestion(event.target.value)
...@@ -18,19 +32,33 @@ function Admin() { ...@@ -18,19 +32,33 @@ function Admin() {
const handleChangeanswer = (event) => { const handleChangeanswer = (event) => {
setAnswer(event.target.value) setAnswer(event.target.value)
} }
const handleChangePassword = (event) => {
setPassword(event.target.value)
}
const handleChangeAdminPassword = (event) => {
setAdminPassword(event.target.value)
}
const handleChangeTime = (event) => {
setTime(event.target.value)
}
function handleClick() { function handleClick() {
// localStorage.setItem('N', number) alert('입력이 완료되었습니다')
localStorage.setItem('Q', question) localStorage.setItem('Q', question)
localStorage.setItem('Choose', choose) localStorage.setItem('Choose', choose)
localStorage.setItem('Answer', answer) localStorage.setItem('Answer', answer)
// setDone(true) localStorage.setItem('P', password)
alert('입력이 완료되었습니다') localStorage.setItem('AP', adminpassword)
localStorage.setItem('T', time * 1000)
setDone(true)
} }
function addSelectOption() { function addSelectOption() {
let list = function(){ let list = function () {
return <div className="input-group"> return <div className="input-group">
<div className="input-group-prepend"> <div className="input-group-prepend">
<div className="input-group-text"> <div className="input-group-text">
...@@ -42,12 +70,155 @@ function Admin() { ...@@ -42,12 +70,155 @@ function Admin() {
} }
setselectOption(list) setselectOption(list)
} }
function addSelectOption() {
let list = function () {
return <div className="input-group">
<div className="input-group-prepend">
<div className="input-group-text">
<input type="radio" id="option" />
</div>
</div>
<input type="text" class="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div>
}
setselectOption(list)
}
function handleClickQuiz() {
let addQuiz = function () {
return <a className="nav-link" id="v-pills-settings-tab" data-toggle="pill" href="#Quiz4" role="tab" aria-controls="v-pills-settings" aria-selected="false">Quiz4</a>
}
setaddQuiz(addQuiz)
}
return ( return (
<> <>
{/* {done ? alert('모두 입력되었습니다.') : ''} */} {done ? alert('모두 입력되었습니다.') : ''}
<div className="row">
<div className="col-3">
<div className="container-fluid ">
<div className="navbar-header p-3">
<p className="navbar-brand">관리자 페이지</p>
</div>
<div className="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
<p className="navbar-text">관리자 설정 변경하기</p>
<a className="nav-link" id="setting-tab" data-toggle='pill' href="#setting" role="tab" aria-controls="v-pills-home" aria-selected="false">Setting</a>
<p className="navbar-text">Quiz 입력하기</p>
<a className="nav-link" id="Quiz1-tab" data-toggle="pill" href="#Quiz1" role="tab" aria-controls="v-pills-profile" aria-selected="false">Quiz1</a>
<a className="nav-link" id="Quiz2-tab" data-toggle="pill" href="#Quiz2" role="tab" aria-controls="v-pills-messages" aria-selected="false">Quiz2</a>
<a className="nav-link" id="Quiz3-tab" data-toggle="pill" href="#Quiz3" role="tab" aria-controls="v-pills-settings" aria-selected="false">Quiz3</a>
{addQuiz}
<button class="btn btn-danger navbar-btn" onClick={handleClickQuiz} >Quiz 추가</button>
</div>
</div>
</div>
<div className="col-9">
<div className="tab-content" id="v-pills-tabContent">
<div className="tab-pane fade show active" id="setting" role="tabpanel" aria-labelledby="v-pills-home-tab">
<div>
<div className="container">
<div className="row d-flex justify-content-center">
<div className="col-8">
<h1 className="p-3 border">관리자 설정 변경 창</h1>
<div className="p-3 border">
<h2>변경할 비밀번호를 입력하세요</h2>
<input type="text" onChange={handleChangePassword} placeholder="New Password" />
</div>
<div className="p-3 border">
<h2>변경할 관리자 비밀번호를 입력하세요</h2>
<input type="text" onChange={handleChangeAdminPassword} placeholder="New Admin Password" />
</div>
<div className="p-3 border">
<h2>타이머를 설정하세요(초단위)</h2>
<input type="text" onChange={handleChangeTime} placeholder="Set Time" />
</div>
<label for="inputLogin" className="d-flex justify-content-center">
<button className="mt-4 btn btn-dark" onClick={handleClick}>작성완료</button>
</label>
</div>
</div>
</div>
</div>
</div>
<div className="tab-pane fade show active" id="Quiz1" role="tabpanel" aria-labelledby="v-pills-profile-tab">
<div className="container">
<div className="row d-flex justify-content-center">
<div className="col-8">
<h2 className="p-3 border text-center">문제만들기</h2>
<div className="p-3 borber">
<div className="p-3 ">
<span className="font-weight-bold mr-2 h3">1.</span>
{/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */}
<input type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" />
</div>
<div className="p-3 ">
<div className="input-group">
<div className="input-group-prepend">
<div className="input-group-text">
<input type="radio" id="option" />
</div>
</div>
<input type="text" class="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div>
{selectOption}
<button className="btn btn-outline-secondary btn-sm" onClick={addSelectOption}>+</button>
</div>
<div className="p-3 ">
<span className="font-weight-bold mr-2 h3">정답:</span>
<input type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" />
</div>
<label for="inputLogin" className="d-flex justify-content-center">
<button className="mt-4 btn btn-dark" onClick={handleClick}>작성완료</button>
</label>
<div className="container-fluid"> </div>
</div>
</div>
<div className="p-3 ">
<div className="input-group">
<div className="input-group-prepend">
<div className="input-group-text">
<input type="radio" id="option" />
</div>
</div>
<input type="text" class="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div>
{selectOption}
<button className="btn btn-outline-secondary btn-sm" onClick={addSelectOption}>+</button>
</div>
</div>
<div className="tab-pane fade" id="Quiz2" role="tabpanel" aria-labelledby="v-pills-messages-tab">
<div className="container">
<div className="row d-flex justify-content-center"> <div className="row d-flex justify-content-center">
<div className="col-8"> <div className="col-8">
...@@ -65,7 +236,7 @@ function Admin() { ...@@ -65,7 +236,7 @@ function Admin() {
<div className="input-group"> <div className="input-group">
<div className="input-group-prepend"> <div className="input-group-prepend">
<div className="input-group-text"> <div className="input-group-text">
<input type="radio" id="option"/> <input type="radio" id="option" />
</div> </div>
</div> </div>
<input type="text" class="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} /> <input type="text" class="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
...@@ -84,11 +255,62 @@ function Admin() { ...@@ -84,11 +255,62 @@ function Admin() {
<label for="inputLogin" className="d-flex justify-content-center"> <label for="inputLogin" className="d-flex justify-content-center">
<button className="mt-4 btn btn-dark" onClick={handleClick}>작성완료</button> <button className="mt-4 btn btn-dark" onClick={handleClick}>작성완료</button>
</label> </label>
</div>
</div> </div>
</div>
</div>
</div>
<div className="tab-pane fade" id="Quiz3" role="tabpanel" aria-labelledby="v-pills-settings-tab">
<div className="container">
<div className="row d-flex justify-content-center">
<div className="col-8">
<h2 className="p-3 border text-center">문제만들기</h2>
<div className="p-3 borber">
<div className="p-3 ">
<span className="font-weight-bold mr-2 h3">1.</span>
{/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */}
<input type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" />
</div>
<div className="p-3 ">
<div className="input-group">
<div className="input-group-prepend">
<div className="input-group-text">
<input type="radio" id="option" />
</div>
</div>
<input type="text" class="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div>
{selectOption}
<button className="btn btn-outline-secondary btn-sm" onClick={addSelectOption}>+</button>
</div> </div>
<div className="p-3 ">
<span className="font-weight-bold mr-2 h3">정답:</span>
<input type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" />
</div> </div>
<label for="inputLogin" className="d-flex justify-content-center">
<button className="mt-4 btn btn-dark" onClick={handleClick}>작성완료</button>
</label>
</div> </div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</> </>
) )
} }
......
src/End.js
View file @ 77b88d35
...@@ -5,6 +5,7 @@ import React from 'react' ...@@ -5,6 +5,7 @@ import React from 'react'
// import { Link } from 'react-router-dom'; // import { Link } from 'react-router-dom';
function End() { function End() {
let result = ''
let scores = [] let scores = []
let score = 0 let score = 0
const answers = JSON.parse(localStorage.getItem('Answers')) const answers = JSON.parse(localStorage.getItem('Answers'))
...@@ -16,11 +17,17 @@ function End() { ...@@ -16,11 +17,17 @@ function End() {
scores[i] = 1 scores[i] = 1
} }
else if (answers[i] === 0) {
scores[i] = -1
}
else { else {
scores[i] = 0 scores[i] = 0
} }
score += scores[i] score += scores[i]
if (score <0){
score =0
}
} }
return ( return (
...@@ -37,7 +44,17 @@ function End() { ...@@ -37,7 +44,17 @@ function End() {
<tbody> <tbody>
{scores.map((score, index) => { {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> if (score === -1) {
result = <tr><td>Quiz {index + 1}</td> <td> 정답이 입력되지 않았습니다. </td></tr>
}
else if (score === 1) {
result = <tr><td>Quiz {index + 1}</td> <td> O </td></tr>
}
else {
result = <tr><td>Quiz {index + 1}</td> <td> X</td></tr>
}
return result
})} })}
<tr> <tr>
<td>총점</td> <td>총점</td>
......
src/Quiz.js
View file @ 77b88d35
...@@ -4,9 +4,9 @@ import Timer from 'react-compound-timer'; // 타이머쓰기위해 import ...@@ -4,9 +4,9 @@ import Timer from 'react-compound-timer'; // 타이머쓰기위해 import
import logo from './img/img_question.png' import logo from './img/img_question.png'
const QnA = [ const QnA = [
{ Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], A: "4", N: 1 }, { Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], N: 1 },
{ Q: "3 + 3 = ?", Choose: [2, 4, 6, 8], A: "3", N: 2 }, { Q: "3 + 3 = ?", Choose: [2, 4, 6, 8], N: 2 },
{ Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], A: "2", N: 3 } { Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], N: 3 }
] ]
let Answers = [0,0,0] let Answers = [0,0,0]
......
src/index.js
View file @ 77b88d35
...@@ -5,6 +5,7 @@ import './index.css'; ...@@ -5,6 +5,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'
import 'bootstrap' import 'bootstrap'
ReactDOM.render( ReactDOM.render(
......
src/preQuiz.js deleted 100644 → 0
View file @ 109ab3ca
import React, { useState } from 'react'
import { Link } from 'react-router-dom';
import Timer from 'react-compound-timer'; // 타이머쓰기위해 import
import logo from './img/img_question.png'
import './Quiz.css'
const QnA = [
{ 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 }
]
let Answers = []
let Solutions = [4, 3, 2]
localStorage.setItem('Solutions', JSON.stringify(Solutions))
function Quiz() {
const [question, setQuestion] = useState({
...QnA[0],
i: 0,
page: 0,
})
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)
}
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 position-absolute">
<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="mt-2">
<form>
{question.Choose.map((a, index) =>
<div key={index}>
<input type="radio" name='answer' id={index} value={a} onClick={handleChange} />
<label className="font-weight-bold" htmlFor={a}>{a}</label>
</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)
}
]}
>
{() => (
<>
<Timer.Minutes /> : <Timer.Seconds></Timer.Seconds> / 60 : 00 </>
)}
</Timer> {/* npm i react-compound-timer */}
</p>
</div>
</div>
<div className="col">
</div>
</div>
</div>
)
}
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