diff --git a/.eslintrc.js b/.eslintrc.js index 431f2c2fc..62e7dc28e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -32,12 +32,12 @@ module.exports = { { selector: "MemberExpression[property.name='innerText']", message: - 'The homework tests do not support `innerText`. Please replace with `textContent`.', + 'The assignment tests do not support `innerText`. Please replace with `textContent`.', }, { selector: "MemberExpression[property.name='innerHTML']", message: - 'Please do not use `innerHTML` in the homework. Use `textContent` and/or `document.createElement()` instead.', + 'Please do not use `innerHTML` in the assignment. Use `textContent` and/or `document.createElement()` instead.', }, { selector: 'ForInStatement', diff --git a/.gitignore b/.gitignore index 8591e559a..4b72510b7 100644 --- a/.gitignore +++ b/.gitignore @@ -121,4 +121,4 @@ dist # test-runner .recent.json .disclaimer -@homework* +@assignment* diff --git a/.tours/test-runner.tour b/.tours/test-runner.tour index f6e0bccde..8036f7fb1 100644 --- a/.tours/test-runner.tour +++ b/.tours/test-runner.tour @@ -16,7 +16,7 @@ }, { "file": "test-runner/test-runner-helpers.js", - "description": "Exercise files and folders must reside in a folder named **homework** and match a pattern that starts with the letters **ex** followed by a number and a dash. Each **homework** folder is a subfolder of a **Week𝑛** folder, which itself is a subfolder of a module specific top-level folder. For instance:\n\n```console\n1-JavaScript/\n Week3/\n homework/\n ex1-giveCompliment.js\n ...\n```\n\nNote that Windows paths contain back slashes that must be replaced with forward slashes as required by `fast-glob`.", + "description": "Exercise files and folders must reside in a folder named **assignment** and match a pattern that starts with the letters **ex** followed by a number and a dash. Each **assignment** folder is a subfolder of a **Week𝑛** folder, which itself is a subfolder of a module specific top-level folder. For instance:\n\n```console\n1-JavaScript/\n Week3/\n assignment/\n ex1-giveCompliment.js\n ...\n```\n\nNote that Windows paths contain back slashes that must be replaced with forward slashes as required by `fast-glob`.", "line": 26, "selection": { "start": { @@ -80,7 +80,7 @@ }, { "file": "test-runner/index.js", - "description": "The students' exercises are in subfolders of the **homework** folder. For testing the \"happy path\" of the unit tests completed exercises can be placed in an alternate folder, the name of whhich can be defined through the `HOMEWORK_FOLDER` environment variable. The recommended folder for this purpose is **@homework** (git-ignored). The npm script **npm run testalt** sets the `HOMEWORK_FOLDER` environment variable to **@homework** before running the test.", + "description": "The students' exercises are in subfolders of the **assignment** folder. For testing the \"happy path\" of the unit tests completed exercises can be placed in an alternate folder, the name of whhich can be defined through the `ASSIGNMENT_FOLDER` environment variable. The recommended folder for this purpose is **@assignment** (git-ignored). The npm script **npm run testalt** sets the `ASSIGNMENT_FOLDER` environment variable to **@assignment** before running the test.", "line": 198 }, { diff --git a/1-JavaScript/Week2/README.md b/1-JavaScript/Week2/README.md index a88137fab..76033fb36 100644 --- a/1-JavaScript/Week2/README.md +++ b/1-JavaScript/Week2/README.md @@ -1,10 +1,10 @@ -# Homework Javascript Week 2 +# Assignment Javascript Week 2 -The homework for this week can be found in the `homework` folder. +The assignment for this week can be found in the `assignment` folder. ## Exercises -Starter code for all exercises is located in the `homework` folder. Modify the starter code so that the requirements of the exercise are met. At the bottom of some of the exercise files you will see a code snippet similar to: +Starter code for all exercises is located in the `assignment` folder. Modify the starter code so that the requirements of the exercise are met. At the bottom of some of the exercise files you will see a code snippet similar to: ```js // ! Do not change or remove the code below diff --git a/1-JavaScript/Week2/homework/ex1-giveCompliment.js b/1-JavaScript/Week2/assignment/ex1-giveCompliment.js similarity index 100% rename from 1-JavaScript/Week2/homework/ex1-giveCompliment.js rename to 1-JavaScript/Week2/assignment/ex1-giveCompliment.js diff --git a/1-JavaScript/Week2/homework/ex2-dogYears.js b/1-JavaScript/Week2/assignment/ex2-dogYears.js similarity index 90% rename from 1-JavaScript/Week2/homework/ex2-dogYears.js rename to 1-JavaScript/Week2/assignment/ex2-dogYears.js index 3f2aadf0f..446d93182 100644 --- a/1-JavaScript/Week2/homework/ex2-dogYears.js +++ b/1-JavaScript/Week2/assignment/ex2-dogYears.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week3#exercise-2-dog-years +Full description at: https://github.com/HackYourFuture/Assignment/tree/main/1-JavaScript/Week3#exercise-2-dog-years You know how old your dog is in human years, but what about dog years? Let's calculate it! diff --git a/1-JavaScript/Week2/homework/ex3-tellFortune.js b/1-JavaScript/Week2/assignment/ex3-tellFortune.js similarity index 94% rename from 1-JavaScript/Week2/homework/ex3-tellFortune.js rename to 1-JavaScript/Week2/assignment/ex3-tellFortune.js index eedb9c369..2c181a0fa 100644 --- a/1-JavaScript/Week2/homework/ex3-tellFortune.js +++ b/1-JavaScript/Week2/assignment/ex3-tellFortune.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week3#exercise-3-be-your-own-fortune-teller +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week3#exercise-3-be-your-own-fortune-teller Why pay a fortune teller when you can just program your fortune yourself? diff --git a/1-JavaScript/Week2/homework/ex4-shoppingCart.js b/1-JavaScript/Week2/assignment/ex4-shoppingCart.js similarity index 94% rename from 1-JavaScript/Week2/homework/ex4-shoppingCart.js rename to 1-JavaScript/Week2/assignment/ex4-shoppingCart.js index 33e338799..7158aafb9 100644 --- a/1-JavaScript/Week2/homework/ex4-shoppingCart.js +++ b/1-JavaScript/Week2/assignment/ex4-shoppingCart.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week3#exercise-4-shopping-at-the-supermarket +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week3#exercise-4-shopping-at-the-supermarket Let's do some grocery shopping! We're going to get some things to cook dinner with. However, you like to spend money and always buy too many things. So when diff --git a/1-JavaScript/Week2/homework/ex5-shoppingCartPure.js b/1-JavaScript/Week2/assignment/ex5-shoppingCartPure.js similarity index 94% rename from 1-JavaScript/Week2/homework/ex5-shoppingCartPure.js rename to 1-JavaScript/Week2/assignment/ex5-shoppingCartPure.js index 0addf4c7c..ac1be8219 100644 --- a/1-JavaScript/Week2/homework/ex5-shoppingCartPure.js +++ b/1-JavaScript/Week2/assignment/ex5-shoppingCartPure.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week3#exercise-5-improved-shopping-at-the-supermarket +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week3#exercise-5-improved-shopping-at-the-supermarket In the current exercise we will rewrite the `addToShoppingCart` function to make it pure. Do the following: diff --git a/1-JavaScript/Week2/homework/ex6-totalCost.js b/1-JavaScript/Week2/assignment/ex6-totalCost.js similarity index 92% rename from 1-JavaScript/Week2/homework/ex6-totalCost.js rename to 1-JavaScript/Week2/assignment/ex6-totalCost.js index 26e40fcf4..4ba19506c 100644 --- a/1-JavaScript/Week2/homework/ex6-totalCost.js +++ b/1-JavaScript/Week2/assignment/ex6-totalCost.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week3#exercise-6-total-cost-is +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week3#exercise-6-total-cost-is You want to buy a couple of things from the supermarket to prepare for a party. After scanning all the items the cashier wants to give you the total price, but diff --git a/1-JavaScript/Week2/homework/ex7-mindPrivacy.js b/1-JavaScript/Week2/assignment/ex7-mindPrivacy.js similarity index 93% rename from 1-JavaScript/Week2/homework/ex7-mindPrivacy.js rename to 1-JavaScript/Week2/assignment/ex7-mindPrivacy.js index 42868eaf2..4f4479c75 100644 --- a/1-JavaScript/Week2/homework/ex7-mindPrivacy.js +++ b/1-JavaScript/Week2/assignment/ex7-mindPrivacy.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week3#exercise-7-mind-the-privacy +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week3#exercise-7-mind-the-privacy 1. Complete the `filterPrivateData()` function. It should take a single parameter: the array of employee records. diff --git a/1-JavaScript/Week3/README.md b/1-JavaScript/Week3/README.md index 70ae3e2f0..07f924461 100644 --- a/1-JavaScript/Week3/README.md +++ b/1-JavaScript/Week3/README.md @@ -1,8 +1,8 @@ -# Homework Javascript Week 3 +# Assignment Javascript Week 3 ## Exercises -The homework for this week can be found in the `homework` folder. +The assignment for this week can be found in the `assignment` folder. > In this week we will be using a test library called [Jest](https://jestjs.io/) rather than using plain vanilla JavaScript as we did last week. > @@ -57,7 +57,7 @@ Your task in this assignment is to rewrite the function body so that it uses the Expected output from a successful unit test: ```console - PASS 1-JavaScript/Week4/homework/ex1-doubleEvenNumbers.test.js + PASS 1-JavaScript/Week4/assignment/ex1-doubleEvenNumbers.test.js ✓ doubleEvenNumbers should take the even numbers and double them (2 ms) Test Suites: 1 passed, 1 total @@ -125,7 +125,7 @@ describe('computeEarnings', () => { 1. Use the `npm test` command on the unmodified exercise and observe that both unit tests fail. (A green check mark indicates a _passed_ test, a red cross indicates a _failed_ test.) ```console - FAIL 1-JavaScript/Week4/homework/ex2-mondaysWorth.test.js + FAIL 1-JavaScript/Week4/assignment/ex2-mondaysWorth.test.js computeEarnings ✕ should take two parameters (3 ms) ✕ should compute the earnings as a formatted Euro amount (1 ms) @@ -160,7 +160,7 @@ describe('computeEarnings', () => { 3. Run `npm test` again and observe that the first test now passes while the second one still fails. ```console - FAIL 1-JavaScript/Week4/homework/ex2-mondaysWorth.test.js + FAIL 1-JavaScript/Week4/assignment/ex2-mondaysWorth.test.js computeEarnings ✓ should take two parameters (2 ms) ✕ should compute the earnings as a formatted Euro amount (1 ms) @@ -185,7 +185,7 @@ describe('computeEarnings', () => { 5. Run `npm test` again and check whether the second unit test now passes. If not, fix the problem and try again. ```console - PASS 1-JavaScript/Week4/homework/ex2-mondaysWorth.test.js + PASS 1-JavaScript/Week4/assignment/ex2-mondaysWorth.test.js computeEarnings ✓ should take two parameters (1 ms) ✓ should compute the earnings as a formatted Euro amount (1 ms) @@ -491,7 +491,7 @@ Let's run the exercise using our convenience command `npm run it`: ```console ❯ npm run it -> javascript@1.0.0 it C:\Users\jimcr\dev\hackyourfuture\homework +> javascript@1.0.0 it C:\Users\jimcr\dev\hackyourfuture\assignments > node ./test-runner/run-it ? Rerun last test (1-Javascript, Week4, ex5-wallet)? No diff --git a/1-JavaScript/Week3/homework/ex1-doubleEvenNumbers.test.js b/1-JavaScript/Week3/assignment/ex1-doubleEvenNumbers.test.js similarity index 88% rename from 1-JavaScript/Week3/homework/ex1-doubleEvenNumbers.test.js rename to 1-JavaScript/Week3/assignment/ex1-doubleEvenNumbers.test.js index 4520d0f48..d5cf84f2c 100644 --- a/1-JavaScript/Week3/homework/ex1-doubleEvenNumbers.test.js +++ b/1-JavaScript/Week3/assignment/ex1-doubleEvenNumbers.test.js @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week4#exercise-1-the-odd-ones-out +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week4#exercise-1-the-odd-ones-out The `doubleEvenNumbers` function returns only the even numbers in the array passed as the `numbers` parameter and doubles them. diff --git a/1-JavaScript/Week3/homework/ex2-mondaysWorth.test.js b/1-JavaScript/Week3/assignment/ex2-mondaysWorth.test.js similarity index 92% rename from 1-JavaScript/Week3/homework/ex2-mondaysWorth.test.js rename to 1-JavaScript/Week3/assignment/ex2-mondaysWorth.test.js index c65a4f31b..24a125efd 100644 --- a/1-JavaScript/Week3/homework/ex2-mondaysWorth.test.js +++ b/1-JavaScript/Week3/assignment/ex2-mondaysWorth.test.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description atL https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week4#exercise-2-whats-your-monday-worth +Full description atL https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week4#exercise-2-whats-your-monday-worth - Complete the function names `computeEarnings`. It should take an array of tasks and an hourly rate as arguments and return a formatted Euro amount diff --git a/1-JavaScript/Week3/homework/ex3-lemonAllergy.test.js b/1-JavaScript/Week3/assignment/ex3-lemonAllergy.test.js similarity index 93% rename from 1-JavaScript/Week3/homework/ex3-lemonAllergy.test.js rename to 1-JavaScript/Week3/assignment/ex3-lemonAllergy.test.js index a9f414e2b..9a3a024c6 100644 --- a/1-JavaScript/Week3/homework/ex3-lemonAllergy.test.js +++ b/1-JavaScript/Week3/assignment/ex3-lemonAllergy.test.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week4#exercise-3-lemon-allergy +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week4#exercise-3-lemon-allergy Your mom bought you a basket of fruit, because you're doing so well in HackYourFuture. How sweet of her! diff --git a/1-JavaScript/Week3/homework/ex4-observable/ex4-observable.js b/1-JavaScript/Week3/assignment/ex4-observable/ex4-observable.js similarity index 88% rename from 1-JavaScript/Week3/homework/ex4-observable/ex4-observable.js rename to 1-JavaScript/Week3/assignment/ex4-observable/ex4-observable.js index f4f13e771..5af1d0ee0 100644 --- a/1-JavaScript/Week3/homework/ex4-observable/ex4-observable.js +++ b/1-JavaScript/Week3/assignment/ex4-observable/ex4-observable.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/1-JavaScript/Week4#exercise-4-observable +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/1-JavaScript/Week4#exercise-4-observable Complete the `createObservable()` function as follows: diff --git a/1-JavaScript/Week3/homework/ex4-observable/ex4-observable.test.js b/1-JavaScript/Week3/assignment/ex4-observable/ex4-observable.test.js similarity index 100% rename from 1-JavaScript/Week3/homework/ex4-observable/ex4-observable.test.js rename to 1-JavaScript/Week3/assignment/ex4-observable/ex4-observable.test.js diff --git a/1-JavaScript/Week3/homework/ex4-observable/main.js b/1-JavaScript/Week3/assignment/ex4-observable/main.js similarity index 100% rename from 1-JavaScript/Week3/homework/ex4-observable/main.js rename to 1-JavaScript/Week3/assignment/ex4-observable/main.js diff --git a/1-JavaScript/Week3/homework/ex5-wallet/index.html b/1-JavaScript/Week3/assignment/ex5-wallet/index.html similarity index 100% rename from 1-JavaScript/Week3/homework/ex5-wallet/index.html rename to 1-JavaScript/Week3/assignment/ex5-wallet/index.html diff --git a/1-JavaScript/Week3/homework/ex5-wallet/index.js b/1-JavaScript/Week3/assignment/ex5-wallet/index.js similarity index 100% rename from 1-JavaScript/Week3/homework/ex5-wallet/index.js rename to 1-JavaScript/Week3/assignment/ex5-wallet/index.js diff --git a/2-Browsers/Week1/README.md b/2-Browsers/Week1/README.md index d32c22a39..218bf3761 100644 --- a/2-Browsers/Week1/README.md +++ b/2-Browsers/Week1/README.md @@ -1,12 +1,12 @@ -# Homework Browsers Week 1 +# Assignment Browsers Week 1 ## Deliverable Exercises -The homework for this week can be found in the `homework` folder. +The assignment for this week can be found in the `assignment` folder. > :collision: **Important** > -> In this homework you are not allowed to use `.innerHTML`. To create HTML elements, use `document.createElement()`. To set the text content of an element, use `.textContent`. The homework tests currently do not support `.innerText`. +> In this assignment you are not allowed to use `.innerHTML`. To create HTML elements, use `document.createElement()`. To set the text content of an element, use `.textContent`. The assignment tests currently do not support `.innerText`. ## Exercise 1: The book list diff --git a/2-Browsers/Week1/homework/ex1-bookList/assets/the_design_of_everyday_things.jpg b/2-Browsers/Week1/assignment/ex1-bookList/assets/the_design_of_everyday_things.jpg similarity index 100% rename from 2-Browsers/Week1/homework/ex1-bookList/assets/the_design_of_everyday_things.jpg rename to 2-Browsers/Week1/assignment/ex1-bookList/assets/the_design_of_everyday_things.jpg diff --git a/2-Browsers/Week1/homework/ex1-bookList/assets/the_most_human_human.jpg b/2-Browsers/Week1/assignment/ex1-bookList/assets/the_most_human_human.jpg similarity index 100% rename from 2-Browsers/Week1/homework/ex1-bookList/assets/the_most_human_human.jpg rename to 2-Browsers/Week1/assignment/ex1-bookList/assets/the_most_human_human.jpg diff --git a/2-Browsers/Week1/homework/ex1-bookList/assets/the_pragmatic_programmer.jpg b/2-Browsers/Week1/assignment/ex1-bookList/assets/the_pragmatic_programmer.jpg similarity index 100% rename from 2-Browsers/Week1/homework/ex1-bookList/assets/the_pragmatic_programmer.jpg rename to 2-Browsers/Week1/assignment/ex1-bookList/assets/the_pragmatic_programmer.jpg diff --git a/2-Browsers/Week1/homework/ex1-bookList/index.html b/2-Browsers/Week1/assignment/ex1-bookList/index.html similarity index 100% rename from 2-Browsers/Week1/homework/ex1-bookList/index.html rename to 2-Browsers/Week1/assignment/ex1-bookList/index.html diff --git a/2-Browsers/Week1/homework/ex1-bookList/index.js b/2-Browsers/Week1/assignment/ex1-bookList/index.js similarity index 92% rename from 2-Browsers/Week1/homework/ex1-bookList/index.js rename to 2-Browsers/Week1/assignment/ex1-bookList/index.js index ecd28501a..24a92487d 100644 --- a/2-Browsers/Week1/homework/ex1-bookList/index.js +++ b/2-Browsers/Week1/assignment/ex1-bookList/index.js @@ -1,6 +1,6 @@ //cspell: disable /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/2-Browsers/Week1#exercise-1-the-book-list +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/2-Browsers/Week1#exercise-1-the-book-list I'd like to display my three favorite books inside a nice webpage! diff --git a/2-Browsers/Week1/homework/ex1-bookList/style.css b/2-Browsers/Week1/assignment/ex1-bookList/style.css similarity index 100% rename from 2-Browsers/Week1/homework/ex1-bookList/style.css rename to 2-Browsers/Week1/assignment/ex1-bookList/style.css diff --git a/2-Browsers/Week1/homework/ex2-aboutMe/index.html b/2-Browsers/Week1/assignment/ex2-aboutMe/index.html similarity index 100% rename from 2-Browsers/Week1/homework/ex2-aboutMe/index.html rename to 2-Browsers/Week1/assignment/ex2-aboutMe/index.html diff --git a/2-Browsers/Week1/homework/ex2-aboutMe/index.js b/2-Browsers/Week1/assignment/ex2-aboutMe/index.js similarity index 79% rename from 2-Browsers/Week1/homework/ex2-aboutMe/index.js rename to 2-Browsers/Week1/assignment/ex2-aboutMe/index.js index e398e72d1..d44ae0ddc 100644 --- a/2-Browsers/Week1/homework/ex2-aboutMe/index.js +++ b/2-Browsers/Week1/assignment/ex2-aboutMe/index.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/2-Browsers/Week1#exercise-2-about-me +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/2-Browsers/Week1#exercise-2-about-me 1. Using JavaScript, replace each of the spans (`nickname`, fav-food`, `hometown`) with your own information. diff --git a/2-Browsers/Week1/homework/ex2-aboutMe/style.css b/2-Browsers/Week1/assignment/ex2-aboutMe/style.css similarity index 100% rename from 2-Browsers/Week1/homework/ex2-aboutMe/style.css rename to 2-Browsers/Week1/assignment/ex2-aboutMe/style.css diff --git a/2-Browsers/Week1/homework/ex3-hijackLogo.js b/2-Browsers/Week1/assignment/ex3-hijackLogo.js similarity index 79% rename from 2-Browsers/Week1/homework/ex3-hijackLogo.js rename to 2-Browsers/Week1/assignment/ex3-hijackLogo.js index 593c09c33..c52f6d744 100644 --- a/2-Browsers/Week1/homework/ex3-hijackLogo.js +++ b/2-Browsers/Week1/assignment/ex3-hijackLogo.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/2-Browsers/Week1#exercise-3-the-logo-hijack +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/2-Browsers/Week1#exercise-3-the-logo-hijack 1. Find out how to select the element that contains the Google logo, and store it in a variable. diff --git a/2-Browsers/Week1/homework/ex4-whatsTheTime/index.html b/2-Browsers/Week1/assignment/ex4-whatsTheTime/index.html similarity index 100% rename from 2-Browsers/Week1/homework/ex4-whatsTheTime/index.html rename to 2-Browsers/Week1/assignment/ex4-whatsTheTime/index.html diff --git a/2-Browsers/Week1/homework/ex4-whatsTheTime/index.js b/2-Browsers/Week1/assignment/ex4-whatsTheTime/index.js similarity index 83% rename from 2-Browsers/Week1/homework/ex4-whatsTheTime/index.js rename to 2-Browsers/Week1/assignment/ex4-whatsTheTime/index.js index a9839f779..0724f2d72 100644 --- a/2-Browsers/Week1/homework/ex4-whatsTheTime/index.js +++ b/2-Browsers/Week1/assignment/ex4-whatsTheTime/index.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/2-Browsers/Week1#exercise-4-whats-the-time +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/2-Browsers/Week1#exercise-4-whats-the-time 1. Inside the `index.js`, complete the `addCurrentTime` to add the current time to the webpage. Make sure it's written in the HH:MM:SS notation (hour, minute, diff --git a/2-Browsers/Week1/homework/ex5-catWalk/index.html b/2-Browsers/Week1/assignment/ex5-catWalk/index.html similarity index 100% rename from 2-Browsers/Week1/homework/ex5-catWalk/index.html rename to 2-Browsers/Week1/assignment/ex5-catWalk/index.html diff --git a/2-Browsers/Week1/homework/ex5-catWalk/index.js b/2-Browsers/Week1/assignment/ex5-catWalk/index.js similarity index 91% rename from 2-Browsers/Week1/homework/ex5-catWalk/index.js rename to 2-Browsers/Week1/assignment/ex5-catWalk/index.js index e08e33e0a..ad7c83fab 100644 --- a/2-Browsers/Week1/homework/ex5-catWalk/index.js +++ b/2-Browsers/Week1/assignment/ex5-catWalk/index.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/2-Browsers/Week1#exercise-5-the-cat-walk +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/2-Browsers/Week1#exercise-5-the-cat-walk 1. Create a variable to store a reference to the `` element. 2. Change the style of the `` to have a `left` of `0px`, so that it starts diff --git a/2-Browsers/Week1/homework/ex6-gameOfLife/index.html b/2-Browsers/Week1/assignment/ex6-gameOfLife/index.html similarity index 100% rename from 2-Browsers/Week1/homework/ex6-gameOfLife/index.html rename to 2-Browsers/Week1/assignment/ex6-gameOfLife/index.html diff --git a/2-Browsers/Week1/homework/ex6-gameOfLife/index.js b/2-Browsers/Week1/assignment/ex6-gameOfLife/index.js similarity index 96% rename from 2-Browsers/Week1/homework/ex6-gameOfLife/index.js rename to 2-Browsers/Week1/assignment/ex6-gameOfLife/index.js index 9c000af8b..b744fee03 100644 --- a/2-Browsers/Week1/homework/ex6-gameOfLife/index.js +++ b/2-Browsers/Week1/assignment/ex6-gameOfLife/index.js @@ -1,8 +1,8 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/2-Browsers/Week1#exercise-6-conways-game-of-life +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/2-Browsers/Week1#exercise-6-conways-game-of-life -THIS IS A PREP EXERCISE FOR THE Q&A SESSION, IT SHOULD NOT BE PART OF THE HOMEWORK +THIS IS A PREP EXERCISE FOR THE Q&A SESSION, IT SHOULD NOT BE PART OF THE ASSIGNMENT Adapted from: https://spicyyoghurt.com/tutorials/javascript/conways-game-of-life-canvas Refactored from ES6 Class syntax to regular functions diff --git a/2-Browsers/Week1/homework/ex6-gameOfLife/style.css b/2-Browsers/Week1/assignment/ex6-gameOfLife/style.css similarity index 100% rename from 2-Browsers/Week1/homework/ex6-gameOfLife/style.css rename to 2-Browsers/Week1/assignment/ex6-gameOfLife/style.css diff --git a/3-UsingAPIs/Week1/README.md b/3-UsingAPIs/Week1/README.md index 8a7ba9447..6e35f32e3 100644 --- a/3-UsingAPIs/Week1/README.md +++ b/3-UsingAPIs/Week1/README.md @@ -1,8 +1,8 @@ -# Homework Using APIs Week 1 +# Assignment Using APIs Week 1 ## Exercises -The homework for this week can be found in the `homework` folder. +The assignment for this week can be found in the `assignment` folder. ### Exercise 1: John who? @@ -145,7 +145,7 @@ Since we want to practice with promises anyway, let's see what happens when we r #### Bonus: Event Loop Experiments -> The event loop in JavaScript is not that easy to comprehend. But having a good grasp of how it works is vital for you to better understand how asynchronous code works. We will examine the event loop in the experiment below. If you are still left puzzled, we invite you to discuss it with your class mates on Slack and see if you can work it out together. +> The event loop in JavaScript is not that easy to comprehend. But having a good grasp of how it works is vital for you to better understand how asynchronous code works. We will examine the event loop in the experiment below. If you are still left puzzled, we invite you to discuss it with your cohort mates on Slack and see if you can work it out together. So what do you think the JavaScript engine is doing while it is waiting for a `setTimeout()` to fire? Well, since it has nothing else waiting for it to do on its call stack, it is just sitting idle. diff --git a/3-UsingAPIs/Week1/homework/ex1-johnWho.js b/3-UsingAPIs/Week1/assignment/ex1-johnWho.js similarity index 89% rename from 3-UsingAPIs/Week1/homework/ex1-johnWho.js rename to 3-UsingAPIs/Week1/assignment/ex1-johnWho.js index 70ebea15a..0f88628a5 100644 --- a/3-UsingAPIs/Week1/homework/ex1-johnWho.js +++ b/3-UsingAPIs/Week1/assignment/ex1-johnWho.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/3-UsingAPIs/Week1#exercise-1-john-who +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/3-UsingAPIs/Week1#exercise-1-john-who Rewrite this function, but replace the callback syntax with the Promise syntax: - Have the `getAnonName` function return a `new Promise`. diff --git a/3-UsingAPIs/Week1/homework/ex2-checkDoubleDigits.js b/3-UsingAPIs/Week1/assignment/ex2-checkDoubleDigits.js similarity index 91% rename from 3-UsingAPIs/Week1/homework/ex2-checkDoubleDigits.js rename to 3-UsingAPIs/Week1/assignment/ex2-checkDoubleDigits.js index 66120fe6e..c2e6489ef 100644 --- a/3-UsingAPIs/Week1/homework/ex2-checkDoubleDigits.js +++ b/3-UsingAPIs/Week1/assignment/ex2-checkDoubleDigits.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/3-UsingAPIs/Week1#exercise-2-is-it-a-double-digit-number +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/3-UsingAPIs/Week1#exercise-2-is-it-a-double-digit-number Complete the function called `checkDoubleDigits` such that: diff --git a/3-UsingAPIs/Week1/homework/ex3-rollDie.js b/3-UsingAPIs/Week1/assignment/ex3-rollDie.js similarity index 94% rename from 3-UsingAPIs/Week1/homework/ex3-rollDie.js rename to 3-UsingAPIs/Week1/assignment/ex3-rollDie.js index d6918257a..849d012d0 100644 --- a/3-UsingAPIs/Week1/homework/ex3-rollDie.js +++ b/3-UsingAPIs/Week1/assignment/ex3-rollDie.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/3-UsingAPIs/Week1#exercise-3-roll-a-die +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/3-UsingAPIs/Week1#exercise-3-roll-a-die - Run the unmodified program and confirm that problem described occurs. - Refactor the `rollDie()` function from callback-based to returning a diff --git a/3-UsingAPIs/Week1/homework/ex4-pokerDiceAll.js b/3-UsingAPIs/Week1/assignment/ex4-pokerDiceAll.js similarity index 92% rename from 3-UsingAPIs/Week1/homework/ex4-pokerDiceAll.js rename to 3-UsingAPIs/Week1/assignment/ex4-pokerDiceAll.js index 589c568df..7b614a58a 100644 --- a/3-UsingAPIs/Week1/homework/ex4-pokerDiceAll.js +++ b/3-UsingAPIs/Week1/assignment/ex4-pokerDiceAll.js @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/3-UsingAPIs/Week1#exercise-4-throw-the-dice-for-a-poker-dice-game +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/3-UsingAPIs/Week1#exercise-4-throw-the-dice-for-a-poker-dice-game For this exercise you should do the following: - Refactor the `rollDice()` function to throw five dice in one go, by diff --git a/3-UsingAPIs/Week1/homework/ex5-pokerDiceChain.js b/3-UsingAPIs/Week1/assignment/ex5-pokerDiceChain.js similarity index 90% rename from 3-UsingAPIs/Week1/homework/ex5-pokerDiceChain.js rename to 3-UsingAPIs/Week1/assignment/ex5-pokerDiceChain.js index f7916425e..a63628643 100644 --- a/3-UsingAPIs/Week1/homework/ex5-pokerDiceChain.js +++ b/3-UsingAPIs/Week1/assignment/ex5-pokerDiceChain.js @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/tree/main/3-UsingAPIs/Week1#exercise-5-throw-dice-sequentially +Full description at: https://github.com/HackYourFuture/Assignments/tree/main/3-UsingAPIs/Week1#exercise-5-throw-dice-sequentially In the previous exercise we used `Promise.all()` to throw five dice in one go. In the current exercise we will be throwing five dice one at a time, waiting diff --git a/3-UsingAPIs/Week2/README.md b/3-UsingAPIs/Week2/README.md index 03aea6f3c..3e151fdd3 100644 --- a/3-UsingAPIs/Week2/README.md +++ b/3-UsingAPIs/Week2/README.md @@ -1,8 +1,8 @@ -# Homework Using APIs Week 2 +# Assignment Using APIs Week 2 ## Exercises -The homework for this week can be found in the `homework` folder. +The assignment for this week can be found in the `assignment` folder. ### Exercise 1: Programmer Fun diff --git a/3-UsingAPIs/Week2/homework/ex1-programmerFun/index.html b/3-UsingAPIs/Week2/assignment/ex1-programmerFun/index.html similarity index 100% rename from 3-UsingAPIs/Week2/homework/ex1-programmerFun/index.html rename to 3-UsingAPIs/Week2/assignment/ex1-programmerFun/index.html diff --git a/3-UsingAPIs/Week2/homework/ex1-programmerFun/index.js b/3-UsingAPIs/Week2/assignment/ex1-programmerFun/index.js similarity index 92% rename from 3-UsingAPIs/Week2/homework/ex1-programmerFun/index.js rename to 3-UsingAPIs/Week2/assignment/ex1-programmerFun/index.js index d71c11d0e..11c8dc21d 100644 --- a/3-UsingAPIs/Week2/homework/ex1-programmerFun/index.js +++ b/3-UsingAPIs/Week2/assignment/ex1-programmerFun/index.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/blob/main/3-UsingAPIs/Week2/README.md#exercise-1-programmer-fun +Full description at: https://github.com/HackYourFuture/Assignments/blob/main/3-UsingAPIs/Week2/README.md#exercise-1-programmer-fun 1. Complete the function `requestData()` using `fetch()` to make a request to the url passed to it as an argument. The function should return a promise. diff --git a/3-UsingAPIs/Week2/homework/ex2-pokemonApp/index.html b/3-UsingAPIs/Week2/assignment/ex2-pokemonApp/index.html similarity index 100% rename from 3-UsingAPIs/Week2/homework/ex2-pokemonApp/index.html rename to 3-UsingAPIs/Week2/assignment/ex2-pokemonApp/index.html diff --git a/3-UsingAPIs/Week2/homework/ex2-pokemonApp/index.js b/3-UsingAPIs/Week2/assignment/ex2-pokemonApp/index.js similarity index 91% rename from 3-UsingAPIs/Week2/homework/ex2-pokemonApp/index.js rename to 3-UsingAPIs/Week2/assignment/ex2-pokemonApp/index.js index dd608d7d7..2ba42b081 100644 --- a/3-UsingAPIs/Week2/homework/ex2-pokemonApp/index.js +++ b/3-UsingAPIs/Week2/assignment/ex2-pokemonApp/index.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/blob/main/3-UsingAPIs/Week2/README.md#exercise-2-gotta-catch-em-all +Full description at: https://github.com/HackYourFuture/Assignments/blob/main/3-UsingAPIs/Week2/README.md#exercise-2-gotta-catch-em-all Complete the four functions provided in the starter `index.js` file: diff --git a/3-UsingAPIs/Week2/homework/ex2-pokemonApp/style.css b/3-UsingAPIs/Week2/assignment/ex2-pokemonApp/style.css similarity index 100% rename from 3-UsingAPIs/Week2/homework/ex2-pokemonApp/style.css rename to 3-UsingAPIs/Week2/assignment/ex2-pokemonApp/style.css diff --git a/3-UsingAPIs/Week2/homework/ex3-rollAnAce.js b/3-UsingAPIs/Week2/assignment/ex3-rollAnAce.js similarity index 90% rename from 3-UsingAPIs/Week2/homework/ex3-rollAnAce.js rename to 3-UsingAPIs/Week2/assignment/ex3-rollAnAce.js index 9574f1e85..7d0080288 100644 --- a/3-UsingAPIs/Week2/homework/ex3-rollAnAce.js +++ b/3-UsingAPIs/Week2/assignment/ex3-rollAnAce.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/blob/main/3-UsingAPIs/Week2/README.md#exercise-3-roll-an-ace +Full description at: https://github.com/HackYourFuture/Assignments/blob/main/3-UsingAPIs/Week2/README.md#exercise-3-roll-an-ace 1. Run the unmodified exercise and observe that it works as advertised. Observe that the die must be thrown an indeterminate number of times until we get an diff --git a/3-UsingAPIs/Week2/homework/ex4-diceRace.js b/3-UsingAPIs/Week2/assignment/ex4-diceRace.js similarity index 90% rename from 3-UsingAPIs/Week2/homework/ex4-diceRace.js rename to 3-UsingAPIs/Week2/assignment/ex4-diceRace.js index 14a931926..c8dd3d396 100644 --- a/3-UsingAPIs/Week2/homework/ex4-diceRace.js +++ b/3-UsingAPIs/Week2/assignment/ex4-diceRace.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/blob/main/3-UsingAPIs/Week2/README.md#exercise-4-dice-race +Full description at: https://github.com/HackYourFuture/Assignments/blob/main/3-UsingAPIs/Week2/README.md#exercise-4-dice-race 1. Complete the function `rollDice()` by using `.map()` on the `dice` array to create an array of promises for use with `Promise.race()`. diff --git a/3-UsingAPIs/Week2/homework/ex5-vscDebug.js b/3-UsingAPIs/Week2/assignment/ex5-vscDebug.js similarity index 87% rename from 3-UsingAPIs/Week2/homework/ex5-vscDebug.js rename to 3-UsingAPIs/Week2/assignment/ex5-vscDebug.js index 78b44b22c..11f3f1b00 100644 --- a/3-UsingAPIs/Week2/homework/ex5-vscDebug.js +++ b/3-UsingAPIs/Week2/assignment/ex5-vscDebug.js @@ -1,6 +1,6 @@ 'use strict'; /*------------------------------------------------------------------------------ -Full description at: https://github.com/HackYourFuture/Homework/blob/main/3-UsingAPIs/Week2/README.md#exercise-5-using-the-vscode-debugger +Full description at: https://github.com/HackYourFuture/Assignments/blob/main/3-UsingAPIs/Week2/README.md#exercise-5-using-the-vscode-debugger Use the VSCode Debugger to fix the bugs --------------------------------------------------------------- --------------*/ diff --git a/3-UsingAPIs/Week2/homework/ex6-browserDebug/index.html b/3-UsingAPIs/Week2/assignment/ex6-browserDebug/index.html similarity index 100% rename from 3-UsingAPIs/Week2/homework/ex6-browserDebug/index.html rename to 3-UsingAPIs/Week2/assignment/ex6-browserDebug/index.html diff --git a/3-UsingAPIs/Week2/homework/ex6-browserDebug/index.js b/3-UsingAPIs/Week2/assignment/ex6-browserDebug/index.js similarity index 91% rename from 3-UsingAPIs/Week2/homework/ex6-browserDebug/index.js rename to 3-UsingAPIs/Week2/assignment/ex6-browserDebug/index.js index 6f22c363c..5d7773f65 100644 --- a/3-UsingAPIs/Week2/homework/ex6-browserDebug/index.js +++ b/3-UsingAPIs/Week2/assignment/ex6-browserDebug/index.js @@ -1,5 +1,5 @@ /* -Full description at:https://github.com/HackYourFuture/Homework/blob/main/3-UsingAPIs/Week2/README.md#exercise-6-using-the-browser-debugger +Full description at:https://github.com/HackYourFuture/Assignments/blob/main/3-UsingAPIs/Week2/README.md#exercise-6-using-the-browser-debugger */ 'use strict'; diff --git a/3-UsingAPIs/helpers/pokerDiceRoller.js b/3-UsingAPIs/helpers/pokerDiceRoller.js index 60a2e208c..6f0e79992 100644 --- a/3-UsingAPIs/helpers/pokerDiceRoller.js +++ b/3-UsingAPIs/helpers/pokerDiceRoller.js @@ -26,7 +26,7 @@ const ROLL_TIME = underTest ? 0 : 500; // The number represent indexes into the `sides` array. The roll order to use // is randomly selected. // For a visual illustration see: -// https://github.com/HackYourFuture/Homework/blob/main/assets/flattened-die.png +// https://github.com/HackYourFuture/Assignments/blob/main/assets/flattened-die.png const rollOrders = [ [1, 5, 4, 0], [3, 5, 2, 0], diff --git a/README.md b/README.md index 08ba205b9..b33af86da 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Homework +# Assignments -This repository contains all of the homework exercises that need to be handed in for the JavaScript modules (i.e., JavaScript, Browsers and UsingAPIs) of the HackYourFuture curriculum. +This repository contains all of the assignments exercises that need to be handed in for the JavaScript modules (i.e., JavaScript, Browsers and UsingAPIs) of the HackYourFuture curriculum. ## Introduction -Throughout your [HYF journey](https://github.com/HackYourFuture/curriculum) you will be asked to do certain homework exercises. This repository contains all of these exercises for the JavaScript modules. The module repositories will tell you how to hand in the homework, the curriculum will indicate what week you will need to do. +Throughout your [HYF journey](https://github.com/HackYourFuture/curriculum) you will be asked to do certain exercises. This repository contains all of these exercises for the JavaScript modules. The module repositories will tell you how to hand in the assignment, the curriculum will indicate what week you will need to do. -> Note that a fork of this repository will be created on the HackYourHomework GitHub account specifically for your class. The name of the repository will have the format `Homework-classXX` where `XX` is your class number, +> Note that a fork of this repository will be created on the [HackYourAssignment](https://github.com/HackYourAssignment) GitHub account specifically for your cohort. The name of the repository will have the format `Assignments-cohortXX` where `XX` is your cohort number, ## Installation @@ -27,10 +27,10 @@ This command: You will be spending a lot of time in [VSCode](https://code.visualstudio.com/) while working with this repository. To open it with VSCode you can use the command line: ```text -code Homework-classXX +code Assignments-cohortXX ``` -> When working on your homework it is strongly recommended to open `Homework-classXX` folder itself in VSCode rather than one of its sub-folders. This gives VSCode and all its extensions the full view on the repo for the best overall developer experience. +> When working on your assignment it is strongly recommended to open `Assignments-cohortXX` folder itself in VSCode rather than one of its sub-folders. This gives VSCode and all its extensions the full view on the repo for the best overall developer experience. ### Install Recommended VSCode Extensions @@ -49,14 +49,14 @@ If, for some reason, the prompt to install the extensions does not appear then p ### Overview of the Directory Structure -The directory structure containing the homework for a specific curriculum module (in Figure 1 below, the **JavaScript** module), looks like this: +The directory structure containing the assignment for a specific curriculum module (in Figure 1 below, the **JavaScript** module), looks like this: ![directory structure](./assets/directory-structure.png)
Figure 1. Directory Structure for the `1-JavaScript` folder. > A similar directory structure exists for the **Browser** module (`2-Browsers`) and the **UsingAPIs** module (`3-UsingAPIs`). -Each `homework` folder contains sub-folders and files that make up the exercises. The exercises consist of starter files that you need to complete. Some exercises consist of a single JavaScript (for example, `ex1-giveCompliment.js`). Exercises that are browser-based are mostly contained in sub-folders (for example, `ex1-bookList` in the `1-Browsers/homework` folder). +Each `assignment` folder contains sub-folders and files that make up the exercises. The exercises consist of starter files that you need to complete. Some exercises consist of a single JavaScript (for example, `ex1-giveCompliment.js`). Exercises that are browser-based are mostly contained in sub-folders (for example, `ex1-bookList` in the `1-Browsers/assignment` folder). > You should not change anything in the `test-reports` and `unit-tests` sub-folders. The purpose of these folders will be explained later. @@ -180,7 +180,7 @@ This will open a terminal window at the bottom of the screen, as show in Figure ![Terminal Window](./assets/terminal-window.png)
Figure 7. Terminal Window -Because we used the context menu in the VSCode File Explorer, the current directory in the terminal window is already the `homework` folder containing the exercise. We can execute our program (in this example `ex1-giveCompliment.js`) by typing `node`, followed by a space and then enough characters to uniquely identify the file. Then press the **Tab** key to _expand_ the file name. Because the names of all exercises start with `ex𝑛`, where 𝑛 is a number, it is enough to type just that and press the **Tab** key: +Because we used the context menu in the VSCode File Explorer, the current directory in the terminal window is already the `assignment` folder containing the exercise. We can execute our program (in this example `ex1-giveCompliment.js`) by typing `node`, followed by a space and then enough characters to uniquely identify the file. Then press the **Tab** key to _expand_ the file name. Because the names of all exercises start with `ex𝑛`, where 𝑛 is a number, it is enough to type just that and press the **Tab** key: ```text node ex1- (press TAB) @@ -212,11 +212,11 @@ Once you are satisfied with the results it is time to use the **test runner**, a The repository includes an automated test facility. It serves two purposes. -1. It allows you to test yourself whether your finished exercise meets some important requirements of the assignment. Consider this a form of _early feedback_. Your homework will also be reviewed by a mentor for more thorough feedback later but that make take a while to complete. +1. It allows you to test yourself whether your finished exercise meets some important requirements of the assignment. Consider this a form of _early feedback_. Your assignment will also be reviewed by a mentor for more thorough feedback later but that make take a while to complete. 2. It allows mentors to gain a quick insight on some key quality benchmarks, giving them a head start in the review process. -> The tests that we have provided here cannot possibly test conformance to every detail of the exercise assignments. Therefore running a successful test is just a first indication of success. Ultimately, it will be the mentor reviewing your homework to give the final verdict. +> The tests that we have provided here cannot possibly test conformance to every detail of the exercise assignments. Therefore running a successful test is just a first indication of success. Ultimately, it will be the mentor reviewing your assignment to give the final verdict. ### Running a test @@ -302,7 +302,7 @@ For example: - `ex1-giveCompliment.pass.txt` _or_ - `ex1-giveCompliment.fail.txt` -The report files are considered part of the pull request that you will make to submit your homework. They enable reviewers to get a quick overview of your progress. +The report files are considered part of the pull request that you will make to submit your assignments. They enable reviewers to get a quick overview of your progress. In addition, a log of the test results is written to a log file in the root directory of the repository. The name of that file is **\.log**, where \ is your email address (or **test-runner.log** if the test runner could not determine your email address). @@ -310,9 +310,9 @@ In addition, a log of the test results is written to a log file in the root dire > > You should strive to complete all tests with no errors reported, however it is okay if for some reason you were unable to fix some error. Nevertheless, you _**are**_ required to run the tests, whether successful or not. > -> The test reports should be included in your Pull Request (for the benefit of the homework reviewer). +> The test reports should be included in your Pull Request (for the benefit of the assignment reviewer). -## Homework Exercise Instructions +## assignment Exercise Instructions ### JavaScript Module diff --git a/package-lock.json b/package-lock.json index 618622d72..2a20c7138 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "homework", + "name": "assignments", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "homework", + "name": "assignments", "version": "1.0.0", "hasInstallScript": true, "license": "CC-BY-4.0", @@ -2011,9 +2011,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001412", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz", - "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==", + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", "funding": [ { "type": "opencollective", @@ -2022,6 +2022,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -8277,9 +8281,9 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "caniuse-lite": { - "version": "1.0.30001412", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz", - "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==" + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==" }, "chalk": { "version": "4.1.2", diff --git a/package.json b/package.json index 1156c3621..08f2c77be 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "homework", + "name": "assignments", "version": "1.0.0", "description": "> If you are following the HackYourFuture curriculum we recommend you to start with module 1: [HTML/CSS/GIT](https://github.com/HackYourFuture/HTML-CSS). To get a complete overview of the HackYourFuture curriculum first, click [here](https://github.com/HackYourFuture/curriculum).", "main": "index.js", "scripts": { "test": "node ./test-runner", - "testalt": "node ./test-runner @homework", + "testalt": "node ./test-runner @assignment", "it": "node ./test-runner/run-it", - "alt": "node ./test-runner/run-it @homework", + "alt": "node ./test-runner/run-it @assignment", "reset-reports": "node ./test-runner/reset-reports", "sysinfo": "node ./test-runner/sysinfo", "postinstall": "npm run sysinfo", @@ -18,10 +18,10 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/HackYourFuture/Homework.git" + "url": "git+https://github.com/HackYourFuture/Assignments.git" }, "keywords": [ - "homework", + "assignments", "HackYourFuture" ], "author": "Jim Cramer for HackYourFuture", @@ -30,11 +30,11 @@ }, "license": "CC-BY-4.0", "bugs": { - "url": "https://github.com/HackYourFuture/Homework/issues" + "url": "https://github.com/HackYourFuture/Assignments/issues" }, - "homepage": "https://github.com/HackYourFuture/Homework#readme", + "homepage": "https://github.com/HackYourFuture/Assignments#readme", "alias": { - "pokerDiceRoller": "./3-UsingAPIs/Week1/homework" + "pokerDiceRoller": "./3-UsingAPIs/Week1/assignment" }, "WARNING": "Do not update major versions of dependencies as they may break the test runner", "dependencies": { diff --git a/test-runner/decrypt.js b/test-runner/decrypt.js index 864d31faf..85ccc8be8 100644 --- a/test-runner/decrypt.js +++ b/test-runner/decrypt.js @@ -9,7 +9,7 @@ const Cryptr = require('cryptr'); const { makePath } = require('./test-runner-helpers'); -const solutionsFolderName = '@homework'; +const solutionsFolderName = '@assignment'; async function decryptExerciseSolution(filePath, secret) { const cryptr = new Cryptr(secret); diff --git a/test-runner/encrypt.js b/test-runner/encrypt.js index b6be6a2da..7048e9a2c 100644 --- a/test-runner/encrypt.js +++ b/test-runner/encrypt.js @@ -42,7 +42,7 @@ async function encryptExerciseSolution(secret, fileSpec, exerciseJSON) { function encryptExerciseSolutions(secret, module, week, exercises) { exercises.forEach((exercise) => { - const filePath = makePath(module, week, '@homework', exercise); + const filePath = makePath(module, week, '@assignment', exercise); let fileSpec, isFolder; if (existsSync(filePath)) { diff --git a/test-runner/index.js b/test-runner/index.js index 895262814..f91dd154a 100644 --- a/test-runner/index.js +++ b/test-runner/index.js @@ -139,7 +139,7 @@ async function execJest(exercisePath, homeworkFolder) { stdio: 'pipe', env: { ...process.env, - HOMEWORK_FOLDER: homeworkFolder, + ASSIGNMENT_FOLDER: homeworkFolder, }, }); @@ -178,7 +178,7 @@ async function execESLint(exercisePath) { output = err.stdout; } if (output) { - output = output.replace(/\\/g, '/').replace(/^.*\/\.?homework\//gm, ''); + output = output.replace(/\\/g, '/').replace(/^.*\/\.?assignment\//gm, ''); const title = '*** ESLint Report ***'; console.log(chalk.yellow(`\n${title}`)); console.log(chalk.red(output)); @@ -250,7 +250,7 @@ async function main() { } try { - const homeworkFolder = process.argv[2] || 'homework'; + const homeworkFolder = process.argv[2] || 'assignment'; const menuData = compileMenuData(); let module, week, exercise; diff --git a/test-runner/jsdom-helpers.js b/test-runner/jsdom-helpers.js index 13ca1fda9..456c292fa 100644 --- a/test-runner/jsdom-helpers.js +++ b/test-runner/jsdom-helpers.js @@ -14,7 +14,7 @@ function sleep(ms) { } async function prepare() { - const homeworkFolder = process.env.HOMEWORK_FOLDER || 'homework'; + const homeworkFolder = process.env.ASSIGNMENT_FOLDER || 'assignment'; const { testPath } = expect.getState(); const exercisePath = testPath diff --git a/test-runner/reset-reports.js b/test-runner/reset-reports.js index 0c039cd06..6ce813fbd 100644 --- a/test-runner/reset-reports.js +++ b/test-runner/reset-reports.js @@ -21,7 +21,7 @@ async function prepareHashes(menuData) { for (const week of weeks) { const exercises = menuData[moduleName][week]; for (const exercise of exercises) { - const exercisePath = makePath(moduleName, week, 'homework', exercise); + const exercisePath = makePath(moduleName, week, 'assignment', exercise); hashes[exercise] = await computeHash(exercisePath); } } diff --git a/test-runner/run-it.js b/test-runner/run-it.js index 576b34bf5..91a778256 100644 --- a/test-runner/run-it.js +++ b/test-runner/run-it.js @@ -87,7 +87,7 @@ async function runExercise(exercisePath) { async function main() { try { - const homeworkFolder = process.argv[2] ?? 'homework'; + const homeworkFolder = process.argv[2] ?? 'assignment'; const menuData = compileMenuData(); let module, week, exercise; diff --git a/test-runner/test-runner-helpers.js b/test-runner/test-runner-helpers.js index e9e058bb8..3f1ecb9be 100644 --- a/test-runner/test-runner-helpers.js +++ b/test-runner/test-runner-helpers.js @@ -19,7 +19,7 @@ function makePath(module, week, folder, exercise) { function compileMenuData() { const menuData = {}; const fileSpec = path - .join(__dirname, '..', '**/homework/ex+([0-9])-*') + .join(__dirname, '..', '**/assignment/ex+([0-9])-*') .replace(/\\/g, '/'); const filePaths = fg.sync([fileSpec, '!**/node_modules'], { onlyFiles: false, @@ -27,7 +27,7 @@ function compileMenuData() { filePaths.forEach((filePath) => { const matches = filePath.match( - /^.*\/(.+)\/(Week\d)\/homework\/(.+?)(?:\.js)?$/i + /^.*\/(.+)\/(Week\d)\/assignment\/(.+?)(?:\.js)?$/i ); if (matches) { const [, module, week, exercise] = matches; diff --git a/test-runner/unit-test-helpers.js b/test-runner/unit-test-helpers.js index 384822c12..577f9b3ea 100644 --- a/test-runner/unit-test-helpers.js +++ b/test-runner/unit-test-helpers.js @@ -17,7 +17,7 @@ function beforeAllHelper(testFilePath, options = {}) { throw new Error(`Unexpected test path: ${testFilePath}`); } - const homeworkFolder = process.env.HOMEWORK_FOLDER || 'homework'; + const homeworkFolder = process.env.ASSIGNMENT_FOLDER || 'assignment'; const [, module, week, exercise] = matches; let exercisePath = path.join(