fix alert color issues

ShMcK · ShMcK · commit b5cf63b07dbe · 2016-05-15T14:24:35.000-07:00
diff --git a/lib/actions/page.js b/lib/actions/page.js
@@ -18,15 +18,16 @@ exports.pageNext = pageNext;
 function pageSet(pagePosition) {
     if (pagePosition === void 0) { pagePosition = 0; }
     return function (dispatch, getState) {
-        var _a = getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial;
-        var tasks = tutorial.pages[pagePosition].tasks || [];
+        var _a = getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial, route = _a.route;
+        console.log(pagePosition, dir, progress, tutorial, route);
         if (pagePosition >= progress.pages.length) {
             dispatch({ type: _types_1.ROUTE_SET, payload: { route: 'final' } });
         }
+        dispatch(hint_1.hintPositionSet(0));
+        var tasks = tutorial.pages[pagePosition].tasks || [];
         dispatch({
             type: _types_1.PAGE_SET, payload: { dir: dir, pagePosition: pagePosition, tutorial: tutorial, progress: progress, tasks: tasks }
         });
-        dispatch(hint_1.hintPositionSet(0));
     };
 }
 exports.pageSet = pageSet;
diff --git a/lib/components/AppMenu/Quit/index.js b/lib/components/AppMenu/Quit/index.js
@@ -32,9 +32,7 @@ var Quit = (function (_super) {
     Quit = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                quit: function () {
-                    dispatch(actions_1.quit());
-                }
+                quit: function () { return dispatch(actions_1.quit()); }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/Common/RouteButton.js b/lib/components/Common/RouteButton.js
@@ -15,8 +15,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var actions_1 = require('../../actions');
 var RaisedButton_1 = require('material-ui/RaisedButton');
+var actions_1 = require('../../actions');
 var RouteButton = (function (_super) {
     __extends(RouteButton, _super);
     function RouteButton() {
@@ -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.routeSet(route)); },
+                routeTo: function (route) { return dispatch(actions_1.routeSet(route)); }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/Page/PageToolbar/Continue/index.js b/lib/components/Page/PageToolbar/Continue/index.js
@@ -19,7 +19,7 @@ var RaisedButton_1 = require('material-ui/RaisedButton');
 var actions_1 = require('../../../../actions');
 var styles = {
     zIndex: '10000',
-    border: '0',
+    border: '0px',
     boxShadow: 'none',
     backgroundColor: 'inherit',
     position: 'relative',
@@ -36,9 +36,7 @@ var Continue = (function (_super) {
     Continue = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
             return {
-                callNextPage: function () {
-                    dispatch(actions_1.pageNext());
-                }
+                callNextPage: function () { return dispatch(actions_1.pageNext()); }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/Page/PageToolbar/Save/index.js b/lib/components/Page/PageToolbar/Save/index.js
@@ -18,7 +18,7 @@ var react_redux_1 = require('react-redux');
 var RaisedButton_1 = require('material-ui/RaisedButton');
 var actions_1 = require('../../../../actions');
 var styles = {
-    border: '0',
+    border: '0px',
     boxShadow: 'none',
     backgroundColor: 'inherit',
     position: 'relative',
@@ -35,9 +35,7 @@ var Save = (function (_super) {
     Save = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
             return {
-                save: function () {
-                    dispatch(actions_1.testSave());
-                }
+                save: function () { return dispatch(actions_1.testSave()); }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/components/Page/PageToolbar/ToggleLog/index.js b/lib/components/Page/PageToolbar/ToggleLog/index.js
@@ -34,9 +34,7 @@ var ToggleLog = (function (_super) {
     ToggleLog = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
             return {
-                toggleDevTools: function () {
-                    dispatch(actions_1.devToolsToggle());
-                }
+                toggleDevTools: function () { return dispatch(actions_1.devToolsToggle()); }
             };
         }), 
         __metadata('design:paramtypes', [])
diff --git a/lib/reducers/alert/index.js b/lib/reducers/alert/index.js
@@ -21,6 +21,7 @@ function setAlert(a) {
     var color = colors[a.action] || colors.NOTE;
     var statusBarAlert = document.getElementsByClassName('cr-alert-replay')[0];
     statusBarAlert.style.color = color;
+    current = a;
     return Object.assign({}, open, a);
 }
 function alertReducer(alert, action) {
diff --git a/src/actions/page.ts b/src/actions/page.ts
@@ -1,7 +1,8 @@
 import {
-  ROUTE_SET, PAGE_SET, PAGE_POSITION_SET
+  ROUTE_SET, PAGE_SET
 } from './_types';
 import {hintPositionSet} from './hint';
+import {routeSet} from './route';
 
 export function pageNext(): ReduxThunk.ThunkInterface | Action {
   return (dispatch, getState): void => {
@@ -18,15 +19,18 @@ export function pageNext(): ReduxThunk.ThunkInterface | Action {
 
 export function pageSet(pagePosition = 0): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
-    const {dir, progress, tutorial} = getState();
-    // create absolute paths for 'task-tests'
-    const tasks = tutorial.pages[pagePosition].tasks || [];
+    const {dir, progress, tutorial, route} = getState();
+    console.log(pagePosition, dir, progress, tutorial, route);
+
+    // routes
     if (pagePosition >= progress.pages.length) {
       dispatch({ type: ROUTE_SET, payload: { route: 'final' } });
     }
+    dispatch(hintPositionSet(0));
+    // create absolute paths for 'task-tests'
+    const tasks = tutorial.pages[pagePosition].tasks || [];
     dispatch({
       type: PAGE_SET, payload: { dir, pagePosition, tutorial, progress, tasks }
     });
-    dispatch(hintPositionSet(0));
   };
 }
diff --git a/src/actions/progress.ts b/src/actions/progress.ts
@@ -5,14 +5,14 @@ import {alertOpen} from './alert';
 import {testRun} from './test';
 
 export function progressPagePositionLoad(): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const {progress} = getState();
     dispatch({ type: PROGRESS_PAGE_POSITION_LOAD, payload: { progress } });
   };
 }
 
 export function progressLoad(): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const {tutorial} = getState();
     dispatch({ type: PROGRESS_LOAD, payload: { tutorial } });
     // call pagePositionLoad after progress loads
@@ -22,7 +22,7 @@ export function progressLoad(): ReduxThunk.ThunkInterface {
 }
 
 export function completePage(completed = true): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const {pagePosition, progress, tutorial} = getState();
     // all pages are true, tutorial complete
     dispatch({ type: COMPLETE_PAGE, payload: { pagePosition, tutorial, completed } });
@@ -42,7 +42,7 @@ export function completePage(completed = true): ReduxThunk.ThunkInterface {
 }
 
 export function completeTutorial(completed = true): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const {tutorial} = getState();
     dispatch({ type: COMPLETE_TUTORIAL, payload: { tutorial, completed } });
     dispatch(alertOpen({
diff --git a/src/actions/route.ts b/src/actions/route.ts
@@ -6,7 +6,7 @@ let previous = null;
 /* Navigation */
 export function routeSet(route: string): ReduxThunk.ThunkInterface {
   if (route && route !== previous) {
-    return (dispatch): void => {
+    return (dispatch) => {
       // preloading for routes
       switch (route) {
         case 'tutorials':
diff --git a/src/actions/tutorial.ts b/src/actions/tutorial.ts
@@ -6,28 +6,28 @@ import {routeSet} from './route';
 import {alertOpen} from './alert';
 
 export function tutorialSet(name: string): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const {dir} = getState();
-    dispatch({ type: TUTORIAL_SET, payload: { name, dir } });
+    dispatch({ type: TUTORIAL_SET, payload: {name, dir }});
     dispatch(progressLoad());
     dispatch(routeSet('progress'));
   };
 }
 
 export function tutorialUpdate(name: string): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const alert = {
       message: `run \`npm install --save-dev ${name}\``,
       action: 'note',
       duration: 3000,
     };
-    dispatch({ type: TUTORIAL_UPDATE, payload: { name } });
+    dispatch({ type: TUTORIAL_UPDATE, payload: { name }});
     dispatch(alertOpen(alert));
   };
 }
 
 export function tutorialsFind(): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
+  return (dispatch, getState) => {
     const {packageJson, dir} = getState();
     dispatch({ type: TUTORIALS_FIND, payload: { packageJson, dir } });
   };
diff --git a/src/components/AppMenu/MenuLink/index.tsx b/src/components/AppMenu/MenuLink/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import MenuItem from 'material-ui/MenuItem';
-import {pageSet, routeSet} from '../../../actions';
+import {routeSet} from '../../../actions';
 
 const styles = {
   textAlign: 'center',
diff --git a/src/components/AppMenu/Quit/index.tsx b/src/components/AppMenu/Quit/index.tsx
@@ -10,9 +10,7 @@ const styles = {
 
 @connect(null, (dispatch) => {
   return {
-    quit: () => {
-      dispatch(quit());
-    }
+    quit: () => dispatch(quit())
   };
 })
 export default class Quit 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 {routeSet} from '../../actions';
 import RaisedButton from 'material-ui/RaisedButton';
+import {routeSet} from '../../actions';
 
 @connect(null, dispatch => {
   return {
-    routeTo: (route: string) => dispatch(routeSet(route)),
+    routeTo: (route: string) => dispatch(routeSet(route))
   };
 })
 export default class RouteButton extends React.Component<{
diff --git a/src/components/Page/PageToolbar/Continue/index.tsx b/src/components/Page/PageToolbar/Continue/index.tsx
@@ -5,7 +5,7 @@ import {pageNext} from '../../../../actions';
 
 const styles = {
   zIndex: '10000',
-  border: '0',
+  border: '0px',
   boxShadow: 'none',
   backgroundColor: 'inherit',
   position: 'relative',
@@ -14,9 +14,7 @@ const styles = {
 
 @connect(null, (dispatch, state) => {
   return {
-    callNextPage: () => {
-      dispatch(pageNext());
-    }
+    callNextPage: () => dispatch(pageNext())
   };
 })
 export default class Continue extends React.Component<{
diff --git a/src/components/Page/PageToolbar/Save/index.tsx b/src/components/Page/PageToolbar/Save/index.tsx
@@ -4,7 +4,7 @@ import RaisedButton from 'material-ui/RaisedButton';
 import {testSave} from '../../../../actions';
 
 const styles = {
-  border: '0',
+  border: '0px',
   boxShadow: 'none',
   backgroundColor: 'inherit',
   position: 'relative',
@@ -13,9 +13,7 @@ const styles = {
 
 @connect(null, (dispatch, state) => {
   return {
-    save: () => {
-      dispatch(testSave());
-    }
+    save: () => dispatch(testSave())
   };
 })
 export default class Save extends React.Component<{
diff --git a/src/components/Page/PageToolbar/ToggleLog/index.tsx b/src/components/Page/PageToolbar/ToggleLog/index.tsx
@@ -11,9 +11,7 @@ const styles = {
 
 @connect(null, (dispatch, state) => {
   return {
-    toggleDevTools: () => {
-      dispatch(devToolsToggle());
-    }
+    toggleDevTools: () => dispatch(devToolsToggle())
   };
 })
 export default class ToggleLog extends React.Component<{
diff --git a/src/components/Progress/ProgressPage/index.tsx b/src/components/Progress/ProgressPage/index.tsx
@@ -40,6 +40,7 @@ export default class ProgressPage extends React.Component<{
         onClick={
           canActivate
             ? selectPage.bind(this, index)
+            // do nothing
             : function () { return; }
           }
       />
diff --git a/src/components/Start/Welcome/index.tsx b/src/components/Start/Welcome/index.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import {join} from 'path';
 import {RouteButton} from '../../index';
 
+// TODO: fix path
 const imagePath = join(
   __dirname, '../../../../', 'img', 'coderoad.jpg'
 );
diff --git a/src/reducers/alert/index.ts b/src/reducers/alert/index.ts
@@ -27,6 +27,7 @@ function setAlert(a: CR.Alert): CR.Alert {
   const color = colors[a.action] || colors.NOTE;
   let statusBarAlert = <HTMLElement>document.getElementsByClassName('cr-alert-replay')[0];
   statusBarAlert.style.color = color;
+  current = a;
   return Object.assign({}, open, a);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ function setAlert(a) {`
`21`	`21`	`var color = colors[a.action] \|\| colors.NOTE;`
`22`	`22`	`var statusBarAlert = document.getElementsByClassName('cr-alert-replay')[0];`
`23`	`23`	`statusBarAlert.style.color = color;`
	`24`	`+ current = a;`
`24`	`25`	`return Object.assign({}, open, a);`
`25`	`26`	`}`
`26`	`27`	`function alertReducer(alert, action) {`