add propTypes, use newly create react-router-sans-urls

ShMcK · ShMcK · commit 8e5163f1822e · 2016-07-12T12:09:03.000-07:00
diff --git a/lib/components/Alert/index.js b/lib/components/Alert/index.js
@@ -46,3 +46,12 @@ var Alert = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Alert;
+Alert.propTypes = {
+    alert: React.PropTypes.shape({
+        action: React.PropTypes.string,
+        message: React.PropTypes.string,
+        duration: React.PropTypes.number.optional,
+        color: React.PropTypes.string,
+    }),
+    alertClose: React.PropTypes.func.optional
+};
diff --git a/lib/components/AppMenu/CloseWindow.js b/lib/components/AppMenu/CloseWindow.js
@@ -36,3 +36,6 @@ var CloseWindow = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = CloseWindow;
+CloseWindow.propTypes = {
+    windowToggle: React.PropTypes.func.optional,
+};
diff --git a/lib/components/AppMenu/MenuLink/index.js b/lib/components/AppMenu/MenuLink/index.js
@@ -38,3 +38,8 @@ var MenuLink = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = MenuLink;
+MenuLink.propTypes = {
+    route: React.PropTypes.string,
+    title: React.PropTypes.string.optional,
+    routeSet: React.PropTypes.func.optional,
+};
diff --git a/lib/components/AppMenu/Quit/index.js b/lib/components/AppMenu/Quit/index.js
@@ -39,3 +39,6 @@ var Quit = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Quit;
+Quit.propTypes = {
+    quit: React.PropTypes.func.optional,
+};
diff --git a/lib/components/AppMenu/index.js b/lib/components/AppMenu/index.js
@@ -40,3 +40,6 @@ var AppMenu = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = AppMenu;
+AppMenu.propTypes = {
+    route: React.PropTypes.string.optional,
+};
diff --git a/lib/components/AppMenu/issuesLink.js b/lib/components/AppMenu/issuesLink.js
@@ -0,0 +1,14 @@
+"use strict";
+var React = require('react');
+var MenuItem_1 = require('material-ui/MenuItem');
+function issuesLink() {
+    var tutorial = store.getState().tutorial;
+    if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
+        return null;
+    }
+    return (React.createElement(MenuItem_1.default, {key: 'issue', className: 'link'}, 
+        React.createElement("a", {href: tutorial.config.issuesPath}, "post issue")
+    ));
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = issuesLink;
diff --git a/lib/components/Common/RouteButton.js b/lib/components/Common/RouteButton.js
@@ -34,3 +34,9 @@ var RouteButton = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = RouteButton;
+RouteButton.propTypes = {
+    label: React.PropTypes.string,
+    route: React.PropTypes.string,
+    routeSet: React.PropTypes.func.optional,
+    style: React.PropTypes.object.optional,
+};
diff --git a/lib/components/FinalPage/index.js b/lib/components/FinalPage/index.js
@@ -53,3 +53,4 @@ var FinalPage = (function (_super) {
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = FinalPage;
+FinalPage.propTypes = {};
diff --git a/lib/components/SidePanel/SidePanel.js b/lib/components/SidePanel/SidePanel.js
@@ -15,7 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var Routes_1 = require('../Routes');
+var react_router_sans_urls_1 = require('react-router-sans-urls');
 var index_1 = require('../index');
 var Drawer_1 = require('material-ui/Drawer');
 var SidePanel = (function (_super) {
@@ -24,18 +24,24 @@ var SidePanel = (function (_super) {
         _super.apply(this, arguments);
     }
     SidePanel.prototype.render = function () {
-        var isWindowOpen = this.props.isWindowOpen;
+        var _a = this.props, isWindowOpen = _a.isWindowOpen, route = _a.route;
         return (React.createElement("section", null, 
             React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: isWindowOpen}, 
                 React.createElement("div", {className: 'cr-bg'}, 
                     React.createElement(index_1.AppMenu, null), 
-                    React.createElement(Routes_1.default, null))
+                    React.createElement(react_router_sans_urls_1.Router, {route: route}, 
+                        React.createElement(react_router_sans_urls_1.Route, {path: 'page', component: React.createElement(index_1.Page, null)}), 
+                        React.createElement(react_router_sans_urls_1.Route, {path: 'progress', component: React.createElement(index_1.Progress, null)}), 
+                        React.createElement(react_router_sans_urls_1.Route, {path: 'start', component: React.createElement(index_1.Start, null)}), 
+                        React.createElement(react_router_sans_urls_1.Route, {path: 'tutorials', component: React.createElement(index_1.Tutorials, null)}), 
+                        React.createElement(react_router_sans_urls_1.Route, {path: 'final', component: React.createElement(index_1.FinalPage, null)})))
             ), 
             React.createElement(index_1.Alert, null)));
     };
     SidePanel = __decorate([
         react_redux_1.connect(function (state) { return ({
             isWindowOpen: state.window,
+            route: state.route,
         }); }), 
         __metadata('design:paramtypes', [])
     ], SidePanel);
diff --git a/lib/components/common/ContentCard.js b/lib/components/common/ContentCard.js
@@ -17,3 +17,7 @@ var ContentCard = function (_a) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ContentCard;
+ContentCard.propTypes = {
+    title: React.PropTypes.string,
+    content: React.PropTypes.string.optional,
+};
diff --git a/package.json b/package.json
@@ -56,6 +56,6 @@
   "devDependencies": {
     "tslint": "3.13.0",
     "tslint-react": "0.4.0",
-    "typescript": "^2.0.0-dev.20160707"
+    "typescript": "^2.0.0"
   }
 }
diff --git a/src/components/Alert/index.tsx b/src/components/Alert/index.tsx
@@ -39,4 +39,12 @@ export default class Alert extends React.Component<{
   }
 }
 
-// action={action || ''} removed from Snackbar as of Material 0.15.1 due to bug
+Alert.propTypes = {
+  alert: React.PropTypes.shape({
+    action: React.PropTypes.string,
+    message: React.PropTypes.string,
+    duration: React.PropTypes.number.optional,
+    color: React.PropTypes.string,
+  }),
+  alertClose: React.PropTypes.func.optional
+};
diff --git a/src/components/AppMenu/CloseWindow.tsx b/src/components/AppMenu/CloseWindow.tsx
@@ -8,11 +8,15 @@ import NavigationClose from 'material-ui/svg-icons/navigation/close';
 @connect(null, { windowToggle })
 export default class CloseWindow extends React.Component<{
   windowToggle?: any}, {}> {
-  render() {
+  public render() {
     return (
       <IconButton onClick={this.props.windowToggle}>
         <NavigationClose color='white'/>
       </IconButton>
     );
   }
 }
+
+CloseWindow.propTypes = {
+  windowToggle: React.PropTypes.func.optional,
+};
diff --git a/src/components/AppMenu/MenuLink/index.tsx b/src/components/AppMenu/MenuLink/index.tsx
@@ -25,3 +25,9 @@ export default class MenuLink extends React.Component<{
     );
   }
 }
+
+MenuLink.propTypes = {
+  route: React.PropTypes.string,
+  title: React.PropTypes.string.optional,
+  routeSet: React.PropTypes.func.optional,
+};
diff --git a/src/components/AppMenu/Quit/index.tsx b/src/components/AppMenu/Quit/index.tsx
@@ -27,3 +27,7 @@ export default class Quit extends React.Component<{
     );
   }
 }
+
+Quit.propTypes = {
+  quit: React.PropTypes.func.optional,
+};
diff --git a/src/components/AppMenu/index.tsx b/src/components/AppMenu/index.tsx
@@ -29,3 +29,7 @@ export default class AppMenu extends React.Component<{
     );
   }
 }
+
+AppMenu.propTypes = {
+  route: React.PropTypes.string.optional,
+};
diff --git a/src/components/AppMenu/issuesLink.tsx b/src/components/AppMenu/issuesLink.tsx
@@ -1,19 +1,20 @@
-// import * as React from 'react';
-// import MenuItem from 'material-ui/MenuItem';
-//
-// export default function issuesLink() {
-//   const tutorial = store.getState().tutorial;
-//   if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
-//     return null;
-//   }
-//   return (
-//     <MenuItem
-//         key='issue'
-//         className='link'
-//     >
-//       <a href={tutorial.config.issuesPath}>
-//         post issue
-//       </a>
-//     </MenuItem>
-//   );
-// }
+import * as React from 'react';
+
+import MenuItem from 'material-ui/MenuItem';
+
+export default function issuesLink() {
+  const tutorial = store.getState().tutorial;
+  if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
+    return null;
+  }
+  return (
+    <MenuItem
+        key='issue'
+        className='link'
+    >
+      <a href={tutorial.config.issuesPath}>
+        post issue
+      </a>
+    </MenuItem>
+  );
+}
diff --git a/src/components/Common/RouteButton.tsx b/src/components/Common/RouteButton.tsx
@@ -20,3 +20,10 @@ export default class RouteButton extends React.Component<{
     );
   }
 }
+
+RouteButton.propTypes = {
+  label: React.PropTypes.string,
+  route: React.PropTypes.string,
+  routeSet: React.PropTypes.func.optional,
+  style: React.PropTypes.object.optional,
+};
diff --git a/src/components/FinalPage/index.tsx b/src/components/FinalPage/index.tsx
@@ -42,3 +42,5 @@ export default class FinalPage extends React.Component<{}, {}> {
     );
   }
 }
+
+FinalPage.propTypes = {};
diff --git a/src/components/Routes/index.tsx b/src/components/Routes/index.tsx
diff --git a/src/components/SidePanel/SidePanel.tsx b/src/components/SidePanel/SidePanel.tsx
@@ -1,19 +1,20 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
+import {Route, Router} from 'react-router-sans-urls';
 
-import Routes from '../Routes';
-import {Alert, AppMenu} from '../index';
+import {Alert, AppMenu, FinalPage, Page, Progress, Start, Tutorials} from '../index';
 import Drawer from 'material-ui/Drawer';
 import Menu from 'material-ui/svg-icons/navigation/menu';
 
 @connect(state => ({
   isWindowOpen: state.window,
+  route: state.route,
 }))
 export default class SidePanel extends React.Component<{
   isWindowOpen?: boolean
 }, {}> {
   public render(): React.ReactElement<{}> {
-    const {isWindowOpen} = this.props;
+    const {isWindowOpen, route} = this.props;
     return (
       <section>
         <Drawer
@@ -23,7 +24,13 @@ export default class SidePanel extends React.Component<{
         >
           <div className='cr-bg'>
             <AppMenu />
-            <Routes />
+            <Router route={route}>
+              <Route path='page' component={<Page />} />
+              <Route path='progress' component={<Progress />} />
+              <Route path='start' component={<Start />} />
+              <Route path='tutorials' component={<Tutorials />} />
+              <Route path='final' component={<FinalPage />} />
+            </Router>
           </div>
         </Drawer>
         <Alert />
diff --git a/src/components/common/ContentCard.tsx b/src/components/common/ContentCard.tsx
@@ -20,3 +20,8 @@ const ContentCard: React.StatelessComponent<{
   </Card>
 );
 export default ContentCard;
+
+ContentCard.propTypes = {
+  title: React.PropTypes.string,
+  content: React.PropTypes.string.optional,
+};
diff --git a/src/typings.d.ts b/src/typings.d.ts
@@ -1,4 +1,4 @@
 /// <reference path="../node_modules/core-coderoad/src/typings/index.d.ts" />
 // load typings from core-coderoad
 // this requires that the module be declared first
-declare module 'core-coderoad' {}
+declare module 'core-coderoad';
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
- "compileOnSave": false,
- "buildOnSave": false,
+ "compileOnSave": true,
+ "buildOnSave": true,
  "compilerOptions": {
   "target": "ES5",
   "module": "commonjs",
@@ -13,7 +13,8 @@
   "emitDecoratorMetadata": true,
   "outDir": "lib",
   "moduleResolution": "node",
-  "rootDirs": ["src"]
+  "rootDirs": ["src"],
+  "strictNullChecks": true
  },
  "filesGlob": [
   "typings.d.ts",
