next version

ShMcK · ShMcK · commit 710f3b2413ab · 2016-03-04T14:23:16.000-08:00
diff --git a/lib/components/_components.js b/lib/components/_components.js
@@ -1,7 +1,7 @@
 "use strict";
 var app_1 = require('./app/app');
 exports.App = app_1.default;
-var router_1 = require('./router');
+var router_1 = require('./app/router');
 exports.Router = router_1.default;
 var page_1 = require('./page/page');
 exports.Page = page_1.default;
diff --git a/lib/components/app/router.js b/lib/components/app/router.js
@@ -5,7 +5,8 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 var React = require('react');
-var _components_1 = require('../_components');
+var _components_1 = require('./../_components');
+var ReactCSSTransitionGroup = require('react-addons-css-transition-group');
 var default_1 = (function (_super) {
     __extends(default_1, _super);
     function default_1() {
@@ -25,7 +26,7 @@ var default_1 = (function (_super) {
     };
     default_1.prototype.render = function () {
         var state = this.props.state;
-        return this.chooseRoute(state);
+        return (React.createElement(ReactCSSTransitionGroup, {transitionName: 'route', transitionEnterTimeout: 500, transitionLeaveTimeout: 300}, this.chooseRoute(state)));
     };
     return default_1;
 }(React.Component));
diff --git a/src/components/_components.ts b/src/components/_components.ts
@@ -5,7 +5,7 @@
 export {default as App} from './app/app';
 
 // Router
-export {default as Router} from './router';
+export {default as Router} from './app/router';
 
 // Components
 export {default as Page} from './page/page';
diff --git a/src/components/app/router.tsx b/src/components/app/router.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Page, Progress, Projects} from './_components';
+import {Page, Progress, Projects} from './../_components';
 import * as ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 
 export default class extends React.Component<{state: CR.State}, {}> {
diff --git a/tsconfig.json b/tsconfig.json
@@ -97,6 +97,7 @@
     "src/components/account/signup.tsx",
     "src/components/alert/alert.tsx",
     "src/components/app/app.tsx",
+    "src/components/app/router.tsx",
     "src/components/markdown/markdown.tsx",
     "src/components/menu/menu.tsx",
     "src/components/page/chapter.tsx",
@@ -110,8 +111,7 @@
     "src/components/page/toolbar.tsx",
     "src/components/progress/progress.tsx",
     "src/components/projects/projects.tsx",
-    "src/components/render.tsx",
-    "src/components/router.tsx"
+    "src/components/render.tsx"
   ],
   "exclude": [
     "node_modules"
