Skip to content

Commit 23cdb3b

Browse files
committed
refactor page into modules, flatten store/actions/reducers
1 parent 5c42567 commit 23cdb3b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3625
-3970
lines changed

lib/actions.js

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
"use strict";
2+
var actions_1 = require('./modules/alert/actions');
3+
exports.alertOpen = actions_1.alertOpen;
4+
exports.alertClose = actions_1.alertClose;
5+
exports.alertReplay = actions_1.alertReplay;
6+
var actions_2 = require('./modules/editor/actions');
7+
exports.editorDevToolsToggle = actions_2.editorDevToolsToggle;
8+
var actions_3 = require('./modules/hints/actions');
9+
exports.hintPositionSet = actions_3.hintPositionSet;
10+
var actions_4 = require('./modules/page/actions');
11+
exports.pageSet = actions_4.pageSet;
12+
exports.pageNext = actions_4.pageNext;
13+
var actions_5 = require('./modules/progress/actions');
14+
exports.progressLoad = actions_5.progressLoad;
15+
exports.progressCompletePage = actions_5.progressCompletePage;
16+
var actions_6 = require('./modules/route/actions');
17+
exports.routeSet = actions_6.routeSet;
18+
var actions_7 = require('./modules/setup/actions');
19+
exports.setupVerify = actions_7.setupVerify;
20+
exports.setupPackage = actions_7.setupPackage;
21+
var actions_8 = require('./modules/tests/actions');
22+
exports.testRun = actions_8.testRun;
23+
exports.testResult = actions_8.testResult;
24+
exports.testSave = actions_8.testSave;
25+
exports.testComplete = actions_8.testComplete;
26+
var actions_9 = require('./modules/tutorial/actions');
27+
exports.tutorialSet = actions_9.tutorialSet;
28+
var actions_10 = require('./modules/tutorials/actions');
29+
exports.tutorialsFind = actions_10.tutorialsFind;
30+
exports.tutorialUpdate = actions_10.tutorialUpdate;

lib/actions/_types.js

-8
This file was deleted.

lib/actions/index.js

-30
This file was deleted.

lib/actions/progress.js

-53
This file was deleted.

lib/actions/toggle.js

Whitespace-only changes.

lib/actions/tutorial.js

-31
This file was deleted.

lib/atom/editor.js

-18
This file was deleted.

lib/components/AppMenu/Quit/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var React = require('react');
3+
var subscriptions_1 = require('../../../subscriptions');
34
var MenuItem_1 = require('material-ui/MenuItem');
4-
var subscriptions_1 = require('../../../atom/subscriptions');
55
var styles = {
66
textAlign: 'center',
77
padding: '0px 2px',

lib/atom/main.js renamed to lib/main.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
2-
var render_1 = require('../components/render');
3-
var root_1 = require('../components/root');
4-
var polyfills_1 = require('../services/polyfills');
2+
var render_1 = require('./components/render');
3+
var root_1 = require('./components/root');
4+
var polyfills_1 = require('./services/polyfills');
55
var subscriptions_1 = require('./subscriptions');
6-
var store_1 = require('../store');
7-
var actions_1 = require('../modules/setup/actions');
6+
var store_1 = require('./store');
7+
var actions_1 = require('./modules/setup/actions');
88
var Main = (function () {
99
function Main() {
1010
polyfills_1.default();
File renamed without changes.
File renamed without changes.

lib/atom/actions/file.js renamed to lib/modules/editor/actions/file.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var fs_1 = require('fs');
3-
var exists_1 = require('../../services/exists');
3+
var exists_1 = require('../../../services/exists');
44
var editor_1 = require('./editor');
55
var openTimeout = 200;
66
function openFolder() {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib/reducers/task-actions/editor-reducer.js renamed to lib/modules/editor/editor.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
var editor_1 = require('../../atom/editor');
2+
var index_1 = require('./index');
33
var parser_1 = require('./parser');
44
var Type = {
55
OPEN: 'open',
@@ -17,7 +17,7 @@ function editorActionReducer(actionString) {
1717
var file = obj.param;
1818
var options = obj.options;
1919
if (params.length === 1) {
20-
editor_1.open(file, options);
20+
index_1.open(file, options);
2121
setTimeout(function () {
2222
resolve();
2323
}, 100);
@@ -27,7 +27,7 @@ function editorActionReducer(actionString) {
2727
if (params.length === 1) {
2828
var content_1 = params[0];
2929
setTimeout(function () {
30-
editor_1.set(content_1);
30+
index_1.set(content_1);
3131
resolve(true);
3232
});
3333
}
@@ -36,15 +36,15 @@ function editorActionReducer(actionString) {
3636
if (params.length === 1) {
3737
var content_2 = params[0];
3838
setTimeout(function () {
39-
editor_1.insert(content_2, {});
39+
index_1.insert(content_2, {});
4040
resolve(true);
4141
});
4242
}
4343
break;
4444
case Type.OPEN_CONSOLE:
4545
if (params.length === 0) {
4646
setTimeout(function () {
47-
editor_1.openDevTools();
47+
index_1.openDevTools();
4848
resolve(true);
4949
});
5050
}

lib/modules/editor/index.js

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
"use strict";
2-
var editor_1 = require('./editor');
3-
exports.editor = editor_1.default;
2+
var reducer_1 = require('./reducer');
3+
exports.reducer = reducer_1.default;
44
var dir_1 = require('./dir');
55
exports.dir = dir_1.default;
66
var ToggleDevTools_1 = require('./ToggleDevTools');
77
exports.ToggleDevTools = ToggleDevTools_1.default;
8+
var file_1 = require('./actions/file');
9+
exports.save = file_1.save;
10+
exports.open = file_1.open;
11+
exports.openFolder = file_1.openFolder;
12+
var write_1 = require('./actions/write');
13+
exports.set = write_1.set;
14+
exports.insert = write_1.insert;
15+
var console_1 = require('./actions/console');
16+
exports.openDevTools = console_1.openDevTools;
17+
exports.toggleDevTools = console_1.toggleDevTools;
18+
exports.clearConsole = console_1.clearConsole;
19+
var terminal_1 = require('./actions/terminal');
20+
exports.openTerminal = terminal_1.openTerminal;
21+
var tabs_1 = require('./actions/tabs');
22+
exports.closeAllPanels = tabs_1.closeAllPanels;
23+
var quit_1 = require('./actions/quit');
24+
exports.quit = quit_1.quit;

lib/modules/editor/editor/index.js renamed to lib/modules/editor/reducer.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"use strict";
2-
var types_1 = require('../types');
3-
var editor_1 = require('../../../atom/editor');
2+
var types_1 = require('./types');
3+
var index_1 = require('./index');
44
function editor(editor, action) {
55
if (editor === void 0) { editor = 'atom'; }
66
switch (action.type) {
77
case types_1.EDITOR_DEVTOOLS_TOGGLE:
8-
editor_1.toggleDevTools();
8+
index_1.toggleDevTools();
99
return editor;
1010
default:
1111
return editor;

lib/actions/page.js renamed to lib/modules/page/actions.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
2-
var _types_1 = require('./_types');
3-
var index_1 = require('./index');
2+
var types_1 = require('./types');
3+
var actions_1 = require('../../actions');
44
function pageNext() {
55
return function (dispatch, getState) {
66
var pagePosition = getState().pagePosition;
@@ -13,12 +13,12 @@ function pageSet(pagePosition) {
1313
return function (dispatch, getState) {
1414
var _a = getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial, route = _a.route;
1515
if (pagePosition >= progress.pages.length) {
16-
return dispatch(index_1.routeSet('final'));
16+
return dispatch(actions_1.routeSet('final'));
1717
}
18-
dispatch(index_1.hintPositionSet(0));
18+
dispatch(actions_1.hintPositionSet(0));
1919
var tasks = tutorial.pages[pagePosition].tasks || [];
2020
dispatch({
21-
type: _types_1.PAGE_SET, payload: { dir: dir, pagePosition: pagePosition, tutorial: tutorial, progress: progress, tasks: tasks }
21+
type: types_1.PAGE_SET, payload: { dir: dir, pagePosition: pagePosition, tutorial: tutorial, progress: progress, tasks: tasks }
2222
});
2323
};
2424
}

lib/modules/page/index.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"use strict";
2+
var page_1 = require('./page');
3+
exports.page = page_1.default;
4+
var page_position_1 = require('./page-position');
5+
exports.pagePosition = page_position_1.default;
6+
var task_actions_1 = require('./task-actions');
7+
exports.taskActions = task_actions_1.default;
8+
var task_tests_1 = require('./task-tests');
9+
exports.taskTests = task_tests_1.default;
10+
var tasks_1 = require('./tasks');
11+
exports.tasks = tasks_1.default;
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"use strict";
2-
var _types_1 = require('../../actions/_types');
3-
function pagePositionReducer(pagePosition, action) {
2+
var types_1 = require('../types');
3+
function pagePosition(pagePosition, action) {
44
if (pagePosition === void 0) { pagePosition = 0; }
55
switch (action.type) {
6-
case _types_1.PAGE_SET:
6+
case types_1.PAGE_SET:
77
return action.payload.pagePosition;
88
default:
99
return pagePosition;
1010
}
1111
}
1212
Object.defineProperty(exports, "__esModule", { value: true });
13-
exports.default = pagePositionReducer;
13+
exports.default = pagePosition;

lib/reducers/page/index.js renamed to lib/modules/page/page/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"use strict";
2-
var _types_1 = require('../../actions/_types');
2+
var types_1 = require('../types');
33
var _page = {
44
title: '',
55
description: '',
66
};
77
function pageReducer(p, action) {
88
if (p === void 0) { p = _page; }
99
switch (action.type) {
10-
case _types_1.PAGE_SET:
10+
case types_1.PAGE_SET:
1111
var _a = action.payload, pagePosition = _a.pagePosition, tutorial = _a.tutorial;
1212
var _b = tutorial.pages[pagePosition], title = _b.title, description = _b.description, onPageComplete = _b.onPageComplete;
1313
return {

lib/reducers/task-actions/index.js renamed to lib/modules/page/task-actions/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"use strict";
2-
var _types_1 = require('../../actions/_types');
3-
var editor_reducer_1 = require('./editor-reducer');
2+
var types_1 = require('../types');
3+
var editor_1 = require('../../editor/editor');
44
function handleTaskActions(actions) {
55
var next = actions.shift();
66
if (next && next.length) {
77
next.reduce(function (total, curr) {
8-
return total.then(function () { return editor_reducer_1.default(curr); });
8+
return total.then(function () { return editor_1.default(curr); });
99
}, Promise.resolve());
1010
}
1111
}
@@ -14,7 +14,7 @@ function taskActionsReducer(taskActions, action) {
1414
if (taskActions === void 0) { taskActions = []; }
1515
var actions = null;
1616
switch (action.type) {
17-
case _types_1.PAGE_SET:
17+
case types_1.PAGE_SET:
1818
var _a = action.payload, tasks = _a.tasks, pagePosition = _a.pagePosition, progress = _a.progress;
1919
var isCompleted = progress.pages[pagePosition];
2020
if (!isCompleted) {
@@ -28,7 +28,7 @@ function taskActionsReducer(taskActions, action) {
2828
taskTracker = 0;
2929
handleTaskActions(actions);
3030
return actions;
31-
case _types_1.TEST_RESULT:
31+
case 'TEST_RESULT':
3232
actions = action.payload.taskActions || [];
3333
var nextTaskPosition = action.payload.result.taskPosition;
3434
var times = nextTaskPosition - taskTracker;

0 commit comments

Comments
 (0)