| @@ -11,7 +11,8 @@ const Quiz_Details: QuizDetails[] = [ | |||||
| ], | ], | ||||
| answer: ["System.out.println('Hello, how are you?');"], | answer: ["System.out.println('Hello, how are you?');"], | ||||
| result: false, | result: false, | ||||
| timeLimit: 10 | |||||
| timeLimit: 10, | |||||
| type: "singleSelect" | |||||
| }, | }, | ||||
| { | { | ||||
| question: "How do you write 'Hello World' in an alert box?", | question: "How do you write 'Hello World' in an alert box?", | ||||
| @@ -23,7 +24,9 @@ const Quiz_Details: QuizDetails[] = [ | |||||
| ], | ], | ||||
| answer: ["alert('Hello World');"], | answer: ["alert('Hello World');"], | ||||
| result: false, | result: false, | ||||
| timeLimit: 10 | |||||
| timeLimit: 10, | |||||
| type: "singleSelect" | |||||
| }, | }, | ||||
| { | { | ||||
| question: "is javascript", | question: "is javascript", | ||||
| @@ -35,15 +38,30 @@ const Quiz_Details: QuizDetails[] = [ | |||||
| ], | ], | ||||
| answer: ["B", "C"], | answer: ["B", "C"], | ||||
| result: false, | result: false, | ||||
| timeLimit: 35 | |||||
| timeLimit: 35, | |||||
| type: "multiSelect" | |||||
| }, | }, | ||||
| { | { | ||||
| question: "Is javascript single threaded or multi threaded? enter the answer in the below box ", | question: "Is javascript single threaded or multi threaded? enter the answer in the below box ", | ||||
| options: [], | options: [], | ||||
| answer: ["single threaded"], | answer: ["single threaded"], | ||||
| result: false, | result: false, | ||||
| timeLimit: 40 | |||||
| } | |||||
| timeLimit: 40, | |||||
| type: "textInpit" | |||||
| }, | |||||
| { | |||||
| question: "is javascript", | |||||
| options: [ | |||||
| "A", | |||||
| "B", | |||||
| "C", | |||||
| "D" | |||||
| ], | |||||
| answer: ["B", "C"], | |||||
| result: false, | |||||
| timeLimit: 35, | |||||
| type: "multiSelect" | |||||
| }, | |||||
| ]; | ]; | ||||
| @@ -4,4 +4,5 @@ export interface QuizDetails { | |||||
| answer: string[]; | answer: string[]; | ||||
| result: boolean; | result: boolean; | ||||
| timeLimit: number; | timeLimit: number; | ||||
| type: string; | |||||
| } | } | ||||
| @@ -1,12 +1,75 @@ | |||||
| .optionHolder { | .optionHolder { | ||||
| ion-list { | ion-list { | ||||
| ion-radio-group { | |||||
| ion-item { | |||||
| width: 99%; | |||||
| margin: 0 auto; | |||||
| --background: white; | |||||
| border: 1px solid #DBDBDB; | |||||
| border-radius: 25px; | |||||
| ion-label { | |||||
| --color: #626262; | |||||
| font-size: 1.2rem !important; | |||||
| font-weight: 200; | |||||
| } | |||||
| ion-radio { | |||||
| --color-checked: var(--primary-button-color); | |||||
| margin-left: 1.5rem; | |||||
| } | |||||
| } | |||||
| .highlighted { | |||||
| box-shadow: 0px 0px 10px #00000029; | |||||
| ion-radio { | |||||
| --color: var(--primary-button-color); | |||||
| } | |||||
| } | |||||
| // styles for multiselect checkbox | |||||
| .checkBoxHolder { | |||||
| border: 0.2rem solid #707070; | |||||
| border-radius: 2.5rem; | |||||
| width: 2rem; | |||||
| height: 2rem; | |||||
| margin-left: 2rem; | |||||
| .checkBox { | |||||
| --background-checked: var(--primary-button-color); | |||||
| --checkmark-color: var(--primary-button-color); | |||||
| --border-width: 0; | |||||
| margin: 0; | |||||
| margin-top: 0.26rem; | |||||
| margin-left: 0.27rem; | |||||
| width: 1.2rem; | |||||
| height: 1.2rem; | |||||
| } | |||||
| } | |||||
| .multiSelectLabel { | |||||
| margin-left: 2rem; | |||||
| } | |||||
| .options { | |||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| align-items: center; | align-items: center; | ||||
| justify-content: space-around; | justify-content: space-around; | ||||
| height: 40vh; | height: 40vh; | ||||
| .textInput { | |||||
| width: 95%; | |||||
| margin: 0 auto; | |||||
| width: 30rem; | |||||
| height: 4rem; | |||||
| font-size: 1.4rem; | |||||
| border-radius: 2.5rem; | |||||
| padding-left: 2rem; | |||||
| } | |||||
| ion-item { | ion-item { | ||||
| width: 99%; | width: 99%; | ||||
| margin: 0 auto; | margin: 0 auto; | ||||
| @@ -1,17 +1,46 @@ | |||||
| import { IonButton, IonItem, IonLabel, IonList, IonRadio, IonRadioGroup } from '@ionic/react'; | |||||
| import { useState } from 'react'; | |||||
| import { IonButton, IonCheckbox, IonItem, IonLabel, IonList, IonRadio, IonRadioGroup } from '@ionic/react'; | |||||
| import { useEffect, useRef, useState } from 'react'; | |||||
| import Input from '../../components/formInput/Input'; | |||||
| import styles from './Options.module.scss'; | import styles from './Options.module.scss'; | ||||
| interface OwnProps { | interface OwnProps { | ||||
| options: string[] | undefined; | options: string[] | undefined; | ||||
| type: string; | |||||
| updateQuestionNumber: () => void; | updateQuestionNumber: () => void; | ||||
| } | } | ||||
| const Options: React.FC<OwnProps> = (props) => { | const Options: React.FC<OwnProps> = (props) => { | ||||
| const [selected, setSelected] = useState<string | undefined>(undefined); | const [selected, setSelected] = useState<string | undefined>(undefined); | ||||
| const [selectedOptions, setSelectedOptions] = useState<string[]>([]); | |||||
| const [textInput, setTextInput] = useState<String>(""); | |||||
| const [answers, setAnswers] = useState<string[]>([]); | |||||
| const inputRef = useRef<HTMLInputElement>(null); | |||||
| // console.log(selected); | |||||
| useEffect(() => { | |||||
| console.log("render"); | |||||
| setSelected(undefined); | |||||
| setSelectedOptions([]); | |||||
| }, [props.options]); | |||||
| const selectChecked = (option: string) => { | |||||
| let newOption: string[] = []; | |||||
| if (selectedOptions.includes(option)) { | |||||
| newOption = selectedOptions.filter(oldOption => oldOption !== option); | |||||
| } else { | |||||
| newOption = selectedOptions.concat([option]); | |||||
| } | |||||
| setSelectedOptions(newOption); | |||||
| } | |||||
| console.log(selectedOptions); | |||||
| console.log(selected); | |||||
| const handleInput = () => { | |||||
| setTextInput(inputRef.current?.value!) | |||||
| console.log(textInput); | |||||
| } | |||||
| const options = props.options!.map((option, key) => { | const options = props.options!.map((option, key) => { | ||||
| return ( | return ( | ||||
| @@ -22,19 +51,48 @@ const Options: React.FC<OwnProps> = (props) => { | |||||
| ); | ); | ||||
| }); | }); | ||||
| const MultiSelectOptions = props.options!.map((option, key) => { | |||||
| return ( | |||||
| <IonItem lines='none' key={key} className={(selectedOptions.includes(option)) ? styles.highlighted : ""}> | |||||
| <div className={styles.checkBoxHolder}> | |||||
| <IonCheckbox slot="start" mode='ios' className={styles.checkBox} onIonChange={e => selectChecked(option)} /> | |||||
| </div> | |||||
| <IonLabel className={styles.multiSelectLabel}>{option}</IonLabel> | |||||
| </IonItem> | |||||
| ); | |||||
| }); | |||||
| return ( | return ( | ||||
| <div className={styles.optionHolder}> | <div className={styles.optionHolder}> | ||||
| <IonList> | <IonList> | ||||
| <IonRadioGroup onIonChange={e => setSelected(e.detail.value)}> | |||||
| {options} | |||||
| </IonRadioGroup> | |||||
| {props.type === "singleSelect" && | |||||
| <IonRadioGroup onIonChange={e => setSelected(e.detail.value)} allowEmptySelection={true} className={styles.options}> | |||||
| {options} | |||||
| </IonRadioGroup> | |||||
| } | |||||
| {props.type === "multiSelect" && | |||||
| <div className={styles.options}> | |||||
| {MultiSelectOptions} | |||||
| </div> | |||||
| } | |||||
| {props.type === "textInpit" && | |||||
| <div className={styles.options}> | |||||
| <input | |||||
| type="text" | |||||
| className={styles.textInput} | |||||
| placeholder="enter your answer" | |||||
| ref={inputRef} | |||||
| onChange={handleInput} /> | |||||
| </div> | |||||
| } | |||||
| </IonList> | </IonList> | ||||
| <div className={styles.button + " " + (selected ? styles.active : "")} | <div className={styles.button + " " + (selected ? styles.active : "")} | ||||
| onClick={() => props.updateQuestionNumber()}> | onClick={() => props.updateQuestionNumber()}> | ||||
| <IonButton shape="round" expand='block'>Next</IonButton> | <IonButton shape="round" expand='block'>Next</IonButton> | ||||
| </div> | </div> | ||||
| </div> | |||||
| </div > | |||||
| ); | ); | ||||
| } | } | ||||
| @@ -10,29 +10,28 @@ interface OwnProp { | |||||
| updateQuestionNumber: () => void; | updateQuestionNumber: () => void; | ||||
| } | } | ||||
| let timeout: NodeJS.Timeout; | |||||
| const Question: React.FC<OwnProp> = (props) => { | const Question: React.FC<OwnProp> = (props) => { | ||||
| const [seconds, setSeconds] = useState<number>(props.timeLimit); | const [seconds, setSeconds] = useState<number>(props.timeLimit); | ||||
| const [duration, setDuration] = useState<number>(props.timeLimit); | const [duration, setDuration] = useState<number>(props.timeLimit); | ||||
| const displaySeconds = seconds % 60; | const displaySeconds = seconds % 60; | ||||
| useEffect(() => { | |||||
| setSeconds(props.timeLimit); | |||||
| setDuration(props.timeLimit); | |||||
| }, [props.questionNumber]); | |||||
| // useEffect(() => { | |||||
| // setSeconds(props.timeLimit); | |||||
| // setDuration(props.timeLimit); | |||||
| // }, [props.questionNumber]); | |||||
| // useEffect(() => { | |||||
| // console.log(seconds); | |||||
| // setTimeout(() => { | |||||
| // if (seconds > 0) { | |||||
| // setSeconds(seconds - 1); | |||||
| // } else { | |||||
| // props.updateQuestionNumber(); | |||||
| // } | |||||
| // }, 1000); | |||||
| useEffect(() => { | |||||
| setTimeout(() => { | |||||
| if (seconds > 0) { | |||||
| setSeconds(seconds - 1); | |||||
| } else { | |||||
| props.updateQuestionNumber(); | |||||
| } | |||||
| }, 1000); | |||||
| }, [seconds]); | |||||
| // }, [seconds]); | |||||
| const renderTime = () => { | const renderTime = () => { | ||||
| return ( | return ( | ||||
| @@ -59,12 +58,12 @@ const Question: React.FC<OwnProp> = (props) => { | |||||
| <CountdownCircleTimer | <CountdownCircleTimer | ||||
| isPlaying | isPlaying | ||||
| duration={duration} | |||||
| duration={0} | |||||
| colors={'#6BD534'} | colors={'#6BD534'} | ||||
| size={60} | size={60} | ||||
| onComplete={() => { | |||||
| return { shouldRepeat: true, delay: 1.5 } | |||||
| }} | |||||
| // onComplete={() => { | |||||
| // return { shouldRepeat: true, delay: 1.5 } | |||||
| // }} | |||||
| strokeWidth={5} > | strokeWidth={5} > | ||||
| {renderTime} | {renderTime} | ||||
| @@ -38,7 +38,10 @@ const Quiz: React.FC = () => { | |||||
| <div className={styles.quizOptions}> | <div className={styles.quizOptions}> | ||||
| <div className={styles.options}> | <div className={styles.options}> | ||||
| <Options options={Quiz_Details[questionNumber - 1].options} updateQuestionNumber={updateQuestionNumber} /> | |||||
| <Options | |||||
| options={Quiz_Details[questionNumber - 1].options} | |||||
| updateQuestionNumber={updateQuestionNumber} | |||||
| type={Quiz_Details[questionNumber - 1].type} /> | |||||
| </div> | </div> | ||||
| {/* <Link to="/" className={styles.button + " " + (selected ? styles.active : "")}> | {/* <Link to="/" className={styles.button + " " + (selected ? styles.active : "")}> | ||||