Skip to content

Commit 0b1ffd7

Browse files
ShMcKShMcK
committed
set store to default export
1 parent 81e8c20 commit 0b1ffd7

Some content is hidden

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

67 files changed

+101
-92
lines changed

‎lib/actions/alert.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var store_1 = require('../store');
33
var _types_1 = require('./_types');
44
function alertToggle(alert) {
5-
var isOpen = store_1.store.getState().alert.open;
5+
var isOpen = store_1.default.getState().alert.open;
66
if (!alert) {
77
alert = {
88
action: '',

‎lib/actions/page.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ var _position = {
77
};
88
function pageNext() {
99
var position = null;
10-
var _a = store_1.store.getState().position, page = _a.page, chapter = _a.chapter;
11-
var chapters = store_1.store.getState().tutorial.chapters;
10+
var _a = store_1.default.getState().position, page = _a.page, chapter = _a.chapter;
11+
var chapters = store_1.default.getState().tutorial.chapters;
1212
if (page < chapters[chapter].pages.length - 1) {
1313
position = {
1414
chapter: chapter,

‎lib/actions/progress.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ function progressLoad() {
66
}
77
exports.progressLoad = progressLoad;
88
function completePage() {
9-
var position = store_1.store.getState().position;
10-
var pageLength = store_1.store.getState().progress.chapters[position.chapter].pages.length;
9+
var position = store_1.default.getState().position;
10+
var pageLength = store_1.default.getState().progress.chapters[position.chapter].pages.length;
1111
if (position.page >= pageLength - 1) {
12-
store_1.store.dispatch(completeChapter());
12+
store_1.default.dispatch(completeChapter());
1313
}
1414
return {
1515
payload: { position: position },
@@ -18,10 +18,10 @@ function completePage() {
1818
}
1919
exports.completePage = completePage;
2020
function completeChapter() {
21-
var chapter = store_1.store.getState().position.chapter;
22-
var chapterLength = store_1.store.getState().progress.chapters.length;
21+
var chapter = store_1.default.getState().position.chapter;
22+
var chapterLength = store_1.default.getState().progress.chapters.length;
2323
if (chapter >= chapterLength - 1) {
24-
store_1.store.dispatch(completeTutorial());
24+
store_1.default.dispatch(completeTutorial());
2525
}
2626
return {
2727
payload: { chapter: chapter },

‎lib/actions/route.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function routeSet(route) {
77
if (route && route !== previous) {
88
switch (route) {
99
case 'tutorials':
10-
store_1.store.dispatch(tutorial_1.tutorialsFind());
10+
store_1.default.dispatch(tutorial_1.tutorialsFind());
1111
}
1212
previous = route;
1313
return {

‎lib/actions/setup.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var _types_1 = require('./_types');
33
var package_1 = require('./package');
44
var store_1 = require('../store');
55
function setupVerify() {
6-
store_1.store.dispatch(package_1.packageSet());
6+
store_1.default.dispatch(package_1.packageSet());
77
return { type: _types_1.SETUP_VERIFY };
88
}
99
exports.setupVerify = setupVerify;

‎lib/actions/test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function testRun() {
66
}
77
exports.testRun = testRun;
88
function testResult(result) {
9-
var actions = store_1.store.getState().editorActions;
9+
var actions = store_1.default.getState().editorActions;
1010
return {
1111
payload: { result: result, actions: actions },
1212
type: _types_1.TEST_RESULT,

‎lib/atom/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var actions_1 = require('../actions');
88
var Main = (function () {
99
function Main() {
1010
polyfills_1.default();
11-
store_1.store.dispatch(actions_1.setupVerify());
11+
store_1.default.dispatch(actions_1.setupVerify());
1212
this.root = root_1.Root.init();
1313
}
1414
Main.prototype.activate = function () {

‎lib/atom/subscriptions.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ function onActivate() {
1111
}));
1212
atom.workspace.observeTextEditors(function (editor) {
1313
subscriptions.add(editor.onDidSave(function () {
14-
store_1.store.dispatch(actions_1.testRun());
14+
store_1.default.dispatch(actions_1.testRun());
1515
}));
1616
});
1717
subscriptions.add(atom.commands.add('atom-workspace', {
1818
'cr-viewer:testRun': (function () {
19-
if (store_1.store.getState().route === 'page') {
20-
store_1.store.dispatch(actions_1.testRun());
19+
if (store_1.default.getState().route === 'page') {
20+
store_1.default.dispatch(actions_1.testRun());
2121
}
2222
}),
2323
}));
@@ -34,7 +34,7 @@ function addToStatusBar(statusBar) {
3434
var replay = document.createElement('div');
3535
replay.className = 'cr-alert-replay';
3636
replay.textContent = '▲';
37-
replay.onclick = function () { return store_1.store.dispatch(actions_1.alertReplay()); };
37+
replay.onclick = function () { return store_1.default.dispatch(actions_1.alertReplay()); };
3838
return statusBar.addLeftTile({ item: replay, priority: 100 });
3939
}
4040
exports.addToStatusBar = addToStatusBar;

‎lib/components/AppMenu/issuesLink.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var React = require('react');
33
var MenuItem_1 = require('material-ui/MenuItem');
44
var store_1 = require('../../store');
55
function issuesLink() {
6-
var tutorial = store_1.store.getState().tutorial;
6+
var tutorial = store_1.default.getState().tutorial;
77
if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
88
return null;
99
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var VerifyButton = (function (_super) {
2929
VerifyButton = __decorate([
3030
react_redux_1.connect(null, function (dispatch) {
3131
return {
32-
verify: function () { return store_1.store.dispatch(actions_1.setupVerify()); }
32+
verify: function () { return store_1.default.dispatch(actions_1.setupVerify()); }
3333
};
3434
}),
3535
__metadata('design:paramtypes', [])

‎lib/components/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ var theme_1 = require('./theme');
88
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
99
require('./remove-later');
1010
function render(target) {
11-
ReactDOM.render(React.createElement(react_redux_1.Provider, {store: store_1.store}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.muiTheme}, React.createElement(App_1.App, null))), target);
11+
ReactDOM.render(React.createElement(react_redux_1.Provider, {store: store_1.default}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.muiTheme}, React.createElement(App_1.App, null))), target);
1212
}
1313
exports.render = render;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ 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() {
9-
var dir = store_1.store.getState().dir;
9+
var dir = store_1.default.getState().dir;
1010
var packagePath = path_1.join(dir, 'package.json');
1111
return new Promise(function (resolve, reject) {
1212
editor_1.open(packagePath);
@@ -15,7 +15,7 @@ function createPackageJson() {
1515
});
1616
}).then(function () {
1717
editor_1.set(packageData);
18-
store_1.store.dispatch(actions_2.setupVerify());
18+
store_1.default.dispatch(actions_2.setupVerify());
1919
});
2020
}
2121
exports.createPackageJson = createPackageJson;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var actions_1 = require('../../actions');
55
function updateNpm() {
66
command_line_1.default('npm', 'update -g npm')
77
.then(function (res) {
8-
store_1.store.dispatch(actions_1.setupVerify());
8+
store_1.default.dispatch(actions_1.setupVerify());
99
});
1010
}
1111
exports.updateNpm = updateNpm;

‎lib/reducers/checks/verify.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ function allTrue(obj) {
77
return Object.values(obj).every(function (x) { return x === true; });
88
}
99
function setupVerify() {
10-
var dir = !!store_1.store.getState().dir;
10+
var dir = !!store_1.default.getState().dir;
1111
var packageJson = false;
1212
var tutorial = false;
13-
var pj = store_1.store.getState().packageJson;
13+
var pj = store_1.default.getState().packageJson;
1414
if (dir) {
1515
packageJson = !!pj;
1616
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function editorActionsReducer(editorActions, action) {
1313
var actions = null;
1414
switch (action.type) {
1515
case _types_1.TESTS_LOAD:
16-
actions = store_1.store.getState().tasks.map(function (task) { return task.actions || []; });
16+
actions = store_1.default.getState().tasks.map(function (task) { return task.actions || []; });
1717
currentTaskPosition = 0;
1818
handleEditorActions(actions.shift());
1919
return actions;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function packageJsonReducer(pj, action) {
88
if (pj === void 0) { pj = null; }
99
switch (action.type) {
1010
case _types_1.PACKAGE_SET:
11-
var dir = store_1.store.getState().dir;
11+
var dir = store_1.default.getState().dir;
1212
var pathToPackageJson = path_1.join(dir, 'package.json');
1313
if (exists_1.fileExists(pathToPackageJson)) {
1414
return JSON.parse(fs_1.readFileSync(pathToPackageJson, 'utf8'));

‎lib/reducers/page/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function pageReducer(p, action) {
1111
switch (action.type) {
1212
case _types_1.PAGE_SET:
1313
var _a = action.payload.position, chapter = _a.chapter, page = _a.page;
14-
var _b = store_1.store.getState().tutorial
14+
var _b = store_1.default.getState().tutorial
1515
.chapters[chapter].pages[page], title = _b.title, description = _b.description, onPageComplete = _b.onPageComplete, completed = _b.completed;
1616
return {
1717
title: title,

‎lib/reducers/progress/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function progressReducer(progress, action) {
1818
if (progress === void 0) { progress = _progress; }
1919
switch (action.type) {
2020
case _types_1.PROGRESS_LOAD:
21-
var chapters = store_1.store.getState().tutorial.chapters;
21+
var chapters = store_1.default.getState().tutorial.chapters;
2222
return {
2323
completed: false,
2424
chapters: !chapters ? [] : chapters.map(function (_a) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function taskTestsReducer(taskTests, action) {
66
if (taskTests === void 0) { taskTests = ''; }
77
switch (action.type) {
88
case _types_1.TESTS_LOAD:
9-
var tasks = store_1.store.getState().tasks;
9+
var tasks = store_1.default.getState().tasks;
1010
var tests = [].concat.apply([], tasks.map(function (task) { return task.tests || []; }));
1111
var output_1 = '';
1212
tests.forEach(function (file) {

‎lib/reducers/tasks/config-task-tests.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ function configTestString(config, name, testPath) {
66
if (system_1.isWindows) {
77
testPath = testPath.split('/').join('\\');
88
}
9-
var tutorial = store_1.store.getState().tutorial;
9+
var tutorial = store_1.default.getState().tutorial;
1010
if (tutorial && tutorial.config.dir) {
1111
testPath = path_1.join(tutorial.config.dir, testPath);
1212
}
1313
else {
14-
var dir = store_1.store.getState().dir;
14+
var dir = store_1.default.getState().dir;
1515
testPath = path_1.join(dir, 'node_modules', name, testPath);
1616
}
1717
if (tutorial.config.testSuffix) {
@@ -20,7 +20,7 @@ function configTestString(config, name, testPath) {
2020
return testPath;
2121
}
2222
function configTaskTests(tasks) {
23-
var _a = store_1.store.getState().tutorial, config = _a.config, name = _a.name;
23+
var _a = store_1.default.getState().tutorial, config = _a.config, name = _a.name;
2424
return !tasks ? [] : tasks.map(function (task) {
2525
if (task.tests) {
2626
task.tests = task.tests.map(function (testPath) {

‎lib/reducers/tasks/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function tasksReducer(tasks, action) {
1414
switch (action.type) {
1515
case _types_1.PAGE_SET:
1616
var _a = action.payload.position, chapter = _a.chapter, page = _a.page;
17-
return config_task_tests_1.configTaskTests(store_1.store.getState().tutorial.chapters[chapter].pages[page].tasks || []);
17+
return config_task_tests_1.configTaskTests(store_1.default.getState().tutorial.chapters[chapter].pages[page].tasks || []);
1818
default:
1919
return tasks;
2020
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ function parseLoaders(data, fileType) {
2828
}
2929
var pathToFile = null;
3030
if (loader[2]) {
31-
var tutorialDir = store_1.store.getState().tutorial.config.dir;
31+
var tutorialDir = store_1.default.getState().tutorial.config.dir;
3232
pathToFile = path_1.normalize(path_1.join(tutorialDir, fileToLoad));
3333
}
3434
else {
35-
var dir = store_1.store.getState().dir;
35+
var dir = store_1.default.getState().dir;
3636
pathToFile = path_1.normalize(path_1.join(dir, fileToLoad));
3737
}
3838
try {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ var fs_1 = require('fs');
55
var path_1 = require('path');
66
var parse_loaders_1 = require('./parse-loaders');
77
function runTaskTests(setup) {
8-
var tests = store_1.store.getState().taskTests;
8+
var tests = store_1.default.getState().taskTests;
99
if (tests && tests.length) {
10-
var dir = store_1.store.getState().dir;
11-
var tutorialConfig = store_1.store.getState().tutorial.config;
10+
var dir = store_1.default.getState().dir;
11+
var tutorialConfig = store_1.default.getState().tutorial.config;
1212
var output = parse_loaders_1.default(tests, tutorialConfig.testSuffix);
1313
var target = path_1.join(tutorialConfig.dir || dir, "_tmp." + tutorialConfig.testSuffix);
1414
fs_1.writeFileSync(target, output, 'utf8');
1515
var config = {
1616
dir: dir,
1717
tutorialDir: tutorialConfig.dir,
18-
taskPosition: store_1.store.getState().taskPosition
18+
taskPosition: store_1.default.getState().taskPosition
1919
};
2020
tutorialConfig.run(target, config, test_result_1.handleResult);
2121
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
var store_1 = require('../../store');
33
var actions_1 = require('../../actions');
44
function handleResult(result) {
5-
store_1.store.dispatch(actions_1.testComplete());
5+
store_1.default.dispatch(actions_1.testComplete());
66
if (result.completed) {
7-
store_1.store.dispatch(actions_1.testResult(result));
8-
store_1.store.dispatch(actions_1.completePage());
7+
store_1.default.dispatch(actions_1.testResult(result));
8+
store_1.default.dispatch(actions_1.completePage());
99
}
1010
else if (!result.pass) {
11-
store_1.store.dispatch(actions_1.testResult(result));
11+
store_1.default.dispatch(actions_1.testResult(result));
1212
}
1313
else if (result.pass) {
1414
result.msg = "Task " + result.taskPosition + " Complete";
15-
store_1.store.dispatch(actions_1.testResult(result));
15+
store_1.default.dispatch(actions_1.testResult(result));
1616
}
1717
}
1818
exports.handleResult = handleResult;

‎lib/reducers/tutorial/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function tutorialReducer(tutorial, action) {
1515
switch (action.type) {
1616
case _types_1.TUTORIAL_SET:
1717
var name_1 = action.payload.name;
18-
var dir = store_1.store.getState().dir;
18+
var dir = store_1.default.getState().dir;
1919
var packagePath = path_1.join(dir, 'node_modules', name_1);
2020
var packageJson = require(path_1.join(packagePath, 'package.json'));
2121
var config = tutorial_config_1.tutorialConfig(packageJson);

‎lib/reducers/tutorial/tutorial-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var store_1 = require('../../store');
66
function tutorialConfig(tutorialPj) {
77
var config = tutorialPj.config, name = tutorialPj.name;
88
var repo = loadRepo(tutorialPj.repo);
9-
var dir = store_1.store.getState().dir;
9+
var dir = store_1.default.getState().dir;
1010
return {
1111
dir: path_1.join(dir, 'node_modules', name, config.dir),
1212
testSuffix: config.testSuffix || null,

‎lib/reducers/tutorials/check-tutorials.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var is_tutorial_1 = require('./is-tutorial');
66
var store_1 = require('../../store');
77
function searchForTutorials(deps) {
88
if (!!deps && Object.keys(deps).length > 0) {
9-
var dir_1 = store_1.store.getState().dir;
9+
var dir_1 = store_1.default.getState().dir;
1010
return (Object.keys(deps)
1111
.filter(function (name) { return is_tutorial_1.isTutorial(name); })
1212
.map(function (name) {

‎lib/reducers/tutorials/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function tutorialsReducer(tutorials, action) {
99
case _types_1.TUTORIAL_UPDATE:
1010
update_tutorial_1.tutorialUpdate(action.payload.name);
1111
case _types_1.TUTORIALS_FIND:
12-
var packageJson = store_1.store.getState().packageJson;
12+
var packageJson = store_1.default.getState().packageJson;
1313
return ([]
1414
.concat(check_tutorials_1.searchForTutorials(packageJson.dependencies))
1515
.concat(check_tutorials_1.searchForTutorials(packageJson.devDependencies)));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var exists_1 = require('../../services/exists');
55
var store_1 = require('../../store');
66
exports.tutorialError = 'This is an error with the tutorial itself';
77
function isTutorial(name) {
8-
var dir = store_1.store.getState().dir;
8+
var dir = store_1.default.getState().dir;
99
var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
1010
if (!exists_1.fileExists(pathToTutorialPackageJson)) {
1111
console.log("Error with " + name + ": no package.json file found. " + exports.tutorialError);

‎lib/reducers/tutorials/update-tutorial.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var actions_1 = require('../../actions');
55
function tutorialUpdate(name) {
66
command_line_1.default('npm', "install --save-dev " + name)
77
.then(function () {
8-
store_1.store.dispatch(actions_1.tutorialsFind());
8+
store_1.default.dispatch(actions_1.tutorialsFind());
99
});
1010
}
1111
exports.tutorialUpdate = tutorialUpdate;

‎lib/store/index.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ var reducers_1 = require('../reducers');
55
var middleware_1 = require('./middleware');
66
var initialState = {};
77
var reducer = redux_1.compose(redux_localstorage_1.mergePersistedState())(reducers_1.default);
8-
exports.store = middleware_1.default(reducer, initialState);
8+
var store = middleware_1.default(reducer, initialState);
9+
Object.defineProperty(exports, "__esModule", { value: true });
10+
exports.default = store;

‎lib/store/localStorage.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ var redux_1 = require('redux');
33
var redux_localstorage_1 = require('redux-localstorage');
44
var adapter = require('redux-localstorage/lib/adapters/localStorage');
55
var redux_localstorage_filter_1 = require('redux-localstorage-filter');
6-
var key = 'coderoad';
7-
var storage = redux_1.compose(redux_localstorage_filter_1.default('nested.key'))(adapter(window.localStorage));
8-
var localStorage = redux_localstorage_1.default(storage, key);
6+
var index_1 = require('./index');
7+
function getTutorial() {
8+
return index_1.store.getState().tutorial.name;
9+
}
10+
var storage = redux_1.compose(redux_localstorage_filter_1.default(['progress']))(adapter(window.localStorage));
11+
var localStorage = redux_localstorage_1.default(storage, "coderoad." + getTutorial());
912
Object.defineProperty(exports, "__esModule", { value: true });
1013
exports.default = localStorage;

‎src/actions/alert.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {store} from '../store';
1+
import store from '../store';
22
import {ALERT_TOGGLE, ALERT_REPLAY} from './_types';
33

44
export function alertToggle(alert?: CR.Alert): Action {

0 commit comments

Comments
 (0)