moving store into action creators

Author: ShMcK

lib/actions/page.js

@@ -3,28 +3,25 @@ var test_1 = require('./test');
 var _types_1 = require('./_types');
 var store_1 = require('../store');
 function pageNext() {
-    var pagePosition = store_1.default.getState().pagePosition;
-    var pages = store_1.default.getState().tutorial.pages;
+    var _a = store_1.default.getState(), pagePosition = _a.pagePosition, tutorial = _a.tutorial;
+    var pages = tutorial.pages;
     if (pagePosition >= pages.length - 1) {
         return { type: _types_1.ROUTE_SET, payload: { route: 'final' } };
     }
     else {
-        pagePosition = pagePosition + 1;
+        pagePosition += 1;
         setTimeout(function () { return store_1.default.dispatch(test_1.testsLoad(pagePosition)); });
-        return { type: _types_1.PAGE_SET, payload: { pagePosition: pagePosition } };
+        return pageSet(pagePosition);
     }
 }
 exports.pageNext = pageNext;
 function pageSet(pagePosition) {
     if (pagePosition === void 0) { pagePosition = 0; }
-    var _a = store_1.default.getState(), progress = _a.progress, tutorial = _a.tutorial;
+    var _a = store_1.default.getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial;
     if (pagePosition >= progress.pages.length) {
-        return {
-            payload: { route: 'final' },
-            type: _types_1.ROUTE_SET,
-        };
+        return { type: _types_1.ROUTE_SET, payload: { route: 'final' } };
     }
-    return { type: _types_1.PAGE_SET, payload: { pagePosition: pagePosition, tutorial: tutorial } };
+    return { type: _types_1.PAGE_SET, payload: { dir: dir, pagePosition: pagePosition, tutorial: tutorial, progress: progress } };
 }
 exports.pageSet = pageSet;
 function pagePositionLoad() {

lib/actions/progress.js

@@ -9,14 +9,15 @@ function progressLoad() {
 }
 exports.progressLoad = progressLoad;
 function completePage() {
-    var _a = store_1.default.getState(), pagePosition = _a.pagePosition, progress = _a.progress;
+    var _a = store_1.default.getState(), pagePosition = _a.pagePosition, progress = _a.progress, tutorial = _a.tutorial;
     if (progress.pages.every(function (x) { return x.completed; })) {
         store_1.default.dispatch(completeTutorial());
     }
-    return { type: _types_1.COMPLETE_PAGE, payload: { pagePosition: pagePosition } };
+    return { type: _types_1.COMPLETE_PAGE, payload: { pagePosition: pagePosition, tutorial: tutorial } };
 }
 exports.completePage = completePage;
 function completeTutorial() {
-    return { type: _types_1.COMPLETE_TUTORIAL };
+    var tutorial = store_1.default.getState().tutorial;
+    return { type: _types_1.COMPLETE_TUTORIAL, payload: { tutorial: tutorial } };
 }
 exports.completeTutorial = completeTutorial;