create editor module

ShMcK · ShMcK · commit 5c42567ab36a · 2016-05-16T09:55:08.000-07:00
diff --git a/lib/actions/_types.js b/lib/actions/_types.js
@@ -1,7 +1,6 @@
 "use strict";
 exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
 exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
-exports.DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 exports.PAGE_SET = 'PAGE_SET';
 exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
 exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
diff --git a/lib/actions/index.js b/lib/actions/index.js
@@ -7,8 +7,6 @@ exports.progressPagePositionLoad = progress_1.progressPagePositionLoad;
 var page_1 = require('./page');
 exports.pageSet = page_1.pageSet;
 exports.pageNext = page_1.pageNext;
-var toggle_1 = require('./toggle');
-exports.devToolsToggle = toggle_1.devToolsToggle;
 var actions_1 = require('../modules/alert/actions');
 exports.alertOpen = actions_1.alertOpen;
 exports.alertClose = actions_1.alertClose;
diff --git a/lib/actions/toggle.js b/lib/actions/toggle.js
@@ -1,6 +0,0 @@
-"use strict";
-var _types_1 = require('./_types');
-function devToolsToggle() {
-    return { type: _types_1.DEVTOOLS_TOGGLE };
-}
-exports.devToolsToggle = devToolsToggle;
diff --git a/lib/components/Page/PageToolbar/index.js b/lib/components/Page/PageToolbar/index.js
@@ -1,7 +1,7 @@
 "use strict";
 var React = require('react');
 var Toolbar_1 = require('material-ui/Toolbar');
-var ToggleLog_1 = require('./ToggleLog');
+var index_1 = require('../../index');
 var Save_1 = require('./Save');
 var Continue_1 = require('./Continue');
 var styles = {
@@ -15,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(ToggleLog_1.default, null)), React.createElement(Toolbar_1.ToolbarGroup, {float: 'right'}, taskPosition >= tasks.length ?
+    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)))));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/lib/components/index.js b/lib/components/index.js
@@ -23,3 +23,5 @@ var setup_1 = require('../modules/setup');
 exports.Checks = setup_1.Checks;
 var tutorials_1 = require('../modules/tutorials');
 exports.Tutorials = tutorials_1.Tutorials;
+var editor_1 = require('../modules/editor');
+exports.ToggleDevTools = editor_1.ToggleDevTools;
diff --git a/lib/modules/editor/ToggleDevTools/index.js b/lib/modules/editor/ToggleDevTools/index.js
@@ -14,32 +14,32 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var React = require('react');
-var code_1 = require('material-ui/svg-icons/action/code');
 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 code_1 = require('material-ui/svg-icons/action/code');
 var styles = {
     position: 'relative',
     top: '10px',
 };
-var ToggleLog = (function (_super) {
-    __extends(ToggleLog, _super);
-    function ToggleLog() {
+var ToggleDevTools = (function (_super) {
+    __extends(ToggleDevTools, _super);
+    function ToggleDevTools() {
         _super.apply(this, arguments);
     }
-    ToggleLog.prototype.render = function () {
-        return (React.createElement(FlatButton_1.default, {style: styles, icon: React.createElement(code_1.default, null), onTouchTap: this.props.toggleDevTools}));
+    ToggleDevTools.prototype.render = function () {
+        return (React.createElement(FlatButton_1.default, {style: styles, icon: React.createElement(code_1.default, null), onTouchTap: this.props.toggle}));
     };
     ;
-    ToggleLog = __decorate([
+    ToggleDevTools = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
             return {
-                toggleDevTools: function () { return dispatch(actions_1.devToolsToggle()); }
+                toggle: function () { return dispatch(actions_1.editorDevToolsToggle()); }
             };
         }), 
         __metadata('design:paramtypes', [])
-    ], ToggleLog);
-    return ToggleLog;
+    ], ToggleDevTools);
+    return ToggleDevTools;
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = ToggleLog;
+exports.default = ToggleDevTools;
diff --git a/lib/modules/editor/actions.js b/lib/modules/editor/actions.js
@@ -0,0 +1,6 @@
+"use strict";
+var types_1 = require('./types');
+function editorDevToolsToggle() {
+    return { type: types_1.EDITOR_DEVTOOLS_TOGGLE };
+}
+exports.editorDevToolsToggle = editorDevToolsToggle;
diff --git a/lib/modules/editor/dir/index.js b/lib/modules/editor/dir/index.js
diff --git a/lib/modules/editor/editor/index.js b/lib/modules/editor/editor/index.js
@@ -0,0 +1,15 @@
+"use strict";
+var types_1 = require('../types');
+var editor_1 = require('../../../atom/editor');
+function editor(editor, action) {
+    if (editor === void 0) { editor = 'atom'; }
+    switch (action.type) {
+        case types_1.EDITOR_DEVTOOLS_TOGGLE:
+            editor_1.toggleDevTools();
+            return editor;
+        default:
+            return editor;
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = editor;
diff --git a/lib/modules/editor/index.js b/lib/modules/editor/index.js
@@ -0,0 +1,7 @@
+"use strict";
+var editor_1 = require('./editor');
+exports.editor = editor_1.default;
+var dir_1 = require('./dir');
+exports.dir = dir_1.default;
+var ToggleDevTools_1 = require('./ToggleDevTools');
+exports.ToggleDevTools = ToggleDevTools_1.default;
diff --git a/lib/modules/editor/types.js b/lib/modules/editor/types.js
@@ -0,0 +1,2 @@
+"use strict";
+exports.EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';
diff --git a/lib/reducers/devTools-toggle/index.js b/lib/reducers/devTools-toggle/index.js
diff --git a/lib/reducers/index.js b/lib/reducers/index.js
@@ -1,7 +1,5 @@
 "use strict";
 var redux_1 = require('redux');
-var devTools_toggle_1 = require('./devTools-toggle');
-var dir_1 = require('./dir');
 var package_json_1 = require('./package-json');
 var page_1 = require('./page');
 var page_position_1 = require('./page-position');
@@ -17,9 +15,10 @@ var tests_1 = require('../modules/tests');
 var tutorial_1 = require('../modules/tutorial');
 var tutorials_1 = require('../modules/tutorials');
 var window_1 = require('../modules/window');
+var editor_1 = require('../modules/editor');
 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,
+    alert: alert_1.reducer, checks: setup_1.reducer, editor: editor_1.editor, dir: editor_1.dir, 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.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
diff --git a/src/actions/_types.ts b/src/actions/_types.ts
@@ -1,6 +1,5 @@
 export const COMPLETE_PAGE = 'COMPLETE_PAGE';
 export const COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
-export const DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 export const PAGE_SET = 'PAGE_SET';
 export const PROGRESS_LOAD = 'PROGRESS_LOAD';
 export const PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -5,8 +5,6 @@ export {
 } from './progress';
 export {pageSet, pageNext} from './page';
 
-export {devToolsToggle} from './toggle';
-
 // Modules
 export {alertOpen, alertClose, alertReplay} from '../modules/alert/actions';
 export {routeSet} from '../modules/route/actions';
@@ -15,3 +13,4 @@ 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';
+export {devTools, dir} from '../modules/editor/actions';
diff --git a/src/actions/toggle.ts b/src/actions/toggle.ts
@@ -1,5 +0,0 @@
-import {DEVTOOLS_TOGGLE} from './_types';
-
-export function devToolsToggle(): Action {
-  return { type: DEVTOOLS_TOGGLE };
-}
diff --git a/src/components/Page/PageToolbar/index.tsx b/src/components/Page/PageToolbar/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
-import ToggleLog from './ToggleLog';
+import {ToggleDevTools} from '../../index';
 import Save from './Save';
 import Continue from './Continue';
 
@@ -21,7 +21,7 @@ export const PageToolbar: React.StatelessComponent<{
     {children}
     <Toolbar>
       <ToolbarGroup float='left'>
-        <ToggleLog />
+        <ToggleDevTools />
       </ToolbarGroup>
       <ToolbarGroup float='right'>
         {taskPosition >= tasks.length ?
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -11,3 +11,4 @@ export {Alert} from '../modules/alert';
 export {RouteButton} from '../modules/route';
 export {Checks} from '../modules/setup';
 export {Tutorials} from '../modules/tutorials';
+export {ToggleDevTools} from '../modules/editor';
diff --git a/src/modules/editor/ToggleDevTools/index.tsx b/src/modules/editor/ToggleDevTools/index.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Code from 'material-ui/svg-icons/action/code';
 import {connect} from 'react-redux';
-import {devToolsToggle} from '../../../../actions';
+import {editorDevToolsToggle} from '../actions';
 import FlatButton from 'material-ui/FlatButton';
+import Code from 'material-ui/svg-icons/action/code';
 
 const styles = {
   position: 'relative',
@@ -11,11 +11,11 @@ const styles = {
 
 @connect(null, (dispatch, state) => {
   return {
-    toggleDevTools: () => dispatch(devToolsToggle())
+    toggle: () => dispatch(editorDevToolsToggle())
   };
 })
-export default class ToggleLog extends React.Component<{
-  toggleDevTools?: any
+export default class ToggleDevTools extends React.Component<{
+  toggle?: any
 }, {}> {
   render() {
     return (
@@ -24,7 +24,7 @@ export default class ToggleLog extends React.Component<{
         icon={
           <Code />
         }
-        onTouchTap={this.props.toggleDevTools}
+        onTouchTap={this.props.toggle}
       />
     );
   };
diff --git a/src/modules/editor/actions.ts b/src/modules/editor/actions.ts
@@ -0,0 +1,5 @@
+import {EDITOR_DEVTOOLS_TOGGLE} from './types';
+
+export function editorDevToolsToggle(): Action {
+  return { type: EDITOR_DEVTOOLS_TOGGLE };
+}
diff --git a/src/modules/editor/dir/index.ts b/src/modules/editor/dir/index.ts
diff --git a/src/modules/editor/editor/index.ts b/src/modules/editor/editor/index.ts
@@ -0,0 +1,17 @@
+import {EDITOR_DEVTOOLS_TOGGLE} from '../types';
+import {toggleDevTools} from '../../../atom/editor';
+
+// trigger editor actions here
+export default function editor(
+  editor = 'atom', action: Action
+): string {
+  switch (action.type) {
+
+    case EDITOR_DEVTOOLS_TOGGLE:
+      toggleDevTools();
+      return editor;
+
+    default:
+      return editor;
+  }
+}
diff --git a/src/modules/editor/index.ts b/src/modules/editor/index.ts
@@ -0,0 +1,4 @@
+export {default as editor} from './editor';
+export {default as dir} from './dir';
+
+export {default as ToggleDevTools} from './ToggleDevTools';
diff --git a/src/modules/editor/types.ts b/src/modules/editor/types.ts
@@ -0,0 +1 @@
+export const EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';
diff --git a/src/reducers/devTools-toggle/index.ts b/src/reducers/devTools-toggle/index.ts
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
@@ -1,8 +1,6 @@
 import {combineReducers} from 'redux';
 
 // reducers
-import devToolsToggle from './devTools-toggle';
-import dir from './dir';
 import packageJson from './package-json';
 import page from './page';
 import pagePosition from './page-position';
@@ -20,9 +18,10 @@ import {testRun, taskPosition} from '../modules/tests';
 import {reducer as tutorial} from '../modules/tutorial';
 import {reducer as tutorials} from '../modules/tutorials';
 import {reducer as windowToggle} from '../modules/window';
+import {dir, editor} from '../modules/editor';
 
 export default combineReducers({
-  alert, checks, devToolsToggle, dir, hintPosition,
+  alert, checks, editor, dir, hintPosition,
   packageJson, page, pagePosition, progress, route, tasks,
   tutorial, tutorials,
   taskActions, taskPosition, taskTests, testRun, windowToggle
diff --git a/tsconfig.json b/tsconfig.json
@@ -75,6 +75,11 @@
         "src/modules/alert/index.ts",
         "src/modules/alert/reducer.ts",
         "src/modules/alert/types.ts",
+        "src/modules/editor/actions.ts",
+        "src/modules/editor/dir/index.ts",
+        "src/modules/editor/editor/index.ts",
+        "src/modules/editor/index.ts",
+        "src/modules/editor/types.ts",
         "src/modules/hints/actions.ts",
         "src/modules/hints/index.ts",
         "src/modules/hints/reducer.ts",
@@ -116,8 +121,6 @@
         "src/modules/window/index.ts",
         "src/modules/window/reducer.ts",
         "src/modules/window/types.ts",
-        "src/reducers/devTools-toggle/index.ts",
-        "src/reducers/dir/index.ts",
         "src/reducers/index.ts",
         "src/reducers/package-json/index.ts",
         "src/reducers/page-position/index.ts",
@@ -155,7 +158,6 @@
         "src/components/Page/PageToolbar/Continue/index.tsx",
         "src/components/Page/PageToolbar/index.tsx",
         "src/components/Page/PageToolbar/Save/index.tsx",
-        "src/components/Page/PageToolbar/ToggleLog/index.tsx",
         "src/components/Page/ProgressBar/index.tsx",
         "src/components/Page/Task/index.tsx",
         "src/components/Page/Task/taskCheckbox.tsx",
@@ -169,6 +171,7 @@
         "src/components/Start/index.tsx",
         "src/components/Start/Welcome/index.tsx",
         "src/modules/alert/Alert.tsx",
+        "src/modules/editor/ToggleDevTools/index.tsx",
         "src/modules/hints/Hints/HintButton.tsx",
         "src/modules/hints/Hints/index.tsx",
         "src/modules/route/RouteButton.tsx",
