Zubeii · Zubeii · Jun 30, 2019 · Jul 1, 2019 · Jul 1, 2019 · Jul 2, 2019
diff --git a/README.md b/README.md
@@ -7,18 +7,18 @@ 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 project manager 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 project manager 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 project manager as a reviewer on the pull-request
-* [ ] Your project manager 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 project manager as a reviewer on the pull-request
+* [x] Your project manager will count the project as complete by merging the branch back into master.
 
 ## Task 2: Higher Order Functions and Callbacks
 

diff --git a/assignments/array-methods.js b/assignments/array-methods.js
@@ -55,22 +55,37 @@ const runners = [{"id":1,"first_name":"Charmain","last_name":"Seiler","email":"c
 
 // ==== 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 into a new array called fullName. 
+
+
 let fullName = [];
+runners.forEach(runner => fullName.push(`${runner.first_name} ${runner.last_name}`))
+// runners.forEach(function(runner){
+//     fullName.push(`${runner.first_name} ${runner.last_name}`);
+// })
 console.log(fullName);
 
 // ==== Challenge 2: Use .map() ====
+let allCaps = runners.map(({first_name}) => first_name.toUpperCase())
 // The event director needs to have all the runner's first names converted to uppercase because the director BECAME DRUNK WITH POWER. Convert each first name into all caps and log the result
-let allCaps = [];
+// let allCaps = runners.map(function(runner){
+//     return runner.first_name.toUpperCase();
+// });
 console.log(allCaps); 
 
 // ==== Challenge 3: Use .filter() ====
 // The large shirts won't be available for the event due to an ordering issue.  Get a list of runners with large sized shirts so they can choose a different size. Return an array named largeShirts that contains information about the runners that have a shirt size of L and log the result
-let largeShirts = [];
+let largeShirts = runners.filter(({shirt_size}) => shirt_size === "L");
+// let largeShirts = runners.filter(function(runner){
+//     return runner.shirt_size === "L";
+// });
 console.log(largeShirts);
 
 // ==== Challenge 4: Use .reduce() ====
 // The donations need to be tallied up and reported for tax purposes. Add up all the donations into a ticketPriceTotal array and log the result
-let ticketPriceTotal = [];
+let ticketPriceTotal = runners.reduce((total, {donation}) => donation += total, 0)
+// let ticketPriceTotal = runners.reduce(function(total, runner){
+//     return total += runner.donation;
+// }, 0);
 console.log(ticketPriceTotal);
 
 // ==== Challenge 5: Be Creative ====

diff --git a/assignments/callbacks.js b/assignments/callbacks.js
@@ -1,55 +1,59 @@
 // Create a higher order function and invoke the callback function to test your work. You have been provided an example of a problem and a solution to see how this works with our items array.  Study both the problem and the solution to figure out the rest of the problems.
 
-const items = ['Pencil', 'Notebook', 'yo-yo', 'Gum'];
+const items = [ 'Pencil', 'Notebook', 'yo-yo', 'Gum' ];
 
-/* 
+//Given this problem:
 
-  //Given this problem: 
-
-  function firstItem(arr, cb) {
-    // firstItem passes the first item of the given array to the callback function.
-  }
+// function firstItem(arr, cb) {
+// 	// firstItem passes the first item of the given array to the callback function.
+// }
 
-  // Potential Solution:
+// // Potential Solution:
 
-  // Higher order function using "cb" as the call back
-  function firstItem(arr, cb) {
-    return cb(arr[0]);
-  }
-
-  // Function invocation 
-  firstItem(items, function(first) {
-    console.log(first)
-  });
-
-*/
+// // Higher order function using "cb" as the call back
+// function firstItem(arr, cb) {
+// 	return cb(arr[0]);
+// }
 
+// // Function invocation
+// firstItem(items, function(first) {
+// 	console.log(first);
+// });
 
+// getLength passes the length of the array into the callback.
 function getLength(arr, cb) {
-  // getLength passes the length of the array into the callback.
+	return cb(arr.length);
 }
+getLength(items, length => console.log(length));
 
+// last passes the last item of the array into the callback.
 function last(arr, cb) {
-  // last passes the last item of the array into the callback.
+	return cb(arr[arr.length - 1]);
 }
+last(items, lastitem => console.log(lastitem));
 
+// sumNums adds two numbers (x, y) and passes the result to the callback.
 function sumNums(x, y, cb) {
-  // sumNums adds two numbers (x, y) and passes the result to the callback.
+	return cb(x + y);
 }
+sumNums(1, 2, sum => console.log(sum));
 
+// multiplyNums multiplies two numbers and passes the result to the callback.
 function multiplyNums(x, y, cb) {
-  // multiplyNums multiplies two numbers and passes the result to the callback.
+	return cb(x * y);
 }
+multiplyNums(2, 2, product => console.log(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.
+	return cb(list.filter(items => items === item).length !== 0);
+	// contains checks if an item is present inside of the given array/list.
+	// Pass true to the callback if it is, otherwise pass false.
 }
-
+contains('Pencil', items, isThere => console.log(isThere));
 /* 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.
+	// removeDuplicates removes all duplicate values from the given array.
+	// Pass the duplicate free array to the callback function.
+	// Do not mutate the original array.
 }
diff --git a/assignments/closure.js b/assignments/closure.js
@@ -1,21 +1,65 @@
 // ==== Challenge 1: Write your own closure ====
 // Write a simple closure of your own creation.  Keep it simple!
+function husband() {
+	const husbandName = 'Amine';
+	console.log(`${husbandName} is learning to code.`);
 
+	function wife() {
+		const wifeName = 'Shana';
+		console.log(`${wifeName} is married to ${husbandName}.`);
 
-/* STRETCH PROBLEMS, Do not attempt until you have completed all previous tasks for today's project files */
+		function cat() {
+			const catName = 'EggShen';
+			console.log(`Their cat, ${catName} eats too much but ${wifeName} and ${husbandName} love her.`);
+		}
+		cat();
+	}
+	wife();
+}
+husband();
 
+/* STRETCH PROBLEMS, Do not attempt until you have completed all previous tasks for today's project files */
 
 // ==== Challenge 2: Create a counter function ====
 const counter = () => {
-  // Return a function that when invoked increments and returns a counter variable.
+	let count = 0;
+	return function() {
+		return ++count;
+	};
+	// Return a function that when invoked increments and returns a counter variable.
 };
+
+let newCounter = counter();
 // Example usage: const newCounter = counter();
-// newCounter(); // 1
-// newCounter(); // 2
+console.log(newCounter()); // 1
+console.log(newCounter());
+console.log(newCounter());
+console.log(newCounter()); // 2
+console.log(newCounter());
+console.log(newCounter());
+console.log(newCounter());
 
 // ==== Challenge 3: Create a counter function with an object that can increment and decrement ====
 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 count = 0;
+	return {
+		increment : function() {
+			return (count += 1);
+		},
+		decrement : function() {
+			return (count = count - 1);
+		},
+	};
+	// 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 newCounterFactory = counterFactory();
+
+console.log(newCounterFactory.increment());
+console.log(newCounterFactory.increment());
+console.log(newCounterFactory.increment());
+console.log(newCounterFactory.increment());
+console.log(newCounterFactory.decrement());
+// console.log(newCounterFactory.decrement());