diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..5c98b4288 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/JavaScript-I.iml b/.idea/JavaScript-I.iml new file mode 100644 index 000000000..24643cc37 --- /dev/null +++ b/.idea/JavaScript-I.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..28a804d89 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..f06a8f938 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 23108974b..972069807 100644 --- a/README.md +++ b/README.md @@ -6,18 +6,18 @@ **Follow these steps to set up and work on your project:** -- [ ] Create a forked copy of this project. -- [ ] Add your team lead as collaborator on Github. -- [ ] Clone your OWN version of the repository (Not Lambda's by mistake!). -- [ ] Create a new branch: git checkout -b ``. -- [ ] Implement the project on your newly created `` branch, committing changes regularly. -- [ ] Push commits: git push origin ``. +- [x] Create a forked copy of this project. +- [x] Add your team lead as collaborator on Github. +- [x] Clone your OWN version of the repository (Not Lambda's by mistake!). +- [x] Create a new branch: git checkout -b ``. +- [x] Implement the project on your newly created `` branch, committing changes regularly. +- [x] Push commits: git push origin ``. **Follow these steps for completing your project.** -- [ ] Submit a Pull-Request to merge Branch into master (student's Repo). **Please don't merge your own pull request** -- [ ] Add your team lead as a reviewer on the pull-request -- [ ] Your team lead will count the project as complete by merging the branch back into master. +- [x] Submit a Pull-Request to merge Branch into master (student's Repo). **Please don't merge your own pull request** +- [x] Add your team lead as a reviewer on the pull-request +- [x] Your team lead will count the project as complete by merging the branch back into master. ## Assignment Description diff --git a/assignments/arrays.js b/assignments/arrays.js index 1dbf8bd35..b02dcd0d9 100644 --- a/assignments/arrays.js +++ b/assignments/arrays.js @@ -75,30 +75,56 @@ let inventory = [ // ==== Challenge 1 ==== // The dealer can't recall the information for a car with an id of 33 on his lot. Help the dealer find out which car has an id of 33 by logging the car's year, make, and model in the console log provided to you below: -console.log(`Car 33 is a *car year goes here* *car make goes here* *car model goes here*`); +// console.log(`Car 33 is a *car year goes here* *car make goes here* *car model goes here*`); + +for (let i = 0; i < inventory.length; i++) { + if (inventory[i].id === 33) { + console.log( + `Car 33 is a ${inventory[i].car_year} ${inventory[i].car_make} ${inventory[i].car_model}` + ); + } +} // ==== Challenge 2 ==== // The dealer needs the information on the last car in their inventory. What is the make and model of the last car in the inventory? Log the make and model into the console. -let lastCar = 0; -console.log(); +let lastCar = inventory[49]; +console.log(lastCar.car_make, lastCar.car_model); // ==== Challenge 3 ==== // The marketing team wants the car models listed alphabetically on the website. Sort all the car model names into alphabetical order and log the results in the console let carModels = []; -let carModelsSorted = []; -console.log(); +for (let i = 0; i < inventory.length; i++){ + carModels.push(inventory[i].car_model); + carModels.sort(); +} +console.log(carModels); // ==== Challenge 4 ==== // The accounting team needs all the years from every car on the lot. Create a new array from the dealer data containing only the car years and log the result in the console. let carYears = []; -console.log(); +for (let i = 0; i < inventory.length; i++) { + carYears.push(inventory[i].car_year); + carYears.sort(); +} +console.log(carYears); + // ==== Challenge 5 ==== // The car lot manager needs to find out how many cars are older than the year 2000. Using the carYears array you just created, find out how many cars were made before the year 2000 by populating the array oldCars and logging it's length. let oldCars = []; -console.log(); + for (let i = 0; i < inventory.length; i++){ + if (inventory[i].car_year < 2000){ + oldCars.push([i]); + } + } +console.log(oldCars.length); // ==== Challenge 6 ==== // A buyer is interested in seeing only BMW and Audi cars within the inventory. Return an array that only contains BMW and Audi cars. Once you have populated the BMWAndAudi array, use JSON.stringify() to show the results of the array in the console. let BMWAndAudi = []; -console.log(); +for (let i = 0; i < inventory.length; i++) { + if (inventory[i].car_make === "BMW" || inventory[i].car_make === "Audi") { + BMWAndAudi.push(inventory[i]); + } +} +console.log(JSON.stringify(BMWAndAudi)); \ No newline at end of file diff --git a/assignments/function-conversion.js b/assignments/function-conversion.js index 55f57ef62..54b3cf8d7 100644 --- a/assignments/function-conversion.js +++ b/assignments/function-conversion.js @@ -1,24 +1,19 @@ // Take the commented ES5 syntax and convert it to ES6 arrow Syntax -// let myFunction = function () { -// console.log("Function was invoked!"); -// }; -// myFunction(); +let myFunction = () => console.log("Function was invoked!"); +myFunction(); -// let anotherFunction = function (param) { -// return param; -// }; -// anotherFunction("Example"); +let anotherFunction = (param) => param; +//anotherFunction("Example"); +console.log(anotherFunction("example")); -// let add = function (param1, param2) { -// return param1 + param2; -// }; -// add(1,2); +let add = (param1, param2) => param1 + param2; +//add(1,2); +console.log(add(1, 2)); -// let subtract = function (param1, param2) { -// return param1 - param2; -// }; -// subtract(1,2); +let subtract = (param1, param2) => param1 - param2; +//subtract(1,2); +console.log(subtract(1,2)); // Stretch diff --git a/assignments/objects.js b/assignments/objects.js index 798d5e0cf..c9ba46794 100644 --- a/assignments/objects.js +++ b/assignments/objects.js @@ -15,30 +15,61 @@ const example = { name: "Example", email: "examples@you.edu", gender: "F", -} +}; // Write your intern objects here: - +const intern1 ={ + id: 1, + name: "Mitzi", + email: "mmelloy@psu.edu", + gender: "F" +}; +const intern2 ={ + id: 2, + name: "kennan", + email: "kdiben1@tinypic.com", + gender: "M", +}; +const intern3 ={ + id: 3, + name: "Kevin", + email: "kmummery2@wikimedia.org", + gender: "M" +}; +const intern4 ={ + id: 4, + name: "Gannie", + email: "gmartinson3@illinois.edu", + gender: "F" +}; +const intern5 ={ + id: 5, + name: "Antonietto", + email: "adaine5@samsung.com", + gender: "F" +}; // ==== Challenge 2: Reading Object Data ==== // Once your objects are created, log out the following requests from HR into the console: // Mitzi's name - +console.log(intern1.name); // Kennan's ID - +console.log(intern2.id); // Keven's email - +console.log(intern3.email); // Gannie's name - +console.log(intern4.name); // Antonietta's Gender - +console.log(intern5.gender); // ==== Challenge 3: Object Methods ==== // Give Kennan the ability to say "Hello, my name is Kennan!" Use the console.log provided as a hint. -// console.log(kennan.speak()); +intern2.speak = () => "Hello, my name is Kennan"; +console.log(intern2.speak()); // Antonietta loves math, give her the ability to multiply two numbers together and return the product. Use the console.log provided as a hint. -//console.log(antonietta.multiplyNums(3,4)); +intern5.multiplyNums = (num1, num2) => num1 * num2; +console.log(intern5.multiplyNums(3,4)); // === Great work! === Head over to the the arrays.js. You may come back and attempt the Stretch Challenge once you have completed the challenges in arrays.js and function-conversion.js.