final page with styles

ShMcK · ShMcK · commit d32b813a3557 · 2016-04-20T23:33:55.000-07:00
diff --git a/lib/actions/index.js b/lib/actions/index.js
@@ -16,7 +16,7 @@ exports.pageNext = page_1.pageNext;
 var position_1 = require('./position');
 exports.positionSet = position_1.positionSet;
 var route_1 = require('./route');
-exports.setRoute = route_1.setRoute;
+exports.routeSet = route_1.routeSet;
 var setup_1 = require('./setup');
 exports.setupVerify = setup_1.setupVerify;
 var test_1 = require('./test');
diff --git a/lib/actions/page.js b/lib/actions/page.js
@@ -1,6 +1,5 @@
 "use strict";
 var _types_1 = require('./_types');
-var index_1 = require('./index');
 var store_1 = require('../store');
 var _position = {
     chapter: 0,
@@ -17,20 +16,21 @@ function pageNext() {
         };
     }
     else if (chapter < chapters.length - 1) {
-        store_1.store.dispatch(index_1.completePage());
         position = {
             chapter: chapter + 1,
             page: 0,
         };
     }
     else {
-        store_1.store.dispatch(index_1.completeTutorial());
-        position = {
-            chapter: chapter,
-            page: page
+        return {
+            payload: { route: 'final' },
+            type: _types_1.ROUTE_SET,
         };
     }
-    return { type: _types_1.PAGE_SET, payload: { position: position } };
+    return {
+        payload: { position: position },
+        type: _types_1.PAGE_SET,
+    };
 }
 exports.pageNext = pageNext;
 function pageSet(position) {
diff --git a/lib/actions/progress.js b/lib/actions/progress.js
@@ -9,7 +9,7 @@ function completePage() {
     var position = store_1.store.getState().position;
     var pageLength = store_1.store.getState().progress.chapters[position.chapter].pages.length;
     if (position.page >= pageLength - 1) {
-        return completeChapter();
+        store_1.store.dispatch(completeChapter());
     }
     return {
         payload: { position: position },
@@ -21,7 +21,7 @@ function completeChapter() {
     var chapter = store_1.store.getState().position.chapter;
     var chapterLength = store_1.store.getState().progress.chapters.length;
     if (chapter >= chapterLength - 1) {
-        return completeTutorial();
+        store_1.store.dispatch(completeTutorial());
     }
     return {
         payload: { chapter: chapter },
diff --git a/lib/actions/route.js b/lib/actions/route.js
@@ -3,7 +3,7 @@ var store_1 = require('../store');
 var _types_1 = require('./_types');
 var tutorial_1 = require('./tutorial');
 var previous = null;
-function setRoute(route) {
+function routeSet(route) {
     if (route && route !== previous) {
         switch (route) {
             case 'tutorials':
@@ -16,4 +16,4 @@ function setRoute(route) {
         };
     }
 }
-exports.setRoute = setRoute;
+exports.routeSet = routeSet;
diff --git a/lib/components/App.js b/lib/components/App.js
@@ -35,6 +35,7 @@ var App = (function (_super) {
         _super.apply(this, arguments);
     }
     App.prototype.render = function () {
+        console.log(this.props.store);
         return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(index_1.AppMenu, __assign({}, this.props.store)), React.createElement(Routes_1.Routes, __assign({}, this.props.store)), React.createElement(index_1.Alert, __assign({}, this.props.store))));
     };
     App = __decorate([
diff --git a/lib/components/AppMenu/MenuLink.js b/lib/components/AppMenu/MenuLink.js
@@ -29,7 +29,7 @@ var MenuLink = (function (_super) {
     MenuLink = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                routeTo: function (route) { return dispatch(actions_1.setRoute(route)); },
+                routeTo: function (route) { return dispatch(actions_1.routeSet(route)); },
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/Common/RouteButton.js b/lib/components/Common/RouteButton.js
@@ -29,7 +29,7 @@ var RouteButton = (function (_super) {
     RouteButton = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                routeTo: function (route) { return dispatch(actions_1.setRoute(route)); },
+                routeTo: function (route) { return dispatch(actions_1.routeSet(route)); },
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/FinalPage/index.js b/lib/components/FinalPage/index.js
@@ -1,6 +1,9 @@
 "use strict";
 var React = require('react');
-var Paper_1 = require('material-ui/Paper');
 var Card_1 = require('material-ui/Card');
 var FlatButton_1 = require('material-ui/FlatButton');
-exports.FinalPage = function () { return (React.createElement(Paper_1.default, null, React.createElement(Card_1.Card, null, React.createElement(Card_1.CardTitle, {title: 'Congratulations!', subtitle: 'Tutorial Complete!'}), React.createElement(Card_1.CardText, null, "What's next?"), React.createElement(Card_1.CardActions, null, React.createElement("a", {href: 'https://coderoad.github.io/#tutorials'}, React.createElement(FlatButton_1.default, {label: 'See More Tutorials', disabled: true})), React.createElement("a", {href: 'https://coderoad.github.io/build'}, React.createElement(FlatButton_1.default, {label: 'Learn how to Create a Tutorial'})))))); };
+var styles = {
+    margin: '5px',
+    padding: '10px',
+};
+exports.FinalPage = function () { return (React.createElement(Card_1.Card, {style: styles}, React.createElement(Card_1.CardTitle, {title: 'Congratulations!', subtitle: 'Tutorial Complete!'}), React.createElement(Card_1.CardText, null, "What's next?", React.createElement("br", null), React.createElement("br", null), React.createElement("a", {href: 'https://coderoad.github.io/#tutorials'}, React.createElement(FlatButton_1.default, {label: 'See More Tutorials', disabled: true})), React.createElement("span", null, " (coming soon)"), React.createElement("br", null), React.createElement("br", null), React.createElement("a", {href: 'https://coderoad.github.io/build'}, React.createElement(FlatButton_1.default, {label: 'Learn how to Create a Tutorial'}))))); };
diff --git a/lib/components/Page/PageToolbar/Continue.js b/lib/components/Page/PageToolbar/Continue.js
@@ -28,7 +28,10 @@ var Continue = (function (_super) {
     Continue = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
             return {
-                callNextPage: function () { return dispatch(actions_1.pageNext()); },
+                callNextPage: function () {
+                    dispatch(actions_1.pageNext());
+                    dispatch(actions_1.testsLoad());
+                }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/Page/index.js b/lib/components/Page/index.js
@@ -36,7 +36,6 @@ var Page = (function (_super) {
         var _a = this.props, page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, testRun = _a.testRun;
         var task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
         var allComplete = taskPosition >= tasks.length;
-        console.log('page', page);
         return (React.createElement("section", {className: 'cr-page'}, React.createElement(PageContent_1.PageContent, __assign({}, this.props)), React.createElement(Tasks_1.Tasks, __assign({}, this.props, {completed: page.completed})), React.createElement("div", {className: 'listEnd', ref: 'listEnd'}), React.createElement(PageComplete_1.PageComplete, __assign({}, this.props)), React.createElement(Hints_1.Hints, {task: task, hintPosition: hintPosition}), React.createElement(PageToolbar_1.PageToolbar, __assign({}, this.props), React.createElement(ProgressBar_1.ProgressBar, {taskPosition: taskPosition, taskCount: tasks.length, completed: page.completed}))));
     };
     return Page;
diff --git a/lib/components/Progress/ProgressPage.js b/lib/components/Progress/ProgressPage.js
@@ -50,7 +50,7 @@ var ProgressPage = (function (_super) {
                 selectPage: function (position) {
                     dispatch(actions_1.pageSet(position));
                     dispatch(actions_1.testsLoad());
-                    dispatch(actions_1.setRoute('page'));
+                    dispatch(actions_1.routeSet('page'));
                 }
             };
         }), 
diff --git a/lib/components/Tutorials/SelectTutorial.js b/lib/components/Tutorials/SelectTutorial.js
@@ -43,7 +43,7 @@ var SelectTutorial = (function (_super) {
                     dispatch(actions_1.tutorialSet(name));
                     dispatch(actions_1.positionSet({ chapter: 0, page: 0 }));
                     dispatch(actions_1.progressLoad());
-                    dispatch(actions_1.setRoute('progress'));
+                    dispatch(actions_1.routeSet('progress'));
                 },
             };
         }), 
diff --git a/lib/reducers/test-run/test-result.js b/lib/reducers/test-run/test-result.js
@@ -2,7 +2,6 @@
 var store_1 = require('../../store');
 var actions_1 = require('../../actions');
 function handleResult(result) {
-    console.log('handleRes', result);
     store_1.store.dispatch(actions_1.testComplete());
     if (result.completed) {
         store_1.store.dispatch(actions_1.testResult(result));
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -5,7 +5,7 @@ export {
 export {hintShow, hintPositionSet} from './hint';
 export {pageSet, pageNext} from './page';
 export {positionSet} from './position';
-export {setRoute} from './route';
+export {routeSet} from './route';
 export {setupVerify} from './setup';
 export {
   testRun, testComplete, testResult, testsLoad
diff --git a/src/actions/page.ts b/src/actions/page.ts
@@ -1,5 +1,4 @@
 import {ROUTE_SET, PAGE_SET} from './_types';
-import {completePage, completeTutorial} from './index';
 import {store} from '../store';
 
 const _position = {
@@ -17,19 +16,20 @@ export function pageNext(): Action {
       page: page + 1,
     };
   } else if (chapter < chapters.length - 1) {
-    store.dispatch(completePage());
     position = {
       chapter: chapter + 1,
       page: 0,
     };
   } else {
-    store.dispatch(completeTutorial());
-    position = {
-      chapter,
-      page
+    return {
+      payload: { route: 'final' },
+      type: ROUTE_SET,
     };
   }
-  return { type: PAGE_SET, payload: { position } };
+  return {
+    payload: { position },
+    type: PAGE_SET,
+  };
 }
 
 export function pageSet(
diff --git a/src/actions/progress.ts b/src/actions/progress.ts
@@ -11,7 +11,7 @@ export function completePage(): Action {
   const position: CR.Position = store.getState().position;
   const pageLength: number = store.getState().progress.chapters[position.chapter].pages.length;
   if (position.page >= pageLength - 1) {
-    return completeChapter();
+    store.dispatch(completeChapter());
   }
   return {
     payload: { position },
@@ -23,7 +23,7 @@ export function completeChapter(): Action {
   const chapter: number = store.getState().position.chapter;
   const chapterLength: number = store.getState().progress.chapters.length;
   if (chapter >= chapterLength - 1) {
-    return completeTutorial();
+    store.dispatch(completeTutorial());
   }
   return {
     payload: { chapter },
diff --git a/src/actions/route.ts b/src/actions/route.ts
@@ -5,7 +5,7 @@ import {tutorialsFind} from './tutorial';
 let previous = null;
 
 /* Navigation */
-export function setRoute(route: string): Action {
+export function routeSet(route: string): Action {
   if (route && route !== previous) {
 
     // preloading for routes
diff --git a/src/components/AppMenu/MenuLink.tsx b/src/components/AppMenu/MenuLink.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import MenuItem from 'material-ui/MenuItem';
-import {pageSet, setRoute} from '../../actions';
+import {pageSet, routeSet} from '../../actions';
 
 @connect(null, (dispatch) => {
   return {
-    routeTo: (route: string) => dispatch(setRoute(route)),
+    routeTo: (route: string) => dispatch(routeSet(route)),
   };
 })
 export class MenuLink extends React.Component<{
diff --git a/src/components/Common/RouteButton.tsx b/src/components/Common/RouteButton.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {setRoute} from '../../actions';
+import {routeSet} from '../../actions';
 import FlatButton from 'material-ui/FlatButton';
 
 @connect(null, (dispatch) => {
   return {
-    routeTo: (route: string) => dispatch(setRoute(route)),
+    routeTo: (route: string) => dispatch(routeSet(route)),
   };
 })
 export class RouteButton extends React.Component<{
diff --git a/src/components/FinalPage/index.tsx b/src/components/FinalPage/index.tsx
@@ -5,27 +5,32 @@ import Divider from 'material-ui/Divider';
 import {Card, CardTitle, CardText, CardActions} from 'material-ui/Card';
 import FlatButton from 'material-ui/FlatButton';
 
+const styles = {
+  margin: '5px',
+  padding: '10px',
+};
+
 export const FinalPage: React.StatelessComponent<{}> = () => (
-  <Paper>
-    <Card>
+    <Card style={styles}>
       <CardTitle
         title='Congratulations!'
         subtitle='Tutorial Complete!'
       />
       <CardText>
         What's next?
-      </CardText>
-      <CardActions>
+        <br /><br />
         <a href='https://coderoad.github.io/#tutorials'>
           <FlatButton
             label='See More Tutorials'
             disabled={true}
           />
         </a>
+        <span> (coming soon)</span>
+        <br /><br />
         <a href='https://coderoad.github.io/build'>
           <FlatButton label='Learn how to Create a Tutorial' />
         </a>
-      </CardActions>
+      </CardText>
+
     </Card>
-  </Paper>
 );
diff --git a/src/components/Page/PageToolbar/Continue.tsx b/src/components/Page/PageToolbar/Continue.tsx
@@ -1,11 +1,14 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import FlatButton from 'material-ui/FlatButton';
-import {pageNext} from '../../../actions';
+import {pageNext, testsLoad} from '../../../actions';
 
 @connect(null, (dispatch, state) => {
   return {
-    callNextPage: () => dispatch(pageNext()),
+    callNextPage: () => {
+      dispatch(pageNext());
+      dispatch(testsLoad());
+    }
   };
 })
 export class Continue extends React.Component<{
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
@@ -29,7 +29,6 @@ render() {
   const {page, taskPosition, hintPosition, tasks, testRun} = this.props;
   const task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
   const allComplete = taskPosition >= tasks.length;
-  console.log('page', page);
   return (
     <section className='cr-page'>
       <PageContent {...this.props} />
diff --git a/src/components/Progress/ProgressPage.tsx b/src/components/Progress/ProgressPage.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {pageSet, setRoute, testsLoad} from '../../actions';
+import {pageSet, routeSet, testsLoad} from '../../actions';
 import * as classnames from 'classnames';
 import {ListItem} from 'material-ui/List';
 import {progressIcon} from './progressIcon';
@@ -11,7 +11,7 @@ import {grey400} from 'material-ui/styles/colors';
     selectPage: (position: CR.Position) => {
       dispatch(pageSet(position));
       dispatch(testsLoad());
-      dispatch(setRoute('page'));
+      dispatch(routeSet('page'));
     }
   };
 })
diff --git a/src/components/Tutorials/SelectTutorial.tsx b/src/components/Tutorials/SelectTutorial.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import FlatButton from 'material-ui/FlatButton';
 import {
-  positionSet, tutorialSet, progressLoad, setRoute
+  positionSet, tutorialSet, progressLoad, routeSet
 } from '../../actions';
 
 function displayName(name: string): string {
@@ -20,12 +20,12 @@ function displayName(name: string): string {
       dispatch(tutorialSet(name));
       dispatch(positionSet({chapter: 0, page: 0}));
       dispatch(progressLoad());
-      dispatch(setRoute('progress'));
+      dispatch(routeSet('progress'));
     },
   };
 })
 export class SelectTutorial extends React.Component<{
-  tutorial: Tutorial.Info, selectTutorial?: any
+  tutorial: CR.Tutorial, selectTutorial?: any
 }, {}> {
   render() {
     const {tutorial, selectTutorial} = this.props;
diff --git a/src/components/app.tsx b/src/components/app.tsx
@@ -13,6 +13,7 @@ window.onresize = function() {
 })
 export class App extends React.Component<{store?: CR.State}, {}> {
   render(): React.ReactElement<{}> {
+    console.log(this.props.store);
     return (
       <section
         className='cr'
diff --git a/src/reducers/route/route.spec.ts b/src/reducers/route/route.spec.ts
@@ -6,13 +6,13 @@ describe('route', () => {
 
   describe('ROUTE_SET', () => {
     it('changes the store path', () => {
-      const action: Action = Action.setRoute('page');
+      const action: Action = Action.routeSet('page');
       expect(reducer({}, action).route).to.equal('page');
     });
 
     it('updates an existing store path', () => {
       const state = {route: 'page'};
-      const action: Action = Action.setRoute('progress');
+      const action: Action = Action.routeSet('progress');
       expect(reducer(state, action).route).to.equal('progress');
     });
   });
diff --git a/src/reducers/test-run/test-result.ts b/src/reducers/test-run/test-result.ts
@@ -2,9 +2,6 @@ import {store} from '../../store';
 import {testResult, completePage, testComplete} from '../../actions';
 
 export function handleResult(result: Test.Result): void {
-
-  console.log('handleRes', result);
-
   store.dispatch(testComplete());
 
   if (result.completed) {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ var store_1 = require('../store');`
`3`	`3`	`var _types_1 = require('./_types');`
`4`	`4`	`var tutorial_1 = require('./tutorial');`
`5`	`5`	`var previous = null;`
`6`		`-function setRoute(route) {`
	`6`	`+function routeSet(route) {`
`7`	`7`	`if (route && route !== previous) {`
`8`	`8`	`switch (route) {`
`9`	`9`	`case 'tutorials':`
`@@ -16,4 +16,4 @@ function setRoute(route) {`
`16`	`16`	`};`
`17`	`17`	`}`
`18`	`18`	`}`
`19`		`-exports.setRoute = setRoute;`
	`19`	`+exports.routeSet = routeSet;`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ var App = (function (_super) {`
`35`	`35`	`_super.apply(this, arguments);`
`36`	`36`	`}`
`37`	`37`	`App.prototype.render = function () {`
	`38`	`+ console.log(this.props.store);`
`38`	`39`	`return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(index_1.AppMenu, __assign({}, this.props.store)), React.createElement(Routes_1.Routes, __assign({}, this.props.store)), React.createElement(index_1.Alert, __assign({}, this.props.store))));`
`39`	`40`	`};`
`40`	`41`	`App = __decorate([`