Author: jruchaud Date: 2015-05-26 14:28:38 +0000 (Tue, 26 May 2015) New Revision: 1492 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1492 Log: Reactivate Routes Modified: wit/gulpfile.js wit/js/App.js wit/js/pages/Timer.js wit/js/router/Routes.js Modified: wit/gulpfile.js =================================================================== --- wit/gulpfile.js 2015-05-26 14:24:21 UTC (rev 1491) +++ wit/gulpfile.js 2015-05-26 14:28:38 UTC (rev 1492) @@ -33,7 +33,7 @@ gulp.task("scripts", function() { return gulp.src(paths.scripts) - //.pipe(sourcemaps.init()) + .pipe(sourcemaps.init()) .pipe(babel({ blacklist: [ "es3.memberExpressionLiterals", @@ -68,7 +68,7 @@ })) .on("error", standardHandler) //.pipe(concat("all.min.js")) - //.pipe(sourcemaps.write(".")) + .pipe(sourcemaps.write(".")) .pipe(gulp.dest(paths.build)); }); Modified: wit/js/App.js =================================================================== --- wit/js/App.js 2015-05-26 14:24:21 UTC (rev 1491) +++ wit/js/App.js 2015-05-26 14:28:38 UTC (rev 1492) @@ -3,6 +3,10 @@ var React = require("react"); var Routes = require("./router/Routes.js"); var Link = require("./router/Link.js"); +var Timer = require("./pages/Timer.js"); +var Rapport = require("./pages/Rapport.js"); +var Options = require("./pages/Options.js"); +var EditionLogs = require("./pages/EditionLogs.js"); class App extends React.Component { @@ -61,14 +65,14 @@ </div> </div> + <Routes> + <Timer /> + <Rapport /> + <Options /> + <EditionLogs /> + </Routes> </div>; } } -/* <Routes> - <Timer /> - <Rapport /> - <Options /> - <EditionLogs /> - </Routes>*/ module.exports = App; Modified: wit/js/pages/Timer.js =================================================================== --- wit/js/pages/Timer.js 2015-05-26 14:24:21 UTC (rev 1491) +++ wit/js/pages/Timer.js 2015-05-26 14:28:38 UTC (rev 1492) @@ -3,7 +3,7 @@ var React = require("react"); var Tags = require("../components/Tags"); var Time = require("../components/Time"); -var ActionBar = require("../components/ActionBar"); +var ActionsBar = require("../components/ActionsBar"); class Timer extends React.Component { render() { Modified: wit/js/router/Routes.js =================================================================== --- wit/js/router/Routes.js 2015-05-26 14:24:21 UTC (rev 1491) +++ wit/js/router/Routes.js 2015-05-26 14:28:38 UTC (rev 1492) @@ -4,16 +4,15 @@ class Routes extends React.Component { + constructor(props) { + super(props); + this.state = {index: 0}; + } + componentWillMount() { window.router = this; } - getInitialState() { - return { - index: 0 - }; - } - display(to) { var children = this.props.children;