Skip to content

GitLab

Commit 67f034ae authored by 김민수's avatar 김민수
Browse files

No commit message 

No commit message
parent dab3de3f
Show whitespace changes
Inline Side-by-side
src/Admin.js
View file @ 67f034ae
...@@ -54,9 +54,9 @@ function Admin() { ...@@ -54,9 +54,9 @@ function Admin() {
localStorage.setItem('T', time * 1000) localStorage.setItem('T', time * 1000)
setDone(true) setDone(true)
}
}
function addSelectOption() { function addSelectOption() {
let list = function () { let list = function () {
return <div className="input-group"> return <div className="input-group">
...@@ -65,15 +65,14 @@ function Admin() { ...@@ -65,15 +65,14 @@ function Admin() {
<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" className="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div> </div>
} }
setselectOption(list) setselectOption(list)
} }
function handleClickQuiz() { function handleClickQuiz() {
let addQuiz = function () { let addQuiz = function () {
return <a className="nav-link" id="Quiz4-tab" data-toggle="pill" href="#Quiz4" role="tab" >Quiz</a> return <a className="nav-link" id="Quiz4-tab" data-toggle="pill" href="#Quiz4" role="tab" >Quiz4</a>
} }
setaddQuiz(addQuiz) setaddQuiz(addQuiz)
} }
...@@ -84,25 +83,26 @@ function Admin() { ...@@ -84,25 +83,26 @@ function Admin() {
<div className="row justify-content-md-center mt-5 "> <div className="row justify-content-md-center mt-5 ">
<div className="col-2 text-center border"> <div className="col-2 text-center border">
<div className="container-fluid "> <div className="container-fluid ">
<div className="navbar-header p-3 ">
<p className="navbar-brand border-bottom ">관리자 페이지</p>
</div>
<div className="nav flex-column nav-pills" id="v-pills-tab" role="tablist">
<p className="border-bottom h3">관리자 페이지</p> <p className="navbar-text border-bottom">관리자 설정 변경하기</p>
<p className="border-bottom h5">관리자 설정 변경하기</p>
<a className="" id="setting-tab" data-toggle='pill' href="#setting" role="tab">Setting</a> <a className="nav-link" id="setting-tab" data-toggle='pill' href="#setting">Setting</a>
<p className="border-bottom h5">Quiz 입력하기</p> <p className="navbar-text border-bottom">Quiz 입력하기</p>
<a className="nav-link" id="Quiz1-tab" data-toggle="pill" href="#Quiz1" role="tab" >Quiz1</a> <a className="nav-link" id="Quiz1-tab" data-toggle="pill" href="#Quiz1" >Quiz1</a>
<a className="nav-link" id="Quiz2-tab" data-toggle="pill" href="#Quiz2" role="tab" >Quiz2</a> <a className="nav-link" id="Quiz2-tab" data-toggle="pill" href="#Quiz2" >Quiz2</a>
<a className="nav-link" id="Quiz3-tab" data-toggle="pill" href="#Quiz3" role="tab" >Quiz3</a> <a className="nav-link" id="Quiz3-tab" data-toggle="pill" href="#Quiz3" >Quiz3</a>
{addQuiz} {addQuiz}
<button className="btn btn-danger navbar-btn" onClick={handleClickQuiz} >Quiz 추가</button> <button className="btn btn-danger navbar-btn" onClick={handleClickQuiz} >Quiz 추가</button>
</div>
</div> </div>
</div> </div>
<div className="col-8"> <div className="col-8">
...@@ -113,20 +113,20 @@ function Admin() { ...@@ -113,20 +113,20 @@ function Admin() {
<div className="row d-flex justify-content-center"> <div className="row d-flex justify-content-center">
<div className="col-8"> <div className="col-8">
<h1 className="p-3 border">관리자 설정 변경 창</h1> <h2 className="p-3 border text-center bg-danger">관리자 설정변경</h2>
<div className="p-3 border"> <div className="p-3 border">
<h2>변경할 비밀번호를 입력하세요</h2> <h3>변경할 비밀번호를 입력하세요</h3>
<input type="text" onChange={handleChangePassword} placeholder="New Password" /> <input className='p-2' type="text" onChange={handleChangePassword} placeholder="New Password" />
</div> </div>
<div className="p-3 border"> <div className="p-3 border">
<h2>변경할 관리자 비밀번호를 입력하세요</h2> <h3>변경할 관리자 비밀번호를 입력하세요</h3>
<input type="text" onChange={handleChangeAdminPassword} placeholder="New Admin Password" /> <input className='p-2' type="text" onChange={handleChangeAdminPassword} placeholder="New Admin Password" />
</div> </div>
<div className="p-3 border"> <div className="p-3 border">
<h2>타이머를 설정하세요(초단위)</h2> <h3>타이머를 설정하세요(초단위)</h3>
<input type="text" onChange={handleChangeTime} placeholder="Set Time" /> <input className='p-2' type="text" onChange={handleChangeTime} placeholder="Set Time" />
</div> </div>
...@@ -149,24 +149,24 @@ function Admin() { ...@@ -149,24 +149,24 @@ function Admin() {
<div className="row d-flex justify-content-center"> <div className="row d-flex justify-content-center">
<div className="col-8"> <div className="col-8">
<h2 className="p-3 border text-center">문제만들기</h2> <h2 className="p-3 border text-center bg-danger ">문제만들기</h2>
<div className="p-3 borber"> <div className="p-3 borber">
<div className="p-3 "> <div className="p-3 ">
<span className="font-weight-bold mr-2 h3">1.</span> <span className="font-weight-bold mr-2 h3">1.</span>
{/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */} {/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */}
<input type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" /> <input className='p-2' type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" />
</div> </div>
<div className="p-3 "> <div className="p-3 ">
<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 p-3">
<input type="radio" id="option" /> <input type="radio" id="option" />
</div> </div>
</div> </div>
<input type="text" className="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} /> <input type="text" className="form-control p-4" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div> </div>
{selectOption} {selectOption}
...@@ -176,7 +176,7 @@ function Admin() { ...@@ -176,7 +176,7 @@ function Admin() {
<div className="p-3 "> <div className="p-3 ">
<span className="font-weight-bold mr-2 h3">정답:</span> <span className="font-weight-bold mr-2 h3">정답:</span>
<input type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" /> <input className='p-2' type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" />
</div> </div>
<label for="inputLogin" className="d-flex justify-content-center"> <label for="inputLogin" className="d-flex justify-content-center">
...@@ -187,19 +187,6 @@ function Admin() { ...@@ -187,19 +187,6 @@ function Admin() {
</div> </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> </div>
...@@ -209,26 +196,24 @@ function Admin() { ...@@ -209,26 +196,24 @@ function Admin() {
<div className="row d-flex justify-content-center"> <div className="row d-flex justify-content-center">
<div className="col-8"> <div className="col-8">
<h2 className="p-3 border text-center">문제만들기</h2> <h2 className="p-3 border text-center bg-danger">문제만들기</h2>
<div className="p-3 borber"> <div className="p-3 borber">
<div className="p-3 "> <div className="p-3 ">
<span className="font-weight-bold mr-2 h3">1.</span> <span className="font-weight-bold mr-2 h3">1.</span>
{/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */} {/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */}
<input type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" /> <input className='p-2' type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" />
</div> </div>
<div className="p-3 "> <div className="p-3 ">
<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 p-3">
<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" className="form-control p-4" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div>
<input type="text" className="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div> </div>
{selectOption} {selectOption}
...@@ -238,7 +223,7 @@ function Admin() { ...@@ -238,7 +223,7 @@ function Admin() {
<div className="p-3 "> <div className="p-3 ">
<span className="font-weight-bold mr-2 h3">정답:</span> <span className="font-weight-bold mr-2 h3">정답:</span>
<input type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" /> <input className='p-2' type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" />
</div> </div>
<label for="inputLogin" className="d-flex justify-content-center"> <label for="inputLogin" className="d-flex justify-content-center">
...@@ -250,32 +235,29 @@ function Admin() { ...@@ -250,32 +235,29 @@ function Admin() {
</div> </div>
</div> </div>
</div> </div>
</div>
<div className="tab-pane fade" id="Quiz3" role="tabpanel"> <div className="tab-pane fade" id="Quiz3" role="tabpanel">
<div className="container"> <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">
<h2 className="p-3 border text-center">문제만들기</h2> <h2 className="p-3 border text-center bg-danger">문제만들기</h2>
<div className="p-3 borber"> <div className="p-3 borber">
<div className="p-3 "> <div className="p-3 ">
<span className="font-weight-bold mr-2 h3">1.</span> <span className="font-weight-bold mr-2 h3">1.</span>
{/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */} {/* <input type="text" onChange={handleChangenumber} placeholder="Number" /> */}
<input type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" /> <input className='p-2' type="text" onChange={handleChangeQuestion} placeholder="문제를 입력하세요" />
</div> </div>
<div className="p-3 "> <div className="p-3 ">
<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 p-3">
<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" className="form-control p-4" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div>
<input type="text" className="form-control" placeholder="보기를 입력하세요" onChange={handleChangechoose} />
</div> </div>
{selectOption} {selectOption}
...@@ -285,7 +267,7 @@ function Admin() { ...@@ -285,7 +267,7 @@ function Admin() {
<div className="p-3 "> <div className="p-3 ">
<span className="font-weight-bold mr-2 h3">정답:</span> <span className="font-weight-bold mr-2 h3">정답:</span>
<input type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" /> <input className='p-2' type="text" onChange={handleChangeanswer} placeholder="정답을 입력하세요" />
</div> </div>
<label for="inputLogin" className="d-flex justify-content-center"> <label for="inputLogin" className="d-flex justify-content-center">
...@@ -298,6 +280,8 @@ function Admin() { ...@@ -298,6 +280,8 @@ function Admin() {
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</> </>
) )
......
src/App.js
View file @ 67f034ae
...@@ -12,7 +12,7 @@ function App() { ...@@ -12,7 +12,7 @@ function App() {
<Router> <Router>
<header> <header>
<Link to="/"> <Link to="/">
<button className="calcButton">Calculus</button> <button>Calculus</button>
</Link> </Link>
</header> </header>
<hr /> <hr />
......
src/Quiz.js
View file @ 67f034ae
import React, { useState } from 'react' import React, { useState } from 'react'
import { Link, Redirect } from 'react-router-dom'; import { Link, Redirect } 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'
const QnA = [ const QnA = [
{ Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], N: 1 }, { Q: "6 X 4 = ?", Choose: [6, 12, 18, 24], N: 1 },
...@@ -9,7 +11,7 @@ const QnA = [ ...@@ -9,7 +11,7 @@ const QnA = [
{ Q: "3 - 1 = ?", Choose: [1, 2, 3, 4], N: 3 } { 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)) localStorage.setItem('Answers', JSON.stringify(Answers))
let Solutions = [4, 3, 2] let Solutions = [4, 3, 2]
localStorage.setItem('Solutions', JSON.stringify(Solutions)) localStorage.setItem('Solutions', JSON.stringify(Solutions))
...@@ -20,18 +22,21 @@ function Quiz() { ...@@ -20,18 +22,21 @@ function Quiz() {
i: 0, i: 0,
page: 0, page: 0,
}) })
const [selected, setSelected] = useState("") //선택한 답을 보여줄 것 const [selected, setSelected] = useState("") //선택한 답을 보여줄 것들
// const [checked, setChecked] = useState(false)
const [timeout, settimeout] = useState(false) const [timeout, settimeout] = useState(false)
function handleQuestion() { function handleQuestion() {
setQuestion({ ...QnA[question.i + 1], i: question.i + 1, page: question.page + 1 }) setQuestion({ ...QnA[question.i + 1], i: question.i + 1, page: question.page + 1 })
setSelected("") //페이지 넘어가면 selected 초기화 // setChecked(false)
} }
let handleChange = (ev) => { let handleChange = (ev) => {
// ev.preventDefault() //새로고침 안되도록
setSelected(ev.target.value) //selected값 변경 setSelected(ev.target.value) //selected값 변경
Answers[question.N - 1] = Number(ev.target.id) + 1 Answers[question.N - 1] = Number(ev.target.id) + 1
localStorage.setItem('Answers', JSON.stringify(Answers)) localStorage.setItem('Answers', JSON.stringify(Answers))
} }
return ( return (
...@@ -51,8 +56,8 @@ function Quiz() { ...@@ -51,8 +56,8 @@ function Quiz() {
<div className="mt-2"> <div className="mt-2">
<form> <form>
{question.Choose.map((a, index) => {question.Choose.map((a, index) =>
<div> <div key={index}>
<input type="radio" name='answer' id={index} value={a} onChange={handleChange} checked={selected === String(a)} /> <input type="radio" name='answer' id={index} value={a} onChange={handleChange} checked={parseInt(selected) === a} />
<label className="font-weight-bold" htmlFor={a}>{a}</label> <label className="font-weight-bold" htmlFor={a}>{a}</label>
</div> </div>
)} )}
...@@ -68,11 +73,12 @@ function Quiz() { ...@@ -68,11 +73,12 @@ function Quiz() {
</div> </div>
<p className="h3 text-center text-danger "> <p className="h3 text-center text-danger ">
<Timer <Timer
initialTime={30010} initialTime={36000}
direction="backward" direction="backward"
checkpoints={[ checkpoints={[
{time:1, {
callback:()=>alert('시간이 초과되었습니다.'), time: 1,
callback: () => alert('시간이 초과되었습니다.'),
}, },
{ {
time: 0, time: 0,
...@@ -83,7 +89,8 @@ function Quiz() { ...@@ -83,7 +89,8 @@ function Quiz() {
> >
{() => ( {() => (
<> <>
<Timer.Minutes /> : <Timer.Seconds></Timer.Seconds> / 30 : 00 </> <Timer.Minutes /> : <Timer.Seconds /> / 30 : 00
</>
)} )}
</Timer> {/* npm i react-compound-timer */} </Timer> {/* npm i react-compound-timer */}
</p> </p>
...@@ -93,7 +100,7 @@ function Quiz() { ...@@ -93,7 +100,7 @@ function Quiz() {
</div> </div>
</div> </div>
</div> </div>
{timeout ? <Redirect to='/end'/> : '' } {timeout ? <Redirect to='/end' /> : ''}
</> </>
) )
......
src/index.js
View file @ 67f034ae
...@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'; ...@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
import 'react-dom' import 'react-dom'
import './index.css'; import './index.css';
import App from './App'; import App from './App';
import 'bootstrap/dist/css/bootstrap.css'; // import Quiz from './Quiz';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';
import 'bootstrap/dist/css/bootstrap.css' import 'bootstrap/dist/css/bootstrap.css'
import 'bootstrap' import 'bootstrap'
......
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