Merge pull request #1 from CarnunMP/Carnun-Marcus-Page

ruairidhflint · web-flow · commit 2f8c473f44d9 · 2019-08-21T13:45:09.000+01:00
JS-II
diff --git a/README.md b/README.md
@@ -7,47 +7,47 @@ With some basic JavaScript principles in hand, we can now expand our skills out
 
 **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 `<firstName-lastName>`.
-* [ ] Implement the project on your newly created `<firstName-lastName>` branch, committing changes regularly.
-* [ ] Push commits: git push origin `<firstName-lastName>`.
+* [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 `<firstName-lastName>`.
+* [x] Implement the project on your newly created `<firstName-lastName>` branch, committing changes regularly.
+* [x] Push commits: git push origin `<firstName-lastName>`.
 
 **Follow these steps for completing your project.**
 
-* [ ] Submit a Pull-Request to merge <firstName-lastName> 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 <firstName-lastName> 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.
 
 ## Task 1: Higher Order Functions and Callbacks
 
 This task focuses on getting practice with higher order functions and callback functions by giving you an array of values and instructions on what to do with that array.
 
-* [ ] Review the contents of the [callbacks.js](assignments/callbacks.js) file.  Notice you are given an array at the top of the page.  Use that array to aid you with your functions.
+* [x] Review the contents of the [callbacks.js](assignments/callbacks.js) file.  Notice you are given an array at the top of the page.  Use that array to aid you with your functions.
 
-* [ ] Complete the problems provided to you but skip over stretch problems until you are complete with every other JS file first.
+* [x] Complete the problems provided to you but skip over stretch problems until you are complete with every other JS file first.
 
 ## Task 2: Array Methods
 
 Use `.forEach()`, `.map()`, `.filter()`, and `.reduce()` to loop over an array with 50 objects in it. The [array-methods.js](assignments/array-methods.js) file contains several challenges built around a fundraising 5K fun run event.
 
-* [ ] Review the contents of the [array-methods.js](assignments/array-methods.js) file.  
+* [x] Review the contents of the [array-methods.js](assignments/array-methods.js) file.  
 
-* [ ] Complete the problems provided to you but skip over stretch problems until you are complete with every other JS file first.
+* [x] Complete the problems provided to you but skip over stretch problems until you are complete with every other JS file first.
 
-* [ ] Notice the last three problems are up to you to create and solve.  This is an awesome opportunity for you to push your critical thinking about array methods, have fun with it.
+* [x] Notice the last three problems are up to you to create and solve.  This is an awesome opportunity for you to push your critical thinking about array methods, have fun with it.
 
 ## Task 3: Closures
 
 We have learned that closures allow us to access values in scope that have already been invoked (lexical scope).  
 
 **Hint: Utilize debugger statements in your code in combination with your developer tools to easily identify closure values.**
 
-* [ ] Review the contents of the [closure.js](assignments/closure.js) file.  
-* [ ] Complete the problems provided to you but skip over stretch problems until you are complete with every other JS file first.
+* [x] Review the contents of the [closure.js](assignments/closure.js) file.  
+* [x] Complete the problems provided to you but skip over stretch problems until you are complete with every other JS file first.
 
 ## Stretch Goals
 
-* [ ] Go back through the stretch problems that you skipped over and complete as many as you can.
-* [ ] Look up what an IIFE is in JavaScript and experiment with them
+* [x] Go back through the stretch problems that you skipped over and complete as many as you can.
+* [x] Look up what an IIFE is in JavaScript and experiment with them
diff --git a/assignments/array-methods.js b/assignments/array-methods.js
@@ -55,31 +55,67 @@ const runners = [
   { id: 50, first_name: "Shell", last_name: "Baine", email: "sbaine1d@intel.com", shirt_size: "M", company_name: "Gabtype", donation: 171 },
 ];
 
+console.log("Array-methods:");
+
 // ==== Challenge 1: Use .forEach() ====
 // The event director needs both the first and last names of each runner for their running bibs. Combine both the first and last names and populate a new array called `fullNames`. This array will contain just strings.
 let fullNames = [];
+runners.forEach(runner => {
+  let fullName = runner.first_name + " " + runner.last_name;
+  fullNames.push(fullName);
+});
 console.log(fullNames);
 
 // ==== Challenge 2: Use .map() ====
 // The event director needs to have all the runners' first names in uppercase because the director BECAME DRUNK WITH POWER. Populate an array called `firstNamesAllCaps`. This array will contain just strings.
-let firstNamesAllCaps = [];
+let firstNamesAllCaps = runners.map(runner => runner.first_name.toUpperCase());
 console.log(firstNamesAllCaps);
 
 // ==== Challenge 3: Use .filter() ====
 // The large shirts won't be available for the event due to an ordering issue. We need a filtered version of the runners array, containing only those runners with large sized shirts so they can choose a different size. This will be an array of objects.
-let runnersLargeSizeShirt = [];
+let runnersLargeSizeShirt = runners.filter(runner => {
+  return runner.shirt_size === "L";
+});
 console.log(runnersLargeSizeShirt);
 
 // ==== Challenge 4: Use .reduce() ====
 // The donations need to be tallied up and reported for tax purposes. Add up all the donations and save the total into a ticketPriceTotal variable.
-let ticketPriceTotal = 0;
+let ticketPriceTotal = runners.reduce((total, runner) => {
+  return total + runner.donation;
+}, 0);
 console.log(ticketPriceTotal);
 
 // ==== Challenge 5: Be Creative ====
 // Now that you have used .forEach(), .map(), .filter(), and .reduce().  I want you to think of potential problems you could solve given the data set and the 5k fun run theme.  Try to create and then solve 3 unique problems using one or many of the array methods listed above.
 
-// Problem 1
+// Problem 1: You decide to give flowers to the top three donors. Produce an array of the top three runner objects, ranked in descending order of size of donation.
+function topThreeDonors() {
+  let donationsRankedDescending = runners.sort((runnerA, runnerB) => {
+    if (runnerA.donation < runnerB.donation) {return 1}
+    if (runnerA.donation > runnerB.donation) {return -1}
+    return 0
+  });
+
+  return donationsRankedDescending.slice(0, 3);
+}
+console.log(topThreeDonors());
+
+// Problem 2: An anonymous 51st company wants to join the fundraiser, matching everyone else's donations. Add them to runners. (Do not mutuate.)
+let runnersAndMysteryDonor = runners.concat({
+  id: 51,
+  first_name: "",
+  last_name: "",
+  email: "",
+  shirt_size: "N/A",
+  donation: ticketPriceTotal,
+}); // Interesting that you can .concat() an object (/value?) which isn't itself an array!
+console.log(runnersAndMysteryDonor[runnersAndMysteryDonor.length - 1]);
 
-// Problem 2
+// Problem 3: You decide that companies whose names begin with "W" or end in "le" are morally reprehensible, and that it would be criminal to accept their money. Remove them from runners. (Do not mutuate.)
+let runnersAfterPurge = runners.filter(runner => {
+  return !(runner.company_name[0] === "W" || runner.company_name.slice(-2) === "le");
+});
+console.log(runnersAfterPurge);
+// Looks good!
 
-// Problem 3
+console.log("&mdash;&mdash;&mdash;");
diff --git a/assignments/callbacks.js b/assignments/callbacks.js
@@ -38,32 +38,69 @@ const items = ['Pencil', 'Notebook', 'yo-yo', 'Gum'];
   // "this Pencil is worth a million dollars!"
 */
 
+console.log("Callbacks: ");
 
 function getLength(arr, cb) {
   // getLength passes the length of the array into the callback.
+  cb(arr.length);
 }
+getLength(items, item => console.log(`Length is ${item}!`));
 
 function last(arr, cb) {
   // last passes the last item of the array into the callback.
+  cb(arr[arr.length - 1]);
 }
+last(items, item => console.log(`Last item is ${item}`));
 
 function sumNums(x, y, cb) {
   // sumNums adds two numbers (x, y) and passes the result to the callback.
+  cb(x + y);
 }
+sumNums(2, 3, sum => console.log("Sum is " + sum));
 
 function multiplyNums(x, y, cb) {
   // multiplyNums multiplies two numbers and passes the result to the callback.
+  cb(x * y);
 }
+multiplyNums(2, 3, product => console.log("Product is " + product));
 
 function contains(item, list, cb) {
   // contains checks if an item is present inside of the given array/list.
   // Pass true to the callback if it is, otherwise pass false.
+  let isInList = false;
+  list.forEach(i => {
+    if (!isInList && (item === i)) {
+      isInList = true;
+    }
+  });
+
+  cb(isInList);
 }
+contains("Notebook", items, isInList => console.log("There is a notebook in the list: " + isInList));
+contains("T-Rex", items, isInList => console.log("There is a T-Rex in the list: " + isInList));
 
 /* STRETCH PROBLEM */
 
 function removeDuplicates(array, cb) {
   // removeDuplicates removes all duplicate values from the given array.
   // Pass the duplicate free array to the callback function.
   // Do not mutate the original array.
+  let counts = {};
+  array.forEach(item => {
+    if (counts[item] === undefined) {
+      counts[item] = 1;
+    } else {
+      counts[item]++;
+    }
+  });
+
+  console.log(counts);
+  cb(Object.keys(counts));
 }
+
+let testArray = ["A", "A", "B", "C", "C", "C"];
+removeDuplicates(testArray, duplicatesRemoved => console.log(`Original array: [${testArray.toString()}]. Duplicates removed: [${duplicatesRemoved}]`));
+
+// A little hacky, but it works! :P
+
+console.log("&mdash;&mdash;&mdash;")
diff --git a/assignments/closure.js b/assignments/closure.js
@@ -1,33 +1,86 @@
+console.log("Closure:");
+
 // ==== Challenge 1: Write your own closure ====
 // Write a closure of your own creation.
 // Keep it simple! Remember a closure is just a function
 // that manipulates variables defined in the outer scope.
 // The outer scope can be a parent function, or the top level of the script.
-
+let yo = "yo";
+function makeYoYoyo() {
+  yo += "yo";
+}
+makeYoYoyo();
+console.log(yo);
 
 /* STRETCH PROBLEMS, Do not attempt until you have completed all previous tasks for today's project files */
 
 
 // ==== Challenge 2: Implement a "counter maker" function ====
-const counterMaker = () => {
+const counterMaker = (limit = 3) => {
   // IMPLEMENTATION OF counterMaker:
   // 1- Declare a `count` variable with a value of 0. We will be mutating it, so declare it using `let`!
   // 2- Declare a function `counter`. It should increment and return `count`.
   //      NOTE: This `counter` function, being nested inside `counterMaker`,
   //      "closes over" the `count` variable. It can "see" it in the parent scope!
   // 3- Return the `counter` function.
+  let count = 0;
+  function counter() { 
+    if (count < limit) {
+      count++;
+    } else {
+      count = 1;
+    }
+    return count;
+  }
+  return counter;
 };
-// Example usage: const myCounter = counterMaker();
-// myCounter(); // 1
-// myCounter(); // 2
+// Example usage: 
+const myCounter = counterMaker();
+myCounter(); // 1
+myCounter(); // 2
+console.log(myCounter()); // Expected: 3
+console.log(myCounter()); // Expected: 1
+console.log(myCounter()); // Expected: 2
 
 // ==== Challenge 3: Make `counterMaker` more sophisticated ====
 // It should have a `limit` parameter. Any counters we make with `counterMaker`
 // will refuse to go over the limit, and start back at 1.
 
 // ==== Challenge 4: Create a counter function with an object that can increment and decrement ====
+let counter = 0;
 const counterFactory = () => {
   // Return an object that has two methods called `increment` and `decrement`.
   // `increment` should increment a counter variable in closure scope and return it.
   // `decrement` should decrement the counter variable and return it.
+  let counterObject = {
+    increment: function() {
+      counter++;
+      // console.log(counter);
+      return counter;
+    },
+    decrement: function() {
+      counter--;
+      return counter;
+    }
+  }
+
+  return counterObject;
 };
+
+console.log(counterFactory().decrement(), counterFactory().decrement(), counterFactory().increment(), counterFactory().increment(), counterFactory().increment());
+// Hmm... seems to be working!
+
+console.log("&mdash;&mdash;&mdash;");
+
+// Some IIFE experiments:
+console.log((function () {
+  return 5 * 5;
+})());
+
+let iifeTestArray = ["Cat", "Dog", "Giant Man-Eating Lizard"];
+console.log(iifeTestArray.sort((function (a, b) {
+  if (a < b) {return -1}
+  if (b < a) {return 1}
+  return 0;
+})())); // These parentheses are getting a little ridiculous!
+// In any case, the above causes an error... because sort expects a function (as opposed to some returned value)?
