refactoring progress

ShMcK · ShMcK · commit f1888cc6b932 · 2016-06-10T20:30:13.000-07:00
diff --git a/lib/components/Page/Continue/index.js b/lib/components/Page/Continue/index.js
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var React = require('react');
 var react_redux_1 = require('react-redux');
 var RaisedButton_1 = require('material-ui/RaisedButton');
-var actions_1 = require('../actions');
+var actions_1 = require('../../../actions');
 var styles = {
     zIndex: '10000',
     border: '0px',
@@ -34,11 +34,9 @@ var Continue = (function (_super) {
         return (React.createElement(RaisedButton_1.default, {style: { styles: styles }, label: 'Continue', primary: true, onTouchTap: this.props.callNextPage}));
     };
     Continue = __decorate([
-        react_redux_1.connect(null, function (dispatch, state) {
-            return {
-                callNextPage: function () { return dispatch(actions_1.pageNext()); }
-            };
-        }), 
+        react_redux_1.connect(null, function (dispatch) { return ({
+            callNextPage: function () { return dispatch(actions_1.pageNext()); }
+        }); }), 
         __metadata('design:paramtypes', [])
     ], Continue);
     return Continue;
diff --git a/lib/components/Page/PageToolbar/index.js b/lib/components/Page/PageToolbar/index.js
@@ -2,6 +2,7 @@
 var React = require('react');
 var Toolbar_1 = require('material-ui/Toolbar');
 var index_1 = require('../../index');
+var Continue_1 = require('../Continue');
 var styles = {
     zIndex: '5',
     position: 'relative',
@@ -14,7 +15,7 @@ var styles = {
 exports.PageToolbar = function (_a) {
     var tasks = _a.tasks, taskPosition = _a.taskPosition, children = _a.children;
     return (React.createElement("section", {styles: styles}, children, React.createElement(Toolbar_1.Toolbar, null, React.createElement(Toolbar_1.ToolbarGroup, {float: 'left'}, React.createElement(index_1.ToggleDevTools, null)), React.createElement(Toolbar_1.ToolbarGroup, {float: 'right'}, taskPosition >= tasks.length ?
-        React.createElement(index_1.Continue, null) : React.createElement(index_1.Save, null)))));
+        React.createElement(Continue_1.default, null) : React.createElement(index_1.Save, null)))));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.PageToolbar;
diff --git a/lib/components/Page/Tasks/index.js b/lib/components/Page/Tasks/index.js
@@ -12,9 +12,6 @@ var Subheader_1 = require('material-ui/Subheader');
 var Task_1 = require('../Task');
 var colors_1 = require('material-ui/styles/colors');
 var TasksComplete_1 = require('../TasksComplete');
-function visibleTasks(tasks, taskPosition) {
-    return tasks.slice(0, taskPosition + 1);
-}
 var margin = '10px 5px';
 var Tasks = (function (_super) {
     __extends(Tasks, _super);
@@ -24,9 +21,12 @@ var Tasks = (function (_super) {
     Tasks.prototype.componentDidUpdate = function () {
         ReactDOM.findDOMNode(this.refs.listEnd).scrollIntoView();
     };
+    Tasks.prototype.visibleTasks = function (tasks, taskPosition) {
+        return tasks.slice(0, taskPosition + 1);
+    };
     Tasks.prototype.render = function () {
         var _a = this.props, tasks = _a.tasks, taskPosition = _a.taskPosition, testRun = _a.testRun, completed = _a.completed, page = _a.page;
-        var visTasks = visibleTasks(tasks, taskPosition);
+        var visTasks = this.visibleTasks(tasks, taskPosition);
         var backgroundColor = completed ? colors_1.lightGreen200 : 'white';
         return (React.createElement("div", null, React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), visTasks.map(function (task, index) { return (React.createElement(Task_1.default, {key: index, index: index, task: task, taskPosition: taskPosition, testRun: testRun})); }))), React.createElement(TasksComplete_1.default, {page: page, completed: completed}), React.createElement("div", {ref: 'listEnd'})));
     };
diff --git a/lib/components/Page/index.js b/lib/components/Page/index.js
@@ -20,6 +20,7 @@ var Tasks_1 = require('./Tasks');
 var Hints_1 = require('./Hints');
 var PageToolbar_1 = require('./PageToolbar');
 var ProgressBar_1 = require('./ProgressBar');
+var selectors_1 = require('../../selectors');
 var styles = {
     width: '100%',
     overflowY: 'scroll',
@@ -37,12 +38,12 @@ var Page = (function (_super) {
     };
     Page = __decorate([
         react_redux_1.connect(function (state) { return ({
-            page: state.page,
-            tasks: state.tasks,
-            taskPosition: state.taskPosition,
-            hintPosition: state.hintPosition,
+            page: selectors_1.pageSelector(state),
+            tasks: selectors_1.tasksSelector(state),
             testRun: state.testRun,
             progress: state.progress,
+            taskPosition: state.taskPosition,
+            hintPosition: state.hintPosition,
             pagePosition: state.pagePosition,
         }); }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/index.js b/lib/components/index.js
@@ -27,5 +27,3 @@ var Save_1 = require('./common/Save');
 exports.Save = Save_1.default;
 var ToggleDevTools_1 = require('./common/ToggleDevTools');
 exports.ToggleDevTools = ToggleDevTools_1.default;
-var page_1 = require('../modules/page');
-exports.Continue = page_1.Continue;
diff --git a/lib/modules/package-json/actions.js b/lib/modules/package-json/actions.js
diff --git a/lib/modules/package-json/index.js b/lib/modules/package-json/index.js
@@ -0,0 +1,3 @@
+"use strict";
+var reducer_1 = require('./reducer');
+exports.reducer = reducer_1.default;
diff --git a/lib/modules/package-json/reducer.js b/lib/modules/package-json/reducer.js
@@ -0,0 +1,11 @@
+"use strict";
+var _pj = null;
+function packageJson(p, action) {
+    if (p === void 0) { p = _pj; }
+    switch (action.type) {
+        default:
+            return p;
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = packageJson;
diff --git a/lib/modules/package-json/types.js b/lib/modules/package-json/types.js
diff --git a/lib/modules/package-json/utils/packageJson.js b/lib/modules/package-json/utils/packageJson.js
@@ -0,0 +1,17 @@
+"use strict";
+var path_1 = require('path');
+var fs_1 = require('fs');
+var node_file_exists_1 = require('node-file-exists');
+function readPackageJson(dir) {
+    var pathToPJ = path_1.join(dir, './package.json');
+    if (!node_file_exists_1.default(pathToPJ)) {
+        return false;
+    }
+    try {
+        return JSON.parse(fs_1.readFileSync(pathToPJ, 'utf8'));
+    }
+    catch (e) {
+        return null;
+    }
+}
+exports.readPackageJson = readPackageJson;
diff --git a/lib/modules/page/index.js b/lib/modules/page/index.js
@@ -1,13 +1,7 @@
 "use strict";
-var page_1 = require('./page');
-exports.page = page_1.default;
 var page_position_1 = require('./page-position');
 exports.pagePosition = page_position_1.default;
 var task_actions_1 = require('./task-actions');
 exports.taskActions = task_actions_1.default;
 var task_tests_1 = require('./task-tests');
 exports.taskTests = task_tests_1.default;
-var tasks_1 = require('./tasks');
-exports.tasks = tasks_1.default;
-var Continue_1 = require('./Continue');
-exports.Continue = Continue_1.default;
diff --git a/lib/modules/page/page/index.js b/lib/modules/page/page/index.js
diff --git a/lib/modules/page/tasks/index.js b/lib/modules/page/tasks/index.js
diff --git a/lib/modules/tutorials/reducer.js b/lib/modules/tutorials/reducer.js
@@ -1,16 +1,15 @@
 "use strict";
 var coderoad_cli_1 = require('coderoad-cli');
 var types_1 = require('./types');
-function tutorials(t, action) {
+function tutorialsReducer(t, action) {
     if (t === void 0) { t = []; }
     switch (action.type) {
         case types_1.TUTORIALS_FIND:
-            var dir = action.payload.dir;
-            var tuts = coderoad_cli_1.tutorials(dir);
+            var tuts = coderoad_cli_1.tutorials(action.payload.dir);
             return tuts ? tuts : t;
         default:
             return t;
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = tutorials;
+exports.default = tutorialsReducer;
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -14,7 +14,7 @@ var window_1 = require('core-coderoad/lib/window');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
     alert: alert_1.reducer, checks: setup_1.checks, editor: editor_1.reducer, dir: editor_1.dir, hintPosition: hints_1.reducer,
-    packageJson: setup_1.packageJson, page: page_1.page, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: route_1.reducer, tasks: page_1.tasks,
+    packageJson: setup_1.packageJson, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: route_1.reducer,
     tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
     taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, taskTests: page_1.taskTests, testRun: tests_1.testRun, windowToggle: window_1.reducer
 });
diff --git a/lib/selectors.js b/lib/selectors.js
@@ -1 +1,5 @@
 "use strict";
+var reselect_1 = require('reselect');
+exports.pageSelector = function (state) { return state.tutorial.pages[state.pagePosition]; };
+exports.tasksSelector = reselect_1.createSelector(exports.pageSelector, function (page) { return page.tasks; });
+exports.configSelector = function (state) { return state.packageJson.config; };
diff --git a/src/components/Page/PageToolbar/index.tsx b/src/components/Page/PageToolbar/index.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
-import {ToggleDevTools, Save, Continue} from '../../index';
+import {ToggleDevTools, Save} from '../../index';
+import Continue from '../Continue';
 
 const styles = {
     zIndex: '5',
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -13,5 +13,3 @@ export {default as ContentCard} from './common/ContentCard';
 export {default as RouteButton} from './common/RouteButton';
 export {default as Save} from './common/Save';
 export {default as ToggleDevTools} from './common/ToggleDevTools';
-
-export {Continue} from '../modules/page';
diff --git a/src/modules/package-json/reducer.ts b/src/modules/package-json/reducer.ts
@@ -1,6 +1,4 @@
-import {PJ_SAVE} from './types';
-import {readPackageJson, writePackageJson} from './utils/packageJson';
-import {sortPackageJson} from 'sort-package-json';
+import {readPackageJson} from './utils/packageJson';
 
 const _pj = null;
 
diff --git a/src/modules/page/index.ts b/src/modules/page/index.ts
@@ -1,5 +1,3 @@
 export {default as pagePosition} from './page-position';
 export {default as taskActions} from './task-actions';
 export {default as taskTests} from './task-tests';
-
-export {default as Continue} from './Continue';
diff --git a/src/modules/tutorials/reducer.ts b/src/modules/tutorials/reducer.ts
@@ -2,7 +2,7 @@
 import {tutorials} from 'coderoad-cli';
 import {TUTORIALS_FIND} from './types';
 
-export default function tutorials(
+export default function tutorialsReducer(
   t = [], action: Action
 ): Tutorial.Info[] {
   switch (action.type) {
@@ -12,8 +12,7 @@ export default function tutorials(
     /* falls through */
 
     case TUTORIALS_FIND:
-      const {dir} = action.payload;
-      const tuts: Tutorial.Info[] = tutorials(dir);
+      const tuts = tutorials(action.payload.dir);
       return tuts ? tuts : t;
 
     default:
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -2,7 +2,7 @@ import {combineReducers} from 'redux';
 
 // module reducers
 import {reducer as hintPosition} from './modules/hints';
-import {page, pagePosition, tasks, taskActions, taskTests} from './modules/page';
+import {pagePosition, taskActions, taskTests} from './modules/page';
 import {reducer as progress} from './modules/progress';
 import {checks, packageJson} from './modules/setup';
 import {testRun, taskPosition} from './modules/tests';
@@ -16,7 +16,7 @@ import {reducer as windowToggle} from 'core-coderoad/lib/window';
 
 export default combineReducers({
   alert, checks, editor, dir, hintPosition,
-  packageJson, page, pagePosition, progress, route, tasks,
+  packageJson, pagePosition, progress, route,
   tutorial, tutorials,
   taskActions, taskPosition, taskTests, testRun, windowToggle
 });

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+"use strict";`
	`2`	`+var reducer_1 = require('./reducer');`
	`3`	`+exports.reducer = reducer_1.default;`