Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finished event #163

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
71dd959
Made changes to the code, adding the color of the progress bar and ch…
Jikugodwill Feb 14, 2022
6fa4c35
lesson-page
ltran0817 Feb 14, 2022
1a9f0db
Made some changes with respect to the radio buttons
Jikugodwill Feb 15, 2022
a2c1353
change bg of popup
pextech Feb 16, 2022
8425ef8
nav-item
Ebube111 Feb 16, 2022
aeb6635
updated social links section
M-Rb3 Feb 17, 2022
d83cc88
updated select elements
M-Rb3 Feb 17, 2022
a0760f2
Merge pull request #120 from MinorityProgrammers/ft-courses-quizez-po…
pextech Feb 18, 2022
6c3e5c8
Merge pull request #117 from MinorityProgrammers/lesson-page
pextech Feb 18, 2022
f208eda
Merge pull request #123 from MinorityProgrammers/complete-setup
pextech Feb 18, 2022
d32286f
Merge pull request #122 from MinorityProgrammers/nav
pextech Feb 18, 2022
f193242
finished up
Ebube111 Feb 21, 2022
d25847b
merge changes
Ebube111 Feb 21, 2022
01ca83a
fixed conflic
pextech Feb 21, 2022
f4d84ac
Merge pull request #132 from MinorityProgrammers/new-incubator
pextech Feb 21, 2022
9c6afa9
changes
Ebube111 Feb 23, 2022
c79ce32
changes
Ebube111 Feb 24, 2022
8380bc8
temp
Ebube111 Feb 24, 2022
fe968e1
final changes
Ebube111 Feb 28, 2022
0703622
new changes
Ebube111 Feb 28, 2022
40b8892
changes
Ebube111 Feb 28, 2022
e16581a
changes
Ebube111 Feb 28, 2022
3bb3218
changes
Ebube111 Feb 28, 2022
d669788
changes
Ebube111 Feb 28, 2022
4973e21
resolved issues
Ebube111 Mar 1, 2022
34ed986
hopefully done
Ebube111 Mar 1, 2022
703e7b6
Merge pull request #145 from MinorityProgrammers/new-temp
pextech Mar 2, 2022
adeccc2
resolved changes
Ebube111 Mar 3, 2022
d64d04d
changes to incubator page
Ebube111 Mar 4, 2022
3af2161
merge changes
Ebube111 Mar 5, 2022
87fed9d
implemented latest suggestions
Ebube111 Mar 10, 2022
b158be3
changes
Ebube111 Mar 15, 2022
dfee327
event page
Ebube111 Mar 18, 2022
6b0c226
final change
Ebube111 Mar 22, 2022
0e159a6
conflicts
Ebube111 Mar 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions components/learn/quizActivity/QuizProgress.js
Original file line number Diff line number Diff line change
@@ -5,21 +5,23 @@ export default function QuizProgress(props) {
return (
<div>
<div className="progress">
<p className="counter">
<span>
Question
{currentQuestion + 1}
of
{questionLength}
</span>
</p>
<div
className="progress-bar"
style={{
width: `${((currentQuestion + 1) / questionLength) * 100}%`,
}}
/>
</div>
<p className="counter">
<span>
Question
{currentQuestion + 1}
<span className="total-questions">
/
{questionLength}
</span>
</span>
</p>
</div>
);
}
1 change: 1 addition & 0 deletions components/learn/quizActivity/SimpleQuiz.css
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@
height: 2em;
font-family: "Open Sans", "Helvetica", "Arial", sans-serif;
}

.quiz .progress .progress-bar {
background-color: #1d77cc;
}
42 changes: 38 additions & 4 deletions components/learn/quizActivity/SimpleQuiz.js
Original file line number Diff line number Diff line change
@@ -96,8 +96,31 @@ export default function SimpleQuiz() {
<div className="question-container">
<p className="question">{questions[currentQuestion].question}</p>
<form ref={radioRef}>
{answer?.map((item, index) => (
<div
{answer?.map((item, index) => (
<label
htmlFor={`radio-${index}`}
// class="input_radio"
key={`${index + 1}`}
className={`option${
questions[currentQuestion].checked && !item.correct
? ' dim'
: ''
}${
questions[currentQuestion].checked && item.correct
? ' correct'
: ''
}`}
>
<input id={`radio-${index}`}
type="radio"
name="option"
value={item.correct}
disabled={questions[currentQuestion].checked}
onClick={updateAnswer}
className="input_tag"
/>
<span className="q_main">{item.option}</span></label>
/* <div
key={`${index + 1}`}
className={`option${
questions[currentQuestion].checked && !item.correct
@@ -118,7 +141,7 @@ export default function SimpleQuiz() {
onClick={updateAnswer}
/>
<label htmlFor={`radio-${index}`}>{item.option}</label>
</div>
</div> */
))}
</form>
<div className="bottom">
@@ -132,7 +155,17 @@ export default function SimpleQuiz() {
</button>
)}
{currentQuestion + 1 < questions.length
&& questions[currentQuestion].checked && (
&& questions[currentQuestion].checked && (
<div className="spread-bottom">
<div className="left_bottom">
<svg className="arrow_circle" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="12" cy="12" r="9" transform="rotate(90 12 12)" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M12 8L8 12" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M16 12L8 12" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M12 16L8 12" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
<p className="back">back</p>
</div>
<button
className="fade-in next"
type="button"
@@ -142,6 +175,7 @@ export default function SimpleQuiz() {
{' '}
<i className="fa fa-arrow-right" />
</button>
</div>
)}
{currentQuestion + 1 === questions.length
&& questions[currentQuestion].checked && (
Loading