Merge pull request #1 from vebradev/justinas-vebra

borjasolerme · web-flow · commit f4da0418e73d · 2019-05-08T15:28:15.000+02:00
JavaScript-II
diff --git a/assignments/array-methods.js b/assignments/array-methods.js
@@ -56,21 +56,27 @@ 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(function(item) {
+    let combined = item.first_name + " " + item.last_name;
+    fullName.push(combined);
+});
 console.log(fullName);
 
 // ==== Challenge 2: Use .map() ====
 // 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 = [];
-console.log(allCaps); 
+let allCaps = runners.map(function (runner) {
+    return runner.first_name.toUpperCase() + " " + runner.last_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(runner => 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((donation, runner) => donation + runner.donation, 0);
 console.log(ticketPriceTotal);
 
 // ==== Challenge 5: Be Creative ====
diff --git a/assignments/callbacks.js b/assignments/callbacks.js
@@ -24,27 +24,50 @@ const items = ['Pencil', 'Notebook', 'yo-yo', 'Gum'];
 
 */
 
-
 function getLength(arr, cb) {
   // getLength passes the length of the array into the callback.
+  return cb(arr.length);
 }
+getLength(items, function(cb) {
+  console.log(cb)
+});
 
 function last(arr, cb) {
   // last passes the last item of the array into the callback.
+  return cb(arr.pop());
 }
+last(items, function(cb) {
+  console.log(cb);
+});
 
 function sumNums(x, y, cb) {
   // sumNums adds two numbers (x, y) and passes the result to the callback.
+  return cb(x + y);
 }
+sumNums(5, 10, function(cb) {
+  console.log(cb);
+});
 
 function multiplyNums(x, y, cb) {
   // multiplyNums multiplies two numbers and passes the result to the callback.
+  return cb(x * y);
 }
+multiplyNums(5, 10, function(cb) {
+  console.log(cb);
+});
 
 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.
+  if (list.includes(item)) {
+    return cb(true);
+  } else {
+    return cb(false);
+  }
 }
+contains('Notebook', items, function(cb) {
+  console.log(cb);
+});
 
 /* STRETCH PROBLEM */
 
diff --git a/assignments/closure.js b/assignments/closure.js
@@ -1,10 +1,18 @@
 // ==== Challenge 1: Write your own closure ====
 // Write a simple closure of your own creation.  Keep it simple!
 
+function outer() {
+  let a = 5;
+  function inner() {
+    b = 10;
+    console.log(a + b);
+  }
+  return inner;
+}
+const inner = outer();
 
 /* 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.
diff --git a/assignments/index.html b/assignments/index.html
@@ -10,7 +10,7 @@
   <script src="array-methods.js"></script>
   <script src="callbacks.js"></script>
   <script src="closure.js"></script>
-  <script src="stretch-function-conversion.js"></script>
+  <!-- <script src="stretch-function-conversion.js"></script> -->
 </head>
 
 <body>
