From 58b8c54be6c12aba715cddcb6ede5a3b1b37e363 Mon Sep 17 00:00:00 2001 From: blakelower Date: Mon, 14 Oct 2019 18:34:05 +0700 Subject: [PATCH 1/7] did problems 1 and 2 of Arrays --- README.md | 12 ++++++------ assignments/arrays.js | 25 +++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 23108974b..67a0becee 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..f869bdbae 100644 --- a/assignments/arrays.js +++ b/assignments/arrays.js @@ -1,4 +1,4 @@ -// To help us use arrays with real world problems we are going to simulate a used car dealer that has 50 cars in their inventory. +0// To help us use arrays with real world problems we are going to simulate a used car dealer that has 50 cars in their inventory. // The car dealer has all of their inventory housed in the array seen below. Scroll down past the data to find out how you can help the car dealer. @@ -73,14 +73,35 @@ let inventory = [ // console.log(evens); // [12, 14] + + + + // ==== 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 ' + inventory[32].car_year + ' ' + inventory[32].car_make + ' ' + inventory[32].car_model + '.'); + +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(); +console.log('car 50 is a ' + inventory[49].car_make + ' ' + inventory[49].car_model); +for (let i = 0; i < inventory.length; i++){ + if (inventory[i].id === 50){ + console.log('Car 50 is a ' + inventory[i].car_make + ' ' + inventory[i].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 From 2023f1105200a9e195f3e196971be602bbad0266 Mon Sep 17 00:00:00 2001 From: blakelower Date: Mon, 14 Oct 2019 19:33:09 +0700 Subject: [PATCH 2/7] did 5,6 and 3 --- assignments/arrays.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/assignments/arrays.js b/assignments/arrays.js index f869bdbae..dfbf8c302 100644 --- a/assignments/arrays.js +++ b/assignments/arrays.js @@ -79,9 +79,7 @@ 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 ' + inventory[32].car_year + ' ' + inventory[32].car_make + ' ' + inventory[32].car_model + '.'); - 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 +'.'); @@ -101,25 +99,38 @@ for (let i = 0; i < inventory.length; i++){ - - // ==== 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 Date: Mon, 14 Oct 2019 19:58:58 +0700 Subject: [PATCH 3/7] did number 4 --- assignments/arrays.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/assignments/arrays.js b/assignments/arrays.js index dfbf8c302..274021014 100644 --- a/assignments/arrays.js +++ b/assignments/arrays.js @@ -114,9 +114,12 @@ 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++){ + if(!carYears.includes(inventory[i].car_year)){ + carYears.push(inventory[i].car_year); + } + } + 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. From cc4aca950b4d405d7c50d70d6608a8e4ec993f5f Mon Sep 17 00:00:00 2001 From: blakelower Date: Mon, 14 Oct 2019 20:08:12 +0700 Subject: [PATCH 4/7] added arrow syntax --- assignments/arrays.js | 2 +- assignments/function-conversion.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignments/arrays.js b/assignments/arrays.js index 274021014..d593ccc1b 100644 --- a/assignments/arrays.js +++ b/assignments/arrays.js @@ -136,4 +136,4 @@ 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 = [inventory[7], inventory[24], inventory[43], inventory[44], inventory[29]]; -console.log(JSON.stringify(BMWAndAudi)); +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..bdb7777bf 100644 --- a/assignments/function-conversion.js +++ b/assignments/function-conversion.js @@ -1,9 +1,9 @@ // 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; From f4a3dfde15c10e9c454bc708642fb62b9318b0bc Mon Sep 17 00:00:00 2001 From: blakelower Date: Mon, 14 Oct 2019 20:11:14 +0700 Subject: [PATCH 5/7] added all arrow synatxs --- assignments/function-conversion.js | 34 ++++++++++++++++++------------ 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/assignments/function-conversion.js b/assignments/function-conversion.js index bdb7777bf..4f862473d 100644 --- a/assignments/function-conversion.js +++ b/assignments/function-conversion.js @@ -5,20 +5,26 @@ console.log("Function was invoked!"); }; myFunction(); -// let anotherFunction = function (param) { -// return param; -// }; -// anotherFunction("Example"); - -// let add = function (param1, param2) { -// return param1 + param2; -// }; -// add(1,2); - -// let subtract = function (param1, param2) { -// return param1 - param2; -// }; -// subtract(1,2); + + +let anotherFunction = (param) => { + return param; +}; +anotherFunction("Example"); + + + +let add = (param1, param2) => { + return param1 + param2; +}; +add(1,2); + + + +let subtract = (param1, param2) => { + return param1 - param2; +}; +subtract(1,2); // Stretch From 0ec92ef212838ca115c2923a840ee867b4486665 Mon Sep 17 00:00:00 2001 From: blakelower Date: Mon, 14 Oct 2019 20:51:46 +0700 Subject: [PATCH 6/7] added an object class and consoled logged it --- assignments/objects.js | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/assignments/objects.js b/assignments/objects.js index 798d5e0cf..6ea1fec7f 100644 --- a/assignments/objects.js +++ b/assignments/objects.js @@ -18,21 +18,34 @@ const example = { } // Write your intern objects here: +function intern(nameString, emailString, genderString, idString) { + this.name= nameString; + this.email=emailString; + this.gender= genderString; + this.id = idString; +} +let Mitzi = new intern ("Mitzi", "mmelloy0@psu.edu", "F", "1"); +let Kennan = new intern ("Kennan", "kdiben1@tinypic.com", "M", "2"); +let Kevan = new intern ("Kevan", "gmartinson3@illinois.edu", "M", "3"); +let Gannie = new intern ("Gannie", "gmartinson3@illinois.edu", "M", "4"); +let Antonietta = new intern ("Antonietta", "adaine5@samsung.com", "F", "5"); + + // ==== 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(Mitzi.name); // Kennan's ID - +console.log(Kennan.id); // Keven's email - +console.log(Kevan.email); // Gannie's name - +console.log(Gannie.name); // Antonietta's Gender - +console.log(Antonietta.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()); @@ -61,4 +74,4 @@ const parent = {} // Have the child speak -// Have the grandchild speak +// Have the grandchild speak \ No newline at end of file From abb523427fb0b39da07a0df5186e2d6cd31ee681 Mon Sep 17 00:00:00 2001 From: blakelower Date: Mon, 14 Oct 2019 21:07:45 +0700 Subject: [PATCH 7/7] finished everything up --- assignments/objects.js | 43 +++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/assignments/objects.js b/assignments/objects.js index 6ea1fec7f..674ada184 100644 --- a/assignments/objects.js +++ b/assignments/objects.js @@ -49,10 +49,17 @@ console.log(Antonietta.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()); +Kennan.speak = function (){ + return "Hello, my name is Kennan!"; +} +console.log(Kennan.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)); - +Antonietta.multiplyNums = function(num1,num2){ + return num1 * num2; +} +console.log(Antonietta.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 ==== @@ -62,16 +69,38 @@ console.log(Antonietta.gender); // 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 = {} +let parent = { + "name": "Julie", + "age": "70", + "child": { + "name": "Jeff", + "age": "48", + "grandchild":{ + "name": "Blake", + "age" : "19", + } +}} -// Log the parent object's name +// Log the parent object's name +console.log(parent.name); // Log the child's age - +console.log(parent.child.age); // Log the name and age of the grandchild - +console.log(parent.child.grandchild.age, parent.child.grandchild.name) // Have the parent speak - +parent.speak = function(){ + return "Hi Im a Parent" +} +console.log(parent.speak()); // Have the child speak +parent.child.speak = function(){ + return "Hello family! i love you mom and dad!" +} +console.log(parent.child.speak()); +// Have the grandchild speak +parent.child.grandchild.speak = function(){ + return "Hello, I am a kid" +} -// Have the grandchild speak \ No newline at end of file +console.log(parent.child.grandchild.speak()); \ No newline at end of file