Skip to content

Commit 37e2e70

Browse files
ShMcKShMcK
committed
move store out of reducers into actions, material-ui@0.15
1 parent 9c18bfe commit 37e2e70

File tree

48 files changed

+110
-224
lines changed

Some content is hidden

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

48 files changed

+110
-224
lines changed

‎lib/actions/alert.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ function alertToggle(alert) {
1313
else {
1414
alert = Object.assign({}, { open: !isOpen }, alert);
1515
}
16-
return {
17-
payload: { alert: alert },
18-
type: _types_1.ALERT_TOGGLE,
19-
};
16+
return { type: _types_1.ALERT_TOGGLE, payload: { alert: alert } };
2017
}
2118
exports.alertToggle = alertToggle;
2219
function alertReplay() {

‎lib/actions/hint.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
"use strict";
22
var _types_1 = require('./_types');
33
function hintPositionSet(hintPosition) {
4-
return {
5-
payload: { hintPosition: hintPosition },
6-
type: _types_1.HINT_POSITION_SET,
7-
};
4+
return { type: _types_1.HINT_POSITION_SET, payload: { hintPosition: hintPosition } };
85
}
96
exports.hintPositionSet = hintPositionSet;
107
function hintShow() {

‎lib/actions/package.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
"use strict";
22
var _types_1 = require('./_types');
3+
var store_1 = require('../store');
34
function packageSet() {
4-
return { type: _types_1.PACKAGE_SET };
5+
var dir = store_1.default.getState().dir;
6+
return { type: _types_1.PACKAGE_SET, payload: { dir: dir } };
57
}
68
exports.packageSet = packageSet;

‎lib/actions/page.js

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,33 @@ function pageNext() {
66
var pagePosition = store_1.default.getState().pagePosition;
77
var pages = store_1.default.getState().tutorial.pages;
88
if (pagePosition >= pages.length - 1) {
9-
return {
10-
payload: { route: 'final' },
11-
type: _types_1.ROUTE_SET,
12-
};
9+
return { type: _types_1.ROUTE_SET, payload: { route: 'final' } };
1310
}
1411
else {
1512
pagePosition = pagePosition + 1;
1613
setTimeout(function () { return store_1.default.dispatch(test_1.testsLoad(pagePosition)); });
17-
return {
18-
payload: { pagePosition: pagePosition },
19-
type: _types_1.PAGE_SET,
20-
};
14+
return { type: _types_1.PAGE_SET, payload: { pagePosition: pagePosition } };
2115
}
2216
}
2317
exports.pageNext = pageNext;
2418
function pageSet(pagePosition) {
2519
if (pagePosition === void 0) { pagePosition = 0; }
26-
if (pagePosition >= store_1.default.getState().progress.pages.length) {
20+
var _a = store_1.default.getState(), progress = _a.progress, tutorial = _a.tutorial;
21+
if (pagePosition >= progress.pages.length) {
2722
return {
2823
payload: { route: 'final' },
2924
type: _types_1.ROUTE_SET,
3025
};
3126
}
32-
return {
33-
payload: { pagePosition: pagePosition },
34-
type: _types_1.PAGE_SET,
35-
};
27+
return { type: _types_1.PAGE_SET, payload: { pagePosition: pagePosition, tutorial: tutorial } };
3628
}
3729
exports.pageSet = pageSet;
3830
function pagePositionLoad() {
39-
return { type: _types_1.PAGE_POSITION_LOAD };
31+
var progress = store_1.default.getState().progress;
32+
return { type: _types_1.PAGE_POSITION_LOAD, payload: { progress: progress } };
4033
}
4134
exports.pagePositionLoad = pagePositionLoad;
4235
function pagePositionSet(pagePosition) {
43-
return {
44-
payload: { pagePosition: pagePosition },
45-
type: _types_1.PAGE_POSITION_SET,
46-
};
36+
return { type: _types_1.PAGE_POSITION_SET, payload: { pagePosition: pagePosition } };
4737
}
4838
exports.pagePositionSet = pagePositionSet;

‎lib/actions/progress.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,17 @@ var _types_1 = require('./_types');
33
var page_1 = require('./page');
44
var store_1 = require('../store');
55
function progressLoad() {
6-
setTimeout(function () {
7-
store_1.default.dispatch(page_1.pagePositionLoad());
8-
});
9-
return { type: _types_1.PROGRESS_LOAD };
6+
setTimeout(function () { return store_1.default.dispatch(page_1.pagePositionLoad()); });
7+
var tutorial = store_1.default.getState().tutorial;
8+
return { type: _types_1.PROGRESS_LOAD, payload: { tutorial: tutorial } };
109
}
1110
exports.progressLoad = progressLoad;
12-
function isTrue(x) {
13-
return x === true;
14-
}
1511
function completePage() {
16-
var pagePosition = store_1.default.getState().pagePosition;
17-
var progress = store_1.default.getState().progress;
12+
var _a = store_1.default.getState(), pagePosition = _a.pagePosition, progress = _a.progress;
1813
if (progress.pages.every(function (x) { return x.completed; })) {
1914
store_1.default.dispatch(completeTutorial());
2015
}
21-
return {
22-
payload: { pagePosition: pagePosition },
23-
type: _types_1.COMPLETE_PAGE,
24-
};
16+
return { type: _types_1.COMPLETE_PAGE, payload: { pagePosition: pagePosition } };
2517
}
2618
exports.completePage = completePage;
2719
function completeTutorial() {

‎lib/actions/route.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ function routeSet(route) {
1010
store_1.default.dispatch(tutorial_1.tutorialsFind());
1111
}
1212
previous = route;
13-
return {
14-
payload: { route: route },
15-
type: _types_1.ROUTE_SET,
16-
};
13+
return { type: _types_1.ROUTE_SET, payload: { route: route } };
1714
}
1815
}
1916
exports.routeSet = routeSet;

‎lib/actions/test.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ function testRun() {
77
exports.testRun = testRun;
88
function testResult(result) {
99
var actions = store_1.default.getState().taskActions;
10-
return {
11-
payload: { result: result, actions: actions },
12-
type: _types_1.TEST_RESULT,
13-
};
10+
return { type: _types_1.TEST_RESULT, payload: { result: result, actions: actions } };
1411
}
1512
exports.testResult = testResult;
1613
function testComplete() {
@@ -22,6 +19,7 @@ function testSave() {
2219
}
2320
exports.testSave = testSave;
2421
function testsLoad(pagePosition) {
25-
return { type: _types_1.TESTS_LOAD, payload: { pagePosition: pagePosition } };
22+
var _a = store_1.default.getState(), tasks = _a.tasks, progress = _a.progress;
23+
return { type: _types_1.TESTS_LOAD, payload: { pagePosition: pagePosition, tasks: tasks, progress: progress } };
2624
}
2725
exports.testsLoad = testsLoad;

‎lib/actions/tutorial.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
"use strict";
22
var _types_1 = require('./_types');
3+
var store_1 = require('../store');
34
function tutorialSet(name) {
4-
return {
5-
payload: { name: name },
6-
type: _types_1.TUTORIAL_SET,
7-
};
5+
var dir = store_1.default.getState().dir;
6+
return { type: _types_1.TUTORIAL_SET, payload: { name: name, dir: dir } };
87
}
98
exports.tutorialSet = tutorialSet;
109
function tutorialUpdate(name) {
1110
return { type: _types_1.TUTORIAL_UPDATE, payload: { name: name } };
1211
}
1312
exports.tutorialUpdate = tutorialUpdate;
1413
function tutorialsFind() {
15-
return { type: _types_1.TUTORIALS_FIND };
14+
var _a = store_1.default.getState(), packageJson = _a.packageJson, dir = _a.dir;
15+
return { type: _types_1.TUTORIALS_FIND, payload: { packageJson: packageJson, dir: dir } };
1616
}
1717
exports.tutorialsFind = tutorialsFind;

‎lib/actions/window.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎lib/components/Progress/progressIcon.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ var check_box_1 = require('material-ui/svg-icons/toggle/check-box');
55
var play_circle_filled_1 = require('material-ui/svg-icons/av/play-circle-filled');
66
var check_box_outline_blank_1 = require('material-ui/svg-icons/toggle/check-box-outline-blank');
77
function progressIcon(pages, index, pagePosition) {
8-
console.log(index, pagePosition);
98
switch (true) {
109
case pages[pagePosition]:
1110
return React.createElement(check_box_1.default, {style: { fill: colors_1.green300 }});

‎lib/components/index.js

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +0,0 @@
1-
"use strict";
2-
var Alert_1 = require('./Alert');
3-
exports.Alert = Alert_1.default;
4-
var AppMenu_1 = require('./AppMenu');
5-
exports.AppMenu = AppMenu_1.default;
6-
var FinalPage_1 = require('./FinalPage');
7-
exports.FinalPage = FinalPage_1.default;
8-
var Page_1 = require('./Page');
9-
exports.Page = Page_1.default;
10-
var Progress_1 = require('./Progress');
11-
exports.Progress = Progress_1.default;
12-
var Routes_1 = require('./Routes');
13-
exports.Routes = Routes_1.default;
14-
var Start_1 = require('./Start');
15-
exports.Start = Start_1.default;
16-
var Tutorials_1 = require('./Tutorials');
17-
exports.Tutorials = Tutorials_1.default;
18-
var Markdown_1 = require('./common/Markdown');
19-
exports.Markdown = Markdown_1.default;
20-
var RouteButton_1 = require('./common/RouteButton');
21-
exports.RouteButton = RouteButton_1.default;
22-
var ContentCard_1 = require('./common/ContentCard');
23-
exports.ContentCard = ContentCard_1.default;

‎lib/reducers/package-json/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ var _types_1 = require('../../actions/_types');
33
var path_1 = require('path');
44
var fs_1 = require('fs');
55
var exists_1 = require('../../services/exists');
6-
var store_1 = require('../../store');
76
function packageJsonReducer(pj, action) {
87
if (pj === void 0) { pj = null; }
98
switch (action.type) {
109
case _types_1.PACKAGE_SET:
11-
var dir = store_1.default.getState().dir;
12-
var pathToPackageJson = path_1.join(dir, 'package.json');
10+
var pathToPackageJson = path_1.join(action.payload.dir, 'package.json');
1311
if (exists_1.fileExists(pathToPackageJson)) {
1412
return JSON.parse(fs_1.readFileSync(pathToPackageJson, 'utf8'));
1513
}

‎lib/reducers/page-position/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var store_1 = require('../../store');
43
function pagePositionReducer(pagePosition, action) {
54
if (pagePosition === void 0) { pagePosition = 0; }
65
switch (action.type) {
76
case _types_1.PAGE_POSITION_LOAD:
8-
var pages = store_1.default.getState().progress.pages;
7+
var pages = action.payload.progress.pages;
98
var firstFail = pages.indexOf(false);
109
return firstFail < 0 ? pages.length - 1 : firstFail;
1110
case _types_1.PAGE_SET:

‎lib/reducers/page/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var store_1 = require('../../store');
43
var editor_1 = require('../../atom/editor');
54
var _page = {
65
title: '',
@@ -12,7 +11,7 @@ function pageReducer(p, action) {
1211
switch (action.type) {
1312
case _types_1.PAGE_SET:
1413
var pagePosition = action.payload.pagePosition;
15-
var _a = store_1.default.getState().tutorial.pages[pagePosition], title = _a.title, description = _a.description, onPageComplete = _a.onPageComplete, completed = _a.completed;
14+
var _a = action.payload.tutorial.pages[pagePosition], title = _a.title, description = _a.description, onPageComplete = _a.onPageComplete, completed = _a.completed;
1615
editor_1.clearConsole();
1716
return {
1817
title: title,

‎lib/reducers/progress/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
33
var local_storage_1 = require('./local-storage');
4-
var store_1 = require('../../store');
54
var _progress = {
65
completed: false,
76
pages: []
@@ -16,7 +15,7 @@ function progressReducer(progress, action) {
1615
}
1716
return {
1817
completed: false,
19-
pages: store_1.default.getState().tutorial.pages.map(function () { return false; })
18+
pages: action.payload.tutorial.pages.map(function () { return false; })
2019
};
2120
case _types_1.COMPLETE_PAGE:
2221
var pagePosition = action.payload.pagePosition;

‎lib/reducers/task-actions/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
33
var editor_reducer_1 = require('./editor-reducer');
4-
var store_1 = require('../../store');
54
function handleTaskActions(actions) {
65
var next = actions.shift();
76
if (next && next.length) {
@@ -16,9 +15,8 @@ function taskActionsReducer(taskActions, action) {
1615
var actions = null;
1716
switch (action.type) {
1817
case _types_1.TESTS_LOAD:
19-
var tasks = store_1.default.getState().tasks || [];
20-
var pagePosition = store_1.default.getState().pagePosition;
21-
var isCompleted = store_1.default.getState().progress.pages[pagePosition];
18+
var _a = action.payload, tasks = _a.tasks, pagePosition = _a.pagePosition, progress = _a.progress;
19+
var isCompleted = progress.pages[pagePosition];
2220
if (!isCompleted) {
2321
actions = tasks.map(function (task) { return task.actions || []; });
2422
}

‎lib/reducers/task-tests/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
"use strict";
22
var fs_1 = require('fs');
33
var _types_1 = require('../../actions/_types');
4-
var store_1 = require('../../store');
54
function taskTestsReducer(taskTests, action) {
65
if (taskTests === void 0) { taskTests = ''; }
76
switch (action.type) {
87
case _types_1.TESTS_LOAD:
9-
return [].concat.apply([], store_1.default.getState().tasks.map(function (task) { return task.tests || []; })).reduce(function (output, file) {
8+
return [].concat.apply([], action.payload.tasks.map(function (task) { return task.tests || []; })).reduce(function (output, file) {
109
try {
1110
output += fs_1.readFileSync(file, 'utf8') + '\n';
1211
}

‎lib/reducers/tasks/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var store_1 = require('../../store');
43
var config_task_tests_1 = require('../task-tests/config-task-tests');
54
var _tasks = [{
65
actions: [],
@@ -13,8 +12,8 @@ function tasksReducer(tasks, action) {
1312
if (tasks === void 0) { tasks = _tasks; }
1413
switch (action.type) {
1514
case _types_1.PAGE_SET:
16-
var pagePosition = action.payload.pagePosition;
17-
return config_task_tests_1.default(store_1.default.getState().tutorial.pages[pagePosition].tasks || []);
15+
var _a = action.payload, tutorial = _a.tutorial, pagePosition = _a.pagePosition;
16+
return config_task_tests_1.default(tutorial.pages[pagePosition].tasks || []);
1817
default:
1918
return tasks;
2019
}

‎lib/reducers/tutorial-list/check.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ var path_1 = require('path');
33
var fs_1 = require('fs');
44
var exists_1 = require('../../services/exists');
55
var is_tutorial_1 = require('./is-tutorial');
6-
var store_1 = require('../../store');
76
var update_1 = require('./update');
8-
function searchForTutorials(deps) {
7+
function searchForTutorials(dir, deps) {
98
if (!!deps && Object.keys(deps).length > 0) {
10-
var dir_1 = store_1.default.getState().dir;
119
return (Object.keys(deps)
12-
.filter(function (name) { return is_tutorial_1.isTutorial(name); })
10+
.filter(function (name) { return is_tutorial_1.isTutorial(dir, name); })
1311
.map(function (name) {
14-
var pathToTutorialPackageJson = path_1.join(dir_1, 'node_modules', name, 'package.json');
12+
var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
1513
if (!exists_1.fileExists(pathToTutorialPackageJson)) {
1614
console.log("Error with " + name + ": no package.json file found. " + is_tutorial_1.tutorialError);
1715
return {

‎lib/reducers/tutorial-list/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var store_1 = require('../../store');
43
var check_1 = require('./check');
54
function tutorialListReducer(tutorialList, action) {
65
if (tutorialList === void 0) { tutorialList = []; }
76
switch (action.type) {
87
case _types_1.TUTORIALS_FIND:
9-
var packageJson = store_1.default.getState().packageJson;
8+
var _a = action.payload, packageJson = _a.packageJson, dir = _a.dir;
109
return ([]
11-
.concat(check_1.searchForTutorials(packageJson.dependencies))
12-
.concat(check_1.searchForTutorials(packageJson.devDependencies)));
10+
.concat(check_1.searchForTutorials(dir, packageJson.dependencies))
11+
.concat(check_1.searchForTutorials(dir, packageJson.devDependencies)));
1312
default:
1413
return tutorialList;
1514
}

‎lib/reducers/tutorial-list/is-tutorial.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
var path_1 = require('path');
33
var fs_1 = require('fs');
44
var exists_1 = require('../../services/exists');
5-
var store_1 = require('../../store');
65
exports.tutorialError = 'This is an error with the tutorial itself';
7-
function isTutorial(name) {
8-
var dir = store_1.default.getState().dir;
6+
function isTutorial(dir, name) {
97
var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
108
if (!exists_1.fileExists(pathToTutorialPackageJson)) {
119
console.log("Error with " + name + ": no package.json file found. " + exports.tutorialError);

‎lib/reducers/tutorial/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
var _types_1 = require('../../actions/_types');
33
var path_1 = require('path');
44
var tutorial_config_1 = require('./tutorial-config');
5-
var store_1 = require('../../store');
65
var _tutorial = {
76
name: null,
87
info: null,
@@ -14,12 +13,11 @@ function tutorialReducer(tutorial, action) {
1413
if (tutorial === void 0) { tutorial = _tutorial; }
1514
switch (action.type) {
1615
case _types_1.TUTORIAL_SET:
17-
var name_1 = action.payload.name;
18-
var dir = store_1.default.getState().dir;
16+
var _a = action.payload, name_1 = _a.name, dir = _a.dir;
1917
var packagePath = path_1.join(dir, 'node_modules', name_1);
2018
var packageJson = require(path_1.join(packagePath, 'package.json'));
2119
var config = tutorial_config_1.tutorialConfig(packageJson);
22-
var _a = require(path_1.join(packagePath, packageJson.main)), info = _a.info, pages = _a.pages;
20+
var _b = require(path_1.join(packagePath, packageJson.main)), info = _b.info, pages = _b.pages;
2321
return {
2422
name: packageJson.name,
2523
info: info,

0 commit comments

Comments
 (0)