[Sandbox-commits] r1490 - in wit: . js js/pages

26 May 2015

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;

    

[Sandbox-commits] r1490 - in wit: . js js/pages

smaisonneuve＠users.nuiton.org