refactor tutorial, tutorials into modules

Author: ShMcK

lib/actions/_types.js

@@ -7,6 +7,3 @@ exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
 exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
 exports.SETUP_PACKAGE = 'SETUP_PACKAGE';
 exports.SETUP_VERIFY = 'SETUP_VERIFY';
-exports.TUTORIAL_SET = 'TUTORIAL_SET';
-exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
-exports.TUTORIALS_FIND = 'TUTORIALS_FIND';

lib/actions/index.js

@@ -7,10 +7,6 @@ exports.progressPagePositionLoad = progress_1.progressPagePositionLoad;
 var page_1 = require('./page');
 exports.pageSet = page_1.pageSet;
 exports.pageNext = page_1.pageNext;
-var tutorial_1 = require('./tutorial');
-exports.tutorialsFind = tutorial_1.tutorialsFind;
-exports.tutorialSet = tutorial_1.tutorialSet;
-exports.tutorialUpdate = tutorial_1.tutorialUpdate;
 var toggle_1 = require('./toggle');
 exports.devToolsToggle = toggle_1.devToolsToggle;
 var actions_1 = require('../modules/alert/actions');
@@ -29,3 +25,8 @@ exports.testRun = actions_5.testRun;
 exports.testResult = actions_5.testResult;
 exports.testSave = actions_5.testSave;
 exports.testComplete = actions_5.testComplete;
+var actions_6 = require('../modules/tutorial/actions');
+exports.tutorialSet = actions_6.tutorialSet;
+var actions_7 = require('../modules/tutorials/actions');
+exports.tutorialsFind = actions_7.tutorialsFind;
+exports.tutorialUpdate = actions_7.tutorialUpdate;

lib/components/index.js

@@ -11,8 +11,6 @@ var Routes_1 = require('./Routes');
 exports.Routes = Routes_1.default;
 var Start_1 = require('./Start');
 exports.Start = Start_1.default;
-var Tutorials_1 = require('./Tutorials');
-exports.Tutorials = Tutorials_1.default;
 var Markdown_1 = require('./common/Markdown');
 exports.Markdown = Markdown_1.default;
 var ContentCard_1 = require('./common/ContentCard');
@@ -23,3 +21,5 @@ var route_1 = require('../modules/route');
 exports.RouteButton = route_1.RouteButton;
 var setup_1 = require('../modules/setup');
 exports.Checks = setup_1.Checks;
+var tutorials_1 = require('../modules/tutorials');
+exports.Tutorials = tutorials_1.Tutorials;

lib/modules/setup/utils/verify.js

@@ -1,6 +1,6 @@
 "use strict";
 var check_system_1 = require('./check-system');
-var check_1 = require('../../../reducers/tutorial-list/check');
+var check_1 = require('../../tutorials/utils/check');
 function allTrue(obj) {
     return Object.values(obj).every(function (x) { return x === true; });
 }

lib/modules/tests/task-position/index.js

@@ -1,6 +1,6 @@
 "use strict";
 var types_1 = require('../types');
-function taskPositionReducer(taskPosition, action) {
+function taskPosition(taskPosition, action) {
     if (taskPosition === void 0) { taskPosition = 0; }
     switch (action.type) {
         case 'PAGE_SET':
@@ -12,4 +12,4 @@ function taskPositionReducer(taskPosition, action) {
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = taskPositionReducer;
+exports.default = taskPosition;

lib/modules/tests/test-run/index.js

@@ -4,7 +4,7 @@ var run_1 = require('../utils/run');
 var editor_1 = require('../../../atom/editor');
 var pageTimeout = 800;
 var previous = new Date().getTime();
-function runTestReducer(testRun, action) {
+function runTest(testRun, action) {
     if (testRun === void 0) { testRun = false; }
     switch (action.type) {
         case types_1.TEST_RUN:
@@ -27,4 +27,4 @@ function runTestReducer(testRun, action) {
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = runTestReducer;
+exports.default = runTest;

lib/modules/tutorial/actions.js

@@ -0,0 +1,12 @@
+"use strict";
+var types_1 = require('./types');
+var actions_1 = require('../../actions');
+function tutorialSet(name) {
+    return function (dispatch, getState) {
+        var dir = getState().dir;
+        dispatch({ type: types_1.TUTORIAL_SET, payload: { name: name, dir: dir } });
+        dispatch(actions_1.progressLoad());
+        dispatch(actions_1.routeSet('progress'));
+    };
+}
+exports.tutorialSet = tutorialSet;

lib/modules/tutorial/index.js

@@ -0,0 +1,3 @@
+"use strict";
+var reducer_1 = require('./reducer');
+exports.reducer = reducer_1.default;

lib/reducers/tutorial/index.js renamed to lib/modules/tutorial/reducer.js

@@ -1,8 +1,8 @@
 "use strict";
 var path_1 = require('path');
-var tutorial_config_1 = require('./tutorial-config');
-var _types_1 = require('../../actions/_types');
-var config_paths_1 = require('./config-paths');
+var tutorial_config_1 = require('./utils/tutorial-config');
+var types_1 = require('./types');
+var config_paths_1 = require('./utils/config-paths');
 var _tutorial = {
     name: null,
     info: null,
@@ -13,7 +13,7 @@ var _tutorial = {
 function tutorialReducer(tutorial, action) {
     if (tutorial === void 0) { tutorial = _tutorial; }
     switch (action.type) {
-        case _types_1.TUTORIAL_SET:
+        case types_1.TUTORIAL_SET:
             var _a = action.payload, name_1 = _a.name, dir = _a.dir;
             var packagePath = path_1.join(dir, 'node_modules', name_1);
             var packageJson = require(path_1.join(packagePath, 'package.json'));

lib/modules/tutorial/types.js

@@ -0,0 +1,2 @@
+"use strict";
+exports.TUTORIAL_SET = 'TUTORIAL_SET';

lib/reducers/tutorial/config-paths.js renamed to lib/modules/tutorial/utils/config-paths.js

@@ -1,6 +1,6 @@
 "use strict";
 var path_1 = require('path');
-var system_1 = require('../../services/system');
+var system_1 = require('../../../services/system');
 function configTestString(dir, name, config, testPath) {
     if (system_1.isWindows) {
         testPath = testPath.split('/').join('\\');

lib/reducers/tutorial/tutorial-config.js renamed to lib/modules/tutorial/utils/tutorial-config.js

@@ -1,7 +1,7 @@
 "use strict";
 var path_1 = require('path');
-var exists_1 = require('../../services/exists');
-var system_1 = require('../../services/system');
+var exists_1 = require('../../../services/exists');
+var system_1 = require('../../../services/system');
 function tutorialConfig(tutorialPj, dir) {
     var config = tutorialPj.config, name = tutorialPj.name;
     var repo = loadRepo(tutorialPj.repo);

lib/components/Tutorials/LoadTutorials/index.js renamed to lib/modules/tutorials/Tutorials/LoadTutorials/index.js

@@ -15,7 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var actions_1 = require('../../../actions');
+var actions_1 = require('../../actions');
 var FlatButton_1 = require('material-ui/FlatButton');
 var LoadTutorials = (function (_super) {
     __extends(LoadTutorials, _super);

lib/components/Tutorials/SelectTutorial/index.js renamed to lib/modules/tutorials/Tutorials/SelectTutorial/index.js

@@ -15,8 +15,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
+var actions_1 = require('../../../../actions');
 var FlatButton_1 = require('material-ui/FlatButton');
-var actions_1 = require('../../../actions');
 function displayName(name) {
     if (name.match(/^coderoad-tutorial-/)) {
         return name.slice(18);

lib/components/Tutorials/UpdateTutorial/index.js renamed to lib/modules/tutorials/Tutorials/UpdateTutorial/index.js

@@ -15,8 +15,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
+var actions_1 = require('../../actions');
 var update_1 = require('material-ui/svg-icons/action/update');
-var actions_1 = require('../../../actions');
 var colors_1 = require('material-ui/styles/colors');
 var styles = {
     width: '18px',

lib/components/Tutorials/index.js renamed to lib/modules/tutorials/Tutorials/index.js

@@ -19,7 +19,7 @@ var Table_1 = require('material-ui/Table');
 var LoadTutorials_1 = require('./LoadTutorials');
 var UpdateTutorial_1 = require('./UpdateTutorial');
 var SelectTutorial_1 = require('./SelectTutorial');
-var actions_1 = require('../../actions');
+var actions_1 = require('../actions');
 var styles = {
     padding: '10px',
     textAlign: 'center',
@@ -33,8 +33,8 @@ var Tutorials = (function (_super) {
         this.props.loadTutorials();
     };
     Tutorials.prototype.render = function () {
-        var tutorialList = this.props.tutorialList;
-        return (React.createElement("div", {style: styles}, React.createElement(Table_1.Table, null, React.createElement(Table_1.TableHeader, {displaySelectAll: false, adjustForCheckbox: false}, React.createElement(Table_1.TableRow, null, React.createElement(Table_1.TableHeaderColumn, null, "Tutorial"), React.createElement(Table_1.TableHeaderColumn, null, "Version"))), React.createElement(Table_1.TableBody, {displayRowCheckbox: false}, tutorialList.map(function tutorialRow(tutorial, index) {
+        var tutorials = this.props.tutorials;
+        return (React.createElement("div", {style: styles}, React.createElement(Table_1.Table, null, React.createElement(Table_1.TableHeader, {displaySelectAll: false, adjustForCheckbox: false}, React.createElement(Table_1.TableRow, null, React.createElement(Table_1.TableHeaderColumn, null, "Tutorial"), React.createElement(Table_1.TableHeaderColumn, null, "Version"))), React.createElement(Table_1.TableBody, {displayRowCheckbox: false}, tutorials.map(function tutorialRow(tutorial, index) {
             return (React.createElement(Table_1.TableRow, {key: index}, React.createElement(Table_1.TableRowColumn, null, React.createElement(SelectTutorial_1.default, {tutorial: tutorial})), React.createElement(Table_1.TableRowColumn, null, tutorial.version, !!tutorial.latest
                 ? React.createElement(UpdateTutorial_1.default, {tutorial: tutorial})
                 : null)));

lib/modules/tutorials/actions.js

@@ -0,0 +1,22 @@
+"use strict";
+var types_1 = require('./types');
+var actions_1 = require('../../actions');
+function tutorialUpdate(name) {
+    return function (dispatch, getState) {
+        var alert = {
+            message: "run `npm install --save-dev " + name + "`",
+            action: 'note',
+            duration: 3000,
+        };
+        dispatch({ type: types_1.TUTORIAL_UPDATE, payload: { name: name } });
+        dispatch(actions_1.alertOpen(alert));
+    };
+}
+exports.tutorialUpdate = tutorialUpdate;
+function tutorialsFind() {
+    return function (dispatch, getState) {
+        var _a = getState(), packageJson = _a.packageJson, dir = _a.dir;
+        dispatch({ type: types_1.TUTORIALS_FIND, payload: { packageJson: packageJson, dir: dir } });
+    };
+}
+exports.tutorialsFind = tutorialsFind;

lib/modules/tutorials/index.js

@@ -0,0 +1,5 @@
+"use strict";
+var reducer_1 = require('./reducer');
+exports.reducer = reducer_1.default;
+var Tutorials_1 = require('./Tutorials');
+exports.Tutorials = Tutorials_1.default;

lib/reducers/tutorial-list/index.js renamed to lib/modules/tutorials/reducer.js

@@ -1,17 +1,17 @@
 "use strict";
-var check_1 = require('./check');
-var _types_1 = require('../../actions/_types');
-function tutorialListReducer(tutorialList, action) {
-    if (tutorialList === void 0) { tutorialList = []; }
+var check_1 = require('./utils/check');
+var types_1 = require('./types');
+function tutorials(tutorials, action) {
+    if (tutorials === void 0) { tutorials = []; }
     switch (action.type) {
-        case _types_1.TUTORIALS_FIND:
+        case types_1.TUTORIALS_FIND:
             var _a = action.payload, packageJson = _a.packageJson, dir = _a.dir;
             return ([]
                 .concat(check_1.searchForTutorials(dir, packageJson.dependencies))
                 .concat(check_1.searchForTutorials(dir, packageJson.devDependencies)));
         default:
-            return tutorialList;
+            return tutorials;
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = tutorialListReducer;
+exports.default = tutorials;

lib/modules/tutorials/types.js

@@ -0,0 +1,3 @@
+"use strict";
+exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
+exports.TUTORIALS_FIND = 'TUTORIALS_FIND';

lib/reducers/tutorial-list/check.js renamed to lib/modules/tutorials/utils/check.js

@@ -1,7 +1,7 @@
 "use strict";
 var path_1 = require('path');
 var fs_1 = require('fs');
-var exists_1 = require('../../services/exists');
+var exists_1 = require('../../../services/exists');
 var is_tutorial_1 = require('./is-tutorial');
 var update_1 = require('./update');
 function searchForTutorials(dir, deps) {

lib/reducers/tutorial-list/is-tutorial.js renamed to lib/modules/tutorials/utils/is-tutorial.js

@@ -1,7 +1,7 @@
 "use strict";
 var path_1 = require('path');
 var fs_1 = require('fs');
-var exists_1 = require('../../services/exists');
+var exists_1 = require('../../../services/exists');
 exports.tutorialError = 'This is an error with the tutorial itself';
 function isTutorial(dir, name) {
     var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');

lib/reducers/tutorial-list/update.js renamed to lib/modules/tutorials/utils/update.js

@@ -1,5 +1,5 @@
 "use strict";
-var command_line_1 = require('../../services/command-line');
+var command_line_1 = require('../../../services/command-line');
 function tutorialUpdate(name) {
     console.log("run \"npm install --save-dev " + name + "\"");
 }

lib/reducers/index.js

@@ -9,18 +9,18 @@ var progress_1 = require('./progress');
 var tasks_1 = require('./tasks');
 var task_actions_1 = require('./task-actions');
 var task_tests_1 = require('./task-tests');
-var tutorial_1 = require('./tutorial');
-var tutorial_list_1 = require('./tutorial-list');
 var alert_1 = require('../modules/alert');
 var setup_1 = require('../modules/setup');
 var hints_1 = require('../modules/hints');
 var route_1 = require('../modules/route');
 var tests_1 = require('../modules/tests');
+var tutorial_1 = require('../modules/tutorial');
+var tutorials_1 = require('../modules/tutorials');
 var window_1 = require('../modules/window');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
     alert: alert_1.reducer, checks: setup_1.reducer, devToolsToggle: devTools_toggle_1.default, dir: dir_1.default, hintPosition: hints_1.reducer,
     packageJson: package_json_1.default, page: page_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.reducer, tasks: tasks_1.default,
-    tutorial: tutorial_1.default, tutorialList: tutorial_list_1.default,
+    tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
     taskActions: task_actions_1.default, taskPosition: tests_1.taskPosition, taskTests: task_tests_1.default, testRun: tests_1.testRun, windowToggle: window_1.reducer
 });

src/actions/_types.ts

@@ -6,6 +6,3 @@ export const PROGRESS_LOAD = 'PROGRESS_LOAD';
 export const PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
 export const SETUP_PACKAGE = 'SETUP_PACKAGE';
 export const SETUP_VERIFY = 'SETUP_VERIFY';
-export const TUTORIAL_SET = 'TUTORIAL_SET';
-export const TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
-export const TUTORIALS_FIND = 'TUTORIALS_FIND';

src/actions/index.ts

@@ -4,9 +4,7 @@ export {
   progressPagePositionLoad
 } from './progress';
 export {pageSet, pageNext} from './page';
-export {
-  tutorialsFind, tutorialSet, tutorialUpdate
-} from './tutorial';
+
 export {devToolsToggle} from './toggle';
 
 // Modules
@@ -15,3 +13,5 @@ export {routeSet} from '../modules/route/actions';
 export {setupVerify, setupPackage} from '../modules/setup/actions';
 export {hintPositionSet} from '../modules/hints/actions';
 export {testRun, testResult, testSave, testComplete} from '../modules/tests/actions';
+export {tutorialSet} from '../modules/tutorial/actions';
+export {tutorialsFind, tutorialUpdate} from '../modules/tutorials/actions';

src/components/Routes/index.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {Page, Progress, Tutorials, Start, FinalPage} from '../index';
 
 export default class Routes extends React.Component<{
-  route: string, progress: CR.Progress, page: CR.Page, tutorialList: Tutorial.Info[],
+  route: string, progress: CR.Progress, page: CR.Page, tutorials: Tutorial.Info[],
   testRun: boolean, checks: CR.Checks, pagePosition: CR.PagePosition, tasks: CR.Task[],
   taskPosition: number, hintPosition: number, tutorial: CR.Tutorial
 }, {}> {

src/components/index.ts

@@ -4,10 +4,10 @@ export {default as Page} from './Page';
 export {default as Progress} from './Progress';
 export {default as Routes} from './Routes';
 export {default as Start} from './Start';
-export {default as Tutorials} from './Tutorials';
 export {default as Markdown} from './common/Markdown';
 export {default as ContentCard} from './common/ContentCard';
 
 export {Alert} from '../modules/alert';
 export {RouteButton} from '../modules/route';
 export {Checks} from '../modules/setup';
+export {Tutorials} from '../modules/tutorials';

src/modules/setup/deps.md

@@ -1,6 +1,7 @@
-ContentCard
+components: ContentCard
+
 atom
-commandLine
-searchForTutorials
 
-Todo: refactor out deps
+services: commandLine
+
+tutorials/searchForTutorials

src/modules/setup/utils/verify.ts

@@ -1,5 +1,5 @@
 import {npmMinVersion, nodeMinVersion, requiresXCode} from './check-system';
-import {searchForTutorials} from '../../../reducers/tutorial-list/check';
+import {searchForTutorials} from '../../tutorials/utils/check';
 
 function allTrue(obj: Object): boolean {
   return Object.values(obj).every(x => x === true);

src/modules/tests/deps.md

@@ -0,0 +1,5 @@
+store
+
+atom: save
+
+actions: hintPositionSet, alertOpen, completePage, testComplete

src/modules/tests/index.ts

@@ -1,2 +1,3 @@
+// reducers
 export {default as testRun} from './test-run';
 export {default as taskPosition} from './task-position'

src/modules/tests/task-position/index.ts

@@ -1,6 +1,6 @@
 import {TEST_RESULT} from '../types';
 
-export default function taskPositionReducer(
+export default function taskPosition(
   taskPosition = 0, action: Action
 ): number {
   switch (action.type) {

src/modules/tests/test-run/index.ts

@@ -6,7 +6,7 @@ const pageTimeout = 800;
 
 let previous: number = new Date().getTime();
 
-export default function runTestReducer(
+export default function runTest(
   testRun = false, action: Action
 ): boolean {
   switch (action.type) {

src/modules/tutorial/actions.ts

@@ -0,0 +1,11 @@
+import {TUTORIAL_SET} from './types';
+import {progressLoad, routeSet} from '../../actions';
+
+export function tutorialSet(name: string): ReduxThunk.ThunkInterface {
+  return (dispatch, getState) => {
+    const {dir} = getState();
+    dispatch({ type: TUTORIAL_SET, payload: {name, dir }});
+    dispatch(progressLoad());
+    dispatch(routeSet('progress'));
+  };
+}

src/modules/tutorial/deps.md

@@ -0,0 +1,4 @@
+services/system
+services/exists
+
+actions: progressLoad, routeSet