Skip to content

Commit a850bcd

Browse files
ShMcKShMcK
committed
cleaner setup
1 parent a9cf0ff commit a850bcd

34 files changed

+167
-463
lines changed

‎lib/_base.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"use strict";
22
var store_1 = require('./store/store');
33
exports.store = store_1.store;
4-
exports.initialState = store_1.initialState;
5-
exports.dispatch = store_1.dispatch;
64
var reducer_1 = require('./reducers/reducer');
75
exports.reducer = reducer_1.default;

‎lib/actions/actionTypes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use strict";
22
exports.SET_PROJECT = 'SET_PROJECT';
33
exports.VERIFY_SETUP = 'VERIFY_SETUP';
4+
exports.SET_GLOBALS = 'SET_GLOBALS';
45
exports.LOAD_TUTORIALS = 'LOAD_TUTORIALS';
56
exports.SET_ROUTE = 'SET_ROUTE';
67
exports.SET_PAGE = 'SET_PAGE';

‎lib/actions/actions.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ function setProject() {
66
return { type: Type.SET_PROJECT };
77
}
88
exports.setProject = setProject;
9+
function setGlobals(packageJson) {
10+
return { type: Type.SET_GLOBALS, payload: { packageJson: packageJson } };
11+
}
12+
exports.setGlobals = setGlobals;
913
function verifySetup() {
1014
return { type: Type.VERIFY_SETUP };
1115
}

‎lib/atom/editor.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
"use strict";
22
var fs = require('fs');
33
var exists_1 = require('../services/exists');
4-
function setAtomGlobals() {
5-
if (atom.project.rootDirectories.length > 0) {
6-
window.coderoad.dir = atom.project.rootDirectories[0].path;
7-
if (navigator.appVersion.indexOf('Win') > -1) {
8-
window.coderoad.win = true;
9-
}
10-
}
11-
else {
12-
window.coderoad.dir = null;
13-
}
14-
}
15-
exports.setAtomGlobals = setAtomGlobals;
164
var getEditorCount = 0;
175
function save() {
186
var editor = findEditor();

‎lib/atom/main.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
var render_1 = require('../components/render');
33
var polyfills_1 = require('../services/polyfills');
44
var subscriptions_1 = require('./subscriptions');
5-
var editor_1 = require('./editor');
6-
var store_1 = require('../store/store');
7-
var Action = require('../actions/actions');
85
var Main = (function () {
96
function Main() {
107
window.coderoad = {
118
dir: null
129
};
1310
polyfills_1.default();
14-
editor_1.setAtomGlobals();
15-
store_1.store.dispatch(Action.verifySetup());
1611
this.root = render_1.initRoot();
1712
}
1813
Main.prototype.activate = function () {

‎lib/reducers/globals/globals.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
"use strict";
2+
var Type = require('../../actions/actionTypes');
3+
var set_globals_1 = require('./set-globals');
4+
var defaultGlobals = {
5+
dir: set_globals_1.setDir(),
6+
win: set_globals_1.setWin()
7+
};
8+
function globalReducer(globals, action) {
9+
if (globals === void 0) { globals = defaultGlobals; }
10+
switch (action.type) {
11+
case Type.SET_GLOBALS:
12+
return Object.assign({}, set_globals_1.setGlobals(action.payload.packageJson), globals);
13+
default:
14+
return globals;
15+
}
16+
}
17+
Object.defineProperty(exports, "__esModule", { value: true });
18+
exports.default = globalReducer;

‎lib/services/set-globals.js renamed to ‎lib/reducers/globals/set-globals.js

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
11
"use strict";
22
var path = require('path');
3-
var exists_1 = require('./exists');
4-
function setGlobals(config) {
3+
var exists_1 = require('../../services/exists');
4+
function setDir() {
5+
if (atom.project.rootDirectories.length > 0) {
6+
return atom.project.rootDirectories[0].path;
7+
}
8+
else {
9+
return null;
10+
}
11+
}
12+
exports.setDir = setDir;
13+
function setWin() {
14+
return navigator.appVersion.indexOf('Win') > -1;
15+
}
16+
exports.setWin = setWin;
17+
function setGlobals(packageJson) {
518
window.coderoad = Object.assign(window.coderoad, {
6-
tutorial: config.name,
7-
suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.') + 1, config.config.testSuffix.length),
8-
tutorialDir: path.join(window.coderoad.dir, 'node_modules', config.name, config.config.testDir),
9-
testRunner: config.config.testRunner,
10-
testRunnerOptions: config.config.testRunnerOptions || {}
19+
tutorial: packageJson.name,
20+
suffix: packageJson.config.testSuffix.substring(packageJson.config.testSuffix.lastIndexOf('.') + 1, packageJson.config.testSuffix.length),
21+
tutorialDir: path.join(window.coderoad.dir, 'node_modules', packageJson.name, packageJson.config.testDir),
22+
testRunner: packageJson.config.testRunner,
23+
testRunnerOptions: packageJson.config.testRunnerOptions || {}
1124
});
12-
loadRepo(config);
13-
loadRunnerDep(config);
25+
loadRepo(packageJson);
26+
loadRunnerDep(packageJson);
1427
}
1528
exports.setGlobals = setGlobals;
16-
function loadRunnerDep(config) {
17-
var flatDep = path.join(window.coderoad.dir, 'node_modules', config.config.testRunner, 'package.json');
18-
var treeDep = path.join(window.coderoad.dir, 'node_modules', config.name, 'node_modules', config.config.testRunner, 'package.json');
29+
function loadRunnerDep(packageJson) {
30+
var flatDep = path.join(window.coderoad.dir, 'node_modules', packageJson.config.testRunner, 'package.json');
31+
var treeDep = path.join(window.coderoad.dir, 'node_modules', packageJson.name, 'node_modules', packageJson.config.testRunner, 'package.json');
1932
var runnerMain;
2033
var runnerRoot;
2134
if (exists_1.fileExists(flatDep)) {
@@ -42,16 +55,16 @@ function loadRunnerDep(config) {
4255
window.coderoad.runner = require(pathToMain);
4356
}
4457
}
45-
function loadRepo(config) {
46-
if (config.bugs && config.bugs.url) {
47-
window.coderoad.issuesPath = config.bugs.url;
58+
function loadRepo(packageJson) {
59+
if (packageJson.bugs && packageJson.bugs.url) {
60+
window.coderoad.issuesPath = packageJson.bugs.url;
4861
}
49-
if (config.repo && config.repo.url) {
50-
var repo = config.repo.url;
62+
if (packageJson.repo && packageJson.repo.url) {
63+
var repo = packageJson.repo.url;
5164
if (!!repo.match(/\.git$/)) {
5265
repo = repo.slice(0, repo.length - 4);
5366
}
5467
window.coderoad.repo = repo;
5568
}
56-
window.coderoad.edit = config.config.edit && !!window.coderoad.repo || false;
69+
window.coderoad.edit = packageJson.config.edit && !!window.coderoad.repo || false;
5770
}

‎lib/reducers/route/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var Type = require('../../actions/actionTypes');
3-
var defaultRoute = 'progress';
3+
var defaultRoute = 'projects';
44
function routeReducer(route, action) {
55
if (route === void 0) { route = defaultRoute; }
66
switch (action.type) {

‎lib/reducers/warning/warning.js

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

‎lib/services/package.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use strict";
22
var path = require('path');
3-
var set_globals_1 = require('./set-globals');
43
var Action = require('../actions/actions');
54
var _base_1 = require('../_base');
65
var _ = require('lodash');
@@ -31,7 +30,7 @@ var PackageService = (function () {
3130
PackageService.prototype.selectPackage = function (packageName) {
3231
var packagePath = path.join(window.coderoad.dir, 'node_modules', packageName);
3332
this.config = require(path.join(packagePath, 'package.json'));
34-
set_globals_1.setGlobals(this.config);
33+
_base_1.store.dispatch(Action.setGlobals(this.config));
3534
this.data = require(path.join(packagePath, this.config.main));
3635
this.packageName = packageName;
3736
};

‎lib/services/setup/set-globals.js

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

‎lib/services/setup/setup-actions.js

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

‎lib/services/setup/setup-checks.js

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

‎lib/services/setup/setup.js

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

‎lib/services/setup/system-checks.js

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

0 commit comments

Comments
 (0)