fix es6 imports

Author: ShMcK

README.md

@@ -415,51 +415,3 @@ Back to business.
 We have a suspect in mind: a classmate named "Hack Kerr". He's a nice guy, and he's always been friendly to you - but there's something suspicious about him: his name.
 
 We'll test out flatten, then re-create our student array of data from the original course data.
-
-##### reduce
-
-Array -> anything
-
-We know our likely suspect is also in the school computer system. Perhaps our suspect also changed his grades.
-
-You can't be sure who is a cheater, but you can assume if the grades are well above the average, the person is likely to be the culprit. For this, we'll have to do some basic statistical calculations. We'll need a new tool for transforming arrays into different data representations.
-
-`map` has a major limitation: it will always output the same number of elements as the input array.
-
-When you want to transform data into something different, you'll likely want to use `reduce`.
-
-Reduce requires two parameters:
-
-  * the running total (set by an initialValue)
-  * the next value in the array
-
-```js
-function add(total, next) {
-    console.log(`add(${total}, ${next}) -> ${total + next}`)
-    return total + next
-}
-
-const initialValue = 100;
-[1, 5, 10].reduce(add, initialValue); // initial value
-
-// add(100, 1) -> 101
-// add(101, 5) -> 106
-// add(106, 10) -> 116
-//> 116
-```
-
-Notice in the example we input an array of 3 items and output a single number. The data has been transformed.
-
-It takes a while to wrap your head around `reduce`, but once you do, you'll see it's usefulness everywhere.
-
-You may have noticed we've already used `reduce` to `flatten` our arrays.
-
-```js
-Array.prototype.flatten = function() {
-  return this.reduce((a, b) => a.concat(b), []);
-};
-```
-
-With `flatten`, the initialValue was set to an empty array which each value was `concat` onto.
-
-Do some practice with `reduce`, before you use it to narrow down a cheating suspect.

coderoad.json

@@ -72,7 +72,7 @@
           ],
           "actions": [
             "open('01-filter.js')",
-            "set('const students = require('./data/students').default;\n// Array.filter(fn)\n\nfunction isAda(student) {\n  // return true if student name\n  // matches \"Ada Lovelace\"\n  ::>\n}\n')"
+            "set('import students from './data/students';\n// Array.filter(fn)\n\nfunction isAda(student) {\n  // return true if student name\n  // matches \"Ada Lovelace\"\n  ::>\n}\n')"
           ],
           "hints": [
             "Some tasks have hints",
@@ -139,7 +139,7 @@
           ],
           "actions": [
             "open('02-sort.js')",
-            "set('const myBest = require('./data/myBest').default;\n// Array.sort(fn)\n\nfunction compareScore(a, b) {\n  switch (true) {\n    case b.score > a.score:\n      // it should return 1 if b's score is more than a's\n      return ::>\n    case 'set condition here':\n      // it should return -1 if b's score is less than a's\n\n    default:\n      // it should return 0 if b and a have the same score\n\n  }\n}\n')"
+            "set('import myBest from './data/myBest';\n// Array.sort(fn)\n\nfunction compareScore(a, b) {\n  switch (true) {\n    case b.score > a.score:\n      // it should return 1 if b's score is more than a's\n      return ::>\n    case 'set condition here':\n      // it should return -1 if b's score is less than a's\n\n    default:\n      // it should return 0 if b and a have the same score\n\n  }\n}\n')"
           ]
         },
         {
@@ -196,7 +196,7 @@
           ],
           "actions": [
             "open('03-map.js')",
-            "set('const myCourses = require('./data/myCourses').default;\n// Array.map(fn)\n\n/*\n * change any the `course.grade` into an 'A'\n *\n * for example:\n * changeGrade({ grade: 'F' }) === { grade: 'A' };\n*/\n\nfunction changeGrade(course) {\n  ::>\n}\n\n')"
+            "set('import myCourses from './data/myCourses';\n// Array.map(fn)\n\n/*\n * change any the `course.grade` into an 'A'\n *\n * for example:\n * changeGrade({ grade: 'F' }) === { grade: 'A' };\n*/\n\nfunction changeGrade(course) {\n  ::>\n}\n\n')"
           ],
           "hints": [
             "give `changeGrade` a parameter, call it \"course\"",
@@ -292,7 +292,7 @@
           ],
           "actions": [
             "open('04-forEach.js')",
-            "set('const myFixed = require('./data/myFixed').default;\n// Array.forEach(fn)\n\nfunction logCourse(course) {\n  console.log(`${course.grade}  ${course.score}  ${course.title}`);\n}\n\n// log your grades to the console\nmyFixed.forEach(::>);\n')"
+            "set('import myFixed from './data/myFixed';\n// Array.forEach(fn)\n\nfunction logCourse(course) {\n  console.log(`${course.grade}  ${course.score}  ${course.title}`);\n}\n\n// log your grades to the console\nmyFixed.forEach(::>);\n')"
           ],
           "hints": [
             "call `forEach` with `logCourse`"
@@ -357,7 +357,7 @@
           ],
           "actions": [
             "open('05-find.js')",
-            "set('const courses = require('./data/myCourses2');\n// Array.find(fn)\n\n// filter for the course title matching \"Web Security\"\nconst myClass = courses.filter(::>);\n')"
+            "set('import courses from './data/myCourses2';\n// Array.find(fn)\n\n// filter for the course title matching \"Web Security\"\nconst myClass = courses.filter(::>);\n')"
           ],
           "hints": [
             "create a `filter` function that takes a param `course`",
@@ -435,69 +435,15 @@
           ]
         },
         {
-          "description": "First, test out `flatten` on the `flattenedArray`",
+          "description": "First, test out `flatten` on the `flattenedArray`\nArray -> anything\n\nWe know our likely suspect is also in the school computer system. Perhaps our suspect also changed his grades.\n\nYou can't be sure who is a cheater, but you can assume if the grades are well above the average, the person is likely to be the culprit. For this, we'll have to do some basic statistical calculations. We'll need a new tool for transforming arrays into different data representations.\n\n`map` has a major limitation: it will always output the same number of elements as the input array.\n\nWhen you want to transform data into something different, you'll likely want to use `reduce`.\n\nReduce requires two parameters:\n\n  * the running total (set by an initialValue)\n  * the next value in the array\n\n```js\nfunction add(total, next) {\n    console.log(`add(${total}, ${next}) -> ${total + next}`)\n    return total + next\n}\n\nconst initialValue = 100;\n[1, 5, 10].reduce(add, initialValue); // initial value\n\n// add(100, 1) -> 101\n// add(101, 5) -> 106\n// add(106, 10) -> 116\n//> 116\n```\n\nNotice in the example we input an array of 3 items and output a single number. The data has been transformed.\n\nIt takes a while to wrap your head around `reduce`, but once you do, you'll see it's usefulness everywhere.\n\nYou may have noticed we've already used `reduce` to `flatten` our arrays.\n\n```js\nArray.prototype.flatten = function() {\n  return this.reduce((a, b) => a.concat(b), []);\n};\n```\n\nWith `flatten`, the initialValue was set to an empty array which each value was `concat` onto.\n\nDo some practice with `reduce`, before you use it to narrow down a cheating suspect.",
           "tests": [
             "06/02"
           ],
           "actions": [
             "open('06-concat.js')",
-            "set('const courses = require('./data/courses2').default;\n// Array.concat(any)\n\n// Array.prototype can be used to create new Array methods\nArray.prototype.flatten = function() {\n  return this.reduce((a, b) => a.concat(b), []);\n};\n')",
-            "insert('\nconst numberedList = [[1, 2], [3, 4]];\n\n// use `flatten` on `numberedList`\nconst flattenedArray = numberedList::>;\n')"
-          ],
-          "hints": [
-            "call `.flatten()` on `numberedList`"
-          ]
-        },
-        {
-          "description": "Now `map` over the courses array, and `map` over the students array inside of it.\nReturn the fields:\n\n  * title\n  * instructor\n  * name\n  * grade\n  * score",
-          "tests": [
-            "06/03"
-          ],
-          "actions": [
-            "insert('\n// map over courses then\n// map over students inside of courses\nconst doubleArray = courses.map((course) => {\n    return course.students.map((student) => {\n      return {\n        // fill in the fields\n        title: ::>'',\n        instructor: '',\n        name: '',\n        score: '',\n        grade: ''\n      };\n    });\n});\n\n')"
-          ],
-          "hints": [
-            "pair `course.title`",
-            "pair `student.name`"
+            "set('```\nimport courses from './data/courses2');\n// Array.concat(any)\n\n// Array.prototype can be used to create new Array methods\nArray.prototype.flatten = function() {\n  return this.reduce((a, b) => a.concat(b), []);\n};\n```\n))\n@action(insert(\n```\n\nconst numberedList = [[1, 2], [3, 4]];\n\n// use `flatten` on `numberedList`\nconst flattenedArray = numberedList::>;\n```  \n))\n@hint('call `.flatten()` on `numberedList`')\n\n\n+ Now `map` over the courses array, and `map` over the students array inside of it.\nReturn the fields:\n\n  * title\n  * instructor\n  * name\n  * grade\n  * score\n@test('06/03')\n@action(insert(\n```\n\n// map over courses then\n// map over students inside of courses\nconst doubleArray = courses.map((course) => {\n    return course.students.map((student) => {\n      return {\n        // fill in the fields\n        title: ::>'',\n        instructor: '',\n        name: '',\n        score: '',\n        grade: ''\n      };\n    });\n});\n\n```\n))\n@hint('pair `course.title`')\n@hint('pair `student.name`')\n\n+ Use `flatten` to put all data into a single array. Set `students` to the result.\n@test('06/04')\n@action(insert(\n```\n// `flatten` doubleArray\nconst students = doubleArray::>;\n```\n))\n@hint('call `.flatten()` on `doubleArray`')\n\n+ Use the `suspects` array to `filter` to only data matching the names in the `suspects` array\n@test('06/05')\n@action(insert(\n```\n\nconst suspects = [\"Hack Kerr\"];\n// filter to data matching `suspects`\n\nconst suspectData = students::>;\n```\n))\n\n+ You just thought of two more suspects! Make a new variable called `newSuspects` and add it above `suspects`.\n\n```js\nconst newSuspects = ['Albert Gonzalez', 'Kevin Mitnick'];\n```\n\n`concat` the `newSuspects` onto the `suspects` list.\n@test('06/06')\n@hint('call `suspects.concat()` with `newSuspects`')\n\n\n## redu')"
           ]
         },
-        {
-          "description": "Use `flatten` to put all data into a single array. Set `students` to the result.",
-          "tests": [
-            "06/04"
-          ],
-          "actions": [
-            "insert('// `flatten` doubleArray\nconst students = doubleArray::>;\n')"
-          ],
-          "hints": [
-            "call `.flatten()` on `doubleArray`"
-          ]
-        },
-        {
-          "description": "Use the `suspects` array to `filter` to only data matching the names in the `suspects` array",
-          "tests": [
-            "06/05"
-          ],
-          "actions": [
-            "insert('\nconst suspects = [\"Hack Kerr\"];\n// filter to data matching `suspects`\n\nconst suspectData = students::>;\n')"
-          ]
-        },
-        {
-          "description": "You just thought of two more suspects! Make a new variable called `newSuspects` and add it above `suspects`.\n\n```js\nconst newSuspects = ['Albert Gonzalez', 'Kevin Mitnick'];\n```\n\n`concat` the `newSuspects` onto the `suspects` list.",
-          "tests": [
-            "06/06"
-          ],
-          "hints": [
-            "call `suspects.concat()` with `newSuspects`"
-          ]
-        }
-      ],
-      "onPageComplete": "In the next step, we'll look at using one of the most powerful methods: `reduce`"
-    },
-    {
-      "title": "reduce",
-      "description": "Array -> anything\n\nWe know our likely suspect is also in the school computer system. Perhaps our suspect also changed his grades.\n\nYou can't be sure who is a cheater, but you can assume if the grades are well above the average, the person is likely to be the culprit. For this, we'll have to do some basic statistical calculations. We'll need a new tool for transforming arrays into different data representations.\n\n`map` has a major limitation: it will always output the same number of elements as the input array.\n\nWhen you want to transform data into something different, you'll likely want to use `reduce`.\n\nReduce requires two parameters:\n\n  * the running total (set by an initialValue)\n  * the next value in the array\n\n```js\nfunction add(total, next) {\n    console.log(`add(${total}, ${next}) -> ${total + next}`)\n    return total + next\n}\n\nconst initialValue = 100;\n[1, 5, 10].reduce(add, initialValue); // initial value\n\n// add(100, 1) -> 101\n// add(101, 5) -> 106\n// add(106, 10) -> 116\n//> 116\n```\n\nNotice in the example we input an array of 3 items and output a single number. The data has been transformed.\n\nIt takes a while to wrap your head around `reduce`, but once you do, you'll see it's usefulness everywhere.\n\nYou may have noticed we've already used `reduce` to `flatten` our arrays.\n\n```js\nArray.prototype.flatten = function() {\n  return this.reduce((a, b) => a.concat(b), []);\n};\n```\n\nWith `flatten`, the initialValue was set to an empty array which each value was `concat` onto.\n\nDo some practice with `reduce`, before you use it to narrow down a cheating suspect.",
-      "tasks": [
         {
           "description": "load suspectData. We will come back to this after some practice;",
           "tests": [
@@ -515,7 +461,7 @@
           ],
           "actions": [
             "open('07-reduce.js')",
-            "set('const courses = require('./data/courses2');\n// Array.reduce(fn(a, b), initialValue)\n\nconst practice = [1, 1, 2, 3, 5, 8, 13, 21];\n\nfunction add(a, b) {\n  return a + b;\n}\n\n// total the numbers using a reduce function\nconst total = practice.reduce(::>);\n')"
+            "set('import courses from './data/courses2';\n// Array.reduce(fn(a, b), initialValue)\n\nconst practice = [1, 1, 2, 3, 5, 8, 13, 21];\n\nfunction add(a, b) {\n  return a + b;\n}\n\n// total the numbers using a reduce function\nconst total = practice.reduce(::>);\n')"
           ],
           "hints": [
             "with only numbers, the initialValue defaults to 0",
@@ -587,7 +533,8 @@
             "insert('console.log(likelySuspects);\n')"
           ]
         }
-      ]
+      ],
+      "onPageComplete": "In the next step, we'll look at using one of the most powerful methods: `reduce`"
     }
   ]
 }

tutorial/01/01.js

@@ -1,5 +1,6 @@
 var expect = require('chai').expect;
 
+const students = require('BASE/data/students.js');
 const filter = require('BASE/01-filter.js');
 
 describe('01 function isAda', () => {

tutorial/01/filter.md

@@ -56,7 +56,7 @@ console.log(students[0]);
 @action(open('01-filter.js'))
 @action(set(
 ```
-const students = require('./data/students').default;
+import students from './data/students';
 // Array.filter(fn)
 
 function isAda(student) {

tutorial/02/01.js

@@ -1,8 +1,8 @@
 const expect = require('chai').expect;
 
-describe('01 myBest data', () => {
+const myBest = require('BASE/data/myBest.js');
 
-  const myBest = require('BASE/data/myBest.js');
+describe('01 myBest data', () => {
 
   it('should be loaded in "data/myBest.js"', () => {
     expect(myBest).to.not.be.undefined;

tutorial/02/sort.md

@@ -42,7 +42,7 @@ First you'll need to write a sort condition function called `compareScore`.
 @action(open('02-sort.js'))
 @action(set(
 ```
-const myBest = require('./data/myBest').default;
+import myBest from './data/myBest';
 // Array.sort(fn)
 
 function compareScore(a, b) {

tutorial/03/01.js

@@ -1,8 +1,8 @@
 const expect = require('chai').expect;
 
-describe('01 myCourses data', () => {
+const myCourses = require('BASE/data/myCourses.js');
 
-  const myCourses = require('BASE/data/myCourses.js');
+describe('01 myCourses data', () => {
 
   it('should be loaded in "data/myCourses.js"', () => {
     expect(myCourses).to.not.be.undefined;

tutorial/03/map.md

@@ -66,7 +66,7 @@ Let's go back to before we filtered out the bad grades, and instead change the g
 @action(open('03-map.js'))
 @action(set(
 ```
-const myCourses = require('./data/myCourses').default;
+import myCourses from './data/myCourses';
 // Array.map(fn)
 
 /*

tutorial/04/01.js

@@ -3,15 +3,15 @@ const spies = require('chai-spies');
 const expect = chai.expect;
 chai.use(spies);
 
+let myFixed = require('BASE/data/myFixed.js');
 if (process.env.TASK_POSITION === '4') {
 	myFixed = [];
 }
+
 let spy = chai.spy.on(console, 'log');
 
 describe('01 myFixed data', () => {
 
-  const myFixed = require('BASE/data/myFixed.js');
-
   it('should be loaded in "data/myFixed.js"', () => {
     expect(myFixed).to.not.be.undefined;
   });

tutorial/04/forEach.md

@@ -96,7 +96,7 @@ Now that we see how `forEach` works, let's use it to make calls to the `console`
 @action(open('04-forEach.js'))
 @action(set(
 ```
-const myFixed = require('./data/myFixed').default;
+import myFixed from './data/myFixed';
 // Array.forEach(fn)
 
 function logCourse(course) {

tutorial/05/01.js

@@ -1,8 +1,8 @@
 const expect = require('chai').expect;
 
-describe('01 courses2 data', () => {
+const courses = require('BASE/data/courses2.js');
 
-  const courses = require('BASE/data/courses2.js');
+describe('01 courses2 data', () => {
 
   it('should be loaded in "data/courses2.js"', () => {
     expect(courses).to.not.be.undefined;

tutorial/05/find.md

@@ -35,7 +35,7 @@ Find is great for performantly matching unique values in data, such as an "id",
 @action(open('05-find.js'))
 @action(set(
 ```
-const courses = require('./data/myCourses2');
+import courses from './data/myCourses2';
 // Array.find(fn)
 
 // filter for the course title matching "Web Security"

tutorial/06/01.js

@@ -1,8 +1,8 @@
 const expect = require('chai').expect;
 
-describe('01 load courses', () => {
+const courses = require('BASE/data/courses2.js');
 
-  const courses = require('BASE/data/courses2.js');
+describe('01 load courses', () => {
 
   it('should be loaded in "data/courses2.js"', () => {
     expect(courses).to.not.be.undefined;

tutorial/06/concat.md

@@ -105,7 +105,7 @@ We'll test out flatten, then re-create our student array of data from the origin
 @action(open('06-concat.js'))
 @action(set(
 ```
-const courses = require('./data/courses2').default;
+import courses from './data/courses2');
 // Array.concat(any)
 
 // Array.prototype can be used to create new Array methods

tutorial/07/01.js

@@ -1,6 +1,8 @@
-describe('01 suspectData', () => {
+const expect = require('chai').expect;
+
+const suspectData = require('BASE/data/suspectData.js');
 
-  const suspectData = require('BASE/data/suspectData.js');
+describe('01 suspectData', () => {
 
   it('should be loaded in "data/suspectData.js"', () => {
     expect(suspectData).to.not.be.undefined;

tutorial/07/02.js

@@ -1,5 +1,3 @@
-const expect = require('chai').expect;
-
 const reduce = require('BASE/07-reduce.js');
 
 describe('02 const total', () => {

tutorial/07/reduce.md

@@ -55,7 +55,7 @@ Do some practice with `reduce`, before you use it to narrow down a cheating susp
 @action(open('07-reduce.js'))
 @action(set(
 ```
-const courses = require('./data/courses2');
+import courses from './data/courses2';
 // Array.reduce(fn(a, b), initialValue)
 
 const practice = [1, 1, 2, 3, 5, 8, 13, 21];