Merge branch 'packageRefactor'

Author: ShMcK

lib/actions/_types.js

@@ -4,18 +4,18 @@ exports.ALERT_TOGGLE = 'ALERT_TOGGLE';
 exports.COMPLETE_CHAPTER = 'COMPLETE_CHAPTER';
 exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
 exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
-exports.GLOBALS_SET = 'GLOBALS_SET';
 exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
 exports.HINT_SHOW = 'HINT_SHOW';
 exports.PACKAGE_SET = 'PACKAGE_SET';
-exports.PAGE_NEXT = 'PAGE_NEXT';
 exports.PAGE_SET = 'PAGE_SET';
 exports.POSITION_SET = 'POSITION_SET';
+exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
 exports.ROUTE_SET = 'ROUTE_SET';
 exports.SETUP_VERIFY = 'SETUP_VERIFY';
 exports.TEST_COMPLETE = 'TEST_COMPLETE';
 exports.TEST_RESULT = 'TEST_RESULT';
 exports.TEST_RUN = 'TEST_RUN';
+exports.TESTS_LOAD = 'TESTS_LOAD';
 exports.TUTORIAL_SET = 'TUTORIAL_SET';
 exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
 exports.TUTORIALS_FIND = 'TUTORIALS_FIND';

lib/actions/alert.js

@@ -4,12 +4,19 @@ var _types_1 = require('./_types');
 function alertToggle(alert) {
     var isOpen = store_1.store.getState().alert.open;
     if (!alert) {
-        alert = { message: '', action: '', open: false };
+        alert = {
+            action: '',
+            message: '',
+            open: false,
+        };
     }
     else {
         alert = Object.assign({}, { open: !isOpen }, alert);
     }
-    return { type: _types_1.ALERT_TOGGLE, payload: { alert: alert } };
+    return {
+        payload: { alert: alert },
+        type: _types_1.ALERT_TOGGLE,
+    };
 }
 exports.alertToggle = alertToggle;
 function alertReplay() {

lib/actions/globals.js

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

lib/actions/hint.js

@@ -2,12 +2,11 @@
 var alert_1 = require('./alert');
 exports.alertToggle = alert_1.alertToggle;
 exports.alertReplay = alert_1.alertReplay;
-var complete_1 = require('./complete');
-exports.completePage = complete_1.completePage;
-exports.completeChapter = complete_1.completeChapter;
-exports.completeTutorial = complete_1.completeTutorial;
-var globals_1 = require('./globals');
-exports.globalsSet = globals_1.globalsSet;
+var progress_1 = require('./progress');
+exports.progressLoad = progress_1.progressLoad;
+exports.completePage = progress_1.completePage;
+exports.completeChapter = progress_1.completeChapter;
+exports.completeTutorial = progress_1.completeTutorial;
 var hint_1 = require('./hint');
 exports.hintShow = hint_1.hintShow;
 exports.hintPositionSet = hint_1.hintPositionSet;
@@ -24,7 +23,7 @@ var test_1 = require('./test');
 exports.testRun = test_1.testRun;
 exports.testComplete = test_1.testComplete;
 exports.testResult = test_1.testResult;
+exports.testsLoad = test_1.testsLoad;
 var tutorial_1 = require('./tutorial');
 exports.tutorialsFind = tutorial_1.tutorialsFind;
-exports.tutorialUpdate = tutorial_1.tutorialUpdate;
 exports.tutorialSet = tutorial_1.tutorialSet;

lib/actions/index.js

@@ -1,22 +1,49 @@
 "use strict";
 var _types_1 = require('./_types');
+var index_1 = require('./index');
 var store_1 = require('../store');
-var tutorial_package_1 = require('../services/tutorial-package');
+var _position = {
+    chapter: 0,
+    page: 0,
+};
 function pageNext() {
-    var position = store_1.store.getState().position;
-    var nextPosition = tutorial_package_1.default.getNextPosition(position);
-    return pageSet(nextPosition);
+    var position = null;
+    var _a = store_1.store.getState().position, page = _a.page, chapter = _a.chapter;
+    var chapters = store_1.store.getState().tutorial.chapters;
+    if (page < chapters[chapter].pages.length - 1) {
+        position = {
+            chapter: chapter,
+            page: page + 1,
+        };
+    }
+    else if (chapter < chapters.length - 1) {
+        store_1.store.dispatch(index_1.completePage());
+        position = {
+            chapter: chapter + 1,
+            page: 0,
+        };
+    }
+    else {
+        store_1.store.dispatch(index_1.completeTutorial());
+        position = {
+            chapter: chapter,
+            page: page
+        };
+    }
+    return { type: _types_1.PAGE_SET, payload: { position: position } };
 }
 exports.pageNext = pageNext;
-function pageSet(selectedPosition) {
-    if (selectedPosition === void 0) { selectedPosition = { chapter: 0, page: 0 }; }
-    if (selectedPosition.completed) {
-        return { type: _types_1.ROUTE_SET, payload: { route: 'final' } };
+function pageSet(position) {
+    if (position === void 0) { position = _position; }
+    if (position.completed) {
+        return {
+            payload: { route: 'final' },
+            type: _types_1.ROUTE_SET,
+        };
     }
-    var page = tutorial_package_1.default.getPage(selectedPosition);
-    var tasks = tutorial_package_1.default.getTasks(selectedPosition);
-    var taskTests = [].concat.apply([], tasks.map(function (task) { return task.tests || []; }));
-    var actions = tasks.map(function (task) { return task.actions || []; });
-    return { type: _types_1.PAGE_SET, payload: { page: page, tasks: tasks, position: selectedPosition, taskTests: taskTests, actions: actions } };
+    return {
+        payload: { position: position },
+        type: _types_1.PAGE_SET,
+    };
 }
 exports.pageSet = pageSet;

lib/actions/page.js

@@ -1,6 +1,9 @@
 "use strict";
 var _types_1 = require('./_types');
 function positionSet(position) {
-    return { type: _types_1.POSITION_SET, payload: { position: position } };
+    return {
+        payload: { position: position },
+        type: _types_1.POSITION_SET,
+    };
 }
 exports.positionSet = positionSet;

lib/actions/position.js

@@ -1,13 +1,20 @@
 "use strict";
 var _types_1 = require('./_types');
 var store_1 = require('../store');
+function progressLoad() {
+    return { type: _types_1.PROGRESS_LOAD };
+}
+exports.progressLoad = progressLoad;
 function completePage() {
     var position = store_1.store.getState().position;
     var pageLength = store_1.store.getState().progress.chapters[position.chapter].pages.length;
     if (position.page >= pageLength - 1) {
         return completeChapter();
     }
-    return { type: _types_1.COMPLETE_PAGE, payload: { position: position } };
+    return {
+        payload: { position: position },
+        type: _types_1.COMPLETE_PAGE,
+    };
 }
 exports.completePage = completePage;
 function completeChapter() {
@@ -16,7 +23,10 @@ function completeChapter() {
     if (chapter >= chapterLength - 1) {
         return completeTutorial();
     }
-    return { type: _types_1.COMPLETE_CHAPTER, payload: { chapter: chapter } };
+    return {
+        payload: { chapter: chapter },
+        type: _types_1.COMPLETE_CHAPTER,
+    };
 }
 exports.completeChapter = completeChapter;
 function completeTutorial() {

lib/actions/complete.js renamed to lib/actions/progress.js

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

lib/actions/route.js

@@ -7,10 +7,17 @@ function testRun() {
 exports.testRun = testRun;
 function testResult(result) {
     var actions = store_1.store.getState().editorActions;
-    return { type: _types_1.TEST_RESULT, payload: { result: result, actions: actions } };
+    return {
+        payload: { result: result, actions: actions },
+        type: _types_1.TEST_RESULT,
+    };
 }
 exports.testResult = testResult;
 function testComplete() {
     return { type: _types_1.TEST_COMPLETE };
 }
 exports.testComplete = testComplete;
+function testsLoad() {
+    return { type: _types_1.TESTS_LOAD };
+}
+exports.testsLoad = testsLoad;