refactor routes

Author: ShMcK

lib/components/routes/routes.js

@@ -11,26 +11,23 @@ var Routes = (function (_super) {
     function Routes() {
         _super.apply(this, arguments);
     }
-    Routes.prototype.chooseRoute = function (state) {
-        switch (state.route) {
+    Routes.prototype.render = function () {
+        var _a = this.props.state, page = _a.page, tasks = _a.tasks, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, editorActions = _a.editorActions, testRun = _a.testRun, log = _a.log, progress = _a.progress, position = _a.position, checks = _a.checks, tutorials = _a.tutorials, route = _a.route;
+        switch (route) {
             case 'page':
-                return React.createElement(_components_1.Page, {page: state.page, tasks: state.tasks, taskPosition: state.taskPosition, hintPosition: state.hintPosition, editorActions: state.editorActions, testRun: state.testRun, log: state.log});
+                return React.createElement(_components_1.Page, {page: page, tasks: tasks, taskPosition: taskPosition, hintPosition: hintPosition, editorActions: editorActions, testRun: testRun});
             case 'progress':
-                return React.createElement(_components_1.Progress, {progress: state.progress, position: state.position});
+                return React.createElement(_components_1.Progress, {progress: progress, position: position});
             case 'start':
-                return React.createElement(_components_1.Start, {checks: state.checks});
+                return React.createElement(_components_1.Start, {checks: checks});
             case 'tutorials':
-                return React.createElement(_components_1.Tutorials, {tutorials: state.tutorials});
+                return React.createElement(_components_1.Tutorials, {tutorials: tutorials});
             case 'final':
                 return React.createElement(_components_1.FinalPage, null);
             default:
                 throw 'Error: Route not found.';
         }
     };
-    Routes.prototype.render = function () {
-        var state = this.props.state;
-        return (React.createElement("div", null, this.chooseRoute(state)));
-    };
     return Routes;
 }(React.Component));
 exports.Routes = Routes;

src/components/routes/routes.tsx

@@ -2,35 +2,28 @@ import * as React from 'react';
 import {Page, Progress, Tutorials, Start, FinalPage} from '../_components';
 
 export class Routes extends React.Component<{state: CR.State}, {}> {
-  chooseRoute(state: CR.State) {
-    switch (state.route) {
+  render() {
+    const {page, tasks, taskPosition, hintPosition, editorActions, testRun,
+      log, progress, position, checks, tutorials, route} = this.props.state;
+    switch (route) {
       case 'page':
-        return <Page page={state.page}
-                    tasks={state.tasks}
-                    taskPosition={state.taskPosition}
-                    hintPosition={state.hintPosition}
-                    editorActions={state.editorActions}
-                    testRun={state.testRun}
-                    log={state.log} />;
+        return <Page page={page}
+                    tasks={tasks}
+                    taskPosition={taskPosition}
+                    hintPosition={hintPosition}
+                    editorActions={editorActions}
+                    testRun={testRun} />;
       case 'progress':
-        return <Progress progress={state.progress}
-                        position={state.position} />;
+        return <Progress progress={progress}
+                        position={position} />;
       case 'start':
-        return <Start checks={state.checks} />;
+        return <Start checks={checks} />;
       case 'tutorials':
-        return <Tutorials tutorials={state.tutorials} />;
+        return <Tutorials tutorials={tutorials} />;
       case 'final':
         return <FinalPage />;
       default:
         throw 'Error: Route not found.';
     }
   }
-  render() {
-    const state = this.props.state;
-    return (
-       <div>
-        {this.chooseRoute(state)}
-       </div>
-    );
-  }
 }