Author: jruchaud Date: 2015-05-26 13:11:02 +0000 (Tue, 26 May 2015) New Revision: 1483 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1483 Log: Forgot App Added: wit/js/App.js Modified: wit/index.html wit/js/main.js wit/js/router/Link.js wit/js/router/Routes.js wit/package.json Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 12:52:16 UTC (rev 1482) +++ wit/index.html 2015-05-26 13:11:02 UTC (rev 1483) @@ -3,30 +3,8 @@ <title>WIT</title> <!-- For React --> - <script type="text/javascript" src="node_modules/react/dist/react-with-addons.js"></script> - <script type="text/javascript" src="node_modules/react/dist/JSXTransformer.js"></script> - <script type="text/javascript" src="js/utils/Printer.js"></script> + <script type="text/javascript" src="build/all.min.js"></script> - <script type="text/jsx" src="js/router/Routes.js"></script> - <script type="text/jsx" src="js/router/Link.js"></script> - <script type="text/jsx" src="js/App.js"></script> - - <script type="text/jsx" src="js/components/InputTag.js"></script> - <script type="text/jsx" src="js/components/Tags.js"></script> - <script type="text/jsx" src="js/components/Time.js"></script> - <script type="text/jsx" src="js/components/ActionsBar.js"></script> - <script type="text/jsx" src="js/components/FilterBar.js"></script> - <script type="text/jsx" src="js/components/FilterLogs.js"></script> - <script type="text/jsx" src="js/components/Timeline.js"></script> - <script type="text/jsx" src="js/components/LogsTable.js"></script> - <script type="text/jsx" src="js/pages/Timer.js"></script> - <script type="text/jsx" src="js/pages/Rapport.js"></script> - <script type="text/jsx" src="js/pages/UserActivity.js"></script> - <script type="text/jsx" src="js/pages/Options.js"></script> - <script type="text/jsx" src="js/pages/EditionLogs.js"></script> - <script type="text/jsx" src="js/main.js"></script> - <script type="application/javascript" src="js/gui.js"></script> - <!-- For Bootstrap --> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> Added: wit/js/App.js =================================================================== --- wit/js/App.js (rev 0) +++ wit/js/App.js 2015-05-26 13:11:02 UTC (rev 1483) @@ -0,0 +1,71 @@ +"use strict"; + +var React = require("react"); +var Routes = require("./js/router/Routes.js"); +var Link = require("./js/router/Link.js"); + +global.module.exports = class extends React.Component { + + openRapport() { + this.refs.rapportDropdown.getDOMNode().classList.toggle("open"); + this.refs.editionDropdown.getDOMNode().classList.remove("open"); + } + + openEdition() { + this.refs.editionDropdown.getDOMNode().classList.toggle("open"); + this.refs.rapportDropdown.getDOMNode().classList.remove("open"); + } + + closeAll() { + this.refs.editionDropdown.getDOMNode().classList.remove("open"); + this.refs.rapportDropdown.getDOMNode().classList.remove("open"); + } + + render() { + return <div className="container-fluid"> + + <div className="navbar navbar-default"> + <div className="navbar-header pull-left"> + <a className="navbar-brand" href="#">WIT</a> + </div> + + <div className="nav navbar-header pull-right"> + <ul className="nav pull-right"> + <li className="pull-left"><Link onClick={this.closeAll} to="Timer">Timer</Link></li> + + <li ref="rapportDropdown" className="dropdown pull-left"> + <a className="dropdown-toggle" onClick={this.openRapport}> + Rapport <span className="caret"></span> + </a> + <ul className="dropdown-menu"> + <li><Link onClick={this.closeAll} to="Rapport">By date</Link></li> + <li><a href="#">By week</a></li> + <li><a href="#">By month</a></li> + <li><a href="#">By Year</a></li> + </ul> + </li> + + <li ref="editionDropdown" className="dropdown pull-left"> + <a className="dropdown-toggle" onClick={this.openEdition}> + Edition <span className="caret"></span> + </a> + <ul className="dropdown-menu"> + <li><Link onClick={this.closeAll} to="EditionLogs">Logs</Link></li> + <li><a href="#">Tags</a></li> + <li><a href="#">Activities</a></li> + </ul> + </li> + + <li className="pull-left"><Link onClick={this.closeAll} to="Options">Options</Link></li> + </ul> + </div> + </div> + <Routes> + <Timer /> + <Rapport /> + <Options /> + <EditionLogs /> + </Routes> + </div>; + } +}; Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-26 12:52:16 UTC (rev 1482) +++ wit/js/main.js 2015-05-26 13:11:02 UTC (rev 1483) @@ -33,6 +33,7 @@ // React conf // var React = require("react"); +var App = require("./App.js"); React.render(<App/>, document.body); var popups = []; Modified: wit/js/router/Link.js =================================================================== --- wit/js/router/Link.js 2015-05-26 12:52:16 UTC (rev 1482) +++ wit/js/router/Link.js 2015-05-26 13:11:02 UTC (rev 1483) @@ -1,16 +1,18 @@ "use strict"; -var Link = React.createClass({ +var React = require("react"); - goTo: function() { +global.module.exports = class extends React.Component { + + goTo() { if (this.props.onClick) { this.props.onClick(); } router.display(this.props.to); - }, + } - render: function() { + render() { return <a href="#" onClick={this.goTo}>{this.props.children}</a>; } -}); +}; Modified: wit/js/router/Routes.js =================================================================== --- wit/js/router/Routes.js 2015-05-26 12:52:16 UTC (rev 1482) +++ wit/js/router/Routes.js 2015-05-26 13:11:02 UTC (rev 1483) @@ -1,18 +1,20 @@ "use strict"; -var Routes = React.createClass({ +var React = require("react"); - componentWillMount: function() { +global.module.exports = class extends React.Component { + + componentWillMount() { window.router = this; - }, + } - getInitialState: function() { + getInitialState() { return { index: 0 }; - }, + } - display: function(to) { + display(to) { var children = this.props.children; for (var i = 0, l = children.length; i < l; i++) { @@ -23,15 +25,15 @@ break; } } - }, + } - getChild: function() { + getChild() { return this.props.children[this.state.index]; - }, + } - render: function() { + render() { return <div> {this.getChild()} </div>; } -}); +}; Modified: wit/package.json =================================================================== --- wit/package.json 2015-05-26 12:52:16 UTC (rev 1482) +++ wit/package.json 2015-05-26 13:11:02 UTC (rev 1483) @@ -13,15 +13,15 @@ "frame": true, "transparent": false }, - "dbFileNamePrefix" : "dev-", + "dbFileNamePrefix": "dev-", "platformOverrides": { "linux64": { - "dbFileNamePrefix" : "", - "window": { - "height": 490, - "min_height": 490, - "toolbar": false - } + "dbFileNamePrefix": "", + "window": { + "height": 490, + "min_height": 490, + "toolbar": false + } } }, "dependencies": { @@ -32,12 +32,21 @@ "react": "^0.13.1", "x11": "^1.0.3", "xprop": "^0.0.0", - "nonce":"^1.0.3", + "nonce": "^1.0.3", "loglevel": "^1.2.0" }, "devDependencies": { + "del": "^1.2.0", "grunt": "^0.4.5", - "grunt-node-webkit-builder": "^1.0.2" + "grunt-node-webkit-builder": "^1.0.2", + "gulp": "^3.8.11", + "gulp-babel": "^5.1.0", + "gulp-concat": "^2.5.2", + "gulp-less": "^3.0.3", + "gulp-sourcemaps": "^1.5.2", + "gulp-util": "^3.0.4", + "node-notifier": "^4.2.1", + "node-webkit-builder": "^1.0.11" }, - "chromium-args":"--javascript-harmony" + "chromium-args": "--javascript-harmony" }
participants (1)
-
jruchaud＠users.nuiton.org