move store out of reducers into actions, material-ui@0.15

Author: ShMcK

lib/actions/alert.js

@@ -13,10 +13,7 @@ function alertToggle(alert) {
     else {
         alert = Object.assign({}, { open: !isOpen }, alert);
     }
-    return {
-        payload: { alert: alert },
-        type: _types_1.ALERT_TOGGLE,
-    };
+    return { type: _types_1.ALERT_TOGGLE, payload: { alert: alert } };
 }
 exports.alertToggle = alertToggle;
 function alertReplay() {

lib/actions/hint.js

@@ -1,10 +1,7 @@
 "use strict";
 var _types_1 = require('./_types');
 function hintPositionSet(hintPosition) {
-    return {
-        payload: { hintPosition: hintPosition },
-        type: _types_1.HINT_POSITION_SET,
-    };
+    return { type: _types_1.HINT_POSITION_SET, payload: { hintPosition: hintPosition } };
 }
 exports.hintPositionSet = hintPositionSet;
 function hintShow() {

lib/actions/package.js

@@ -1,6 +1,8 @@
 "use strict";
 var _types_1 = require('./_types');
+var store_1 = require('../store');
 function packageSet() {
-    return { type: _types_1.PACKAGE_SET };
+    var dir = store_1.default.getState().dir;
+    return { type: _types_1.PACKAGE_SET, payload: { dir: dir } };
 }
 exports.packageSet = packageSet;

lib/actions/page.js

@@ -6,43 +6,33 @@ function pageNext() {
     var pagePosition = store_1.default.getState().pagePosition;
     var pages = store_1.default.getState().tutorial.pages;
     if (pagePosition >= pages.length - 1) {
-        return {
-            payload: { route: 'final' },
-            type: _types_1.ROUTE_SET,
-        };
+        return { type: _types_1.ROUTE_SET, payload: { route: 'final' } };
     }
     else {
         pagePosition = pagePosition + 1;
         setTimeout(function () { return store_1.default.dispatch(test_1.testsLoad(pagePosition)); });
-        return {
-            payload: { pagePosition: pagePosition },
-            type: _types_1.PAGE_SET,
-        };
+        return { type: _types_1.PAGE_SET, payload: { pagePosition: pagePosition } };
     }
 }
 exports.pageNext = pageNext;
 function pageSet(pagePosition) {
     if (pagePosition === void 0) { pagePosition = 0; }
-    if (pagePosition >= store_1.default.getState().progress.pages.length) {
+    var _a = store_1.default.getState(), progress = _a.progress, tutorial = _a.tutorial;
+    if (pagePosition >= progress.pages.length) {
         return {
             payload: { route: 'final' },
             type: _types_1.ROUTE_SET,
         };
     }
-    return {
-        payload: { pagePosition: pagePosition },
-        type: _types_1.PAGE_SET,
-    };
+    return { type: _types_1.PAGE_SET, payload: { pagePosition: pagePosition, tutorial: tutorial } };
 }
 exports.pageSet = pageSet;
 function pagePositionLoad() {
-    return { type: _types_1.PAGE_POSITION_LOAD };
+    var progress = store_1.default.getState().progress;
+    return { type: _types_1.PAGE_POSITION_LOAD, payload: { progress: progress } };
 }
 exports.pagePositionLoad = pagePositionLoad;
 function pagePositionSet(pagePosition) {
-    return {
-        payload: { pagePosition: pagePosition },
-        type: _types_1.PAGE_POSITION_SET,
-    };
+    return { type: _types_1.PAGE_POSITION_SET, payload: { pagePosition: pagePosition } };
 }
 exports.pagePositionSet = pagePositionSet;

lib/actions/progress.js

@@ -3,25 +3,17 @@ var _types_1 = require('./_types');
 var page_1 = require('./page');
 var store_1 = require('../store');
 function progressLoad() {
-    setTimeout(function () {
-        store_1.default.dispatch(page_1.pagePositionLoad());
-    });
-    return { type: _types_1.PROGRESS_LOAD };
+    setTimeout(function () { return store_1.default.dispatch(page_1.pagePositionLoad()); });
+    var tutorial = store_1.default.getState().tutorial;
+    return { type: _types_1.PROGRESS_LOAD, payload: { tutorial: tutorial } };
 }
 exports.progressLoad = progressLoad;
-function isTrue(x) {
-    return x === true;
-}
 function completePage() {
-    var pagePosition = store_1.default.getState().pagePosition;
-    var progress = store_1.default.getState().progress;
+    var _a = store_1.default.getState(), pagePosition = _a.pagePosition, progress = _a.progress;
     if (progress.pages.every(function (x) { return x.completed; })) {
         store_1.default.dispatch(completeTutorial());
     }
-    return {
-        payload: { pagePosition: pagePosition },
-        type: _types_1.COMPLETE_PAGE,
-    };
+    return { type: _types_1.COMPLETE_PAGE, payload: { pagePosition: pagePosition } };
 }
 exports.completePage = completePage;
 function completeTutorial() {

lib/actions/route.js

@@ -10,10 +10,7 @@ function routeSet(route) {
                 store_1.default.dispatch(tutorial_1.tutorialsFind());
         }
         previous = route;
-        return {
-            payload: { route: route },
-            type: _types_1.ROUTE_SET,
-        };
+        return { type: _types_1.ROUTE_SET, payload: { route: route } };
     }
 }
 exports.routeSet = routeSet;

lib/actions/test.js

@@ -7,10 +7,7 @@ function testRun() {
 exports.testRun = testRun;
 function testResult(result) {
     var actions = store_1.default.getState().taskActions;
-    return {
-        payload: { result: result, actions: actions },
-        type: _types_1.TEST_RESULT,
-    };
+    return { type: _types_1.TEST_RESULT, payload: { result: result, actions: actions } };
 }
 exports.testResult = testResult;
 function testComplete() {
@@ -22,6 +19,7 @@ function testSave() {
 }
 exports.testSave = testSave;
 function testsLoad(pagePosition) {
-    return { type: _types_1.TESTS_LOAD, payload: { pagePosition: pagePosition } };
+    var _a = store_1.default.getState(), tasks = _a.tasks, progress = _a.progress;
+    return { type: _types_1.TESTS_LOAD, payload: { pagePosition: pagePosition, tasks: tasks, progress: progress } };
 }
 exports.testsLoad = testsLoad;

lib/actions/tutorial.js

@@ -1,17 +1,17 @@
 "use strict";
 var _types_1 = require('./_types');
+var store_1 = require('../store');
 function tutorialSet(name) {
-    return {
-        payload: { name: name },
-        type: _types_1.TUTORIAL_SET,
-    };
+    var dir = store_1.default.getState().dir;
+    return { type: _types_1.TUTORIAL_SET, payload: { name: name, dir: dir } };
 }
 exports.tutorialSet = tutorialSet;
 function tutorialUpdate(name) {
     return { type: _types_1.TUTORIAL_UPDATE, payload: { name: name } };
 }
 exports.tutorialUpdate = tutorialUpdate;
 function tutorialsFind() {
-    return { type: _types_1.TUTORIALS_FIND };
+    var _a = store_1.default.getState(), packageJson = _a.packageJson, dir = _a.dir;
+    return { type: _types_1.TUTORIALS_FIND, payload: { packageJson: packageJson, dir: dir } };
 }
 exports.tutorialsFind = tutorialsFind;

lib/actions/window.js

@@ -5,7 +5,6 @@ var check_box_1 = require('material-ui/svg-icons/toggle/check-box');
 var play_circle_filled_1 = require('material-ui/svg-icons/av/play-circle-filled');
 var check_box_outline_blank_1 = require('material-ui/svg-icons/toggle/check-box-outline-blank');
 function progressIcon(pages, index, pagePosition) {
-    console.log(index, pagePosition);
     switch (true) {
         case pages[pagePosition]:
             return React.createElement(check_box_1.default, {style: { fill: colors_1.green300 }});