diff --git a/README.md b/README.md index 23108974b..28ae55d8b 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ **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.** diff --git a/assignments/arrays.js b/assignments/arrays.js index 1dbf8bd35..46734a6ac 100644 --- a/assignments/arrays.js +++ b/assignments/arrays.js @@ -75,30 +75,50 @@ 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*`); + +let car; +for (let i = 0; i console.log("Function was invoked!"); +myFunction(); + // let anotherFunction = function (param) { // return param; // }; // anotherFunction("Example"); +const anotherFunction =(param) => param; +console.log(anotherFunction("Parameter")); + // let add = function (param1, param2) { // return param1 + param2; // }; // add(1,2); - +const add =(param1, param2) => param1 + param2; +console.log(add(1,2)); // let subtract = function (param1, param2) { // return param1 - param2; // }; // subtract(1,2); - +const subtract =(param1, param2) => param1 - param2; +console.log(subtract(1,2)); // Stretch @@ -27,4 +35,5 @@ // const triple = exampleArray.map(function (num) { // return num * 3; // }); -// console.log(triple); \ No newline at end of file +// console.log(triple); + diff --git a/assignments/objects.js b/assignments/objects.js index 798d5e0cf..5677d81f0 100644 --- a/assignments/objects.js +++ b/assignments/objects.js @@ -18,28 +18,76 @@ const example = { } // Write your intern objects here: +const newIntern1 = { + id: 1, + name: "Mitzi", + email: "mmelloy0@psu.edu", + gender: "F", +} + +const newIntern2 = { + id: 2, + name: "Kennan", + email: "kdiben1@tinypic.com", + gender: "M", + + +} + + + +const newIntern3 = { + id: 3, + name: "Keven", + email: "kmummery2@wikimedia.org", + gender: "M", +} + +const newIntern4 = { + id: 4, + name: "Gannie", + email: "gmartinson3@illinois.edu", + gender: "F", +} + +const newIntern5 = { + id: 5, + name: "Antonietta", + email: "adaine5@samsung.com", + gender: "F", + multiplyNums(num1, num2){ + return num1 * num2 + + } +} // ==== 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(newIntern1.name); // Kennan's ID - +console.log(newIntern2.id); // Keven's email - +console.log(newIntern3.email); // Gannie's name - +console.log(newIntern4.name); // Antonietta's Gender - +console.log(newIntern5.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()); +newIntern2.speak=function (){ + return "Hello, my name is Kennan!"; +} +console.log(newIntern2.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)); +console.log(newIntern5.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. // ==== Stretch Challenge: Nested Objects and the this keyword ==== @@ -49,7 +97,25 @@ const example = { // 3. Nest a grandchild object in the child object with properties for name and age. The name will be Sam and the age will be 30 // 4. Give each of the objects the ability to speak their names using the this keyword. -const parent = {} +const parent = { + name: "Susan", + age: 70, + child:{ + name: "George", + age: 50, + }, + grandchild:{ + name:"Sam", + age:30, + }, + speak() { + + console.log(`${this.name}, ${this.age}`); + } + }; + parent.speak(); + parent.child.speak(); + grandchild.speak(); // Log the parent object's name