add page from tab

ShMcK · ShMcK · commit 8a9c83b42e4f · 2016-06-05T12:40:43.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 node_modules
-tutorial/.tmp.*
+.DS_Store
diff --git a/coderoad.json b/coderoad.json
diff --git a/lib/actions.js b/lib/actions.js
@@ -11,6 +11,9 @@ exports.tutorialInit = tutorial_1.tutorialInit;
 exports.tutorialLoad = tutorial_1.tutorialLoad;
 exports.tutorialBuild = tutorial_1.tutorialBuild;
 exports.tutorialPageAdd = tutorial_1.tutorialPageAdd;
+exports.tutorialTaskAdd = tutorial_1.tutorialTaskAdd;
+exports.tutorialHintAdd = tutorial_1.tutorialHintAdd;
+exports.tutorialActionAdd = tutorial_1.tutorialActionAdd;
 var window_1 = require('./modules/window');
 exports.windowToggle = window_1.windowToggle;
 var editor_paths_1 = require('./modules/editor-paths');
diff --git a/lib/components/TopPanel/TopPanel.js b/lib/components/TopPanel/TopPanel.js
@@ -48,7 +48,7 @@ var TopPanel = (function (_super) {
         }
         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.toString(), label: page.title.substring(0, 10), onClick: pageSet.bind(_this, index)}));
-        }), React.createElement(Tabs_1.Tab, {style: Object.assign({}, styles.tab, styles.add), label: '+'})));
+        }), React.createElement(Tabs_1.Tab, {style: Object.assign({}, styles.tab, styles.add), label: '+', onActive: pageAdd})));
     };
     TopPanel = __decorate([
         react_redux_1.connect(null, function (dispatch) {
diff --git a/lib/modules/tutorial/actions.js b/lib/modules/tutorial/actions.js
@@ -24,7 +24,18 @@ function tutorialBuild() {
 }
 exports.tutorialBuild = tutorialBuild;
 function tutorialPageAdd() {
-    console.log('called tutorialPageAdd');
     return { type: types_1.TUTORIAL_PAGE_ADD };
 }
 exports.tutorialPageAdd = tutorialPageAdd;
+function tutorialTaskAdd(pagePosition, taskPosition) {
+    return { type: types_1.TUTORIAL_TASK_ADD, payload: { pagePosition: pagePosition, taskPosition: taskPosition } };
+}
+exports.tutorialTaskAdd = tutorialTaskAdd;
+function tutorialActionAdd(pagePosition, taskPosition) {
+    return { type: types_1.TUTORIAL_ACTION_ADD, payload: { pagePosition: pagePosition, taskPosition: taskPosition } };
+}
+exports.tutorialActionAdd = tutorialActionAdd;
+function tutorialHintAdd(pagePosition, taskPosition) {
+    return { type: types_1.TUTORIAL_HINT_ADD, payload: { pagePosition: pagePosition, taskPosition: taskPosition } };
+}
+exports.tutorialHintAdd = tutorialHintAdd;
diff --git a/lib/modules/tutorial/index.js b/lib/modules/tutorial/index.js
@@ -4,5 +4,8 @@ exports.tutorialInit = actions_1.tutorialInit;
 exports.tutorialLoad = actions_1.tutorialLoad;
 exports.tutorialBuild = actions_1.tutorialBuild;
 exports.tutorialPageAdd = actions_1.tutorialPageAdd;
+exports.tutorialTaskAdd = actions_1.tutorialTaskAdd;
+exports.tutorialHintAdd = actions_1.tutorialHintAdd;
+exports.tutorialActionAdd = actions_1.tutorialActionAdd;
 var reducer_1 = require('./reducer');
 exports.reducer = reducer_1.default;
diff --git a/lib/modules/tutorial/reducer.js b/lib/modules/tutorial/reducer.js
@@ -3,27 +3,23 @@ var types_1 = require('./types');
 var coderoad_cli_1 = require('coderoad-cli');
 var fs_1 = require('fs');
 var path_1 = require('path');
+var pageNew_1 = require('./utils/pageNew');
 var _tutorial = {
-    title: '',
-    pages: [{
-            file: './01/page-01.md',
-            title: 'Page One',
-            description: 'page one description',
-            tasks: [{
-                    tests: ['./01/01.js'],
-                    description: 'first task',
-                    hints: ['hint 1', 'hint 2']
-                }]
-        }]
+    info: {
+        title: '',
+        description: '',
+    },
+    pages: [].concat(pageNew_1.default(0))
 };
 function tutorial(t, action) {
     if (t === void 0) { t = _tutorial; }
     switch (action.type) {
         case types_1.TUTORIAL_INIT:
             var _a = action.payload, dir = _a.dir, name_1 = _a.name;
             coderoad_cli_1.create(dir, name_1);
-            if (_tutorial.title.length < 1) {
-                t = Object.assign({}, t, { title: name_1 });
+            if (_tutorial.info.title.length < 1) {
+                var info = Object.assign({}, t.info, { title: name_1 });
+                t = Object.assign({}, t, { info: info });
             }
             return t;
         case types_1.TUTORIAL_BUILD:
@@ -32,6 +28,9 @@ function tutorial(t, action) {
         case types_1.TUTORIAL_LOAD:
             var data = JSON.parse(fs_1.readFileSync(path_1.join(action.payload.dir, 'coderoad.json'), 'utf8'));
             return data;
+        case types_1.TUTORIAL_PAGE_ADD:
+            var pages = t.pages.concat(pageNew_1.default(t.pages.length));
+            return Object.assign({}, t, { pages: pages });
         default:
             return t;
     }
diff --git a/lib/modules/tutorial/types.js b/lib/modules/tutorial/types.js
@@ -3,3 +3,6 @@ exports.TUTORIAL_INIT = 'TUTORIAL_INIT';
 exports.TUTORIAL_LOAD = 'TUTORIAL_LOAD';
 exports.TUTORIAL_BUILD = 'TUTORIAL_BUILD';
 exports.TUTORIAL_PAGE_ADD = 'TUTORIAL_PAGE_ADD';
+exports.TUTORIAL_TASK_ADD = 'TUTORIAL_TASK_ADD';
+exports.TUTORIAL_HINT_ADD = 'TUTORIAL_HINT_ADD';
+exports.TUTORIAL_ACTION_ADD = 'TUTORIAL_ACTION_ADD';
diff --git a/lib/modules/tutorial/utils/pageNew.js b/lib/modules/tutorial/utils/pageNew.js
@@ -0,0 +1,16 @@
+"use strict";
+function pageNew(index) {
+    index += 1;
+    return {
+        title: "Page " + index,
+        description: "page " + index + " description",
+        tasks: [{
+                tests: ['./01/01'],
+                description: 'first task description',
+                hints: [],
+                actions: [],
+            }]
+    };
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = pageNew;
diff --git a/lib/modules/tutorial/utils/taskUpdate.js b/lib/modules/tutorial/utils/taskUpdate.js
@@ -0,0 +1,7 @@
+"use strict";
+function updateTask(tutorial, pagePosition, taskPosition, prop, value) {
+    tutorial.pages[pagePosition].tasks[taskPosition] = tutorial.pages[pagePosition].tasks[taskPosition][prop].concat(value);
+    return tutorial;
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = updateTask;
diff --git a/src/actions.ts b/src/actions.ts
@@ -1,7 +1,10 @@
 export {pageSet} from './modules/page-position';
 export {pjSave} from './modules/package-json';
 export {setupVerify, setupPackage} from './modules/setup';
-export {tutorialInit, tutorialLoad, tutorialBuild, tutorialPageAdd} from './modules/tutorial';
+export {
+  tutorialInit, tutorialLoad, tutorialBuild, tutorialPageAdd,
+  tutorialTaskAdd, tutorialHintAdd, tutorialActionAdd
+} from './modules/tutorial';
 export {windowToggle} from './modules/window';
 export {editorOpenPage, editorOpenTest} from './modules/editor-paths';
 
diff --git a/src/components/TopPanel/TopPanel.tsx b/src/components/TopPanel/TopPanel.tsx
@@ -58,6 +58,7 @@ export default class TopPanel extends React.Component<{
        <Tab
         style={Object.assign({}, styles.tab, styles.add)}
         label='+'
+        onActive={pageAdd}
       />
      </Tabs>
    );
diff --git a/src/modules/tutorial/actions.ts b/src/modules/tutorial/actions.ts
@@ -1,5 +1,6 @@
 import {
-  TUTORIAL_INIT, TUTORIAL_LOAD, TUTORIAL_BUILD, TUTORIAL_PAGE_ADD
+  TUTORIAL_INIT, TUTORIAL_LOAD, TUTORIAL_BUILD,
+  TUTORIAL_PAGE_ADD, TUTORIAL_TASK_ADD, TUTORIAL_HINT_ADD, TUTORIAL_ACTION_ADD
 } from './types';
 
 export function tutorialInit() {
@@ -26,6 +27,17 @@ export function tutorialBuild() {
 }
 
 export function tutorialPageAdd() {
-  console.log('called tutorialPageAdd');
   return { type: TUTORIAL_PAGE_ADD };
 }
+
+export function tutorialTaskAdd(pagePosition: number, taskPosition: number) {
+  return { type: TUTORIAL_TASK_ADD, payload: { pagePosition, taskPosition } };
+}
+
+export function tutorialActionAdd(pagePosition: number, taskPosition: number) {
+  return { type: TUTORIAL_ACTION_ADD, payload: { pagePosition, taskPosition } };
+}
+
+export function tutorialHintAdd(pagePosition: number, taskPosition: number) {
+  return { type: TUTORIAL_HINT_ADD, payload: { pagePosition, taskPosition } };
+}
diff --git a/src/modules/tutorial/index.ts b/src/modules/tutorial/index.ts
@@ -1,2 +1,5 @@
-export {tutorialInit, tutorialLoad, tutorialBuild, tutorialPageAdd} from './actions';
+export {
+  tutorialInit, tutorialLoad, tutorialBuild, tutorialPageAdd,
+  tutorialTaskAdd, tutorialHintAdd, tutorialActionAdd
+} from './actions';
 export {default as reducer} from './reducer';
diff --git a/src/modules/tutorial/reducer.ts b/src/modules/tutorial/reducer.ts
@@ -1,45 +1,56 @@
-import {TUTORIAL_INIT, TUTORIAL_BUILD, TUTORIAL_LOAD} from './types';
+import {
+  TUTORIAL_INIT, TUTORIAL_BUILD, TUTORIAL_LOAD,
+  TUTORIAL_PAGE_ADD, TUTORIAL_TASK_ADD, TUTORIAL_HINT_ADD, TUTORIAL_ACTION_ADD
+} from './types';
 import {create, build} from 'coderoad-cli';
 import {readFileSync} from 'fs';
 import {join} from 'path';
+// import taskUpdate from './utils/taskUpdate';
+import pageNew from './utils/pageNew';
 
-const _tutorial = {
-  title: '',
-  pages: [{
-    file: './01/page-01.md',
-    title: 'Page One',
-    description: 'page one description',
-    tasks: [{
-      tests: ['./01/01.js'],
-      description: 'first task',
-      hints: ['hint 1', 'hint 2']
-    }]
-  }]
+const _tutorial: CR.Tutorial = {
+  info: {
+    title: '',
+    description: '',
+  },
+  pages: [].concat(pageNew(0))
 };
 
-export default function tutorial(t = _tutorial, action: Action) {
+export default function tutorial(t = _tutorial, action: Action): CR.Tutorial {
   switch (action.type) {
 
     case TUTORIAL_INIT:
       const {dir, name} = action.payload;
       create(dir, name);
-      if (_tutorial.title.length < 1) {
-        t = Object.assign({}, t, { title: name });
+      if (_tutorial.info.title.length < 1) {
+        // no title? save packageJson name as title
+        const info = Object.assign({}, t.info, { title: name });
+        t = Object.assign({}, t, {info});
       }
       return t;
 
     case TUTORIAL_BUILD:
+      // run CLI build to create a new coderoad.json file
       build(action.payload.dir, join('tutorial', 'tutorial.md'));
       return t;
 
     case TUTORIAL_LOAD:
+      // load data from coderoad.json
       const data = JSON.parse(readFileSync(
         join(action.payload.dir, 'coderoad.json'), 'utf8')
       );
       // TODO: validate coderoad.json data
-
       return data;
 
+    case TUTORIAL_PAGE_ADD:
+      // add a new page template
+      const pages = t.pages.concat(pageNew(t.pages.length));
+      return Object.assign({}, t, {pages});
+
+    // case TUTORIAL_ADD_HINT:
+    //   const {pagePosition, taskPosition} = action.payload;
+    //   t.pages[pagePosition].tasks[taskPosition].hints.concat('')
+
     default:
       return t;
   }
diff --git a/src/modules/tutorial/types.ts b/src/modules/tutorial/types.ts
@@ -1,4 +1,8 @@
 export const TUTORIAL_INIT = 'TUTORIAL_INIT';
 export const TUTORIAL_LOAD = 'TUTORIAL_LOAD';
 export const TUTORIAL_BUILD = 'TUTORIAL_BUILD';
+
 export const TUTORIAL_PAGE_ADD = 'TUTORIAL_PAGE_ADD';
+export const TUTORIAL_TASK_ADD = 'TUTORIAL_TASK_ADD';
+export const TUTORIAL_HINT_ADD = 'TUTORIAL_HINT_ADD';
+export const TUTORIAL_ACTION_ADD = 'TUTORIAL_ACTION_ADD';
diff --git a/src/modules/tutorial/utils/pageNew.ts b/src/modules/tutorial/utils/pageNew.ts
@@ -0,0 +1,13 @@
+export default function pageNew(index: number) {
+  index += 1;
+  return {
+    title: `Page ${index}`,
+    description: `page ${index} description`,
+    tasks: [{
+      tests: ['./01/01'],
+      description: 'first task description',
+      hints: [],
+      actions: [],
+    }]
+  };
+}
diff --git a/src/modules/tutorial/utils/taskUpdate.ts b/src/modules/tutorial/utils/taskUpdate.ts
@@ -0,0 +1,7 @@
+export default function updateTask(
+  tutorial: CR.Tutorial,
+  pagePosition: number, taskPosition: number,
+  prop: string, value): CR.Tutorial {
+  tutorial.pages[pagePosition].tasks[taskPosition] = tutorial.pages[pagePosition].tasks[taskPosition][prop].concat(value);
+  return tutorial;
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -52,6 +52,8 @@
         "src/modules/tutorial/index.ts",
         "src/modules/tutorial/reducer.ts",
         "src/modules/tutorial/types.ts",
+        "src/modules/tutorial/utils/pageNew.ts",
+        "src/modules/tutorial/utils/taskUpdate.ts",
         "src/modules/window/actions.ts",
         "src/modules/window/index.ts",
         "src/modules/window/reducer.ts",
diff --git a/tutorial/01/01.js b/tutorial/01/01.js
diff --git a/tutorial/01/02.js b/tutorial/01/02.js
diff --git a/tutorial/01/index.md b/tutorial/01/index.md
diff --git a/tutorial/02/01.js b/tutorial/02/01.js
diff --git a/tutorial/02/02.js b/tutorial/02/02.js
diff --git a/tutorial/02/index.md b/tutorial/02/index.md
diff --git a/tutorial/tutorial.md b/tutorial/tutorial.md

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`node_modules`
`2`		`-tutorial/.tmp.*`
	`2`	`+.DS_Store`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ var TopPanel = (function (_super) {`
`48`	`48`	`}`
`49`	`49`	`return (React.createElement(Tabs_1.Tabs, {tabItemContainerStyle: styles.tabs, style: styles.all}, tutorial.pages.map(function (page, index) {`
`50`	`50`	`return (React.createElement(Tabs_1.Tab, {style: styles.tab, key: index.toString(), label: page.title.substring(0, 10), onClick: pageSet.bind(_this, index)}));`
`51`		`- }), React.createElement(Tabs_1.Tab, {style: Object.assign({}, styles.tab, styles.add), label: '+'})));`
	`51`	`+ }), React.createElement(Tabs_1.Tab, {style: Object.assign({}, styles.tab, styles.add), label: '+', onActive: pageAdd})));`
`52`	`52`	`};`
`53`	`53`	`TopPanel = __decorate([`
`54`	`54`	`react_redux_1.connect(null, function (dispatch) {`