Update scripts based on truffle shuffle

.vscode/launch.json

@@ -10,8 +10,7 @@
       "name": "Launch Program",
       "program": "${workspaceFolder}/_not_important/scripts/start.js",
       "env": {
-        "APP_EXERCISE": "exercise-17",
-        "APP_USE_CSS_MODULES": "true"
+        "APP_EXERCISE": "exercise-17"
       }
     }
   ]

_not_important/instructor-notes/TODO.md

@@ -0,0 +1,25 @@
+1: Modern JavaScript: Modules (& fat-arrow)
+2: Thinking In Components
+3: Modern JavaScript: Working With Variables (was 4)
+t4: JSX Fundamentals (was 5)
+v5: What can a component render? (was 6)
+t6: Composition & `props.children` (was 8)
+v7: Three Ways To Style (was 10)
+t8: React Router (was 11)
+v9: Managing Component State (was 12)
+10: Modern JavaScript: `async`/`await` (was 13)
+t11: Loading Data (was 14)
+v12: React Context (was 15)
+13: Modern JavaScript: Class Syntax (was 3)
+t14: Convert A Component (was 7)
+v15: Legacy State Management (new)
+t16: Legacy Lifecycle Events (new)
+17: Testing Component Render
+18: Testing Component Interactions
+
+X rename folders
+x rename in README's
+x rename in apps
+x yarn start's
+change colors
+sync names/numbers to slides

exercise-10/README.md

@@ -1,6 +1,6 @@
 # Exercise 10
 
-## Modern JS: Async/Await
+## Modern JavaScript: `async`/`await`
 
 This exercise introduces you to the async/await features utilized in modern JavaScript applications.
 

exercise-10/a_callbacks.spec.js

@@ -1,6 +1,6 @@
 import { takeCareOfKitten, runOutOfBowls, washBowls } from './a_callbacks';
 
-describe('exercise-13', () => {
+describe('exercise-10', () => {
   describe('a_callbacks', () => {
     it('feeds a kitten when we have bowls', done => {
       washBowls();

exercise-10/b_promises.spec.js

@@ -1,6 +1,6 @@
 import { takeCareOfKitten, runOutOfBowls, washBowls } from './b_promises';
 
-describe('exercise-13', () => {
+describe('exercise-10', () => {
   describe('b_promises', () => {
     it('feeds a kitten when we have bowls', done => {
       washBowls();

exercise-10/c_async.spec.js

@@ -1,6 +1,6 @@
 import { takeCareOfKitten, runOutOfBowls, washBowls } from './c_async';
 
-describe('exercise-13', () => {
+describe('exercise-10', () => {
   describe('c_async', () => {
     it('feeds a kitten when we have bowls', async () => {
       washBowls();

exercise-10/jest.config.js

@@ -1,4 +1,4 @@
-const exercise = 'exercise-13';
+const exercise = 'exercise-10';
 
 module.exports = {
   rootDir: '../',

exercise-11/App.js

@@ -12,7 +12,7 @@ function App() {
     <BrowserRouter>
       <div className={styles.app}>
         <header className={styles.appHeader}>
-          <h1 className={styles.appTitle}>Exercise 14</h1>
+          <h1 className={styles.appTitle}>Exercise 11</h1>
           <h2 className={styles.subTitle}>Loading Data</h2>
         </header>
         <div className={styles.exercise}>

exercise-11/complete/App.js

@@ -12,7 +12,7 @@ function App() {
     <BrowserRouter>
       <div className={styles.app}>
         <header className={styles.appHeader}>
-          <h1 className={styles.appTitle}>Exercise 14</h1>
+          <h1 className={styles.appTitle}>Exercise 11</h1>
           <h2 className={styles.subTitle}>Loading Data</h2>
         </header>
         <div className={styles.exercise}>

exercise-12/Header.js

@@ -9,7 +9,7 @@ import styles from './Header.module.css';
 export default function Header() {
   return (
     <header className={classNames(styles.appHeader, styles[theme])}>
-      <h1 className={styles.appTitle}>Exercise 15</h1>
+      <h1 className={styles.appTitle}>Exercise 12</h1>
       <h2 className={styles.subTitle}>React Context</h2>
       <div className={styles.switcherWrapper}>
         <ThemeSwitcher />

exercise-12/complete/Header.js

@@ -12,7 +12,7 @@ export default function Header() {
     <ThemeContext.Consumer>
       {({ theme }) => (
         <header className={classNames(styles.appHeader, styles[theme])}>
-          <h1 className={styles.appTitle}>Exercise 15</h1>
+          <h1 className={styles.appTitle}>Exercise 12</h1>
           <h2 className={styles.subTitle}>React Context</h2>
           <div className={styles.switcherWrapper}>
             <ThemeSwitcher />

exercise-13/jest.config.js

@@ -1,4 +1,4 @@
-const exercise = 'exercise-3';
+const exercise = 'exercise-13';
 
 module.exports = {
   rootDir: '../',

exercise-14/App.js

@@ -6,7 +6,7 @@ function App() {
   return (
     <div className="App">
       <header className="App-header">
-        <h1 className="App-title">Exercise 7</h1>
+        <h1 className="App-title">Exercise 14</h1>
         <h2 className="sub-title">Convert a Component</h2>
       </header>
       <div className="exercise">

exercise-5/App.js

@@ -6,7 +6,7 @@ function App() {
   return (
     <div className="App">
       <header className="App-header">
-        <h1 className="App-title">Exercise 6</h1>
+        <h1 className="App-title">Exercise 5</h1>
         <h2 className="sub-title">What can a component render?</h2>
       </header>
       <div className="exercise">

exercise-6/App.js

@@ -6,7 +6,7 @@ function App() {
   return (
     <div className="App">
       <header className="App-header">
-        <h1 className="App-title">Exercise 8</h1>
+        <h1 className="App-title">Exercise 6</h1>
         <h2 className="sub-title">Composition & props.children</h2>
       </header>
       <div className="exercise">

exercise-6/README.md

@@ -1,6 +1,6 @@
 # Exercise 6
 
-## Composition & props.children
+## Composition & `props.children`
 
 Every React component receives a special prop named `children`. This prop contains any elements declared inside of the component.
 

exercise-7/1-component-css-files/App.js

@@ -6,7 +6,7 @@ function App() {
   return (
     <div className="App">
       <header className="App-header">
-        <h1 className="App-title">Exercise 10</h1>
+        <h1 className="App-title">Exercise 7</h1>
         <h2 className="sub-title">Styling - Component CSS Files</h2>
       </header>
       <div className="exercise">

exercise-7/2-css-modules/App.js

@@ -8,7 +8,7 @@ function App() {
   return (
     <div className={styles.app}>
       <header className={styles.appHeader}>
-        <h1 className={styles.appTitle}>Exercise 10</h1>
+        <h1 className={styles.appTitle}>Exercise 7</h1>
         <h2 className={classNames(styles.subTitle, styles.emphasize)}>
           Styling - CSS Modules
         </h2>

exercise-7/3-styled-components/App.js

@@ -22,7 +22,7 @@ function App() {
   return (
     <AppDiv>
       <AppHeader className="App-header">
-        <Title>Exercise 10</Title>
+        <Title>Exercise 7</Title>
         <h2>Styling - Styled Components</h2>
       </AppHeader>
       <div>

exercise-8/App.js

@@ -10,7 +10,7 @@ function App() {
     <BrowserRouter>
       <div className={styles.app}>
         <header className={styles.appHeader}>
-          <h1 className={styles.appTitle}>Exercise 11</h1>
+          <h1 className={styles.appTitle}>Exercise 8</h1>
           <h2 className={styles.subTitle}>React Router</h2>
         </header>
         <div className={styles.exercise}>

exercise-8/SOLUTIONS.md

@@ -12,7 +12,7 @@ function App() {
     <BrowserRouter>
       <div className={styles.app}>
         <header className={styles.appHeader}>
-          <h1 className={styles.appTitle}>Exercise 11</h1>
+          <h1 className={styles.appTitle}>Exercise 8</h1>
           <h2 className={styles.subTitle}>React Router</h2>
         </header>
         <div className={styles.exercise}>

exercise-8/complete/App.js

@@ -12,7 +12,7 @@ function App() {
     <BrowserRouter>
       <div className={styles.app}>
         <header className={styles.appHeader}>
-          <h1 className={styles.appTitle}>Exercise 11</h1>
+          <h1 className={styles.appTitle}>Exercise 8</h1>
           <h2 className={styles.subTitle}>React Router</h2>
         </header>
         <div className={styles.exercise}>

exercise-9/App.js

@@ -12,7 +12,7 @@ function App() {
     <BrowserRouter>
       <div className={styles.app}>
         <header className={styles.appHeader}>
-          <h1 className={styles.appTitle}>Exercise 12</h1>
+          <h1 className={styles.appTitle}>Exercise 9</h1>
           <h2 className={styles.subTitle}>Managing Component State</h2>
         </header>
         <div className={styles.exercise}>

package.json

@@ -69,36 +69,36 @@
   "scripts": {
     "verify": "node ./verify",
     "test-exercise-1": "jest --config ./exercise-1/jest.config.js --watch",
-    "test-exercise-2": "cross-env APP_EXERCISE=exercise-2 node ./_not_important/scripts/test.js --env=jsdom --config ./exercise-2/jest.config.js",
-    "start-exercise-2": "cross-env APP_EXERCISE=exercise-2 node ./_not_important/scripts/start.js",
     "test-exercise-3": "jest --config ./exercise-3/jest.config.js --watch",
-    "test-exercise-4": "jest --config ./exercise-4/jest.config.js --watch",
+    "start-exercise-4": "cross-env APP_EXERCISE=exercise-4 node ./_not_important/scripts/start.js",
     "start-exercise-5": "cross-env APP_EXERCISE=exercise-5 node ./_not_important/scripts/start.js",
     "start-exercise-6": "cross-env APP_EXERCISE=exercise-6 node ./_not_important/scripts/start.js",
     "start-exercise-7": "cross-env APP_EXERCISE=exercise-7 node ./_not_important/scripts/start.js",
     "start-exercise-8": "cross-env APP_EXERCISE=exercise-8 node ./_not_important/scripts/start.js",
     "start-exercise-9": "cross-env APP_EXERCISE=exercise-9 node ./_not_important/scripts/start.js",
-    "start-exercise-10": "cross-env APP_EXERCISE=exercise-10 node ./_not_important/scripts/start.js",
-    "start-exercise-11": "cross-env APP_EXERCISE=exercise-11 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js",
-    "start-exercise-12": "cross-env APP_EXERCISE=exercise-12 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js",
+    "test-exercise-10": "jest --config ./exercise-10/jest.config.js --watch",
+    "start-exercise-11": "concurrently \"npm run start-exercise-11-server\" \"npm run start-exercise-11-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
+    "start-exercise-11-server": "json-server --watch exercise-11/data/db.json --port 2999",
+    "start-exercise-11-client": "cross-env APP_EXERCISE=exercise-11 node ./_not_important/scripts/start.js",
+    "start-exercise-12": "concurrently \"npm run start-exercise-12-server\" \"npm run start-exercise-12-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
+    "start-exercise-12-server": "json-server --watch exercise-12/data/db.json --port 2999",
+    "start-exercise-12-client": "cross-env APP_EXERCISE=exercise-12 node ./_not_important/scripts/start.js",
     "test-exercise-13": "jest --config ./exercise-13/jest.config.js --watch",
-    "start-exercise-14": "concurrently \"npm run start-exercise-14-server\" \"npm run start-exercise-14-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
-    "start-exercise-14-server": "json-server --watch exercise-14/data/db.json --port 2999",
-    "start-exercise-14-client": "cross-env APP_EXERCISE=exercise-14 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js",
+    "start-exercise-14": "cross-env APP_EXERCISE=exercise-14 node ./_not_important/scripts/start.js",
     "start-exercise-15": "concurrently \"npm run start-exercise-15-server\" \"npm run start-exercise-15-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
     "start-exercise-15-server": "json-server --watch exercise-15/data/db.json --port 2999",
-    "start-exercise-15-client": "cross-env APP_EXERCISE=exercise-15 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js",
+    "start-exercise-15-client": "cross-env APP_EXERCISE=exercise-15 node ./_not_important/scripts/start.js",
     "start-exercise-16": "concurrently \"npm run start-exercise-16-server\" \"npm run start-exercise-16-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
     "start-exercise-16-server": "json-server --watch exercise-16/data/db.json --port 2999",
-    "start-exercise-16-client": "cross-env APP_EXERCISE=exercise-16 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js",
+    "start-exercise-16-client": "cross-env APP_EXERCISE=exercise-16 node ./_not_important/scripts/start.js",
     "test-exercise-17": "cross-env APP_EXERCISE=exercise-17 node ./_not_important/scripts/test.js --env=jsdom --config ./exercise-17/jest.config.js --watch --runInBand",
     "start-exercise-17": "concurrently \"npm run start-exercise-17-server\" \"npm run start-exercise-17-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
     "start-exercise-17-server": "json-server --watch exercise-17/data/db.json --port 2999",
-    "start-exercise-17-client": "cross-env APP_EXERCISE=exercise-17 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js",
+    "start-exercise-17-client": "cross-env APP_EXERCISE=exercise-17 node ./_not_important/scripts/start.js",
     "test-exercise-18": "cross-env APP_EXERCISE=exercise-18 node ./_not_important/scripts/test.js --env=jsdom --config ./exercise-18/jest.config.js --watch --runInBand",
     "start-exercise-18": "concurrently \"npm run start-exercise-18-server\" \"npm run start-exercise-18-client\" -n SERVER,CLIENT -c bgBlue,bgGreen",
     "start-exercise-18-server": "json-server --watch exercise-18/data/db.json --port 2999",
-    "start-exercise-18-client": "cross-env APP_EXERCISE=exercise-18 APP_USE_CSS_MODULES=true node ./_not_important/scripts/start.js"
+    "start-exercise-18-client": "cross-env APP_EXERCISE=exercise-18 node ./_not_important/scripts/start.js"
   },
   "babel": {
     "presets": [