remove coderoad-json reducer

ShMcK · ShMcK · commit 1eb5e0bfaded · 2016-06-24T11:28:22.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -1,7 +1,4 @@
 "use strict";
-var coderoad_json_1 = require('./modules/coderoad-json');
-exports.cjSave = coderoad_json_1.cjSave;
-exports.cjLoad = coderoad_json_1.cjLoad;
 var editor_paths_1 = require('./modules/editor-paths');
 exports.editorMarkdownOpen = editor_paths_1.editorMarkdownOpen;
 exports.editorTestOpen = editor_paths_1.editorTestOpen;
diff --git a/lib/components/Publish/index.js b/lib/components/Publish/index.js
@@ -54,7 +54,7 @@ var TutorialPublish = (function (_super) {
     };
     TutorialPublish.prototype.validate = function () {
         this.props.pjLoad();
-        this.props.cjLoad();
+        this.props.tutorialLoad();
         this.props.validateTutorial();
     };
     TutorialPublish.prototype.selectStep = function (index) {
@@ -91,7 +91,7 @@ var TutorialPublish = (function (_super) {
     TutorialPublish = __decorate([
         react_redux_1.connect(function (state) { return ({
             validation: state.validation,
-        }); }, { pjLoad: actions_1.pjLoad, cjLoad: actions_1.cjLoad, editorPjOpen: actions_1.editorPjOpen, validateTutorial: actions_1.validateTutorial }), 
+        }); }, { pjLoad: actions_1.pjLoad, tutorialLoad: actions_1.tutorialLoad, editorPjOpen: actions_1.editorPjOpen, validateTutorial: actions_1.validateTutorial }), 
         __metadata('design:paramtypes', [Object])
     ], TutorialPublish);
     return TutorialPublish;
diff --git a/lib/modules/tutorial/reducer.js b/lib/modules/tutorial/reducer.js
@@ -1,11 +1,11 @@
 "use strict";
 var types_1 = require('./types');
 var coderoad_cli_1 = require('coderoad-cli');
-var fs_1 = require('fs');
 var path_1 = require('path');
 var taskUpdate_1 = require('./utils/taskUpdate');
 var pageGet_1 = require('./utils/pageGet');
 var taskGet_1 = require('./utils/taskGet');
+var readFile_1 = require('../utils/readFile');
 var _tutorial = {
     info: {
         title: '',
@@ -28,8 +28,8 @@ function tutorial(t, action) {
             coderoad_cli_1.build(action.payload.dir, path_1.join('tutorial', 'tutorial.md'));
             return t;
         case types_1.TUTORIAL_LOAD:
-            var data = JSON.parse(fs_1.readFileSync(path_1.join(action.payload.dir, 'coderoad.json'), 'utf8'));
-            return data;
+            var loadedCj = readFile_1.default(action.payload.dir, 'coderoad.json');
+            return !!loadedCj ? loadedCj : t;
         case types_1.TUTORIAL_PAGE_ADD:
             var pages = t.pages.concat(pageGet_1.default(t.pages.length));
             return Object.assign({}, t, { pages: pages });
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -7,12 +7,10 @@ var package_json_1 = require('./modules/package-json');
 var tutorial_1 = require('./modules/tutorial');
 var window_1 = require('./modules/window');
 var validate_tutorial_1 = require('./modules/validate-tutorial');
-var coderoad_json_1 = require('./modules/coderoad-json');
 var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
     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, validation: validate_tutorial_1.reducer,
-    coderoadJson: coderoad_json_1.reducer
 });
diff --git a/src/actions.ts b/src/actions.ts
@@ -1,4 +1,3 @@
-export {cjSave, cjLoad} from './modules/coderoad-json';
 export {editorMarkdownOpen, editorTestOpen, editorPjOpen} from './modules/editor-paths';
 export {pageSet} from './modules/page-position';
 export {pjSave, pjLoad} from './modules/package-json';
diff --git a/src/components/Publish/index.tsx b/src/components/Publish/index.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import {Card, CardTitle, CardText} from 'material-ui/Card';
 import RaisedButton from 'material-ui/RaisedButton';
-import {validateTutorial, pjSave, pjLoad, cjLoad, routeSet, editorPjOpen} from '../../actions';
+import {validateTutorial, pjSave, pjLoad, tutorialLoad, routeSet, editorPjOpen} from '../../actions';
 import {topElement} from '../TopPanel';
 import {Stepper} from 'material-ui/Stepper';
 import publishStep from './publishStep';
@@ -25,11 +25,11 @@ const styles = {
 
 @connect(state => ({
   validation: state.validation,
-}), {pjLoad, cjLoad, editorPjOpen, validateTutorial})
+}), {pjLoad, tutorialLoad, editorPjOpen, validateTutorial})
 export default class TutorialPublish extends React.Component<{
   validation?: Validation.Object,
   pjLoad?: () => Redux.ActionCreator,
-  cjLoad?: () => Redux.ActionCreator,
+  tutorialLoad?: () => Redux.ActionCreator,
   validateTutorial?: () => Redux.ActionCreator,
   editorPjOpen?: () => Redux.ActionCreator,
 }, {
@@ -51,7 +51,7 @@ export default class TutorialPublish extends React.Component<{
   }
   validate() {
     this.props.pjLoad();
-    this.props.cjLoad();
+    this.props.tutorialLoad();
     this.props.validateTutorial();
   }
   selectStep(index) {
diff --git a/src/modules/coderoad-json/actions.ts b/src/modules/coderoad-json/actions.ts
diff --git a/src/modules/coderoad-json/index.ts b/src/modules/coderoad-json/index.ts
diff --git a/src/modules/coderoad-json/reducer.ts b/src/modules/coderoad-json/reducer.ts
diff --git a/src/modules/coderoad-json/types.ts b/src/modules/coderoad-json/types.ts
diff --git a/src/modules/tutorial/reducer.ts b/src/modules/tutorial/reducer.ts
@@ -8,6 +8,8 @@ import {join} from 'path';
 import taskUpdate from './utils/taskUpdate';
 import pageGet from './utils/pageGet';
 import taskGet from './utils/taskGet';
+import readFile from '../utils/readFile';
+import writeFile from '../utils/writeFile';
 
 const _tutorial: Tutorial.Output = {
   info: {
@@ -36,12 +38,9 @@ export default function tutorial(t = _tutorial, action: Action): Tutorial.Output
       return t;
 
     case TUTORIAL_LOAD:
-      // load data from coderoad.json
-      const data = JSON.parse(readFileSync(
-        join(action.payload.dir, 'coderoad.json'), 'utf8')
-      );
+      const loadedCj = readFile(action.payload.dir, 'coderoad.json');
+      return !!loadedCj ? loadedCj : t;
       // TODO: validate coderoad.json data
-      return data;
 
     case TUTORIAL_PAGE_ADD:
       // add a new page template
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -8,7 +8,6 @@ import {reducer as packageJson} from './modules/package-json';
 import {reducer as tutorial} from './modules/tutorial';
 import {reducer as windowToggle} from './modules/window';
 import {reducer as validation} from './modules/validate-tutorial';
-import {reducer as coderoadJson} from './modules/coderoad-json';
 
 // core reducers
 import {
@@ -22,5 +21,4 @@ export default combineReducers({
   alert, checks, editor, dir,
   packageJson, pagePosition, route,
   tutorial, windowToggle, form, validation,
-  coderoadJson
 });

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-export {cjSave, cjLoad} from './modules/coderoad-json';`
`2`	`1`	`export {editorMarkdownOpen, editorTestOpen, editorPjOpen} from './modules/editor-paths';`
`3`	`2`	`export {pageSet} from './modules/page-position';`
`4`	`3`	`export {pjSave, pjLoad} from './modules/package-json';`