Skip to content

recommitting files due to branch conflict. All PR changes reflected #117

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

Merged
merged 25 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7dc5f77
recommitting files due to branch conflict. All PR changes reflected
marleomac3 Oct 1, 2024
d587d16
feat: adds Dasia's quiz questions (#114)
Dasiame Oct 1, 2024
53fded3
feat: create test questions for Angie (#109)
angie-3 Oct 1, 2024
b2937cc
feat: added Xavier's quiz questions (#99)
XavierCruz5106 Oct 1, 2024
67bfc8e
feat: adds html README for Chelsea (#118)
Cogbonnia Oct 2, 2024
cca45ee
feat: adds Dasia's quiz questions (#114)
Dasiame Oct 1, 2024
86eefee
feat: create test questions for Angie (#109)
angie-3 Oct 1, 2024
959a443
recommitting files due to branch conflict. All PR changes reflected
marleomac3 Oct 1, 2024
9e4d980
feat: adds Dasia's quiz questions (#114)
Dasiame Oct 1, 2024
8f94a17
feat: create test questions for Angie (#109)
angie-3 Oct 1, 2024
abd4a9f
feat: added Xavier's quiz questions (#99)
XavierCruz5106 Oct 1, 2024
bca32f1
attempting to fix merge conflicts
marleomac3 Oct 2, 2024
4100a38
Merge branch 'main' into lj-lesson-03
marleomac3 Oct 2, 2024
4f302ee
removed duplicate variable instances
marleomac3 Oct 2, 2024
dee729d
recommitting files due to branch conflict. All PR changes reflected
marleomac3 Oct 1, 2024
c984be8
removed duplicate hashes from yaml file
marleomac3 Oct 2, 2024
ee01aad
feat: create test questions for Angie (#109)
angie-3 Oct 1, 2024
3d1156e
feat: added Xavier's quiz questions (#99)
XavierCruz5106 Oct 1, 2024
8ce28b8
feat: create test questions for Angie (#109)
angie-3 Oct 1, 2024
c8fa0e7
recommitting files due to branch conflict. All PR changes reflected
marleomac3 Oct 1, 2024
67fab66
merge conflicts WIP
marleomac3 Oct 2, 2024
59402e3
feat: added Xavier's quiz questions (#99)
XavierCruz5106 Oct 1, 2024
634cbc9
trying to fix yaml merge conflict
marleomac3 Oct 2, 2024
aedcf20
Merge branch 'main' into lj-lesson-03
marleomac3 Oct 2, 2024
9190e13
Merge branch 'main' into lj-lesson-03
marleomac3 Oct 2, 2024
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
4 changes: 4 additions & 0 deletions lesson_03/quiz/quiz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ quiz:
- $2y$10$QsN9VkjWORsKgZRiBT46VOUgc5HVnswKAT4uDbs7JYbTF7DdKbsw.
- $2y$10$sqXEOL0L8o0kRyiAb.2s4u0RlBC2.LmOGDbGWXHj5IfBNwinkv2yq
- $2y$10$HaWueXgrIzd7z8yf39HfVeTjjyr.Kgx0GFBqwCRSzW3zRSreN19yi
ljmcwilliams:
- $2y$10$krHODbBQL0Z.4Me1fsRc0.XODWzJQPjrEL1xzXwDa98TPONF8OeiK
- $2y$10$S5HH5Vv834yLEUO2B3hHQO9gnR.8eBMA3zDORpXFrSYzXCuDsWHN6
- $2y$10$nAd2FkTtyrmhHfTlhuxPcu1tWPimr7cX9mpDSGeIweUPLafpSTeiW
tommytran:
- $2y$10$6Mf9m8JXRHUyCgRNPn4nceimRZVOhtmsZbOGoFnI4ZJp..RluHmwy
- $2y$10$Xr6W53IVq52orDvf6.TQQuXeMGaysQdgAu1cm5DYi1NyCskG2ByPe
Expand Down
62 changes: 62 additions & 0 deletions lesson_03/quiz/src/quizzes/lj_mcwilliams_quiz.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import {
AnswerChoice,
MultipleChoiceQuizQuestion,
QuizQuestion,
QuizQuestionProvider,
} from 'codedifferently-instructional';

export class LjMcwilliamsQuiz implements QuizQuestionProvider {
getProviderName(): string {
return 'ljmcwilliams';
}

makeQuizQuestions(): QuizQuestion[] {
return [
LjMcwilliamsQuiz.makeQuestion0(),
LjMcwilliamsQuiz.makeQuestion1(),
LjMcwilliamsQuiz.makeQuestion2(),
];
}

private static makeQuestion0(): QuizQuestion {
return new MultipleChoiceQuizQuestion(
0,
'Which component of a computer is responsible for short-term memory?',
new Map<AnswerChoice, string>([
[AnswerChoice.A, 'Motherboard'],
[AnswerChoice.B, 'CPU (Central Processing Unit)'],
[AnswerChoice.C, 'RAM (Random Access Memory)'],
[AnswerChoice.D, 'Power Supply'],
]),
AnswerChoice.UNANSWERED,
); // Replace `UNANSWERED` with the correct answer.
}

private static makeQuestion1(): QuizQuestion {
return new MultipleChoiceQuizQuestion(
1,
'Which terminal command allows a user to copy a file or directory?',
new Map<AnswerChoice, string>([
[AnswerChoice.A, 'cp file-name'],
[AnswerChoice.B, 'cpy file-name'],
[AnswerChoice.C, 'dupe file-name'],
[AnswerChoice.D, 'make file-name'],
]),
AnswerChoice.UNANSWERED,
); // Replace `UNANSWERED` with the correct answer.
}

private static makeQuestion2(): QuizQuestion {
return new MultipleChoiceQuizQuestion(
2,
'Which Git command allows a user to delete a feature branch LOCALLY?',
new Map<AnswerChoice, string>([
[AnswerChoice.A, 'git remove branch-name'],
[AnswerChoice.B, 'git push origin --delete branch-name'],
[AnswerChoice.C, 'git checkout master'],
[AnswerChoice.D, 'git branch -d branch-name'],
]),
AnswerChoice.UNANSWERED,
); // Replace `UNANSWERED` with the correct answer.
}
}
2 changes: 2 additions & 0 deletions lesson_03/quiz/src/quizzes/quizzes.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ChigazoGrahamsQuiz } from './chigazo_graham_quiz.js';
import { DasiaEnglishQuiz } from './dasia_english_quiz.js';
import { JamesCapparellQuiz } from './james_capparell_quiz.js';
import { JosephCaballeroQuiz } from './joseph_caballero_quiz.js';
import { LjMcwilliamsQuiz } from './lj_mcwilliams_quiz.js';
import { OyeyemiJimohQuiz } from './oyeyemi_jimoh_quiz.js';
import { ShawnDunsmoreQuiz } from './shawn_dunsmore_quiz.js';
import { TommyTranQuiz } from './tommy.tran.quiz.js';
Expand All @@ -30,6 +31,7 @@ const QUIZ_PROVIDERS = [
ChigazoGrahamsQuiz,
AmiyahJonesQuiz,
XavierCruzQuiz,
LjMcwilliamsQuiz,
ZionBuchananQuiz,
TommyTranQuiz,
];
Expand Down