Skip to content

Commit f058d1a

Browse files
ShMcKShMcK
committed
move package service into reducer
1 parent 1460520 commit f058d1a

Some content is hidden

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

66 files changed

+226
-176
lines changed

‎lib/actions/_types.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
77
exports.GLOBALS_SET = 'GLOBALS_SET';
88
exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
99
exports.HINT_SHOW = 'HINT_SHOW';
10+
exports.PACKAGE_SET = 'PACKAGE_SET';
1011
exports.PAGE_NEXT = 'PAGE_NEXT';
1112
exports.PAGE_SET = 'PAGE_SET';
1213
exports.POSITION_SET = 'POSITION_SET';

‎lib/actions/alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
var store_1 = require('../store/store');
2+
var store_1 = require('../store');
33
var _types_1 = require('./_types');
44
function alertToggle(alert) {
55
var isOpen = store_1.store.getState().alert.open;

‎lib/actions/complete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var _types_1 = require('./_types');
3-
var store_1 = require('../store/store');
3+
var store_1 = require('../store');
44
function completePage() {
55
var position = store_1.store.getState().position;
66
var pageLength = store_1.store.getState().progress.chapters[position.chapter].pages.length;

‎lib/actions/package.js

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

‎lib/actions/page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var _types_1 = require('./_types');
3-
var store_1 = require('../store/store');
3+
var store_1 = require('../store');
44
var tutorial_package_1 = require('../services/tutorial-package');
55
function pageNext() {
66
var position = store_1.store.getState().position;

‎lib/actions/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
var store_1 = require('../store/store');
2+
var store_1 = require('../store');
33
var _types_1 = require('./_types');
44
var tutorial_1 = require('./tutorial');
55
var previous = null;

‎lib/actions/setup.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
"use strict";
22
var _types_1 = require('./_types');
3+
var package_1 = require('./package');
4+
var store_1 = require('../store');
35
function setupVerify() {
6+
store_1.store.dispatch(package_1.packageSet());
47
return { type: _types_1.SETUP_VERIFY };
58
}
69
exports.setupVerify = setupVerify;

‎lib/actions/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var _types_1 = require('./_types');
3-
var store_1 = require('../store/store');
3+
var store_1 = require('../store');
44
function testRun() {
55
return { type: _types_1.TEST_RUN };
66
}

‎lib/atom/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var render_1 = require('../components/render');
33
var mount_1 = require('../components/mount');
44
var polyfills_1 = require('../services/polyfills');
55
var subscriptions_1 = require('./subscriptions');
6-
var store_1 = require('../store/store');
6+
var store_1 = require('../store');
77
var actions_1 = require('../actions');
88
function setDir() {
99
if (atom.project.rootDirectories.length > 0) {

‎lib/atom/subscriptions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var CompositeDisposable = require('atom').CompositeDisposable;
3-
var store_1 = require('../store/store');
3+
var store_1 = require('../store');
44
var actions_1 = require('../actions');
55
var mount_1 = require('../components/mount');
66
var subscriptions = null;

‎lib/components/Start/Checks/VerifyButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
var React = require('react');
1717
var FlatButton_1 = require('material-ui/FlatButton');
18-
var store_1 = require('../../../store/store');
18+
var store_1 = require('../../../store');
1919
var actions_1 = require('../../../actions');
2020
var react_redux_1 = require('react-redux');
2121
var VerifyButton = (function (_super) {

‎lib/components/render.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var React = require('react');
33
var ReactDOM = require('react-dom');
44
var react_redux_1 = require('react-redux');
5-
var store_1 = require('../store/store');
5+
var store_1 = require('../store');
66
var App_1 = require('./App');
77
var theme_1 = require('./theme');
88
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');

‎lib/reducers/alert/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var defaultAlert = {
3+
var _alert = {
44
message: '',
55
open: false,
66
action: '',
77
duration: 0
88
};
9-
var current = defaultAlert;
9+
var current = _alert;
1010
function alertReducer(alert, action) {
11-
if (alert === void 0) { alert = defaultAlert; }
11+
if (alert === void 0) { alert = _alert; }
1212
var statusBarAlert = document.getElementsByClassName('cr-alert-replay')[0];
1313
switch (action.type) {
1414
case _types_1.ALERT_REPLAY:
@@ -19,7 +19,7 @@ function alertReducer(alert, action) {
1919
duration: 2000
2020
};
2121
case _types_1.ALERT_TOGGLE:
22-
return action.payload.alert || defaultAlert;
22+
return action.payload.alert || _alert;
2323
case _types_1.TEST_RESULT:
2424
var result = action.payload.result;
2525
if (result.pass && result.change > 0) {

‎lib/reducers/checks/action-setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var path_1 = require('path');
33
var editor_1 = require('../../atom/editor');
44
var actions_1 = require('../../atom/actions');
5-
var store_1 = require('../../store/store');
5+
var store_1 = require('../../store');
66
var actions_2 = require('../../actions');
77
var packageData = "{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
88
function createPackageJson() {

‎lib/reducers/checks/action-system.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var command_line_1 = require('../../services/command-line');
3-
var store_1 = require('../../store/store');
3+
var store_1 = require('../../store');
44
var actions_1 = require('../../actions');
55
function updateNpm() {
66
command_line_1.default('npm', 'update -g npm')

‎lib/reducers/checks/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
33
var verify_1 = require('./verify');
4-
var defaultChecks = {
4+
var _checks = {
55
passed: false,
66
system: {
77
node: false,
@@ -14,7 +14,7 @@ var defaultChecks = {
1414
}
1515
};
1616
function checksReducer(checks, action) {
17-
if (checks === void 0) { checks = defaultChecks; }
17+
if (checks === void 0) { checks = _checks; }
1818
switch (action.type) {
1919
case _types_1.SETUP_VERIFY:
2020
return verify_1.default();

‎lib/reducers/checks/verify.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var check_system_1 = require('./check-system');
3-
var root_package_1 = require('../../services/root-package');
3+
var store_1 = require('../../store');
44
var check_tutorials_1 = require('../tutorials/check-tutorials');
55
var result = function (x) { return x; };
66
function allTrue(obj) {
@@ -10,8 +10,7 @@ function setupVerify() {
1010
var dir = !!window.coderoad.dir;
1111
var packageJson = false;
1212
var tutorial = false;
13-
root_package_1.default.set();
14-
var pj = root_package_1.default.get();
13+
var pj = store_1.store.getState().packageJson;
1514
if (dir) {
1615
packageJson = !!pj;
1716
}
@@ -24,7 +23,9 @@ function setupVerify() {
2423
npm: !!check_system_1.npmMinVersion()
2524
},
2625
setup: {
27-
dir: dir, packageJson: packageJson, tutorial: tutorial
26+
dir: dir,
27+
packageJson: packageJson,
28+
tutorial: tutorial
2829
}
2930
};
3031
checks.system.passed = allTrue(checks.system);

‎lib/reducers/globals/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
33
var set_globals_1 = require('./set-globals');
4-
var defaultGlobals = {
4+
var _globals = {
55
dir: null,
66
win: null
77
};
88
function globalReducer(globals, action) {
9-
if (globals === void 0) { globals = defaultGlobals; }
9+
if (globals === void 0) { globals = _globals; }
1010
switch (action.type) {
1111
case _types_1.GLOBALS_SET:
1212
var coderoad = Object.assign({}, set_globals_1.globalsSet(action.payload.packageJson), window.coderoad);

‎lib/reducers/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ var checks_1 = require('./checks');
55
var editor_actions_1 = require('./editor-actions');
66
var globals_1 = require('./globals');
77
var hint_position_1 = require('./hint-position');
8+
var package_json_1 = require('./package-json');
89
var page_1 = require('./page');
910
var position_1 = require('./position');
1011
var progress_1 = require('./progress');
@@ -18,6 +19,6 @@ var tutorials_1 = require('./tutorials');
1819
Object.defineProperty(exports, "__esModule", { value: true });
1920
exports.default = redux_1.combineReducers({
2021
alert: alert_1.default, checks: checks_1.default, editorActions: editor_actions_1.default, globals: globals_1.default, hintPosition: hint_position_1.default,
21-
page: page_1.default, position: position_1.default, progress: progress_1.default, route: route_1.default, taskPosition: task_position_1.default, taskTests: task_tests_1.default,
22-
tasks: tasks_1.default, testRun: test_run_1.default, tutorialInfo: tutorial_info_1.default, tutorials: tutorials_1.default,
22+
page: page_1.default, packageJson: package_json_1.default, position: position_1.default, progress: progress_1.default, route: route_1.default, taskPosition: task_position_1.default,
23+
taskTests: task_tests_1.default, tasks: tasks_1.default, testRun: test_run_1.default, tutorialInfo: tutorial_info_1.default, tutorials: tutorials_1.default
2324
});

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
"use strict";
2+
var _types_1 = require('../../actions/_types');
3+
var path_1 = require('path');
4+
var fs_1 = require('fs');
5+
var exists_1 = require('../../services/exists');
6+
function packageJsonReducer(pj, action) {
7+
if (pj === void 0) { pj = null; }
8+
switch (action.type) {
9+
case _types_1.PACKAGE_SET:
10+
var pathToPackageJson = path_1.join(window.coderoad.dir, 'package.json');
11+
if (exists_1.fileExists(pathToPackageJson)) {
12+
return JSON.parse(fs_1.readFileSync(pathToPackageJson, 'utf8'));
13+
}
14+
return null;
15+
default:
16+
return pj;
17+
}
18+
}
19+
Object.defineProperty(exports, "__esModule", { value: true });
20+
exports.default = packageJsonReducer;

‎lib/reducers/package/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"use strict";
2+
var _package = {};
3+
function packageReducer(package, action) {
4+
if (package === void 0) { package = _package; }
5+
switch (action.type) {
6+
default:
7+
return package;
8+
}
9+
}
10+
Object.defineProperty(exports, "__esModule", { value: true });
11+
exports.default = packageReducer;

‎lib/reducers/page/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var defaultPage = {
3+
var _page = {
44
title: '',
55
description: '',
66
completed: false
77
};
88
function pageReducer(page, action) {
9-
if (page === void 0) { page = defaultPage; }
9+
if (page === void 0) { page = _page; }
1010
switch (action.type) {
1111
case _types_1.PAGE_SET:
1212
return action.payload.page;

‎lib/reducers/position/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var defaultPosition = {
3+
var _position = {
44
chapter: 0,
55
page: 0
66
};
77
function positionReducer(position, action) {
8-
if (position === void 0) { position = defaultPosition; }
8+
if (position === void 0) { position = _position; }
99
switch (action.type) {
1010
case _types_1.PAGE_SET:
1111
case _types_1.POSITION_SET:

‎lib/reducers/progress/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
33
var tutorial_package_1 = require('../../services/tutorial-package');
4-
var defaultProgress = {
4+
var _progress = {
55
completed: false,
66
chapters: [{
77
title: '',
@@ -15,7 +15,7 @@ var defaultProgress = {
1515
}]
1616
};
1717
function progressReducer(progress, action) {
18-
if (progress === void 0) { progress = defaultProgress; }
18+
if (progress === void 0) { progress = _progress; }
1919
switch (action.type) {
2020
case _types_1.TUTORIAL_SET:
2121
return tutorial_package_1.default.getProgress();

‎lib/reducers/route/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var defaultRoute = 'start';
3+
var _route = 'start';
44
function routeReducer(route, action) {
5-
if (route === void 0) { route = defaultRoute; }
5+
if (route === void 0) { route = _route; }
66
switch (action.type) {
77
case _types_1.ROUTE_SET:
88
var next = action.payload.route;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var defaultTaskPosition = 0;
43
function taskPositionReducer(taskPosition, action) {
5-
if (taskPosition === void 0) { taskPosition = defaultTaskPosition; }
4+
if (taskPosition === void 0) { taskPosition = 0; }
65
switch (action.type) {
76
case _types_1.PAGE_SET:
87
return 0;

‎lib/reducers/tasks/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
3-
var defaultTasks = [{
3+
var _tasks = [{
44
description: '',
55
completed: false,
66
tests: [],
77
hints: [],
88
actions: []
99
}];
1010
function tasksReducer(tasks, action) {
11-
if (tasks === void 0) { tasks = defaultTasks; }
11+
if (tasks === void 0) { tasks = _tasks; }
1212
switch (action.type) {
1313
case _types_1.PAGE_SET:
1414
return action.payload.tasks;

‎lib/reducers/test-run/run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var test_result_1 = require('./test-result');
3-
var store_1 = require('../../store/store');
3+
var store_1 = require('../../store');
44
var fs_1 = require('fs');
55
var path_1 = require('path');
66
var parse_loaders_1 = require('./parse-loaders');

‎lib/reducers/test-run/test-result.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
var store_1 = require('../../store/store');
2+
var store_1 = require('../../store');
33
var actions_1 = require('../../actions');
44
function handleResult(result) {
55
store_1.store.dispatch(actions_1.testComplete());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
22
var _types_1 = require('../../actions/_types');
33
var tutorial_package_1 = require('../../services/tutorial-package');
4-
var defaultInfo = {
4+
var _info = {
55
title: '',
66
description: ''
77
};
88
function projectReducer(info, action) {
9-
if (info === void 0) { info = defaultInfo; }
9+
if (info === void 0) { info = _info; }
1010
switch (action.type) {
1111
case _types_1.TUTORIAL_SET:
1212
return tutorial_package_1.default.getTutorialInfo();

0 commit comments

Comments
 (0)