May 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1494 - wit/js/pages
by smaisonneuve＠users.nuiton.org 26 May '15

26 May '15

Author: smaisonneuve Date: 2015-05-26 14:35:34 +0000 (Tue, 26 May 2015) New Revision: 1494 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1494 Log: [Refactoring] - shapping pages into modules Modified: wit/js/pages/EditionLogs.js wit/js/pages/Rapport.js Modified: wit/js/pages/EditionLogs.js =================================================================== --- wit/js/pages/EditionLogs.js 2015-05-26 14:32:02 UTC (rev 1493) +++ wit/js/pages/EditionLogs.js 2015-05-26 14:35:34 UTC (rev 1494) @@ -1,14 +1,17 @@ "use strict"; +var moment = require("moment"); +var db = require("../services/database"); + var React = require("react"); var FilterBar = require("../components/FilterBar"); var LogsTable = require("../components/LogsTable"); class EditionLogs extends React.Component { - getInitialState() { - var moment = require("moment"); - return { + constructor(props) { + super(props); + this.state = { startDate: moment().subtract(1, "h"), endDate: moment(), result: null @@ -24,8 +27,6 @@ } onAdd() { - var moment = require("moment"); - var db = require("./js/services/database.js"); var tags = this.refs.tags.getDOMNode().value.split(","); var startDate = moment(this.refs.beginDate.getDOMNode().value); Modified: wit/js/pages/Rapport.js =================================================================== --- wit/js/pages/Rapport.js 2015-05-26 14:32:02 UTC (rev 1493) +++ wit/js/pages/Rapport.js 2015-05-26 14:35:34 UTC (rev 1494) @@ -1,14 +1,17 @@ "use strict"; +var moment = require("moment"); + var React = require("react"); var FilterBar = require("../components/FilterBar"); var FilterLogs = require("../components/FilterLogs"); class Rapport extends React.Component { - getInitialState() { - var moment = require("moment"); - return { + constructor(props) { + super(props); + + this.state = { startDate: moment().subtract(1, "h"), endDate: moment(), result: []

1 0

r1493 - wit/js/components
by jruchaud＠users.nuiton.org 26 May '15

26 May '15

Author: jruchaud Date: 2015-05-26 14:32:02 +0000 (Tue, 26 May 2015) New Revision: 1493 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1493 Log: Change getInitialState Modified: wit/js/components/FilterLogs.js wit/js/components/InputTag.js wit/js/components/Tags.js wit/js/components/Time.js wit/js/components/Timeline.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-26 14:28:38 UTC (rev 1492) +++ wit/js/components/FilterLogs.js 2015-05-26 14:32:02 UTC (rev 1493) @@ -5,8 +5,10 @@ class FilterLogs extends React.Component { - contructor() { + constructor(props) { + super(props); this.printer = new Printer(); + this.state = {data: null, tags: {}}; } onClipboardCSV() { @@ -40,10 +42,6 @@ this.refs.filterTags.getDOMNode().classList.toggle("hidden"); } - getInitialState() { - return {data: null, tags: {}}; - } - componentWillReceiveProps(nextProps) { this.createTree(nextProps); } Modified: wit/js/components/InputTag.js =================================================================== --- wit/js/components/InputTag.js 2015-05-26 14:28:38 UTC (rev 1492) +++ wit/js/components/InputTag.js 2015-05-26 14:32:02 UTC (rev 1493) @@ -5,8 +5,9 @@ class InputTag extends React.Component { - getInitialState() { - return {options: [], value: ""}; + constructor(props) { + super(props); + this.state = {options: [], value: ""}; } getTags() { Modified: wit/js/components/Tags.js =================================================================== --- wit/js/components/Tags.js 2015-05-26 14:28:38 UTC (rev 1492) +++ wit/js/components/Tags.js 2015-05-26 14:32:02 UTC (rev 1493) @@ -5,8 +5,9 @@ class Tags extends React.Component { - getInitialState() { - return timer; + constructor(props) { + super(props); + this.state = timer; } componentDidMount() { Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-05-26 14:28:38 UTC (rev 1492) +++ wit/js/components/Time.js 2015-05-26 14:32:02 UTC (rev 1493) @@ -5,8 +5,9 @@ class Time extends React.Component { - getInitialState() { - return timer; + constructor(props) { + super(props); + this.state = timer; } componentDidMount() { Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-26 14:28:38 UTC (rev 1492) +++ wit/js/components/Timeline.js 2015-05-26 14:32:02 UTC (rev 1493) @@ -7,10 +7,9 @@ class Timeline extends React.Component { - getInitialState() { - return { - sessions: [] - }; + constructor(props) { + super(props); + this.state = {sessions: []}; } componentDidMount() {

1 0

r1492 - in wit: . js js/pages js/router
by jruchaud＠users.nuiton.org 26 May '15

26 May '15

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;

1 0

r1491 - in wit: css js/pages
by smaisonneuve＠users.nuiton.org 26 May '15

26 May '15

Author: smaisonneuve Date: 2015-05-26 14:24:21 +0000 (Tue, 26 May 2015) New Revision: 1491 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1491 Log: [Refactoring] - shapping pages into modules Removed: wit/css/userActivity.less wit/js/pages/UserActivity.js Deleted: wit/css/userActivity.less =================================================================== --- wit/css/userActivity.less 2015-05-26 14:20:39 UTC (rev 1490) +++ wit/css/userActivity.less 2015-05-26 14:24:21 UTC (rev 1491) @@ -1,14 +0,0 @@ -.userActivity { - display: flex; - flex-direction: column; - justify-content: center; - - height: 350px; - width: 100%; - - h1 { - position: absolute; - top: 50px; - color: black; - } -} Deleted: wit/js/pages/UserActivity.js =================================================================== --- wit/js/pages/UserActivity.js 2015-05-26 14:20:39 UTC (rev 1490) +++ wit/js/pages/UserActivity.js 2015-05-26 14:24:21 UTC (rev 1491) @@ -1,18 +0,0 @@ -"use strict"; - -var UserActivity = React.createClass({ - - render: function() { - var moment = require("moment"); - - var data = { - startDate: moment().subtract(1, "m").valueOf(), - endDate: moment().valueOf() - }; - - return <div className="userActivity"> - <h1> What the hell did i do today ? </h1> - <Timeline data={data}/> - </div>; - } -});

1 0

r1490 - in wit: . js js/pages
by smaisonneuve＠users.nuiton.org 26 May '15

26 May '15

Author: smaisonneuve Date: 2015-05-26 14:20:39 +0000 (Tue, 26 May 2015) New Revision: 1490 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1490 Log: [Refactoring] - shapping pages into modules Modified: wit/.eslintrc wit/index.html wit/js/main.js wit/js/pages/EditionLogs.js wit/js/pages/Options.js wit/js/pages/Rapport.js wit/js/pages/Timer.js Modified: wit/.eslintrc =================================================================== --- wit/.eslintrc 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/.eslintrc 2015-05-26 14:20:39 UTC (rev 1490) @@ -6,8 +6,7 @@ "console": false, "React": false, "scope": false, - "alert": false, - "Printer": false + "alert": false }, "env": { "browser": true, Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/index.html 2015-05-26 14:20:39 UTC (rev 1490) @@ -8,12 +8,11 @@ global.localStorage = window.localStorage; </script> - <script type="text/javascript" src="build/main.js"></script> + <script async="true" type="text/javascript" src="build/main.js"></script> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="build/style.css" /> <link rel="stylesheet" type="text/css" href="build/timeline.css" /> - <link rel="stylesheet" type="text/css" href="build/userActivity.css" /> </head> <body></body> Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/js/main.js 2015-05-26 14:20:39 UTC (rev 1490) @@ -10,6 +10,9 @@ var noTimer = require("./js/services/NoTimerService.js"); noTimer.detect(); +//var printer = require("./js/services/PrinterService.js"); +//scope.printer = printer; + // React conf // window.onload = function() { var React = require("react"); Modified: wit/js/pages/EditionLogs.js =================================================================== --- wit/js/pages/EditionLogs.js 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/js/pages/EditionLogs.js 2015-05-26 14:20:39 UTC (rev 1490) @@ -1,25 +1,29 @@ "use strict"; -var EditionLogs = React.createClass({ +var React = require("react"); +var FilterBar = require("../components/FilterBar"); +var LogsTable = require("../components/LogsTable"); - getInitialState: function() { +class EditionLogs extends React.Component { + + getInitialState() { var moment = require("moment"); return { startDate: moment().subtract(1, "h"), endDate: moment(), result: null }; - }, + } - handleSearchResult: function(result, startDate, endDate) { + handleSearchResult(result, startDate, endDate) { this.setState({ startDate: startDate, endDate: endDate, result: result }); - }, + } - onAdd: function() { + onAdd() { var moment = require("moment"); var db = require("./js/services/database.js"); @@ -28,9 +32,9 @@ var endDate = moment(this.refs.endDate.getDOMNode().value); return db.insertLog(tags, startDate, endDate); - }, + } - render: function() { + render() { return <div> <h1>Search log</h1> <FilterBar onSearchResult={this.handleSearchResult}/> @@ -45,4 +49,6 @@ </div> </div>; } -}); +} + +module.exports = EditionLogs; Modified: wit/js/pages/Options.js =================================================================== --- wit/js/pages/Options.js 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/js/pages/Options.js 2015-05-26 14:20:39 UTC (rev 1490) @@ -1,29 +1,32 @@ "use strict"; -var Options = React.createClass({ +var React = require("react"); +var config = require("../services/ConfigurationService"); - setIdleTime: function(e) { - scope.config.setIdleTime(e.target.value); - }, +class Options extends React.Component { - setActivityTime: function(e) { - scope.config.setActivityTime(e.target.value); - }, + setIdleTime(e) { + config.setIdleTime(e.target.value); + } - setNoTimer: function(e) { - scope.config.setNoTimer(e.target.value); - }, + setActivityTime(e) { + config.setActivityTime(e.target.value); + } - setWeekDay: function(e) { - scope.config.setWeekDay(e.target.value); - }, + setNoTimer(e) { + config.setNoTimer(e.target.value); + } - render: function() { - var idleTime = scope.config.getIdleTime(); - var activityTime = scope.config.getActivityTime(); - var noTimer = scope.config.getNoTimer(); - var weekDay = scope.config.getWeekDay(); + setWeekDay(e) { + config.setWeekDay(e.target.value); + } + render() { + var idleTime = config.getIdleTime(); + var activityTime = config.getActivityTime(); + var noTimer = config.getNoTimer(); + var weekDay = config.getWeekDay(); + return <div className="form-horizontal"> <div className="form-group"> @@ -63,4 +66,6 @@ </div> </div>; } -}); +} + +module.exports = Options; Modified: wit/js/pages/Rapport.js =================================================================== --- wit/js/pages/Rapport.js 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/js/pages/Rapport.js 2015-05-26 14:20:39 UTC (rev 1490) @@ -1,27 +1,33 @@ "use strict"; -var Rapport = React.createClass({ +var React = require("react"); +var FilterBar = require("../components/FilterBar"); +var FilterLogs = require("../components/FilterLogs"); - getInitialState: function() { +class Rapport extends React.Component { + + getInitialState() { var moment = require("moment"); return { startDate: moment().subtract(1, "h"), endDate: moment(), result: [] }; - }, + } - handleSearchResult: function(result) { + handleSearchResult(result) { this.setState({ result: result }); - }, + } - render: function() { + render() { return <div> <h1>Search by date</h1> <FilterBar onSearchResult={this.handleSearchResult}/> <FilterLogs data={this.state}/> </div>; } -}); +} + +module.exports = Rapport; Modified: wit/js/pages/Timer.js =================================================================== --- wit/js/pages/Timer.js 2015-05-26 14:18:17 UTC (rev 1489) +++ wit/js/pages/Timer.js 2015-05-26 14:20:39 UTC (rev 1490) @@ -1,11 +1,18 @@ "use strict"; -var Timer = React.createClass({ - render: function() { +var React = require("react"); +var Tags = require("../components/Tags"); +var Time = require("../components/Time"); +var ActionBar = require("../components/ActionBar"); + +class Timer extends React.Component { + render() { return <div> <Time /> <Tags /> <ActionsBar /> </div>; } -}); +} + +module.exports = Timer;

1 0

r1489 - wit/js/components
by jruchaud＠users.nuiton.org 26 May '15

26 May '15

Author: jruchaud Date: 2015-05-26 14:18:17 +0000 (Tue, 26 May 2015) New Revision: 1489 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1489 Log: Use class Added: wit/js/components/TimelineSession.js Modified: wit/js/components/ActionsBar.js wit/js/components/FilterBar.js wit/js/components/FilterLogs.js wit/js/components/InputTag.js wit/js/components/LogsTable.js wit/js/components/Tags.js wit/js/components/Time.js wit/js/components/Timeline.js Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/ActionsBar.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,26 +1,29 @@ "use strict"; -var ActionsBar = React.createClass({ +var React = require("react"); +var timer = require("../services/TimerService.js"); - onPlay: function() { - scope.timer.start(); - }, +class ActionsBar extends React.Component { - onStop: function() { - scope.timer.stop(true); - }, + onPlay() { + timer.start(); + } - prevHistory: function() { - scope.timer.stop(); - scope.timer.prevHistory(); - }, + onStop() { + timer.stop(true); + } - nextHistory: function() { - scope.timer.stop(); - scope.timer.nextHistory(); - }, + prevHistory() { + timer.stop(); + timer.prevHistory(); + } - render: function() { + nextHistory() { + timer.stop(); + timer.nextHistory(); + } + + render() { return <div className="text-center"> <div ref="actions" className="btn-group" role="group"> <button type="button" className="btn btn-primary btn-lg" onClick={this.prevHistory}> @@ -38,4 +41,6 @@ </div> </div>; } -}); +} + +module.exports = ActionsBar; Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/FilterBar.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,8 +1,10 @@ "use strict"; -var FilterBar = React.createClass({ +var React = require("react"); - componentDidMount: function() { +class FilterBar extends React.Component { + + componentDidMount() { var moment = require("moment"); var now = moment(); @@ -14,9 +16,9 @@ this.refs.beginDate.getDOMNode().value = startDefaultDate; this.refs.endDate.getDOMNode().value = endDefaultDate; - }, + } - search: function() { + search() { var moment = require("moment"); var db = require("./js/services/database.js"); @@ -24,18 +26,20 @@ endDate = moment(this.refs.endDate.getDOMNode().value); return db.searchLogs(null, startDate, endDate, true); - }, + } - onSearch: function() { + onSearch() { var onSearchResult = this.props.onSearchResult; this.search().then(onSearchResult); - }, + } - render: function() { + render() { return <div> <input ref="beginDate" type="datetime-local" className="form-control" required></input> <input ref="endDate" type="datetime-local" className="form-control" required></input> <button onClick={this.onSearch} className="btn btn-primary btn-block">Search</button> </div>; } -}); +} + +module.exports = FilterBar; Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/FilterLogs.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,50 +1,54 @@ "use strict"; -var FilterLogs = React.createClass({ +var React = require("react"); +var nonce = require("nonce")(); - nonce: require("nonce")(), - printer: new Printer(), +class FilterLogs extends React.Component { - onClipboardCSV: function() { + contructor() { + this.printer = new Printer(); + } + + onClipboardCSV() { this.printer.clipboard(Printer.CSV); - }, + } - onClipboardTXT: function() { + onClipboardTXT() { this.printer.clipboard(Printer.TXT, this.state); - }, + } - onMailCSV: function() { + onMailCSV() { this.printer.mail(Printer.CSV); - }, + } - onMailTXT: function() { + onMailTXT() { this.printer.mail(Printer.TXT, this.state); - }, + } - onShowSummary: function() { + onShowSummary() { this.refs.summary.getDOMNode().classList.toggle("hidden"); - }, + } - onLogDetails: function(e) { + onLogDetails(e) { var nodeId = e.target.dataset.id; if (nodeId) { this.refs[nodeId].getDOMNode().classList.toggle("hidden"); } - }, + } - onToggleFilterTag: function() { + onToggleFilterTag() { this.refs.filterTags.getDOMNode().classList.toggle("hidden"); - }, + } - getInitialState: function() { + getInitialState() { return {data: null, tags: {}}; - }, + } - componentWillReceiveProps: function(nextProps) { + componentWillReceiveProps(nextProps) { this.createTree(nextProps); - }, + } - toggleTagChecked: function(e) { + toggleTagChecked(e) { Object.keys(this.state.tags).forEach(function(tag) { this.state.tags[tag] = e.target.checked; }, this); @@ -54,17 +58,17 @@ tags: this.state.tags }); e.stopPropagation(); - }, + } - filterTag: function(e) { + filterTag(e) { this.state.tags[e.target.name] = e.target.checked; this.createTree({ data: this.props.data, tags: this.state.tags }); - }, + } - createTree: function(currentState) { + createTree(currentState) { var data = {}, tags = {}; @@ -98,9 +102,9 @@ startDate: currentState.data.result.startDate, endDate: currentState.data.result.endDate }); - }, + } - renderTd: function(date, tags, tagObject) { + renderTd(date, tags, tagObject) { var r = []; if (tagObject.duration) { @@ -109,7 +113,7 @@ return state.tags[tag]; }); - var key = this.nonce(); + var key = nonce(); if (filterTags.length) { r.push( @@ -140,9 +144,9 @@ } return r; - }, + } - render: function() { + render() { var items = []; var classString = ""; @@ -205,7 +209,7 @@ </div> <div ref="summary" className="hidden"> - <Timeline key={this.nonce()} data={this.state}/> + <Timeline key={nonce()} data={this.state}/> </div> <table className="table"> @@ -227,4 +231,6 @@ </h3> </div>; } -}); +} + +module.exports = FilterLogs; Modified: wit/js/components/InputTag.js =================================================================== --- wit/js/components/InputTag.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/InputTag.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,35 +1,38 @@ "use strict"; -var InputTag = React.createClass({ +var React = require("react"); +var timer = require("../services/TimerService.js"); - getInitialState: function() { +class InputTag extends React.Component { + + getInitialState() { return {options: [], value: ""}; - }, + } - getTags: function() { + getTags() { var setState = self.setState; - scope.timer.getLastTags().then(function(tags) { + timer.getLastTags().then(function(tags) { setState({options: tags, value: ""}); }); - }, + } - onKey: function(e) { + onKey(e) { var target = e.target; var value = target.value; if (e.keyCode === 13 && value !== "") { // On enter this.setState({options: this.state.options, value: ""}); - scope.timer.stop(); - scope.timer.addTag(value); + timer.stop(); + timer.addTag(value); } - }, + } - onChange: function(e) { + onChange(e) { this.setState({options: this.state.options, value: e.target.value}); - }, + } - render: function() { + render() { var options = []; if (this.state.value) { @@ -58,4 +61,6 @@ </div>; } -}); +} + +module.exports = InputTag; Modified: wit/js/components/LogsTable.js =================================================================== --- wit/js/components/LogsTable.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/LogsTable.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,19 +1,22 @@ "use strict"; -var LogsTable = React.createClass({ +var React = require("react"); +var timer = require("../services/TimerService.js"); - onDelete: function(e) { +class LogsTable extends React.Component { + + onDelete(e) { var logId = e.target.dataset.id; if (logId) { - scope.timer.deleteLog(logId); + timer.deleteLog(logId); var index = parseInt(e.target.dataset.index, 10); this.props.data.splice(index, 1); this.forceUpdate(); } - }, + } - render: function() { + render() { var moment = require("moment"); var items = []; @@ -62,4 +65,6 @@ </h3> </div>; } -}); +} + +module.exports = LogsTable; Modified: wit/js/components/Tags.js =================================================================== --- wit/js/components/Tags.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/Tags.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,32 +1,35 @@ "use strict"; -var Tags = React.createClass({ +var React = require("react"); +var timer = require("../services/TimerService.js"); - getInitialState: function() { - return scope.timer; - }, +class Tags extends React.Component { - componentDidMount: function() { + getInitialState() { + return timer; + } + + componentDidMount() { this.forceUpdateBound = this.forceUpdate.bind(this); - scope.timer.subscribeTagsChanged(this.forceUpdateBound); - }, + timer.subscribeTagsChanged(this.forceUpdateBound); + } - componentWillUnmount: function() { - scope.timer.unsubscribeTagsChanged(this.forceUpdateBound); - }, + componentWillUnmount() { + timer.unsubscribeTagsChanged(this.forceUpdateBound); + } - onRemove: function(e) { + onRemove(e) { var target = e.target; var index = target.dataset.index; - scope.timer.stop(); - scope.timer.removeTag(index); - }, + timer.stop(); + timer.removeTag(index); + } - render: function() { + render() { var onRemove = this.onRemove; - var tags = scope.timer.getTags(); + var tags = timer.getTags(); var rows = []; for (var i = 0; i < 5; i++) { @@ -50,4 +53,6 @@ </li> </ul>; } -}); +} + +module.exports = Tags; Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/Time.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,41 +1,44 @@ "use strict"; -var Time = React.createClass({ +var React = require("react"); +var timer = require("../services/TimerService.js"); - getInitialState: function() { - return scope.timer; - }, +class Time extends React.Component { - componentDidMount: function() { + getInitialState() { + return timer; + } + + componentDidMount() { this.forceUpdateBound = this.forceUpdate.bind(this); - scope.timer.subscribeTimeChanged(this.forceUpdateBound); - }, + timer.subscribeTimeChanged(this.forceUpdateBound); + } - componentWillUnmount: function() { - scope.timer.unsubscribeTimeChanged(this.forceUpdateBound); - }, + componentWillUnmount() { + timer.unsubscribeTimeChanged(this.forceUpdateBound); + } - onEdit: function() { + onEdit() { this.refs.editButton.getDOMNode().classList.toggle("hidden"); this.refs.editInput.getDOMNode().classList.toggle("hidden"); this.refs.timeValue.getDOMNode().classList.toggle("hidden"); - var time = scope.timer.getTime() || "00:00:00"; + var time = timer.getTime() || "00:00:00"; var editInputTime = this.refs.editInputTime.getDOMNode(); editInputTime.value = time; editInputTime.max = time; - }, + } - onSaveTime: function() { + onSaveTime() { this.refs.editButton.getDOMNode().classList.toggle("hidden"); this.refs.editInput.getDOMNode().classList.toggle("hidden"); this.refs.timeValue.getDOMNode().classList.toggle("hidden"); var editInputTime = this.refs.editInputTime.getDOMNode(); - scope.timer.editTime(editInputTime.value); - }, + timer.editTime(editInputTime.value); + } - render: function() { + render() { return <div> <button ref="editButton" type="button" className="btn btn-primary btn-small editButton" onClick={this.onEdit}> <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span> @@ -60,4 +63,6 @@ </h5> </div>; } -}); +} + +module.exports = Time; Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-26 13:58:47 UTC (rev 1488) +++ wit/js/components/Timeline.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -1,14 +1,19 @@ "use strict"; -var Timeline = React.createClass({ +var React = require("react"); +var sess = require("../services/SessionsService.js"); - getInitialState: function() { +var TimelineSession = require("./TimelineSession.js"); + +class Timeline extends React.Component { + + getInitialState() { return { sessions: [] }; - }, + } - componentDidMount: function() { + componentDidMount() { var moment = require("moment"); var startDate; @@ -24,16 +29,16 @@ if (startDate && endDate) { var setState = this.setState.bind(this); - scope.sessions.getSessions(startDate, endDate, true) + sess.getSessions(startDate, endDate, true) .then(function(sessions) { setState({ sessions: sessions }); }); } - }, + } - render: function() { + render() { var sessions = this.state.sessions; var items = []; @@ -77,14 +82,14 @@ {items} </div> </div>; - }, + } /* * Normalize session dates and duration according to the given dates * If the given session starts before the given startDate or end after the given endDate, * this function will remove the session part outside the scope */ - _normalize: function(session, startDate, endDate) { + _normalize(session, startDate, endDate) { var moment = require("moment"); session.startDate = moment(session.startDate); @@ -101,17 +106,6 @@ return session; } -}); +} -var TimelineSession = React.createClass({ - render: function() { - var data = this.props.data; - - var title = data.title || ""; - var style = { - background: data.color, - width: data.width - }; - return <div className="slice" style={style} title={title}>{title}</div>; - } -}); +module.exports = Timeline; Added: wit/js/components/TimelineSession.js =================================================================== --- wit/js/components/TimelineSession.js (rev 0) +++ wit/js/components/TimelineSession.js 2015-05-26 14:18:17 UTC (rev 1489) @@ -0,0 +1,18 @@ +"use strict"; + +var React = require("react"); + +class TimelineSession extends React.Component { + render() { + var data = this.props.data; + + var title = data.title || ""; + var style = { + background: data.color, + width: data.width + }; + return <div className="slice" style={style} title={title}>{title}</div>; + } +} + +module.exports = TimelineSession;

1 0

r1488 - /
by lkaufmann＠users.nuiton.org 26 May '15

26 May '15

Author: lkaufmann Date: 2015-05-26 13:58:47 +0000 (Tue, 26 May 2015) New Revision: 1488 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1488 Log: Init folder for CL website refactoring tests Added: siteCL-refactoring2015/

1 0

r1487 - in wit: . js js/router js/services
by jruchaud＠users.nuiton.org 26 May '15

26 May '15

Author: jruchaud Date: 2015-05-26 13:56:54 +0000 (Tue, 26 May 2015) New Revision: 1487 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1487 Log: Begin react startup Modified: wit/index.html wit/js/App.js wit/js/router/Link.js wit/js/router/Routes.js wit/js/services/NoTimerService.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/index.html 2015-05-26 13:56:54 UTC (rev 1487) @@ -6,10 +6,8 @@ global.document = window.document; global.navigator = window.navigator; global.localStorage = window.localStorage; - global.localStorage = window.localStorage; </script> - <script type="text/javascript" src="node_modules/react/dist/react-with-addons.js"></script> <script type="text/javascript" src="build/main.js"></script> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> Modified: wit/js/App.js =================================================================== --- wit/js/App.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/App.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -4,7 +4,7 @@ var Routes = require("./router/Routes.js"); var Link = require("./router/Link.js"); -module.exports = class extends React.Component { +class App extends React.Component { openRapport() { this.refs.rapportDropdown.getDOMNode().classList.toggle("open"); @@ -60,12 +60,15 @@ </ul> </div> </div> - <Routes> + + </div>; + } +} + +/* <Routes> <Timer /> <Rapport /> <Options /> <EditionLogs /> - </Routes> - </div>; - } -}; + </Routes>*/ +module.exports = App; Modified: wit/js/router/Link.js =================================================================== --- wit/js/router/Link.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/router/Link.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -2,7 +2,7 @@ var React = require("react"); -global.module.exports = class extends React.Component { +class Link extends React.Component { goTo() { if (this.props.onClick) { @@ -15,4 +15,6 @@ render() { return <a href="#" onClick={this.goTo}>{this.props.children}</a>; } -}; +} + +module.exports = Link; Modified: wit/js/router/Routes.js =================================================================== --- wit/js/router/Routes.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/router/Routes.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -2,7 +2,7 @@ var React = require("react"); -global.module.exports = class extends React.Component { +class Routes extends React.Component { componentWillMount() { window.router = this; @@ -36,4 +36,6 @@ {this.getChild()} </div>; } -}; +} + +module.exports = Routes; Modified: wit/js/services/NoTimerService.js =================================================================== --- wit/js/services/NoTimerService.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/services/NoTimerService.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -1,10 +1,13 @@ "use strict"; var moment = require("moment"); +var config = require("../services/ConfigurationService.js"); +var timer = require("../services/TimerService.js"); + var notTimerTimer; exports.detect = function() { - var noTimerConfig = scope.config.getNoTimer(); + var noTimerConfig = config.getNoTimer(); if (noTimerConfig) { var duration = moment.duration(noTimerConfig, "m"); @@ -18,9 +21,9 @@ } }; -scope.timer.subscribeTimeChanged(function() { +timer.subscribeTimeChanged(function() { clearTimeout(notTimerTimer); - if (!scope.timer.time) { + if (!timer.time) { exports.detect(); } });

1 0

r1486 - in wit: . js
by jruchaud＠users.nuiton.org 26 May '15

26 May '15

Author: jruchaud Date: 2015-05-26 13:46:29 +0000 (Tue, 26 May 2015) New Revision: 1486 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1486 Log: Begin fix module Modified: wit/index.html wit/js/gui.js wit/js/main.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 13:36:01 UTC (rev 1485) +++ wit/index.html 2015-05-26 13:46:29 UTC (rev 1486) @@ -9,13 +9,10 @@ global.localStorage = window.localStorage; </script> -  + <script type="text/javascript" src="node_modules/react/dist/react-with-addons.js"></script> <script type="text/javascript" src="build/main.js"></script> -  <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> - -  <link rel="stylesheet" type="text/css" href="build/style.css" /> <link rel="stylesheet" type="text/css" href="build/timeline.css" /> <link rel="stylesheet" type="text/css" href="build/userActivity.css" /> Modified: wit/js/gui.js =================================================================== --- wit/js/gui.js 2015-05-26 13:36:01 UTC (rev 1485) +++ wit/js/gui.js 2015-05-26 13:46:29 UTC (rev 1486) @@ -35,3 +35,39 @@ tray = null; } }); + +var popups = []; +var openWindow = function(file) { + var gui = global.window.nwDispatcher.requireNwGui(); + + var current = gui.Window.get(); + current.hide(); + + scope.user.suspendActivityDetection(); + + var window = gui.Window.open(file, { + position: "center", + focus: true, + toolbar: false, + frame: true, + width: 480, + height: 300 + }); + + popups.push(window); + + window.on("close", function() { + this.hide(); // Pretend to be closed already + this.close(true); + + popups.splice(popups.indexOf(window), 1); + + if (!popups.length) { + current.show(); + } + }); +}; + +// Subscriptions to services +scope.timer.subscribeIdle(openWindow.bind(null, "idle.html")); +scope.user.subscribeActivityChange(openWindow.bind(null, "activityChange.html")); Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-26 13:36:01 UTC (rev 1485) +++ wit/js/main.js 2015-05-26 13:46:29 UTC (rev 1486) @@ -7,62 +7,13 @@ // Alias // Total time during day -global.scope = window.scope = {}; - -// Services // -var sessions = require("./js/services/SessionsService.js"); -scope.sessions = sessions; - -var timer = require("./js/services/TimerService.js"); -scope.timer = timer; - -var user = require("./js/services/UserActivityService.js"); -scope.user = user; - -var config = require("./js/services/ConfigurationService.js"); -scope.config = config; - var noTimer = require("./js/services/NoTimerService.js"); -scope.noTimer = noTimer; noTimer.detect(); // React conf // -var React = require("react"); -var App = require("./build/App.js"); -React.render(<App/>, document.body); +window.onload = function() { + var React = require("react"); + var App = require("./build/App.js"); -var popups = []; -var openWindow = function(file) { - var gui = global.window.nwDispatcher.requireNwGui(); - - var current = gui.Window.get(); - current.hide(); - - scope.user.suspendActivityDetection(); - - var window = gui.Window.open(file, { - position: "center", - focus: true, - toolbar: false, - frame: true, - width: 480, - height: 300 - }); - - popups.push(window); - - window.on("close", function() { - this.hide(); // Pretend to be closed already - this.close(true); - - popups.splice(popups.indexOf(window), 1); - - if (!popups.length) { - current.show(); - } - }); + React.render(<App/>, document.body); }; - -// Subscriptions to services -scope.timer.subscribeIdle(openWindow.bind(null, "idle.html")); -scope.user.subscribeActivityChange(openWindow.bind(null, "activityChange.html"));

1 0

r1485 - in wit: . js
by jruchaud＠users.nuiton.org 26 May '15

26 May '15

Author: jruchaud Date: 2015-05-26 13:36:01 +0000 (Tue, 26 May 2015) New Revision: 1485 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1485 Log: Begin fix module Modified: wit/gulpfile.js wit/index.html wit/js/App.js wit/js/main.js Modified: wit/gulpfile.js =================================================================== --- wit/gulpfile.js 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/gulpfile.js 2015-05-26 13:36:01 UTC (rev 1485) @@ -33,7 +33,7 @@ gulp.task("scripts", function() { return gulp.src(paths.scripts) - .pipe(sourcemaps.init()) + //.pipe(sourcemaps.init()) .pipe(babel({ blacklist: [ "es3.memberExpressionLiterals", @@ -67,8 +67,8 @@ ] })) .on("error", standardHandler) - .pipe(concat("all.min.js")) - .pipe(sourcemaps.write(".")) + //.pipe(concat("all.min.js")) + //.pipe(sourcemaps.write(".")) .pipe(gulp.dest(paths.build)); }); @@ -77,7 +77,7 @@ .pipe(less({ paths: [path.join(__dirname, "less", "includes")] })) - .pipe(gulp.dest(paths.build)); + .pipe(gulp.dest(path.join(paths.build))); }); gulp.task("watch", function() { Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/index.html 2015-05-26 13:36:01 UTC (rev 1485) @@ -8,8 +8,9 @@ global.localStorage = window.localStorage; global.localStorage = window.localStorage; </script> +  - <script type="text/javascript" src="build/all.min.js"></script> + <script type="text/javascript" src="build/main.js"></script>  <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> Modified: wit/js/App.js =================================================================== --- wit/js/App.js 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/js/App.js 2015-05-26 13:36:01 UTC (rev 1485) @@ -1,8 +1,8 @@ "use strict"; var React = require("react"); -var Routes = require("./js/router/Routes.js"); -var Link = require("./js/router/Link.js"); +var Routes = require("./router/Routes.js"); +var Link = require("./router/Link.js"); module.exports = class extends React.Component { Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-26 13:22:45 UTC (rev 1484) +++ wit/js/main.js 2015-05-26 13:36:01 UTC (rev 1485) @@ -28,7 +28,7 @@ // React conf // var React = require("react"); -var App = require("./App.js"); +var App = require("./build/App.js"); React.render(<App/>, document.body); var popups = [];

1 0