Skip to content

Commit cf6b040

Browse files
authored
Merge branch 'main' into feature/lesson3
2 parents 44b18f8 + 5c071e3 commit cf6b040

File tree

10 files changed

+435
-6
lines changed

10 files changed

+435
-6
lines changed

lesson_03/quiz/quiz.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ quiz:
1515
- $2y$10$9D.oRC8h/PD/10NMSR6MMOzjVAJKm.vfw4te8Rxgw1M1.0Q9x8pjK
1616
- $2y$10$ypLhtfxJikRhLaQdW0Y8GOEqO/X1uoBD8w.kSSSUPggBa9wHLkw0i
1717
- $2y$10$cYuji5D0xOEFAV2fyMaJAuaODeWEwIYu.X3089qnojdx3nQljil5G
18-
dasiaenglish:
18+
dasiaenglish:
1919
- $2y$10$ANtdDzA0GAqn/QeExPO/Du8LgHUwznRLxpv0W0ib2seYk23BZowOC
2020
- $2y$10$6vAkOUmpPrUtWrh010f8e.A4M9kEzuzCrQ8ghWI9hQSEsZeGHpQ9W
2121
- $2y$10$YYTJf2QW.BJST9EUB7NZneVpNkOywIfhsWRpxIsPBg/oTmgqoYWse
@@ -47,3 +47,24 @@ quiz:
4747
- $2y$10$QsN9VkjWORsKgZRiBT46VOUgc5HVnswKAT4uDbs7JYbTF7DdKbsw.
4848
- $2y$10$sqXEOL0L8o0kRyiAb.2s4u0RlBC2.LmOGDbGWXHj5IfBNwinkv2yq
4949
- $2y$10$HaWueXgrIzd7z8yf39HfVeTjjyr.Kgx0GFBqwCRSzW3zRSreN19yi
50+
ljmcwilliams:
51+
- $2y$10$krHODbBQL0Z.4Me1fsRc0.XODWzJQPjrEL1xzXwDa98TPONF8OeiK
52+
- $2y$10$S5HH5Vv834yLEUO2B3hHQO9gnR.8eBMA3zDORpXFrSYzXCuDsWHN6
53+
- $2y$10$nAd2FkTtyrmhHfTlhuxPcu1tWPimr7cX9mpDSGeIweUPLafpSTeiW
54+
tommytran:
55+
- $2y$10$6Mf9m8JXRHUyCgRNPn4nceimRZVOhtmsZbOGoFnI4ZJp..RluHmwy
56+
- $2y$10$Xr6W53IVq52orDvf6.TQQuXeMGaysQdgAu1cm5DYi1NyCskG2ByPe
57+
- $2y$10$x8BG/EcIbVohTU1s/thyc.TIzlfc8f/aVZaD4/1yMpcks2OWzKKMe
58+
zionbuchanan:
59+
- $2y$10$ufNCdP1efvioBYIih6K92uye33p5ckN/IrxfCvw4n7agHjN8aNfhe
60+
- $2y$10$Mb7LA1kqlDRWlN9jdBYvF.u1B8cmJqXWkrxQeMr/3ETRVOAzFlflG
61+
- $2y$10$9bTVOlLmkj4y5f9u1b3sgeTQ9hIrVFrGiz71B0HTxiIidqq0VXHGS
62+
shawndunsmore:
63+
- $2y$10$Kpde4LAfDyEhgWezFoI5texc53Sge6QQs8y5hR8DA7zHfyK8It5LW
64+
- $2y$10$T061IZuccoHb2XGjaICB/Olchf62DqrSDVIE0TE9Q9qidfLAL7sHS
65+
- $2y$10$T061IZuccoHb2XGjaICB/Olchf62DqrSDVIE0TE9Q9qidfLAL7sHS
66+
chelseaogbonnia:
67+
- $2y$10$zToVGnZqyIwx0GGE.19Cve8sJ9enR1V0hGtssvR/8l42AcsR10aJS
68+
- $2y$10$dkWnar/ZXMr9ndtRDcbTbe/HN3DhuULPoZhTx/xATi.UYQ0DUIx1W
69+
- $2y$10$.Cw9Sjf6Pf9K8EsThegQ5e8BMoJdLl40CCuJ2FKHLar1k8hVfR9fu
70+
- $2y$10$.pmOuTs0Oqjfhn9mMIQCQu7Fbe1ZOZmZIbTGqqul.hnVLqIV6bn/W
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class ChelseaOgbonniaQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'chelseaogbonnia';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
ChelseaOgbonniaQuiz.makeQuestion0(),
16+
ChelseaOgbonniaQuiz.makeQuestion1(),
17+
ChelseaOgbonniaQuiz.makeQuestion2(),
18+
ChelseaOgbonniaQuiz.makeQuestion3(),
19+
];
20+
}
21+
22+
private static makeQuestion0(): QuizQuestion {
23+
return new MultipleChoiceQuizQuestion(
24+
0,
25+
'Which git command combines the changes from one branch to the current branch?',
26+
new Map<AnswerChoice, string>([
27+
[AnswerChoice.A, 'git branch -d <branchname>'],
28+
[AnswerChoice.B, 'git merge <branchname>'],
29+
[AnswerChoice.C, 'git branch'],
30+
[AnswerChoice.D, 'git add <filename>'],
31+
]),
32+
AnswerChoice.UNANSWERED,
33+
); // Replace `UNANSWERED` with the correct answer.
34+
}
35+
36+
private static makeQuestion1(): QuizQuestion {
37+
return new MultipleChoiceQuizQuestion(
38+
1,
39+
'Which git command is used fetch and download content from a remote repository to update the local repository?',
40+
new Map<AnswerChoice, string>([
41+
[AnswerChoice.A, 'git fetch'],
42+
[AnswerChoice.B, 'git merge'],
43+
[AnswerChoice.C, 'git clone'],
44+
[AnswerChoice.D, 'git pull'],
45+
]),
46+
AnswerChoice.UNANSWERED,
47+
); // Replace `UNANSWERED` with the correct answer.
48+
}
49+
private static makeQuestion2(): QuizQuestion {
50+
return new MultipleChoiceQuizQuestion(
51+
2,
52+
'Which Git command is NOT used to sync repositories?',
53+
new Map<AnswerChoice, string>([
54+
[AnswerChoice.A, 'git push'],
55+
[AnswerChoice.B, 'git sync'],
56+
[AnswerChoice.C, 'git pull'],
57+
[AnswerChoice.D, 'git merge'],
58+
]),
59+
AnswerChoice.UNANSWERED,
60+
); // Replace `UNANSWERED` with the correct answer.
61+
}
62+
63+
private static makeQuestion3(): QuizQuestion {
64+
return new MultipleChoiceQuizQuestion(
65+
3,
66+
'Which git command creates a new Git repository?',
67+
new Map<AnswerChoice, string>([
68+
[AnswerChoice.A, 'git init'],
69+
[AnswerChoice.B, 'git clone'],
70+
[AnswerChoice.C, 'git folder <repositoryname>'],
71+
[AnswerChoice.D, 'git add <repositoryname>'],
72+
]),
73+
AnswerChoice.UNANSWERED,
74+
); // Replace `UNANSWERED` with the correct answer.
75+
}
76+
}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class LjMcwilliamsQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'ljmcwilliams';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
LjMcwilliamsQuiz.makeQuestion0(),
16+
LjMcwilliamsQuiz.makeQuestion1(),
17+
LjMcwilliamsQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'Which component of a computer is responsible for short-term memory?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, 'Motherboard'],
27+
[AnswerChoice.B, 'CPU (Central Processing Unit)'],
28+
[AnswerChoice.C, 'RAM (Random Access Memory)'],
29+
[AnswerChoice.D, 'Power Supply'],
30+
]),
31+
AnswerChoice.UNANSWERED,
32+
); // Replace `UNANSWERED` with the correct answer.
33+
}
34+
35+
private static makeQuestion1(): QuizQuestion {
36+
return new MultipleChoiceQuizQuestion(
37+
1,
38+
'Which terminal command allows a user to copy a file or directory?',
39+
new Map<AnswerChoice, string>([
40+
[AnswerChoice.A, 'cp file-name'],
41+
[AnswerChoice.B, 'cpy file-name'],
42+
[AnswerChoice.C, 'dupe file-name'],
43+
[AnswerChoice.D, 'make file-name'],
44+
]),
45+
AnswerChoice.UNANSWERED,
46+
); // Replace `UNANSWERED` with the correct answer.
47+
}
48+
49+
private static makeQuestion2(): QuizQuestion {
50+
return new MultipleChoiceQuizQuestion(
51+
2,
52+
'Which Git command allows a user to delete a feature branch LOCALLY?',
53+
new Map<AnswerChoice, string>([
54+
[AnswerChoice.A, 'git remove branch-name'],
55+
[AnswerChoice.B, 'git push origin --delete branch-name'],
56+
[AnswerChoice.C, 'git checkout master'],
57+
[AnswerChoice.D, 'git branch -d branch-name'],
58+
]),
59+
AnswerChoice.UNANSWERED,
60+
); // Replace `UNANSWERED` with the correct answer.
61+
}
62+
}

lesson_03/quiz/src/quizzes/quizzes.module.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
import { Module } from '@nestjs/common';
2+
import { AmiyahJonesQuiz } from './amiyah_jones_quiz.js';
23
import { AngelicaCQuiz } from './angelica_c_quiz.js';
34
import { AnotherQuiz } from './another_quiz.js';
45
import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
5-
import { JamesCapparellQuiz } from './james_capparell_quiz.js';
6-
import { XavierCruzQuiz } from './xavier_cruz_quiz.js';
7-
import { DasiaEnglishQuiz } from './dasia_english_quiz.js';
6+
import { ChelseaOgbonniaQuiz } from './chelsea_ogbonnia_quiz.js';
87
import { ChigazoGrahamsQuiz } from './chigazo_graham_quiz.js';
8+
import { DasiaEnglishQuiz } from './dasia_english_quiz.js';
9+
import { JamesCapparellQuiz } from './james_capparell_quiz.js';
910
import { JosephCaballeroQuiz } from './joseph_caballero_quiz.js';
11+
import { LjMcwilliamsQuiz } from './lj_mcwilliams_quiz.js';
1012
import { OyeyemiJimohQuiz } from './oyeyemi_jimoh_quiz.js';
13+
import { ShawnDunsmoreQuiz } from './shawn_dunsmore_quiz.js';
14+
import { TommyTranQuiz } from './tommy.tran.quiz.js';
15+
import { XavierCruzQuiz } from './xavier_cruz_quiz.js';
1116
import { YafiahAbdullahQuiz } from './yafiah_abdullah_quiz.js';
1217
import { HummadTanweerQuiz } from './hummad_tanweer_quiz.js';
1318
import { AmiyahJonesQuiz } from './amiyah_jones_quiz.js';
19+
import { ZionBuchananQuiz } from './zion_buchanan_quiz.js';
1420

1521
export const Quizzes = Symbol.for('Quizzes');
1622

@@ -24,10 +30,15 @@ const QUIZ_PROVIDERS = [
2430
AngelicaCQuiz,
2531
OyeyemiJimohQuiz,
2632
HummadTanweerQuiz,
33+
ShawnDunsmoreQuiz,
2734
DasiaEnglishQuiz,
2835
ChigazoGrahamsQuiz,
2936
AmiyahJonesQuiz,
30-
XavierCruzQuiz
37+
XavierCruzQuiz,
38+
LjMcwilliamsQuiz,
39+
ZionBuchananQuiz,
40+
ChelseaOgbonniaQuiz,
41+
TommyTranQuiz,
3142
];
3243

3344
@Module({
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class ShawnDunsmoreQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'shawndunsmore';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
ShawnDunsmoreQuiz.makeQuestion0(),
16+
ShawnDunsmoreQuiz.makeQuestion1(),
17+
ShawnDunsmoreQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'What is Davids Favorite Color?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, 'Idc'],
27+
[AnswerChoice.B, 'Blue'],
28+
[AnswerChoice.C, 'Black'],
29+
[AnswerChoice.D, 'Whatever you think it is.'],
30+
]),
31+
AnswerChoice.UNANSWERED,
32+
); // Replace `UNANSWERED` with the correct answer.
33+
}
34+
35+
private static makeQuestion1(): QuizQuestion {
36+
return new MultipleChoiceQuizQuestion(
37+
1,
38+
'What is Jordan famous for?',
39+
new Map<AnswerChoice, string>([
40+
[AnswerChoice.A, 'Photography'],
41+
[AnswerChoice.B, 'Being short'],
42+
[AnswerChoice.C, 'Pickleball'],
43+
[AnswerChoice.D, 'Trampoline Dunking.'],
44+
]),
45+
AnswerChoice.UNANSWERED,
46+
); // Replace `UNANSWERED` with the correct answer.
47+
}
48+
49+
private static makeQuestion2(): QuizQuestion {
50+
return new MultipleChoiceQuizQuestion(
51+
2,
52+
'How mnay states are there?',
53+
new Map<AnswerChoice, string>([
54+
[AnswerChoice.A, '50'],
55+
[AnswerChoice.B, '35'],
56+
[AnswerChoice.C, '20'],
57+
[AnswerChoice.D, '65'],
58+
]),
59+
AnswerChoice.UNANSWERED,
60+
); // Replace `UNANSWERED` with the correct answer.
61+
}
62+
}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class TommyTranQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'tommytran';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
TommyTranQuiz.makeQuestion0(),
16+
TommyTranQuiz.makeQuestion1(),
17+
TommyTranQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'What is the capital city of Japan?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, 'Seoul'],
27+
[AnswerChoice.B, 'Tokyo'],
28+
[AnswerChoice.C, 'Beijing'],
29+
[AnswerChoice.D, 'Bangkok'],
30+
]),
31+
AnswerChoice.UNANSWERED,
32+
); // Replace `UNANSWERED` with the correct answer.
33+
}
34+
35+
private static makeQuestion1(): QuizQuestion {
36+
return new MultipleChoiceQuizQuestion(
37+
1,
38+
'Which planet is known as the "Red Planet?',
39+
new Map<AnswerChoice, string>([
40+
[AnswerChoice.A, 'Venus'],
41+
[AnswerChoice.B, 'Jupiter'],
42+
[AnswerChoice.C, 'Mars'],
43+
[AnswerChoice.D, 'Saturn'],
44+
]),
45+
AnswerChoice.UNANSWERED,
46+
); // Replace `UNANSWERED` with the correct answer.
47+
}
48+
49+
private static makeQuestion2(): QuizQuestion {
50+
return new MultipleChoiceQuizQuestion(
51+
2,
52+
'Who wrote the play "Romeo and Juliet?',
53+
new Map<AnswerChoice, string>([
54+
[AnswerChoice.A, 'Charles Dickens'],
55+
[AnswerChoice.B, 'William Shakespeare'],
56+
[AnswerChoice.C, 'Jane Austen'],
57+
[AnswerChoice.D, 'Mark Twain'],
58+
]),
59+
AnswerChoice.UNANSWERED,
60+
); // Replace `UNANSWERED` with the correct answer.
61+
}
62+
}

0 commit comments

Comments
 (0)