refactor core-coderoad file paths from index

ShMcK · ShMcK · commit 2c999fdc85a4 · 2016-06-14T13:04:16.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -19,16 +19,14 @@ exports.windowToggle = window_1.windowToggle;
 var editor_paths_1 = require('./modules/editor-paths');
 exports.editorMarkdownOpen = editor_paths_1.editorMarkdownOpen;
 exports.editorTestOpen = editor_paths_1.editorTestOpen;
-var alert_1 = require('core-coderoad/lib/alert');
-exports.alertOpen = alert_1.alertOpen;
-exports.alertClose = alert_1.alertClose;
-exports.alertReplay = alert_1.alertReplay;
-var editor_1 = require('core-coderoad/lib/editor');
-exports.editorDevToolsToggle = editor_1.editorDevToolsToggle;
-exports.editorOpen = editor_1.editorOpen;
-exports.editorInsert = editor_1.editorInsert;
-exports.editorSave = editor_1.editorSave;
-exports.editorSet = editor_1.editorSet;
-exports.editorScroll = editor_1.editorScroll;
-var route_1 = require('core-coderoad/lib/route');
-exports.routeSet = route_1.routeSet;
+var core_coderoad_1 = require('core-coderoad');
+exports.alertOpen = core_coderoad_1.alertOpen;
+exports.alertClose = core_coderoad_1.alertClose;
+exports.alertReplay = core_coderoad_1.alertReplay;
+exports.editorDevToolsToggle = core_coderoad_1.editorDevToolsToggle;
+exports.editorOpen = core_coderoad_1.editorOpen;
+exports.editorInsert = core_coderoad_1.editorInsert;
+exports.editorSave = core_coderoad_1.editorSave;
+exports.editorSet = core_coderoad_1.editorSet;
+exports.editorScroll = core_coderoad_1.editorScroll;
+exports.routeSet = core_coderoad_1.routeSet;
diff --git a/lib/components/Page/PageDescription/index.js b/lib/components/Page/PageDescription/index.js
@@ -18,7 +18,7 @@ var react_redux_1 = require('react-redux');
 var index_1 = require('../../index');
 var Card_1 = require('material-ui/Card');
 var actions_1 = require('../../../actions');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     card: {
         margin: '5px',
@@ -39,7 +39,7 @@ var PageDescription = (function (_super) {
     };
     PageDescription = __decorate([
         react_redux_1.connect(function (state) { return ({
-            page: selectors_1.pageSelector(state),
+            page: core_coderoad_1.pageSelector(state),
         }); }, { editorMarkdownOpen: actions_1.editorMarkdownOpen }), 
         __metadata('design:paramtypes', [])
     ], PageDescription);
diff --git a/lib/components/Page/Tasks/index.js b/lib/components/Page/Tasks/index.js
@@ -23,7 +23,7 @@ var TaskActions_1 = require('../TaskActions');
 var Hints_1 = require('../Hints');
 var AddButton_1 = require('../AddButton');
 var actions_1 = require('../../../actions');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     card: {
         margin: '5px',
@@ -59,7 +59,7 @@ var Tasks = (function (_super) {
     };
     Tasks = __decorate([
         react_redux_1.connect(function (state) { return ({
-            tasks: selectors_1.tasksSelector(state),
+            tasks: core_coderoad_1.tasksSelector(state),
         }); }, { tutorialTaskAdd: actions_1.tutorialTaskAdd, editorMarkdownOpen: actions_1.editorMarkdownOpen }), 
         __metadata('design:paramtypes', [])
     ], Tasks);
diff --git a/lib/components/Page/TasksComplete/index.js b/lib/components/Page/TasksComplete/index.js
@@ -19,7 +19,7 @@ var Card_1 = require('material-ui/Card');
 var index_1 = require('../../index');
 var colors_1 = require('material-ui/styles/colors');
 var actions_1 = require('../../../actions');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     card: {
         backgroundColor: colors_1.cyan500,
@@ -41,7 +41,7 @@ var TasksComplete = (function (_super) {
     };
     TasksComplete = __decorate([
         react_redux_1.connect(function (state) { return ({
-            page: selectors_1.pageSelector(state),
+            page: core_coderoad_1.pageSelector(state),
         }); }, { editorMarkdownOpen: actions_1.editorMarkdownOpen }), 
         __metadata('design:paramtypes', [])
     ], TasksComplete);
diff --git a/lib/components/Page/Tests/index.js b/lib/components/Page/Tests/index.js
@@ -17,9 +17,8 @@ var React = require('react');
 var react_redux_1 = require('react-redux');
 var path_1 = require('path');
 var actions_1 = require('../../../actions');
-var options_1 = require('core-coderoad/lib/options');
 var FlatButton_1 = require('material-ui/FlatButton');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     button: {
         bottom: '8px',
@@ -37,10 +36,10 @@ var Tests = (function (_super) {
     };
     Tests = __decorate([
         react_redux_1.connect(function (state) { return ({
-            config: selectors_1.configSelector(state),
+            config: core_coderoad_1.configSelector(state),
         }); }, function (dispatch, props) { return ({
             open: function (file) {
-                var suffix = options_1.default[props.config.language].language.suffix;
+                var suffix = core_coderoad_1.tutorialConfigOptions[props.config.language].language.suffix;
                 file = file.concat('.' + suffix);
                 dispatch(actions_1.editorOpen(path_1.join('tutorial', file)));
             },
diff --git a/lib/components/TopPanel/TopPanel.js b/lib/components/TopPanel/TopPanel.js
@@ -47,16 +47,16 @@ var TopPanel = (function (_super) {
             return null;
         }
         return (React.createElement(Tabs_1.Tabs, {tabItemContainerStyle: styles.tabs, style: styles.all}, tutorial.pages.map(function (page, index) {
-            return (React.createElement(Tabs_1.Tab, {style: styles.tab, key: index, label: page.title.substring(0, 10), onClick: pageSet.bind(_this, index)}));
+            return (React.createElement(Tabs_1.Tab, {style: styles.tab, key: index, label: page.title.substring(0, 10), onClick: pageSet.bind(_this, page.title, index)}));
         }), React.createElement(Tabs_1.Tab, {style: Object.assign({}, styles.tab, styles.add), label: '+', onActive: pageAdd})));
     };
     TopPanel = __decorate([
         react_redux_1.connect(function (state) { return ({
             tutorial: state.tutorial,
         }); }, function (dispatch) { return ({
-            pageSet: function (index) {
+            pageSet: function (title, index) {
                 dispatch(actions_1.pageSet(index));
-                dispatch(actions_1.editorMarkdownOpen(index));
+                dispatch(actions_1.editorMarkdownOpen(title, index));
             },
             pageAdd: function () { dispatch(actions_1.tutorialPageAdd()); },
         }); }), 
diff --git a/lib/components/TutorialConfig/languageItems.js b/lib/components/TutorialConfig/languageItems.js
@@ -1,9 +1,9 @@
 "use strict";
 var React = require('react');
 var MenuItem_1 = require('material-ui/MenuItem');
-var options_1 = require('core-coderoad/lib/options');
+var core_coderoad_1 = require('core-coderoad');
 function runnerItems() {
-    return Object.keys(options_1.default).map(function (language, index) {
+    return Object.keys(core_coderoad_1.tutorialConfigOptions).map(function (language, index) {
         return (React.createElement(MenuItem_1.default, {key: index, value: language, primaryText: language}));
     });
 }
diff --git a/lib/components/TutorialConfig/runnerItems.js b/lib/components/TutorialConfig/runnerItems.js
@@ -1,9 +1,9 @@
 "use strict";
 var React = require('react');
 var MenuItem_1 = require('material-ui/MenuItem');
-var options_1 = require('core-coderoad/lib/options');
+var core_coderoad_1 = require('core-coderoad');
 function runnerItems(language) {
-    return options_1.default[language].runners.map(function (runner, index) {
+    return core_coderoad_1.tutorialConfigOptions[language].runners.map(function (runner, index) {
         return (React.createElement(MenuItem_1.default, {key: index, value: runner, primaryText: runner}));
     });
 }
diff --git a/lib/index.js b/lib/index.js
@@ -3,13 +3,13 @@ var element_1 = require('./components/SidePanel/element');
 var render_1 = require('./components/render');
 var Top_1 = require('./components/TopPanel/Top');
 var render_2 = require('./components/TopPanel/render');
-var polyfills_1 = require('core-coderoad/lib/polyfills');
+var core_coderoad_1 = require('core-coderoad');
 var subscriptions_1 = require('./subscriptions');
 var store_1 = require('./store');
 var setup_1 = require('./modules/setup');
 var Main = (function () {
     function Main() {
-        polyfills_1.default();
+        core_coderoad_1.loadPolyfills();
         store_1.default.dispatch(setup_1.setupVerify());
         this.root = element_1.default.init();
         this.top = Top_1.default.init();
diff --git a/lib/modules/editor-paths/index.js b/lib/modules/editor-paths/index.js
@@ -1,7 +1,7 @@
 "use strict";
 var path_1 = require('path');
 var actions_1 = require('../../actions');
-var options_1 = require('core-coderoad/lib/options');
+var core_coderoad_1 = require('core-coderoad');
 var twoDigitify_1 = require('../../services/twoDigitify');
 function editorMarkdownOpen(content, index) {
     console.log(content, index);
@@ -17,7 +17,7 @@ function editorMarkdownOpen(content, index) {
 exports.editorMarkdownOpen = editorMarkdownOpen;
 function editorTestOpen(pageIndex, testIndex) {
     return function (dispatch, getState) {
-        var suffix = options_1.default[getState().packageJson.config].language.suffix;
+        var suffix = core_coderoad_1.tutorialConfigOptions[getState().packageJson.config].language.suffix;
         var filePath = path_1.join('tutorial', twoDigitify_1.default(pageIndex || getState().pagePosition), twoDigitify_1.default(testIndex) + '.' + suffix);
         dispatch(actions_1.editorOpen(filePath));
     };
diff --git a/lib/modules/setup/utils/action-setup.js b/lib/modules/setup/utils/action-setup.js
@@ -1,6 +1,6 @@
 "use strict";
-var editor_1 = require('core-coderoad/lib/editor');
+var core_coderoad_1 = require('core-coderoad');
 function openDirectory() {
-    editor_1.openFolder();
+    core_coderoad_1.openFolder();
 }
 exports.openDirectory = openDirectory;
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -6,12 +6,10 @@ var setup_1 = require('./modules/setup');
 var package_json_1 = require('./modules/package-json');
 var tutorial_1 = require('./modules/tutorial');
 var window_1 = require('./modules/window');
-var alert_1 = require('core-coderoad/lib/alert');
-var editor_1 = require('core-coderoad/lib/editor');
-var route_1 = require('core-coderoad/lib/route');
+var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
-    alert: alert_1.reducer, checks: setup_1.reducer, editor: editor_1.reducer, dir: editor_1.dir,
-    packageJson: package_json_1.reducer, pagePosition: page_position_1.reducer, route: route_1.reducer,
+    alert: core_coderoad_1.alertReducer, checks: setup_1.reducer, editor: core_coderoad_1.editorReducer, dir: core_coderoad_1.dirReducer,
+    packageJson: package_json_1.reducer, pagePosition: page_position_1.reducer, route: core_coderoad_1.routeReducer,
     tutorial: tutorial_1.reducer, windowToggle: window_1.reducer, form: redux_form_1.reducer
 });
diff --git a/lib/store.js b/lib/store.js
@@ -1,20 +1,5 @@
 "use strict";
-var redux_1 = require('redux');
 var reducers_1 = require('./reducers');
-var createLogger = require('redux-logger');
-var redux_thunk_1 = require('redux-thunk');
-var redux_throttle_actions_1 = require('redux-throttle-actions');
-var configureStore = function () {
-    var middlewares = [redux_thunk_1.default];
-    var devMode = false;
-    if (devMode) {
-        var logger = createLogger();
-        middlewares.push(logger);
-    }
-    var throttleTestRun = redux_throttle_actions_1.default(['TUTORIAL_BUILD'], 800);
-    middlewares.push(throttleTestRun);
-    var store = redux_1.createStore(reducers_1.default, redux_1.applyMiddleware.apply(void 0, middlewares));
-    return store;
-};
+var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = configureStore();
+exports.default = core_coderoad_1.configureStore(reducers_1.default, true, ['TUTORIAL_BUILD']);
diff --git a/src/actions.ts b/src/actions.ts
@@ -8,7 +8,9 @@ export {
 export {windowToggle} from './modules/window';
 export {editorMarkdownOpen, editorTestOpen} from './modules/editor-paths';
 
-export {alertOpen, alertClose, alertReplay} from 'core-coderoad/lib/alert';
-export {editorDevToolsToggle, editorOpen, editorInsert,
-editorSave, editorSet, editorScroll} from 'core-coderoad/lib/editor';
-export {routeSet} from 'core-coderoad/lib/route';
+export {
+  alertOpen, alertClose, alertReplay,
+  editorDevToolsToggle, editorOpen, editorInsert,
+  editorSave, editorSet, editorScroll,
+  routeSet
+} from 'core-coderoad';
diff --git a/src/components/AppMenu/Quit/index.tsx b/src/components/AppMenu/Quit/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {quit} from 'core-coderoad/lib/editor';
+import {quit} from 'core-coderoad';
 import {onDeactivate} from '../../../subscriptions';
 import MenuItem from 'material-ui/MenuItem';
 
diff --git a/src/components/Page/PageDescription/index.tsx b/src/components/Page/PageDescription/index.tsx
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {Markdown} from '../../index';
 import {Card, CardHeader, CardText} from 'material-ui/Card';
 import {editorMarkdownOpen} from '../../../actions';
-import {pageSelector} from 'core-coderoad/lib/selectors';
+import {pageSelector} from 'core-coderoad';
 
 const styles = {
   card: {
diff --git a/src/components/Page/Tasks/index.tsx b/src/components/Page/Tasks/index.tsx
@@ -13,7 +13,7 @@ import AddButton from '../AddButton';
 import {tutorialTaskAdd, editorMarkdownOpen} from '../../../actions';
 import twoDigitify from '../../../services/twoDigitify';
 import {join} from 'path';
-import {tasksSelector} from 'core-coderoad/lib/selectors';
+import {tasksSelector} from 'core-coderoad';
 
 const styles = {
   card: {
diff --git a/src/components/Page/TasksComplete/index.tsx b/src/components/Page/TasksComplete/index.tsx
@@ -4,7 +4,7 @@ import {Card, CardText, CardHeader} from 'material-ui/Card';
 import {Markdown} from '../../index';
 import {cyan500, grey100} from 'material-ui/styles/colors';
 import {editorMarkdownOpen} from '../../../actions';
-import {pageSelector} from 'core-coderoad/lib/selectors';
+import {pageSelector} from 'core-coderoad';
 
 const styles = {
   card: {
diff --git a/src/components/Page/Tests/index.tsx b/src/components/Page/Tests/index.tsx
@@ -2,9 +2,8 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import {join} from 'path';
 import {editorOpen} from '../../../actions';
-import tutorialConfigOptions from 'core-coderoad/lib/options';
 import FlatButton from 'material-ui/FlatButton';
-import {configSelector} from 'core-coderoad/lib/selectors';
+import {configSelector, tutorialConfigOptions} from 'core-coderoad';
 
 const styles = {
   button: {
diff --git a/src/components/TopPanel/TopPanel.tsx b/src/components/TopPanel/TopPanel.tsx
@@ -27,9 +27,9 @@ const styles = {
 @connect(state => ({
     tutorial: state.tutorial,
 }), dispatch => ({
-    pageSet(index: number) {
+    pageSet(title: string, index: number) {
       dispatch(pageSet(index));
-      dispatch(editorMarkdownOpen(index));
+      dispatch(editorMarkdownOpen(title, index));
     },
     pageAdd() { dispatch(tutorialPageAdd()); },
 }))
@@ -50,7 +50,7 @@ export default class TopPanel extends React.Component<{
                 style={styles.tab}
                 key={index}
                 label={page.title.substring(0, 10)}
-                onClick={pageSet.bind(this, index)}
+                onClick={pageSet.bind(this, page.title, index)}
               />
            );
          })}
diff --git a/src/components/TutorialConfig/languageItems.tsx b/src/components/TutorialConfig/languageItems.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import MenuItem from 'material-ui/MenuItem';
-import tutorialConfigOptions from 'core-coderoad/lib/options';
+import {tutorialConfigOptions} from 'core-coderoad';
 
 export default function runnerItems() {
   return Object.keys(tutorialConfigOptions).map((language, index) => {
diff --git a/src/components/TutorialConfig/runnerItems.tsx b/src/components/TutorialConfig/runnerItems.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import MenuItem from 'material-ui/MenuItem';
-import tutorialConfigOptions from 'core-coderoad/lib/options';
+import {tutorialConfigOptions} from 'core-coderoad';
 
 export default function runnerItems(language: string) {
   return tutorialConfigOptions[language].runners.map((runner, index) => {
diff --git a/src/index.ts b/src/index.ts
@@ -3,7 +3,7 @@ import sidePanelElement from './components/SidePanel/element';
 import render from './components/render';
 import Top from './components/TopPanel/Top';
 import renderTop from './components/TopPanel/render';
-import loadPolyfills from 'core-coderoad/lib/polyfills';
+import {loadPolyfills} from 'core-coderoad';
 import {onActivate, onDeactivate} from './subscriptions';
 import store from './store';
 import {setupVerify} from './modules/setup';
diff --git a/src/modules/editor-paths/index.ts b/src/modules/editor-paths/index.ts
@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {editorOpen, editorScroll} from '../../actions';
-import tutorialConfigOptions from 'core-coderoad/lib/options';
+import {tutorialConfigOptions} from 'core-coderoad';
 import twoDigitify from '../../services/twoDigitify';
 
 export function editorMarkdownOpen(content: string, index?: number) {
diff --git a/src/modules/setup/utils/action-setup.ts b/src/modules/setup/utils/action-setup.ts
@@ -1,4 +1,4 @@
-import {openFolder} from 'core-coderoad/lib/editor';
+import {openFolder} from 'core-coderoad';
 
 export function openDirectory(): void {
   openFolder();
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -9,9 +9,12 @@ import {reducer as tutorial} from './modules/tutorial';
 import {reducer as windowToggle} from './modules/window';
 
 // core reducers
-import {reducer as alert} from 'core-coderoad/lib/alert';
-import {reducer as editor, dir} from 'core-coderoad/lib/editor';
-import {reducer as route} from 'core-coderoad/lib/route';
+import {
+  alertReducer as alert,
+  editorReducer as editor,
+  dirReducer as dir,
+  routeReducer as route
+} from 'core-coderoad';
 
 export default combineReducers({
   alert, checks, editor, dir,
diff --git a/src/store.ts b/src/store.ts
@@ -1,23 +1,8 @@
-import { applyMiddleware, createStore } from 'redux';
 import reducer from './reducers';
-import * as createLogger from 'redux-logger';
-import thunk from 'redux-thunk';
-import throttleActions from 'redux-throttle-actions';
+import {configureStore} from 'core-coderoad';
 
-const configureStore = () => {
-  const middlewares = [thunk];
-  const devMode = false;
-  if (devMode) {
-    const logger = createLogger();
-    middlewares.push(logger);
-  }
-  const throttleTestRun = throttleActions(['TUTORIAL_BUILD'], 800);
-  middlewares.push(throttleTestRun);
-  const store: Redux.Store = createStore(
-    reducer,
-    applyMiddleware(...middlewares)
-  );
-  return store;
-};
-
-export default configureStore();
+export default configureStore(
+  reducer,
+  true, // devMode
+  ['TUTORIAL_BUILD'] // throttled actions
+);
