create tutorial reducer, pjSave action

ShMcK · ShMcK · commit 94aeb5c0ff59 · 2016-05-31T21:02:48.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -3,10 +3,12 @@ var actions_1 = require('./modules/page/actions');
 exports.pageSet = actions_1.pageSet;
 exports.pageNext = actions_1.pageNext;
 var package_json_1 = require('./modules/package-json');
-exports.tutorialConfigSave = package_json_1.tutorialConfigSave;
+exports.pjSave = package_json_1.pjSave;
 var setup_1 = require('./modules/setup');
 exports.setupVerify = setup_1.setupVerify;
 exports.setupPackage = setup_1.setupPackage;
+var tutorial_1 = require('./modules/tutorial');
+exports.tutorialInit = tutorial_1.tutorialInit;
 var alert_1 = require('core-coderoad/lib/alert');
 exports.alertOpen = alert_1.alertOpen;
 exports.alertClose = alert_1.alertClose;
@@ -19,7 +21,5 @@ exports.editorSave = editor_1.editorSave;
 exports.editorSet = editor_1.editorSet;
 var route_1 = require('core-coderoad/lib/route');
 exports.routeSet = route_1.routeSet;
-var tutorial_1 = require('core-coderoad/lib/tutorial');
-exports.tutorialSet = tutorial_1.tutorialSet;
 var window_1 = require('core-coderoad/lib/window');
 exports.windowToggle = window_1.windowToggle;
diff --git a/lib/components/TutorialConfig/index.js b/lib/components/TutorialConfig/index.js
@@ -80,13 +80,16 @@ var TutorialConfig = (function (_super) {
     };
     TutorialConfig.prototype.render = function () {
         var pj = this.state.pj;
-        return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {title: 'Tutorial Configuration'}), React.createElement(TextField_1.default, {floatingLabelText: 'Tutorial Package Name', defaultValue: pj.name, onChange: this.handleText.bind(this, 'name')}), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Language', value: pj.config.language, onChange: this.handleSelect.bind(this, 'language')}, languageItems_1.default()), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Test Runner', value: pj.config.runner, onChange: this.handleSelect.bind(this, 'runner')}, runnerItems_1.default(pj.config.language)), React.createElement("br", null), React.createElement(RaisedButton_1.default, {style: styles.button, label: 'Save', primary: true, onTouchTap: this.save.bind(this)}), React.createElement(RaisedButton_1.default, {style: styles.button, label: 'Continue', secondary: true, onTouchTap: this.props.routeToInfo.bind(this)})));
+        return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {title: 'Tutorial Configuration'}), React.createElement(TextField_1.default, {floatingLabelText: 'Tutorial Package Name', defaultValue: pj.name, onChange: this.handleText.bind(this, 'name')}), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Language', value: pj.config.language, onChange: this.handleSelect.bind(this, 'language')}, languageItems_1.default()), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Test Runner', value: pj.config.runner, onChange: this.handleSelect.bind(this, 'runner')}, runnerItems_1.default(pj.config.language)), React.createElement("br", null), React.createElement(RaisedButton_1.default, {style: styles.button, label: 'Save', primary: true, onTouchTap: this.save.bind(this)}), React.createElement(RaisedButton_1.default, {style: styles.button, label: 'Continue', secondary: true, onTouchTap: this.props.routeToPage.bind(this)})));
     };
     TutorialConfig = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                save: function (pj) { return dispatch(actions_1.tutorialConfigSave(pj)); },
-                routeToPage: function () { return dispatch(actions_1.routeSet('page')); }
+                save: function (pj) { return dispatch(actions_1.pjSave(pj)); },
+                routeToPage: function () {
+                    dispatch(actions_1.tutorialInit());
+                    dispatch(actions_1.routeSet('page'));
+                }
             };
         }), 
         __metadata('design:paramtypes', [Object])
diff --git a/lib/components/TutorialInfo/index.js b/lib/components/TutorialInfo/index.js
@@ -31,7 +31,9 @@ var TutorialInfo = (function (_super) {
     __extends(TutorialInfo, _super);
     function TutorialInfo(props) {
         _super.call(this, props);
-        this.state = this.props.packageJson;
+        this.state = {
+            pj: this.props.packageJson
+        };
     }
     TutorialInfo.prototype.handleText = function (prop, event) {
         this.handleChange(prop, event.target.value);
@@ -42,18 +44,18 @@ var TutorialInfo = (function (_super) {
     TutorialInfo.prototype.handleChange = function (prop, val) {
         var obj = {};
         obj[prop] = val;
-        this.setState(Object.assign({}, this.state, obj));
+        this.setState({ pj: Object.assign({}, this.state, obj) });
     };
     TutorialInfo.prototype.save = function () {
-        this.props.save(this.state);
+        this.props.save(this.state.pj);
     };
     TutorialInfo.prototype.render = function () {
-        return (React.createElement(Card_1.Card, {style: styles}, React.createElement(Card_1.CardHeader, {title: 'Tutorial Info'}), React.createElement(TextField_1.default, {floatingLabelText: 'Title', defaultValue: this.state.name, onChange: this.handleText.bind(this, 'name')}), React.createElement("br", null), React.createElement(TextField_1.default, {floatingLabelText: 'Description', defaultValue: this.state.description, onChange: this.handleText.bind(this, 'description')}), React.createElement("br", null), React.createElement(TextField_1.default, {floatingLabelText: 'Version', defaultValue: this.state.version.join('.'), disabled: true, onChange: this.handleText.bind(this, 'version')}), React.createElement("br", null), React.createElement(TextField_1.default, {floatingLabelText: 'Keywords', defaultValue: this.state.keywords.join(', '), multiLine: true, onChange: this.handleText.bind(this, 'keywords')}), React.createElement("br", null), React.createElement(RaisedButton_1.default, {style: buttonStyles, label: 'Save', primary: true, onTouchTap: this.save.bind(this)}), React.createElement(RaisedButton_1.default, {style: buttonStyles, label: 'Continue', secondary: true, onTouchTap: this.props.routeToTutorial.bind(this)})));
+        return (React.createElement(Card_1.Card, {style: styles}, React.createElement(Card_1.CardHeader, {title: 'Tutorial Info'}), React.createElement(TextField_1.default, {floatingLabelText: 'Title', defaultValue: this.state.pj.name, onChange: this.handleText.bind(this, 'name')}), React.createElement("br", null), React.createElement(TextField_1.default, {floatingLabelText: 'Description', defaultValue: this.state.pj.description, onChange: this.handleText.bind(this, 'description')}), React.createElement("br", null), React.createElement(TextField_1.default, {floatingLabelText: 'Version', defaultValue: this.state.pj.version, disabled: true, onChange: this.handleText.bind(this, 'version')}), React.createElement("br", null), React.createElement(TextField_1.default, {floatingLabelText: 'Keywords', defaultValue: this.state.pj.keywords.join(', '), multiLine: true, onChange: this.handleText.bind(this, 'keywords')}), React.createElement("br", null), React.createElement(RaisedButton_1.default, {style: buttonStyles, label: 'Save', primary: true, onTouchTap: this.save.bind(this)}), React.createElement(RaisedButton_1.default, {style: buttonStyles, label: 'Continue', secondary: true, onTouchTap: this.props.routeToTutorial.bind(this)})));
     };
     TutorialInfo = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                save: function (config) { return dispatch(tutorialConfigSave(config)); },
+                save: function (pj) { return dispatch(actions_1.pjSave(pj)); },
                 routeToTutorial: function () { return dispatch(actions_1.routeSet('page')); }
             };
         }), 
diff --git a/lib/modules/package-json/actions.js b/lib/modules/package-json/actions.js
@@ -1,9 +1,9 @@
 "use strict";
 var types_1 = require('./types');
-function tutorialConfigSave(pj) {
+function pjSave(pj) {
     return function (dispatch, getState) {
         var dir = getState().dir;
         dispatch({ type: types_1.PJ_SAVE, payload: { pj: pj, dir: dir } });
     };
 }
-exports.tutorialConfigSave = tutorialConfigSave;
+exports.pjSave = pjSave;
diff --git a/lib/modules/package-json/index.js b/lib/modules/package-json/index.js
@@ -1,5 +1,5 @@
 "use strict";
 var actions_1 = require('./actions');
-exports.tutorialConfigSave = actions_1.tutorialConfigSave;
+exports.pjSave = actions_1.pjSave;
 var reducer_1 = require('./reducer');
 exports.reducer = reducer_1.default;
diff --git a/lib/modules/tutorial/actions.js b/lib/modules/tutorial/actions.js
@@ -0,0 +1,6 @@
+"use strict";
+var types_1 = require('./types');
+function tutorialInit() {
+    return { type: types_1.TUTORIAL_INIT };
+}
+exports.tutorialInit = tutorialInit;
diff --git a/lib/modules/tutorial/index.js b/lib/modules/tutorial/index.js
@@ -0,0 +1,5 @@
+"use strict";
+var actions_1 = require('./actions');
+exports.tutorialInit = actions_1.tutorialInit;
+var reducer_1 = require('./reducer');
+exports.reducer = reducer_1.default;
diff --git a/lib/modules/tutorial/reducer.js b/lib/modules/tutorial/reducer.js
@@ -0,0 +1,14 @@
+"use strict";
+var types_1 = require('./types');
+var _tutorial = {};
+function tutorial(t, action) {
+    if (t === void 0) { t = _tutorial; }
+    switch (action.type) {
+        case types_1.TUTORIAL_INIT:
+            return t;
+        default:
+            return t;
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = tutorial;
diff --git a/lib/modules/tutorial/types.js b/lib/modules/tutorial/types.js
@@ -0,0 +1,3 @@
+"use strict";
+exports.TUTORIAL_INIT = 'TUTORIAL_INIT';
+exports.TUTORIAL_ADD_PAGE = 'TUTORIAL_ADD_PAGE';
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -3,10 +3,10 @@ var redux_1 = require('redux');
 var page_1 = require('./modules/page');
 var setup_1 = require('./modules/setup');
 var package_json_1 = require('./modules/package-json');
+var tutorial_1 = require('./modules/tutorial');
 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 tutorial_1 = require('core-coderoad/lib/tutorial');
 var window_1 = require('core-coderoad/lib/window');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
diff --git a/src/actions.ts b/src/actions.ts
@@ -1,10 +1,10 @@
 export {pageSet, pageNext} from './modules/page/actions';
-export {tutorialInfoSave, tutorialConfigSave} from './modules/package-json';
+export {pjSave} from './modules/package-json';
 export {setupVerify, setupPackage} from './modules/setup';
+export {tutorialInit} from './modules/tutorial';
 
 export {alertOpen, alertClose, alertReplay} from 'core-coderoad/lib/alert';
 export {editorDevToolsToggle, editorOpen, editorInsert,
 editorSave, editorSet} from 'core-coderoad/lib/editor';
 export {routeSet} from 'core-coderoad/lib/route';
-export {tutorialSet} from 'core-coderoad/lib/tutorial';
 export {windowToggle} from 'core-coderoad/lib/window';
diff --git a/src/components/TutorialConfig/index.tsx b/src/components/TutorialConfig/index.tsx
@@ -6,7 +6,7 @@ import SelectField from 'material-ui/SelectField';
 import MenuItem from 'material-ui/MenuItem';
 import {Card, CardHeader} from 'material-ui/Card';
 import RaisedButton from 'material-ui/RaisedButton';
-import {tutorialConfigSave, routeSet} from '../../actions';
+import {pjSave, tutorialInit, routeSet} from '../../actions';
 import languageItems from './languageItems';
 import runnerItems from './runnerItems';
 
@@ -24,8 +24,11 @@ const styles = {
 
 @connect(null, dispatch => {
   return {
-    save: (pj: Tutorial.PJ) => dispatch(tutorialConfigSave(pj)),
-    routeToPage: () => dispatch(routeSet('page'))
+    save: (pj: Tutorial.PJ) => dispatch(pjSave(pj)),
+    routeToPage: () => {
+      dispatch(tutorialInit());
+      dispatch(routeSet('page'));
+    }
   };
 })
 export default class TutorialConfig extends React.Component <{
@@ -119,7 +122,7 @@ export default class TutorialConfig extends React.Component <{
           style={styles.button}
           label='Continue'
           secondary={true}
-          onTouchTap={this.props.routeToInfo.bind(this)}
+          onTouchTap={this.props.routeToPage.bind(this)}
         />
       </Card>
     );
diff --git a/src/components/TutorialInfo/index.tsx b/src/components/TutorialInfo/index.tsx
@@ -5,7 +5,7 @@ import SelectField from 'material-ui/SelectField';
 import MenuItem from 'material-ui/MenuItem';
 import {Card, CardHeader} from 'material-ui/Card'
 import RaisedButton from 'material-ui/RaisedButton';
-import {tutorialInfoSave, routeSet} from '../../actions';
+import {pjSave, routeSet} from '../../actions';
 
 const styles = {
   margin: '10px',
@@ -23,18 +23,20 @@ const buttonStyles = {
 
 @connect(null, dispatch => {
   return {
-    save: (config: Tutorial.ConfigSet) => dispatch(tutorialConfigSave(config)),
+    save: (pj: Tutorial.PJ) => dispatch(pjSave(pj)),
     routeToTutorial: () => dispatch(routeSet('page'))
   };
 })
 export default class TutorialInfo extends React.Component<{
   packageJson: any, save?: any, routeToTutorial?: any
 }, {
-  name: string, description: string, version: string
+  pj: Tutorial.PJ
 }> {
   constructor(props) {
     super(props);
-    this.state = this.props.packageJson;
+    this.state = {
+      pj: this.props.packageJson
+    };
   }
   handleText(prop, event) {
     this.handleChange(prop, event.target.value);
@@ -45,10 +47,10 @@ export default class TutorialInfo extends React.Component<{
   handleChange(prop, val) {
     const obj = {};
     obj[prop] = val;
-    this.setState(Object.assign({}, this.state, obj));
+    this.setState({pj: Object.assign({}, this.state, obj)});
   }
   save() {
-    this.props.save(this.state);
+    this.props.save(this.state.pj);
   }
   render() {
     return (
@@ -58,26 +60,26 @@ export default class TutorialInfo extends React.Component<{
         />
         <TextField
           floatingLabelText='Title'
-          defaultValue={this.state.name}
+          defaultValue={this.state.pj.name}
           onChange={this.handleText.bind(this, 'name')}
         />
         <br />
         <TextField
           floatingLabelText='Description'
-          defaultValue={this.state.description}
+          defaultValue={this.state.pj.description}
           onChange={this.handleText.bind(this, 'description')}
         />
         <br />
         <TextField
           floatingLabelText='Version'
-          defaultValue={this.state.version.join('.')}
+          defaultValue={this.state.pj.version}
           disabled={true}
           onChange={this.handleText.bind(this, 'version')}
         />
         <br />
         <TextField
           floatingLabelText='Keywords'
-          defaultValue={this.state.keywords.join(', ')}
+          defaultValue={this.state.pj.keywords.join(', ')}
           multiLine={true}
           onChange={this.handleText.bind(this, 'keywords')}
         />
diff --git a/src/modules/package-json/actions.ts b/src/modules/package-json/actions.ts
@@ -1,6 +1,6 @@
 import {PJ_SAVE} from './types';
 
-export function tutorialConfigSave(pj: Tutorial.PJ) {
+export function pjSave(pj: Tutorial.PJ) {
   return (dispatch, getState) => {
     const {dir} = getState();
     dispatch({ type: PJ_SAVE, payload: { pj, dir } });
diff --git a/src/modules/package-json/index.ts b/src/modules/package-json/index.ts
@@ -1,2 +1,2 @@
-export {tutorialConfigSave, tutorialInfoSave} from './actions';
+export {pjSave} from './actions';
 export {default as reducer} from './reducer';
diff --git a/src/modules/page/page/index.ts b/src/modules/page/page/index.ts
@@ -14,8 +14,7 @@ export default function pageReducer(
     case PAGE_SET:
       const {pagePosition, tutorial} = action.payload;
       const {title, description, onPageComplete} = tutorial.pages[pagePosition];
-      // clear dev console
-      // clearConsole();
+      
       return {
         title,
         description,
diff --git a/src/modules/tutorial/actions.ts b/src/modules/tutorial/actions.ts
@@ -0,0 +1,5 @@
+import {TUTORIAL_INIT} from './types';
+
+export function tutorialInit() {
+  return { type: TUTORIAL_INIT };
+}
diff --git a/src/modules/tutorial/index.ts b/src/modules/tutorial/index.ts
@@ -0,0 +1,2 @@
+export {tutorialInit} from './actions';
+export {default as reducer} from './reducer';
diff --git a/src/modules/tutorial/reducer.ts b/src/modules/tutorial/reducer.ts
@@ -0,0 +1,12 @@
+import {TUTORIAL_INIT} from './types';
+
+const _tutorial = {};
+
+export default function tutorial(t = _tutorial, action: Action) {
+  switch (action.type) {
+    case TUTORIAL_INIT:
+      return t;
+    default:
+      return t;
+  }
+}
diff --git a/src/modules/tutorial/types.ts b/src/modules/tutorial/types.ts
@@ -0,0 +1,2 @@
+export const TUTORIAL_INIT = 'TUTORIAL_INIT';
+export const TUTORIAL_ADD_PAGE = 'TUTORIAL_ADD_PAGE';
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -4,13 +4,12 @@ import {combineReducers} from 'redux';
 import {page, pagePosition, tasks, taskTests} from './modules/page';
 import {reducer as checks} from './modules/setup';
 import {reducer as packageJson} from './modules/package-json';
-
+import {reducer as tutorial} from './modules/tutorial';
 
 // 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 {reducer as tutorial} from 'core-coderoad/lib/tutorial';
 import {reducer as windowToggle} from 'core-coderoad/lib/window';
 
 export default combineReducers({
diff --git a/tsconfig.json b/tsconfig.json
@@ -49,6 +49,10 @@
         "src/modules/setup/utils/action-system.ts",
         "src/modules/setup/utils/check-system.ts",
         "src/modules/setup/utils/verify.ts",
+        "src/modules/tutorial/actions.ts",
+        "src/modules/tutorial/index.ts",
+        "src/modules/tutorial/reducer.ts",
+        "src/modules/tutorial/types.ts",
         "src/reducers.ts",
         "src/store.ts",
         "src/subscriptions.ts",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+"use strict";`
	`2`	`+exports.TUTORIAL_INIT = 'TUTORIAL_INIT';`
	`3`	`+exports.TUTORIAL_ADD_PAGE = 'TUTORIAL_ADD_PAGE';`