refactor actions

Author: ShMcK

lib/actions/_types.js

@@ -5,7 +5,6 @@ exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
 exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 exports.DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
-exports.HINT_SHOW = 'HINT_SHOW';
 exports.PAGE_SET = 'PAGE_SET';
 exports.PAGE_POSITION_SET = 'POSITION_SET';
 exports.PROGRESS_LOAD = 'PROGRESS_LOAD';

lib/actions/hint.js

@@ -4,7 +4,3 @@ function hintPositionSet(hintPosition) {
     return { type: _types_1.HINT_POSITION_SET, payload: { hintPosition: hintPosition } };
 }
 exports.hintPositionSet = hintPositionSet;
-function hintShow() {
-    return { type: _types_1.HINT_SHOW };
-}
-exports.hintShow = hintShow;

lib/actions/index.js

@@ -8,7 +8,6 @@ exports.completePage = progress_1.completePage;
 exports.completeTutorial = progress_1.completeTutorial;
 exports.progressPagePositionLoad = progress_1.progressPagePositionLoad;
 var hint_1 = require('./hint');
-exports.hintShow = hint_1.hintShow;
 exports.hintPositionSet = hint_1.hintPositionSet;
 var page_1 = require('./page');
 exports.pageSet = page_1.pageSet;

lib/actions/tutorial.js

@@ -1,9 +1,13 @@
 "use strict";
 var _types_1 = require('./_types');
+var progress_1 = require('./progress');
+var route_1 = require('./route');
 function tutorialSet(name) {
     return function (dispatch, getState) {
         var dir = getState().dir;
         dispatch({ type: _types_1.TUTORIAL_SET, payload: { name: name, dir: dir } });
+        dispatch(progress_1.progressLoad());
+        dispatch(route_1.routeSet('progress'));
     };
 }
 exports.tutorialSet = tutorialSet;

src/actions/_types.ts

@@ -4,7 +4,6 @@ export const COMPLETE_PAGE = 'COMPLETE_PAGE';
 export const COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 export const DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 export const HINT_POSITION_SET = 'HINT_POSITION_SET';
-export const HINT_SHOW = 'HINT_SHOW';
 export const PAGE_SET = 'PAGE_SET';
 export const PAGE_POSITION_SET = 'POSITION_SET';
 export const PROGRESS_LOAD = 'PROGRESS_LOAD';

src/actions/hint.ts

@@ -3,7 +3,3 @@ import {HINT_SHOW, HINT_POSITION_SET} from './_types';
 export function hintPositionSet(hintPosition: number): Action {
   return {type: HINT_POSITION_SET, payload: { hintPosition } };
 }
-
-export function hintShow(): Action {
-  return { type: HINT_SHOW };
-}

src/actions/index.ts

@@ -3,7 +3,7 @@ export {
   progressLoad, completePage, completeTutorial,
   progressPagePositionLoad
 } from './progress';
-export {hintShow, hintPositionSet} from './hint';
+export {hintPositionSet} from './hint';
 export {pageSet, pageNext, pagePositionSet} from './page';
 export {routeSet} from './route';
 export {setupVerify, setupPackage} from './setup';

src/actions/tutorial.ts

@@ -2,11 +2,15 @@ import {
   TUTORIALS_FIND, TUTORIAL_UPDATE, TUTORIAL_SET,
   ALERT_TOGGLE
 } from './_types';
+import {progressLoad} from './progress';
+import {routeSet} from './route';
 
 export function tutorialSet(name: string): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {dir} = getState();
     dispatch({ type: TUTORIAL_SET, payload: { name, dir } });
+    dispatch(progressLoad());
+    dispatch(routeSet('progress'));
   };
 }