diff --git a/lesson_05/jeremiahwing/README.md b/lesson_05/jeremiahwing/README.md new file mode 100644 index 000000000..a8d4d9264 --- /dev/null +++ b/lesson_05/jeremiahwing/README.md @@ -0,0 +1,7 @@ +## User Stories For An Independent Artist, Frequent Traveler, and Multitasker + +- As an independent artist i want to upload my vocal recording, so that I van recieve beat suggestions that match the vibe of my song + +- As a frequent traveler, I want to stream my favorite shows and music through my cars sceen, so that I can stay entertained during local drives. + +- As a multitasker/deveoper, I want to project my Mac's screen in full-screen mode onto a wall, so that I can enjoy a cinematic experience in any setting. \ No newline at end of file diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..cc56c08e7 100644 --- a/lesson_06/expression/.env.test +++ b/lesson_06/expression/.env.test @@ -1 +1 @@ -HW_VERSION=your assigned version here \ No newline at end of file +HW_VERSION=D \ No newline at end of file diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 76b215c42..3847462f0 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,25 @@ export class ExpressionCalculator { /** Returns a calculation involving a, b, c, d, and e */ calculate(a: number, b: number, c: number, d: number, e: number): number { - // Implement your code here to return the correct value. - return 0; + const sum = this.add(c, d); + const power = this.pow(sum, e); + const product = this.multiply(a, b); + return this.divide(product, power); } pow(base: number, exponent: number): number { return Math.pow(base, exponent); } -} + + add(a: number, b: number): number { + return a + b; + } + + multiply(a: number, b: number): number { + return a * b; + } + + divide(a: number, b: number): number { + return a / b; + } +} \ No newline at end of file diff --git a/lesson_06/quiz/src/lesson5.ts b/lesson_06/quiz/src/lesson5.ts index 9ad62bd67..3e4564c24 100644 --- a/lesson_06/quiz/src/lesson5.ts +++ b/lesson_06/quiz/src/lesson5.ts @@ -38,7 +38,7 @@ export class Lesson5 { [AnswerChoice.C, "To insert an image"], [AnswerChoice.D, "To create a paragraph"], ]), - AnswerChoice.UNANSWERED, + AnswerChoice.B, ); } @@ -52,7 +52,7 @@ export class Lesson5 { [AnswerChoice.C, "alt"], [AnswerChoice.D, "href"], ]), - AnswerChoice.UNANSWERED, + AnswerChoice.C, ); } @@ -66,7 +66,7 @@ export class Lesson5 { [AnswerChoice.C, "