fix taskTracker, adjust reducer spacing

ShMcK · ShMcK · commit f0b308d1c53a · 2016-05-02T10:23:38.000-07:00
diff --git a/lib/components/App.js b/lib/components/App.js
@@ -36,7 +36,6 @@ var App = (function (_super) {
     }
     App.prototype.render = function () {
         var store = this.props.store;
-        console.log(store);
         return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))));
     };
     App = __decorate([
diff --git a/lib/reducers/alert/index.js b/lib/reducers/alert/index.js
@@ -30,30 +30,31 @@ function alertReducer(alert, action) {
             });
         case _types_1.TEST_RESULT:
             var result = action.payload.result;
-            if (result.pass && result.change > 0) {
-                statusBarAlert.style.color = '#73C990';
-                return setAlert({
-                    message: result.msg,
-                    duration: result.duration || 1500,
-                });
+            switch (true) {
+                case result.pass && result.change > 0:
+                    statusBarAlert.style.color = '#73C990';
+                    return setAlert({
+                        message: result.msg,
+                        duration: result.duration || 1500,
+                    });
+                case result.pass === false && result.change < 1:
+                    statusBarAlert.style.color = '#FF4081';
+                    return setAlert({
+                        message: result.msg,
+                        action: 'fail',
+                        duration: result.duration || 2500,
+                    });
+                default:
+                    statusBarAlert.style.color = '#9DA5B4';
             }
-            else if (result.pass === false && result.change < 1) {
-                statusBarAlert.style.color = '#FF4081';
-                return setAlert({
-                    message: result.msg,
-                    action: 'fail',
-                    duration: result.duration || 2500,
-                });
-            }
-            statusBarAlert.style.color = '#9DA5B4';
             return setAlert({
                 message: result.msg,
                 action: 'note',
                 duration: result.duration || 2500,
             });
         case _types_1.COMPLETE_PAGE:
             return setAlert({
-                message: "Page " + (action.payload.pagePosition.page + 1) + " Complete",
+                message: "Page " + (action.payload.pagePosition + 1) + " Complete",
             });
         case _types_1.COMPLETE_TUTORIAL:
             return setAlert({
diff --git a/lib/reducers/editor-actions/index.js b/lib/reducers/editor-actions/index.js
@@ -10,24 +10,25 @@ function handleEditorActions(actions) {
         }, Promise.resolve());
     }
 }
-var currentTaskPosition = 0;
+var taskTracker = 0;
 function editorActionsReducer(editorActions, action) {
     if (editorActions === void 0) { editorActions = []; }
     var actions = null;
     switch (action.type) {
         case _types_1.TESTS_LOAD:
+            taskTracker = 0;
             actions = store_1.default.getState().tasks.map(function (task) { return task.actions || []; });
             handleEditorActions(actions);
             return actions;
         case _types_1.TEST_RESULT:
             actions = action.payload.actions || [];
             var nextTaskPosition = action.payload.result.taskPosition;
-            var times = nextTaskPosition - currentTaskPosition;
+            var times = nextTaskPosition - taskTracker;
             if (times > 0) {
                 for (var i = 0; i < times; i++) {
                     handleEditorActions(actions);
                 }
-                currentTaskPosition = nextTaskPosition;
+                taskTracker = nextTaskPosition;
             }
             return actions;
         default:
diff --git a/lib/reducers/test-run/test-result.js b/lib/reducers/test-run/test-result.js
@@ -3,16 +3,18 @@ var store_1 = require('../../store');
 var actions_1 = require('../../actions');
 function handleResult(result) {
     store_1.default.dispatch(actions_1.testComplete());
-    if (result.completed) {
-        store_1.default.dispatch(actions_1.testResult(result));
-        store_1.default.dispatch(actions_1.completePage());
-    }
-    else if (!result.pass) {
-        store_1.default.dispatch(actions_1.testResult(result));
-    }
-    else if (result.pass) {
-        result.msg = "Task " + result.taskPosition + " Complete";
-        store_1.default.dispatch(actions_1.testResult(result));
+    switch (true) {
+        case result.completed:
+            store_1.default.dispatch(actions_1.testResult(result));
+            store_1.default.dispatch(actions_1.completePage());
+            break;
+        case !result.pass:
+            store_1.default.dispatch(actions_1.testResult(result));
+            break;
+        case result.pass:
+            result.msg = "Task " + result.taskPosition + " Complete";
+            store_1.default.dispatch(actions_1.testResult(result));
+            break;
     }
 }
 exports.handleResult = handleResult;
diff --git a/lib/store/index.js b/lib/store/index.js
@@ -1,7 +1,16 @@
 "use strict";
 var redux_1 = require('redux');
 var reducers_1 = require('../reducers');
-var initialState = {};
-var store = redux_1.createStore(reducers_1.default, initialState);
+var createLogger = require('redux-logger');
+var dev = false;
+var store = null;
+if (dev) {
+    var logger = createLogger();
+    store = redux_1.createStore(reducers_1.default, redux_1.applyMiddleware(logger));
+}
+else {
+    var initialState = {};
+    store = redux_1.createStore(reducers_1.default, initialState);
+}
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = store;
diff --git a/package.json b/package.json
@@ -45,7 +45,8 @@
     "react-dom": "15.0.2",
     "react-redux": "4.4.5",
     "react-tap-event-plugin": "1.0.0",
-    "redux": "3.5.2"
+    "redux": "3.5.2",
+    "redux-logger": "2.6.1"
   },
   "scripts": {
     "test": "ava src/**/*.spec.js",
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -14,7 +14,6 @@ window.onresize = function() {
 export class App extends React.Component<{store?: CR.State}, {}> {
   render(): React.ReactElement<{}> {
     const store = this.props.store;
-    console.log(store);
     return (
       <section
         className='cr'
diff --git a/src/reducers/alert/index.ts b/src/reducers/alert/index.ts
@@ -26,49 +26,59 @@ export default function alertReducer(
 ): CR.Alert {
   let statusBarAlert = <HTMLElement>document.getElementsByClassName('cr-alert-replay')[0];
   switch (action.type) {
+
     case ALERT_REPLAY:
       return setAlert(current);
+
     case ALERT_TOGGLE:
       return action.payload.alert || _alert;
+
     case TUTORIAL_UPDATE:
       return setAlert({
         message: `run \`npm install --save-dev ${action.payload.name}\``,
         action: 'note',
         duration: 4000,
       });
+
     case TEST_RESULT:
-      let result = action.payload.result;
-      if (result.pass && result.change > 0) {
-        // Pass
-        statusBarAlert.style.color = '#73C990';
-        return setAlert({
-          message: result.msg,
-          duration: result.duration || 1500,
-        });
-      } else if (result.pass === false && result.change < 1) {
+      const result = action.payload.result;
+
+      switch (true) {
+        // pass
+        case result.pass && result.change > 0:
+          statusBarAlert.style.color = '#73C990';
+          return setAlert({
+            message: result.msg,
+            duration: result.duration || 1500,
+          });
         // Fail
-        statusBarAlert.style.color = '#FF4081';
-        return setAlert({
-          message: result.msg,
-          action: 'fail',
-          duration: result.duration || 2500,
-        });
+        case result.pass === false && result.change < 1:
+          statusBarAlert.style.color = '#FF4081';
+          return setAlert({
+            message: result.msg,
+            action: 'fail',
+            duration: result.duration || 2500,
+          });
+        // Alert
+        default:
+          statusBarAlert.style.color = '#9DA5B4';
       }
-      // Alert
-      statusBarAlert.style.color = '#9DA5B4';
       return setAlert({
         message: result.msg,
         action: 'note',
         duration: result.duration || 2500,
       });
+
     case COMPLETE_PAGE:
       return setAlert({
-        message: `Page ${action.payload.pagePosition.page + 1} Complete`,
+        message: `Page ${action.payload.pagePosition + 1} Complete`,
       });
+
     case COMPLETE_TUTORIAL:
       return setAlert({
         message: 'Tutorial Complete',
       });
+
     default:
       return alert;
   }
diff --git a/src/reducers/checks/index.ts b/src/reducers/checks/index.ts
@@ -18,8 +18,10 @@ export default function checksReducer(
   checks = _checks, action: Action
 ): CR.Checks {
   switch (action.type) {
+
     case SETUP_VERIFY:
       return setupVerify();
+
     default:
       return checks;
   }
diff --git a/src/reducers/editor-actions/index.ts b/src/reducers/editor-actions/index.ts
@@ -13,28 +13,31 @@ function handleEditorActions(actions: string[][]): void {
 }
 
 // trigger actions only once, moving fowards
-let currentTaskPosition = 0;
+let taskTracker = 0;
 
 export default function editorActionsReducer(
   editorActions = [], action: Action
 ): string[][] {
   let actions: string[][] = null;
   switch (action.type) {
+
     case TESTS_LOAD:
+      taskTracker = 0;
       actions = store.getState().tasks.map(task => task.actions || []);
       handleEditorActions(actions); // run first action
       return actions;
 
     case TEST_RESULT:
       actions = action.payload.actions || [];
-      const nextTaskPosition: number = action.payload.result.taskPosition;
-      const times: number = nextTaskPosition - currentTaskPosition;
+      const nextTaskPosition = action.payload.result.taskPosition;
+      const times: number = nextTaskPosition - taskTracker;
+
       if (times > 0) {
         // run actions for each task position passed
         for (let i = 0; i < times; i++) {
           handleEditorActions(actions); // run first action
         }
-        currentTaskPosition = nextTaskPosition;
+        taskTracker = nextTaskPosition;
       }
       return actions;
 
diff --git a/src/reducers/hint-position/index.ts b/src/reducers/hint-position/index.ts
@@ -6,15 +6,19 @@ export default function hintPositionReducer(
   hintPosition = 0, action: Action
 ): number {
   switch (action.type) {
+
     case PAGE_SET:
       return 0;
+
     case TEST_RESULT:
       if (action.payload.result.change !== 0) {
         return 0;
       }
       return hintPosition;
+
     case HINT_POSITION_SET:
       return action.payload.hintPosition;
+
     default:
       return hintPosition;
   }
diff --git a/src/reducers/package-json/index.ts b/src/reducers/package-json/index.ts
@@ -8,13 +8,15 @@ export default function packageJsonReducer(
   pj = null, action: Action
 ): PackageJson {
   switch (action.type) {
+
     case PACKAGE_SET:
       const dir = store.getState().dir;
       const pathToPackageJson = join(dir, 'package.json');
       if (fileExists(pathToPackageJson)) {
         return JSON.parse(readFileSync(pathToPackageJson, 'utf8'));
       }
       return null;
+
     default:
       return pj;
   }
diff --git a/src/reducers/page-position/index.ts b/src/reducers/page-position/index.ts
@@ -7,13 +7,16 @@ export default function pagePositionReducer(
   pagePosition = 0, action: Action
 ): CR.PagePosition {
   switch (action.type) {
+
     case PAGE_POSITION_LOAD:
       const pages = store.getState().progress.pages;
       const firstFail = pages.indexOf(x => !x);
       return firstFail > 0 ? firstFail : pages.length - 1;
+
     case PAGE_SET:
     case PAGE_POSITION_SET:
       return action.payload.pagePosition;
+
     default:
       return pagePosition;
   }
diff --git a/src/reducers/page/index.ts b/src/reducers/page/index.ts
@@ -12,6 +12,7 @@ export default function pageReducer(
   p = _page, action: Action
 ): CR.Page {
   switch (action.type) {
+
     case PAGE_SET:
       const pagePosition: CR.PagePosition = action.payload.pagePosition;
       const {title, description, onPageComplete, completed} = store.getState().tutorial.pages[pagePosition];
@@ -23,8 +24,10 @@ export default function pageReducer(
         onPageComplete,
         completed: completed || false
       };
+
     case COMPLETE_PAGE:
       return Object.assign({}, p, { completed: true });
+
     default:
       return p;
   }
diff --git a/src/reducers/progress/index.ts b/src/reducers/progress/index.ts
@@ -13,6 +13,7 @@ export default function progressReducer(
   progress = _progress, action: Action
 ): CR.Progress {
   switch (action.type) {
+
     case PROGRESS_LOAD:
       // load saved progress
       const saved = loadProgressFromLocalStorage();
@@ -22,15 +23,18 @@ export default function progressReducer(
         completed: false,
         pages: store.getState().tutorial.pages.map(() => false)
       };
+
     case COMPLETE_PAGE:
       const pagePosition = action.payload.pagePosition;
       progress.pages[pagePosition] = true;
       saveToLocalStorage(progress);
       return progress;
+
     case COMPLETE_TUTORIAL:
       progress.completed = true;
       saveToLocalStorage(progress);
       return progress;
+
     default:
       return progress;
   }
diff --git a/src/reducers/route/index.ts b/src/reducers/route/index.ts
@@ -7,8 +7,10 @@ export default function routeReducer(
   route = _route, action: Action
 ): string {
   switch (action.type) {
+
     case ROUTE_SET:
       return action.payload.route;
+
     default:
       return route;
   }
diff --git a/src/reducers/task-position/index.ts b/src/reducers/task-position/index.ts
@@ -4,10 +4,13 @@ export default function taskPositionReducer(
   taskPosition = 0, action: Action
 ): number {
   switch (action.type) {
+
     case PAGE_SET:
       return 0;
+
     case TEST_RESULT:
       return action.payload.result.taskPosition;
+
     default:
       return taskPosition;
   }
diff --git a/src/reducers/task-tests/index.ts b/src/reducers/task-tests/index.ts
diff --git a/src/reducers/tasks/index.ts b/src/reducers/tasks/index.ts
diff --git a/src/reducers/test-run/index.ts b/src/reducers/test-run/index.ts
diff --git a/src/reducers/test-run/test-result.ts b/src/reducers/test-run/test-result.ts
diff --git a/src/reducers/tutorial/index.ts b/src/reducers/tutorial/index.ts
diff --git a/src/reducers/tutorials/index.ts b/src/reducers/tutorials/index.ts
diff --git a/src/store/index.ts b/src/store/index.ts

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ var App = (function (_super) {`
`36`	`36`	`}`
`37`	`37`	`App.prototype.render = function () {`
`38`	`38`	`var store = this.props.store;`
`39`		`- console.log(store);`
`40`	`39`	`return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))));`
`41`	`40`	`};`
`42`	`41`	`App = __decorate([`