Actually complete, bad feeling about counter

ssmodish · ssmodish · commit 189a67f0333e · 2018-09-11T19:24:15.000-04:00
diff --git a/README.md b/README.md
@@ -19,9 +19,9 @@ This task focuses on getting practice with callback functions by giving you an a
 
 ### Task 3: 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.  
-* [ ] Complete the problems provided to you
-* [ ] 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.
+* [*] Review the contents of the [array-methods.js](assignments/array-methods.js) file.  
+* [*] Complete the problems provided to you
+* [*] 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 4: Closures
 We have learned that closures allow us to access values in scope that have already been invoked.  
diff --git a/assignments/array-methods.js b/assignments/array-methods.js
@@ -97,18 +97,21 @@ console.log('\n\n========== Challenge 5 ==========');
 
 // Problem 1
 // What size shirts do we need?
+console.log('\n=== Problem 1 ===\n');
 const shirtSizes = [];
 runners.forEach(runner => shirtSizes.push(runner.shirt_size));
 console.log(shirtSizes.sort());
 
 // Problem 2
 // Who donated more than $200 and what companies do they represent?
+console.log('\n=== Problem 2 ===\n');
 const bigDonors = runners.filter(runner => runner.donation > 200);
 
 bigDonors.forEach(donor => console.log(`${donor.first_name} ${donor.last_name}, ${donor.company_name}`));
 
 // Problem 3
 // How many of each size shirt do we need?
+console.log('\n=== Problem 3 ===\n');
 
 const allShirts = [
   {"size":"XS", "quantSize" : 0},
diff --git a/assignments/callbacks.js b/assignments/callbacks.js
@@ -1,5 +1,6 @@
-console.log('------------ CALLBACKS.JS ------------\n\n');
-
+console.log('\n\n------------------------------------------\n');
+console.log('------------   CALLBACKS.JS   ------------\n');
+console.log('------------------------------------------\n');
 // Create a callback function and invoke the 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'];
@@ -85,11 +86,25 @@ console.log('\n\n========== Challenge 5 ?????????????');
 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 tOrF = false;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i] === item) {
+      tOrF = true;
+    }
+  }
+  return cb(tOrF);
 }
 
+function doesContain(truf) {
+  if (truf) {
+    console.log("We have it!");
+  } else {
+    console.log("We don't have it");
+  }
+  return;
+}
 
-
+contains('Pencil', items, doesContain);
 
 /* STRETCH PROBLEM */
 // ========== Stretch Challenge 
@@ -100,3 +115,5 @@ function removeDuplicates(array, cb) {
   // Pass the duplicate free array to the callback function.
   // Do not mutate the original array.
 }
+
+console.log('\n\nEnd of callbacks.js');
diff --git a/assignments/closure.js b/assignments/closure.js
@@ -1,14 +1,39 @@
 // ==== Challenge 1: Write your own closure ====
 // Write a simple closure of your own creation.  Keep it simple!
+function ruben() {
+  let bread = 'Rye';
+  
+  function layer1() {
+    let spread = 'Thousand Island';
+    
+    function layer2() {
+      let veg = 'Sauerkraut';
+      let meat = 'Corned Beef';
+      let cheese = 'Swiss';
+      
+      console.log('A ruben sandwich is: ' + meat + ' and ' + cheese + ' with ' + veg + ', on ' + bread + ' with ' + spread + ' and then grilled.')
+    }
+    layer2();
+  }
+  layer1();
+}
 
+ruben();
 
 // ==== Challenge 2: Create a counter function ====
+
+let count = 0;
 const counter = () => {
   // Return a function that when invoked increments and returns a counter variable.
+  return function() { 
+    return ++count;
+  };
 };
 // Example usage: const newCounter = counter();
-// newCounter(); // 1
-// newCounter(); // 2
+const newCounter = counter();
+console.log(newCounter());
+console.log(newCounter());
+
 
 /* STRETCH PROBLEM, Do not attempt until you have completed all previous tasks for today's project files */
 
diff --git a/index.html b/index.html
@@ -11,10 +11,10 @@
   <h1>Javascript II</h1>
 
   <h2>Callbacks</h2>
-  <script src="assignments/callbacks.js"></script>  
+  <!-- <script src="assignments/callbacks.js"></script>   -->
 
   <h2>Array Methods</h2>
-  <script src="assignments/array-methods.js"></script>
+  <!-- <script src="assignments/array-methods.js"></script> -->
 
   <h2>Closures</h2>
   <script src="assignments/closure.js"></script>
