refactoring components into modules

ShMcK · ShMcK · commit 59d43891ca1f · 2016-05-17T07:36:04.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -21,7 +21,6 @@ exports.setupPackage = actions_7.setupPackage;
 var actions_8 = require('./modules/tests/actions');
 exports.testRun = actions_8.testRun;
 exports.testResult = actions_8.testResult;
-exports.testSave = actions_8.testSave;
 exports.testComplete = actions_8.testComplete;
 var actions_9 = require('./modules/tutorial/actions');
 exports.tutorialSet = actions_9.tutorialSet;
diff --git a/lib/components/Page/PageToolbar/index.js b/lib/components/Page/PageToolbar/index.js
@@ -2,7 +2,6 @@
 var React = require('react');
 var Toolbar_1 = require('material-ui/Toolbar');
 var index_1 = require('../../index');
-var Save_1 = require('./Save');
 var Continue_1 = require('./Continue');
 var styles = {
     zIndex: '5',
@@ -16,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(Continue_1.default, null) : React.createElement(Save_1.default, 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/index.js b/lib/components/index.js
@@ -25,3 +25,5 @@ var tutorials_1 = require('../modules/tutorials');
 exports.Tutorials = tutorials_1.Tutorials;
 var editor_1 = require('../modules/editor');
 exports.ToggleDevTools = editor_1.ToggleDevTools;
+var editor_2 = require('../modules/editor');
+exports.Save = editor_2.Save;
diff --git a/lib/modules/editor/Save/index.js b/lib/modules/editor/Save/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 = {
     border: '0px',
     boxShadow: 'none',
@@ -35,7 +35,7 @@ var Save = (function (_super) {
     Save = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
             return {
-                save: function () { return dispatch(actions_1.testSave()); }
+                save: function () { return dispatch(actions_1.editorSave()); }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/modules/editor/actions.js b/lib/modules/editor/actions.js
@@ -4,3 +4,7 @@ function editorDevToolsToggle() {
     return { type: types_1.EDITOR_DEVTOOLS_TOGGLE };
 }
 exports.editorDevToolsToggle = editorDevToolsToggle;
+function editorSave() {
+    return { type: types_1.EDITOR_SAVE };
+}
+exports.editorSave = editorSave;
diff --git a/lib/modules/editor/index.js b/lib/modules/editor/index.js
@@ -5,6 +5,8 @@ var dir_1 = require('./dir');
 exports.dir = dir_1.default;
 var ToggleDevTools_1 = require('./ToggleDevTools');
 exports.ToggleDevTools = ToggleDevTools_1.default;
+var Save_1 = require('./Save');
+exports.Save = Save_1.default;
 var file_1 = require('./actions/file');
 exports.save = file_1.save;
 exports.open = file_1.open;
diff --git a/lib/modules/editor/reducer.js b/lib/modules/editor/reducer.js
@@ -7,6 +7,9 @@ function editor(editor, action) {
         case types_1.EDITOR_DEVTOOLS_TOGGLE:
             index_1.toggleDevTools();
             return editor;
+        case types_1.EDITOR_SAVE:
+            index_1.save();
+            return editor;
         default:
             return editor;
     }
diff --git a/lib/modules/editor/types.js b/lib/modules/editor/types.js
@@ -1,2 +1,3 @@
 "use strict";
 exports.EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';
+exports.EDITOR_SAVE = 'EDITOR_SAVE';
diff --git a/lib/modules/tests/actions.js b/lib/modules/tests/actions.js
@@ -66,7 +66,3 @@ function testComplete(result) {
     };
 }
 exports.testComplete = testComplete;
-function testSave() {
-    return { type: types_1.TEST_SAVE };
-}
-exports.testSave = testSave;
diff --git a/lib/modules/tests/test-run/index.js b/lib/modules/tests/test-run/index.js
@@ -1,7 +1,6 @@
 "use strict";
 var types_1 = require('../types');
 var run_1 = require('../utils/run');
-var editor_1 = require('../../../modules/editor');
 var pageTimeout = 800;
 var previous = new Date().getTime();
 function runTest(testRun, action) {
@@ -20,8 +19,6 @@ function runTest(testRun, action) {
         case 'PAGE_SET':
             previous = new Date().getTime();
             return false;
-        case types_1.TEST_SAVE:
-            editor_1.save();
         default:
             return testRun;
     }
diff --git a/lib/modules/tests/types.js b/lib/modules/tests/types.js
@@ -2,4 +2,3 @@
 exports.TEST_COMPLETE = 'TEST_COMPLETE';
 exports.TEST_RESULT = 'TEST_RESULT';
 exports.TEST_RUN = 'TEST_RUN';
-exports.TEST_SAVE = 'TEST_SAVE';
diff --git a/lib/modules/tutorials/Tutorials/SelectTutorial/index.js b/lib/modules/tutorials/Tutorials/SelectTutorial/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');
 function displayName(name) {
     if (name.match(/^coderoad-tutorial-/)) {
diff --git a/lib/modules/tutorials/actions.js b/lib/modules/tutorials/actions.js
@@ -1,6 +1,8 @@
 "use strict";
 var types_1 = require('./types');
 var actions_1 = require('../../actions');
+var actions_2 = require('../../actions');
+exports.tutorialSet = actions_2.tutorialSet;
 function tutorialUpdate(name) {
     return function (dispatch, getState) {
         var alert = {
diff --git a/src/components/Page/PageToolbar/index.tsx b/src/components/Page/PageToolbar/index.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
-import {ToggleDevTools} from '../../index';
-import Save from './Save';
+import {ToggleDevTools, Save} from '../../index';
 import Continue from './Continue';
 
 const styles = {
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -12,3 +12,4 @@ export {RouteButton} from '../modules/route';
 export {Checks} from '../modules/setup';
 export {Tutorials} from '../modules/tutorials';
 export {ToggleDevTools} from '../modules/editor';
+export {Save} from '../modules/editor';
diff --git a/src/modules/editor/Save/index.tsx b/src/modules/editor/Save/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import RaisedButton from 'material-ui/RaisedButton';
-import {testSave} from '../../../../actions';
+import {editorSave} from '../actions';
 
 const styles = {
   border: '0px',
@@ -13,7 +13,7 @@ const styles = {
 
 @connect(null, (dispatch, state) => {
   return {
-    save: () => dispatch(testSave())
+    save: () => dispatch(editorSave())
   };
 })
 export default class Save extends React.Component<{
diff --git a/src/modules/editor/actions.ts b/src/modules/editor/actions.ts
@@ -1,5 +1,9 @@
-import {EDITOR_DEVTOOLS_TOGGLE} from './types';
+import {EDITOR_DEVTOOLS_TOGGLE, EDITOR_SAVE} from './types';
 
 export function editorDevToolsToggle(): Action {
   return { type: EDITOR_DEVTOOLS_TOGGLE };
 }
+
+export function editorSave(): Action {
+  return { type: EDITOR_SAVE };
+}
diff --git a/src/modules/editor/index.ts b/src/modules/editor/index.ts
@@ -2,6 +2,7 @@ export {default as reducer} from './reducer';
 export {default as dir} from './dir';
 
 export {default as ToggleDevTools} from './ToggleDevTools';
+export {default as Save} from './Save';
 
 export {save, open, openFolder} from './actions/file';
 export {set, insert} from './actions/write';
diff --git a/src/modules/editor/reducer.ts b/src/modules/editor/reducer.ts
@@ -1,5 +1,5 @@
-import {EDITOR_DEVTOOLS_TOGGLE} from './types';
-import {toggleDevTools} from './index';
+import {EDITOR_DEVTOOLS_TOGGLE, EDITOR_SAVE} from './types';
+import {toggleDevTools, save} from './index';
 
 export default function editor(
   editor = 'atom', action: Action
@@ -10,6 +10,10 @@ export default function editor(
       toggleDevTools();
       return editor;
 
+    case EDITOR_SAVE:
+      save();
+      return editor;
+
     default:
       return editor;
   }
diff --git a/src/modules/editor/types.ts b/src/modules/editor/types.ts
@@ -1 +1,2 @@
 export const EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';
+export const EDITOR_SAVE = 'EDITOR_SAVE';
diff --git a/src/modules/setup/deps.md b/src/modules/setup/deps.md
@@ -2,7 +2,5 @@ components: ContentCard
 
 atom
 
-services: commandLine
-
-tutorials/searchForTutorials
-editor/{open, set, openFolder, openTerminal}
+modules/tutorials/searchForTutorials
+modules/editor/{open, set, openFolder, openTerminal}
diff --git a/src/modules/tests/actions.ts b/src/modules/tests/actions.ts
@@ -74,7 +74,3 @@ export function testComplete(result: Test.Result) {
     dispatch({ type: TEST_COMPLETE });
   };
 }
-
-export function testSave(): Action {
-  return { type: TEST_SAVE };
-}
diff --git a/src/modules/tests/deps.md b/src/modules/tests/deps.md
@@ -1,5 +1,3 @@
 store
 
-atom: save
-
-actions: hintPositionSet, alertOpen, progressCompletePage, testComplete
+actions: hintPositionSet, alertOpen, progressCompletePage
diff --git a/src/modules/tests/test-run/index.ts b/src/modules/tests/test-run/index.ts
@@ -1,6 +1,5 @@
-import {TEST_RUN, TEST_COMPLETE, TEST_SAVE} from '../types';
+import {TEST_RUN, TEST_COMPLETE} from '../types';
 import runTaskTests from '../utils/run';
-import {save} from '../../../modules/editor';
 
 const pageTimeout = 800;
 
@@ -27,10 +26,6 @@ export default function runTest(
       previous = new Date().getTime();
       return false;
 
-    case TEST_SAVE:
-      save();
-      /* falls through */
-
     default:
       return testRun;
   }
diff --git a/src/modules/tests/types.ts b/src/modules/tests/types.ts
@@ -1,4 +1,3 @@
 export const TEST_COMPLETE = 'TEST_COMPLETE';
 export const TEST_RESULT = 'TEST_RESULT';
 export const TEST_RUN = 'TEST_RUN';
-export const TEST_SAVE = 'TEST_SAVE';
diff --git a/src/modules/tutorials/Tutorials/SelectTutorial/index.tsx b/src/modules/tutorials/Tutorials/SelectTutorial/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {tutorialSet} from '../../../../actions';
+import {tutorialSet} from '../../actions';
 import FlatButton from 'material-ui/FlatButton';
 
 function displayName(name: string): string {
diff --git a/src/modules/tutorials/actions.ts b/src/modules/tutorials/actions.ts
@@ -1,5 +1,6 @@
 import {TUTORIALS_FIND, TUTORIAL_UPDATE} from './types';
 import {alertOpen} from '../../actions';
+export {tutorialSet} from '../../actions';
 
 export function tutorialUpdate(name: string): ReduxThunk.ThunkInterface {
   return (dispatch, getState) => {
diff --git a/tsconfig.json b/tsconfig.json
@@ -155,7 +155,6 @@
         "src/components/Page/index.tsx",
         "src/components/Page/PageToolbar/Continue/index.tsx",
         "src/components/Page/PageToolbar/index.tsx",
-        "src/components/Page/PageToolbar/Save/index.tsx",
         "src/components/Page/ProgressBar/index.tsx",
         "src/components/Page/Task/index.tsx",
         "src/components/Page/Task/taskCheckbox.tsx",
@@ -169,6 +168,7 @@
         "src/components/Start/index.tsx",
         "src/components/Start/Welcome/index.tsx",
         "src/modules/alert/Alert.tsx",
+        "src/modules/editor/Save/index.tsx",
         "src/modules/editor/ToggleDevTools/index.tsx",
         "src/modules/hints/Hints/HintButton.tsx",
         "src/modules/hints/Hints/index.tsx",

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,7 @@ function editorDevToolsToggle() {`
`4`	`4`	`return { type: types_1.EDITOR_DEVTOOLS_TOGGLE };`
`5`	`5`	`}`
`6`	`6`	`exports.editorDevToolsToggle = editorDevToolsToggle;`
	`7`	`+function editorSave() {`
	`8`	`+ return { type: types_1.EDITOR_SAVE };`
	`9`	`+}`
	`10`	`+exports.editorSave = editorSave;`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`"use strict";`
`2`	`2`	`exports.EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';`
	`3`	`+exports.EDITOR_SAVE = 'EDITOR_SAVE';`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,3 @@ function testComplete(result) {`
`66`	`66`	`};`
`67`	`67`	`}`
`68`	`68`	`exports.testComplete = testComplete;`
`69`		`-function testSave() {`
`70`		`- return { type: types_1.TEST_SAVE };`
`71`		`-}`
`72`		`-exports.testSave = testSave;`