Skip to content

Commit 5c42567

Browse files
ShMcKShMcK
committed
create editor module
1 parent 961c950 commit 5c42567

File tree

27 files changed

+93
-79
lines changed

27 files changed

+93
-79
lines changed

‎lib/actions/_types.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
33
exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
4-
exports.DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
54
exports.PAGE_SET = 'PAGE_SET';
65
exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
76
exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';

‎lib/actions/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ exports.progressPagePositionLoad = progress_1.progressPagePositionLoad;
77
var page_1 = require('./page');
88
exports.pageSet = page_1.pageSet;
99
exports.pageNext = page_1.pageNext;
10-
var toggle_1 = require('./toggle');
11-
exports.devToolsToggle = toggle_1.devToolsToggle;
1210
var actions_1 = require('../modules/alert/actions');
1311
exports.alertOpen = actions_1.alertOpen;
1412
exports.alertClose = actions_1.alertClose;

‎lib/actions/toggle.js

-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
"use strict";
2-
var _types_1 = require('./_types');
3-
function devToolsToggle() {
4-
return { type: _types_1.DEVTOOLS_TOGGLE };
5-
}
6-
exports.devToolsToggle = devToolsToggle;

‎lib/components/Page/PageToolbar/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var React = require('react');
33
var Toolbar_1 = require('material-ui/Toolbar');
4-
var ToggleLog_1 = require('./ToggleLog');
4+
var index_1 = require('../../index');
55
var Save_1 = require('./Save');
66
var Continue_1 = require('./Continue');
77
var styles = {
@@ -15,7 +15,7 @@ var styles = {
1515
};
1616
exports.PageToolbar = function (_a) {
1717
var tasks = _a.tasks, taskPosition = _a.taskPosition, children = _a.children;
18-
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 ?
18+
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 ?
1919
React.createElement(Continue_1.default, null) : React.createElement(Save_1.default, null)))));
2020
};
2121
Object.defineProperty(exports, "__esModule", { value: true });

‎lib/components/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ var setup_1 = require('../modules/setup');
2323
exports.Checks = setup_1.Checks;
2424
var tutorials_1 = require('../modules/tutorials');
2525
exports.Tutorials = tutorials_1.Tutorials;
26+
var editor_1 = require('../modules/editor');
27+
exports.ToggleDevTools = editor_1.ToggleDevTools;

‎lib/components/Page/PageToolbar/ToggleLog/index.js renamed to ‎lib/modules/editor/ToggleDevTools/index.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1414
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
1515
};
1616
var React = require('react');
17-
var code_1 = require('material-ui/svg-icons/action/code');
1817
var react_redux_1 = require('react-redux');
19-
var actions_1 = require('../../../../actions');
18+
var actions_1 = require('../actions');
2019
var FlatButton_1 = require('material-ui/FlatButton');
20+
var code_1 = require('material-ui/svg-icons/action/code');
2121
var styles = {
2222
position: 'relative',
2323
top: '10px',
2424
};
25-
var ToggleLog = (function (_super) {
26-
__extends(ToggleLog, _super);
27-
function ToggleLog() {
25+
var ToggleDevTools = (function (_super) {
26+
__extends(ToggleDevTools, _super);
27+
function ToggleDevTools() {
2828
_super.apply(this, arguments);
2929
}
30-
ToggleLog.prototype.render = function () {
31-
return (React.createElement(FlatButton_1.default, {style: styles, icon: React.createElement(code_1.default, null), onTouchTap: this.props.toggleDevTools}));
30+
ToggleDevTools.prototype.render = function () {
31+
return (React.createElement(FlatButton_1.default, {style: styles, icon: React.createElement(code_1.default, null), onTouchTap: this.props.toggle}));
3232
};
3333
;
34-
ToggleLog = __decorate([
34+
ToggleDevTools = __decorate([
3535
react_redux_1.connect(null, function (dispatch, state) {
3636
return {
37-
toggleDevTools: function () { return dispatch(actions_1.devToolsToggle()); }
37+
toggle: function () { return dispatch(actions_1.editorDevToolsToggle()); }
3838
};
3939
}),
4040
__metadata('design:paramtypes', [])
41-
], ToggleLog);
42-
return ToggleLog;
41+
], ToggleDevTools);
42+
return ToggleDevTools;
4343
}(React.Component));
4444
Object.defineProperty(exports, "__esModule", { value: true });
45-
exports.default = ToggleLog;
45+
exports.default = ToggleDevTools;

‎lib/modules/editor/actions.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
var types_1 = require('./types');
3+
function editorDevToolsToggle() {
4+
return { type: types_1.EDITOR_DEVTOOLS_TOGGLE };
5+
}
6+
exports.editorDevToolsToggle = editorDevToolsToggle;

‎lib/reducers/dir/index.js renamed to ‎lib/modules/editor/dir/index.js

File renamed without changes.

‎lib/modules/editor/editor/index.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
"use strict";
2+
var types_1 = require('../types');
3+
var editor_1 = require('../../../atom/editor');
4+
function editor(editor, action) {
5+
if (editor === void 0) { editor = 'atom'; }
6+
switch (action.type) {
7+
case types_1.EDITOR_DEVTOOLS_TOGGLE:
8+
editor_1.toggleDevTools();
9+
return editor;
10+
default:
11+
return editor;
12+
}
13+
}
14+
Object.defineProperty(exports, "__esModule", { value: true });
15+
exports.default = editor;

‎lib/modules/editor/index.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
var editor_1 = require('./editor');
3+
exports.editor = editor_1.default;
4+
var dir_1 = require('./dir');
5+
exports.dir = dir_1.default;
6+
var ToggleDevTools_1 = require('./ToggleDevTools');
7+
exports.ToggleDevTools = ToggleDevTools_1.default;

‎lib/modules/editor/types.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"use strict";
2+
exports.EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';

‎lib/reducers/devTools-toggle/index.js

-15
This file was deleted.

‎lib/reducers/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"use strict";
22
var redux_1 = require('redux');
3-
var devTools_toggle_1 = require('./devTools-toggle');
4-
var dir_1 = require('./dir');
53
var package_json_1 = require('./package-json');
64
var page_1 = require('./page');
75
var page_position_1 = require('./page-position');
@@ -17,9 +15,10 @@ var tests_1 = require('../modules/tests');
1715
var tutorial_1 = require('../modules/tutorial');
1816
var tutorials_1 = require('../modules/tutorials');
1917
var window_1 = require('../modules/window');
18+
var editor_1 = require('../modules/editor');
2019
Object.defineProperty(exports, "__esModule", { value: true });
2120
exports.default = redux_1.combineReducers({
22-
alert: alert_1.reducer, checks: setup_1.reducer, devToolsToggle: devTools_toggle_1.default, dir: dir_1.default, hintPosition: hints_1.reducer,
21+
alert: alert_1.reducer, checks: setup_1.reducer, editor: editor_1.editor, dir: editor_1.dir, hintPosition: hints_1.reducer,
2322
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,
2423
tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
2524
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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export const COMPLETE_PAGE = 'COMPLETE_PAGE';
22
export const COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
3-
export const DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
43
export const PAGE_SET = 'PAGE_SET';
54
export const PROGRESS_LOAD = 'PROGRESS_LOAD';
65
export const PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';

‎src/actions/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ export {
55
} from './progress';
66
export {pageSet, pageNext} from './page';
77

8-
export {devToolsToggle} from './toggle';
9-
108
// Modules
119
export {alertOpen, alertClose, alertReplay} from '../modules/alert/actions';
1210
export {routeSet} from '../modules/route/actions';
@@ -15,3 +13,4 @@ export {hintPositionSet} from '../modules/hints/actions';
1513
export {testRun, testResult, testSave, testComplete} from '../modules/tests/actions';
1614
export {tutorialSet} from '../modules/tutorial/actions';
1715
export {tutorialsFind, tutorialUpdate} from '../modules/tutorials/actions';
16+
export {devTools, dir} from '../modules/editor/actions';

‎src/actions/toggle.ts

-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +0,0 @@
1-
import {DEVTOOLS_TOGGLE} from './_types';
2-
3-
export function devToolsToggle(): Action {
4-
return { type: DEVTOOLS_TOGGLE };
5-
}

‎src/components/Page/PageToolbar/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
3-
import ToggleLog from './ToggleLog';
3+
import {ToggleDevTools} from '../../index';
44
import Save from './Save';
55
import Continue from './Continue';
66

@@ -21,7 +21,7 @@ export const PageToolbar: React.StatelessComponent<{
2121
{children}
2222
<Toolbar>
2323
<ToolbarGroup float='left'>
24-
<ToggleLog />
24+
<ToggleDevTools />
2525
</ToolbarGroup>
2626
<ToolbarGroup float='right'>
2727
{taskPosition >= tasks.length ?

‎src/components/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ export {Alert} from '../modules/alert';
1111
export {RouteButton} from '../modules/route';
1212
export {Checks} from '../modules/setup';
1313
export {Tutorials} from '../modules/tutorials';
14+
export {ToggleDevTools} from '../modules/editor';

‎src/components/Page/PageToolbar/ToggleLog/index.tsx renamed to ‎src/modules/editor/ToggleDevTools/index.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as React from 'react';
2-
import Code from 'material-ui/svg-icons/action/code';
32
import {connect} from 'react-redux';
4-
import {devToolsToggle} from '../../../../actions';
3+
import {editorDevToolsToggle} from '../actions';
54
import FlatButton from 'material-ui/FlatButton';
5+
import Code from 'material-ui/svg-icons/action/code';
66

77
const styles = {
88
position: 'relative',
@@ -11,11 +11,11 @@ const styles = {
1111

1212
@connect(null, (dispatch, state) => {
1313
return {
14-
toggleDevTools: () => dispatch(devToolsToggle())
14+
toggle: () => dispatch(editorDevToolsToggle())
1515
};
1616
})
17-
export default class ToggleLog extends React.Component<{
18-
toggleDevTools?: any
17+
export default class ToggleDevTools extends React.Component<{
18+
toggle?: any
1919
}, {}> {
2020
render() {
2121
return (
@@ -24,7 +24,7 @@ export default class ToggleLog extends React.Component<{
2424
icon={
2525
<Code />
2626
}
27-
onTouchTap={this.props.toggleDevTools}
27+
onTouchTap={this.props.toggle}
2828
/>
2929
);
3030
};

‎src/modules/editor/actions.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import {EDITOR_DEVTOOLS_TOGGLE} from './types';
2+
3+
export function editorDevToolsToggle(): Action {
4+
return { type: EDITOR_DEVTOOLS_TOGGLE };
5+
}

‎src/reducers/dir/index.ts renamed to ‎src/modules/editor/dir/index.ts

File renamed without changes.

‎src/modules/editor/editor/index.ts

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import {EDITOR_DEVTOOLS_TOGGLE} from '../types';
2+
import {toggleDevTools} from '../../../atom/editor';
3+
4+
// trigger editor actions here
5+
export default function editor(
6+
editor = 'atom', action: Action
7+
): string {
8+
switch (action.type) {
9+
10+
case EDITOR_DEVTOOLS_TOGGLE:
11+
toggleDevTools();
12+
return editor;
13+
14+
default:
15+
return editor;
16+
}
17+
}

‎src/modules/editor/index.ts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export {default as editor} from './editor';
2+
export {default as dir} from './dir';
3+
4+
export {default as ToggleDevTools} from './ToggleDevTools';

‎src/modules/editor/types.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';

‎src/reducers/devTools-toggle/index.ts

-16
This file was deleted.

‎src/reducers/index.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {combineReducers} from 'redux';
22

33
// reducers
4-
import devToolsToggle from './devTools-toggle';
5-
import dir from './dir';
64
import packageJson from './package-json';
75
import page from './page';
86
import pagePosition from './page-position';
@@ -20,9 +18,10 @@ import {testRun, taskPosition} from '../modules/tests';
2018
import {reducer as tutorial} from '../modules/tutorial';
2119
import {reducer as tutorials} from '../modules/tutorials';
2220
import {reducer as windowToggle} from '../modules/window';
21+
import {dir, editor} from '../modules/editor';
2322

2423
export default combineReducers({
25-
alert, checks, devToolsToggle, dir, hintPosition,
24+
alert, checks, editor, dir, hintPosition,
2625
packageJson, page, pagePosition, progress, route, tasks,
2726
tutorial, tutorials,
2827
taskActions, taskPosition, taskTests, testRun, windowToggle

‎tsconfig.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"src/modules/alert/index.ts",
7676
"src/modules/alert/reducer.ts",
7777
"src/modules/alert/types.ts",
78+
"src/modules/editor/actions.ts",
79+
"src/modules/editor/dir/index.ts",
80+
"src/modules/editor/editor/index.ts",
81+
"src/modules/editor/index.ts",
82+
"src/modules/editor/types.ts",
7883
"src/modules/hints/actions.ts",
7984
"src/modules/hints/index.ts",
8085
"src/modules/hints/reducer.ts",
@@ -116,8 +121,6 @@
116121
"src/modules/window/index.ts",
117122
"src/modules/window/reducer.ts",
118123
"src/modules/window/types.ts",
119-
"src/reducers/devTools-toggle/index.ts",
120-
"src/reducers/dir/index.ts",
121124
"src/reducers/index.ts",
122125
"src/reducers/package-json/index.ts",
123126
"src/reducers/page-position/index.ts",
@@ -155,7 +158,6 @@
155158
"src/components/Page/PageToolbar/Continue/index.tsx",
156159
"src/components/Page/PageToolbar/index.tsx",
157160
"src/components/Page/PageToolbar/Save/index.tsx",
158-
"src/components/Page/PageToolbar/ToggleLog/index.tsx",
159161
"src/components/Page/ProgressBar/index.tsx",
160162
"src/components/Page/Task/index.tsx",
161163
"src/components/Page/Task/taskCheckbox.tsx",
@@ -169,6 +171,7 @@
169171
"src/components/Start/index.tsx",
170172
"src/components/Start/Welcome/index.tsx",
171173
"src/modules/alert/Alert.tsx",
174+
"src/modules/editor/ToggleDevTools/index.tsx",
172175
"src/modules/hints/Hints/HintButton.tsx",
173176
"src/modules/hints/Hints/index.tsx",
174177
"src/modules/route/RouteButton.tsx",

0 commit comments

Comments
 (0)