[Sandbox-commits] r1501 - in wit: . js js/components/root

26 May 2015

Author: jruchaud
Date: 2015-05-26 16:15:26 +0000 (Tue, 26 May 2015)
New Revision: 1501

Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1501

Log:
Fix move components

Modified:
   wit/gulpfile.js
   wit/js/App.js
   wit/js/GuiManager.js
   wit/js/components/root/EditionLogs.js
   wit/js/components/root/Options.js
   wit/js/components/root/Rapport.js
   wit/js/components/root/Timer.js

Modified: wit/gulpfile.js
===================================================================

--- wit/gulpfile.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/gulpfile.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -22,13 +22,14 @@
 }
 
 var paths = {
+    nw: "webkitbuilds",
     build: "build",
     scripts: "./js/**/*.js",
     less: "./css/**/*.less"
 };
 
-gulp.task("clean", function(cb) {
-    del([paths.build], cb);
+gulp.task("clean", function() {
+    del([paths.build, paths.build]);
 });
 
 gulp.task("scripts", function() {
@@ -90,13 +91,13 @@
     var nw = new NwBuilder({
         version: "0.12.2",
         platforms: ["linux64"],
-        buildDir: "./webkitbuilds",
+        buildDir: paths.nw,
         files: [
-              "./*.html",
               "./node_modules/**",
               "./package.json",
               "./font/**",
               "./img/**",
+              "./pages/**",
               "./build/**"
           ]
     });
@@ -110,4 +111,4 @@
     });
 });
 
-gulp.task("default", ["watch", "scripts", "less"]);
+gulp.task("default", ["clean", "scripts", "less", "watch"]);

Modified: wit/js/App.js
===================================================================
--- wit/js/App.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/js/App.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -1,12 +1,12 @@
 "use strict";
 
 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");
+var Routes = require("./router/Routes");
+var Link = require("./router/Link");
+var Timer = require("./components/root/Timer");
+var Rapport = require("./components/root/Rapport");
+var Options = require("./components/root/Options");
+var EditionLogs = require("./components/root/EditionLogs");
 
 class App extends React.Component {
 

Modified: wit/js/GuiManager.js
===================================================================
--- wit/js/GuiManager.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/js/GuiManager.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -1,8 +1,8 @@
 "use strict";
 
 var gui = global.window.nwDispatcher.requireNwGui();
-//var timer = require("./services/TimerService.js");
-//var user = require("./services/UserActivityService.js");
+var timer = require("./services/TimerService.js");
+var user = require("./services/UserActivityService.js");
 
 class GuiManager {
 
@@ -12,8 +12,8 @@
         this.popups = [];
 
         // Subscriptions to services
-        //timer.subscribeIdle(this.openWindow.bind(this, "idle.html"));
-        //user.subscribeActivityChange(this.openWindow.bind(this, "activityChange.html"));
+        timer.subscribeIdle(this.openWindow.bind(this, "idle.html"));
+        user.subscribeActivityChange(this.openWindow.bind(this, "activityChange.html"));
     }
 
     createTray() {

Modified: wit/js/components/root/EditionLogs.js
===================================================================
--- wit/js/components/root/EditionLogs.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/js/components/root/EditionLogs.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -1,11 +1,11 @@
 "use strict";
 
 var moment = require("moment");
-var db = require("../services/database");
+var db = require("../../services/database");
 
 var React = require("react");
-var FilterBar = require("../components/FilterBar");
-var LogsTable = require("../components/LogsTable");
+var FilterBar = require("../FilterBar");
+var LogsTable = require("../LogsTable");
 
 class EditionLogs extends React.Component {
 

Modified: wit/js/components/root/Options.js
===================================================================
--- wit/js/components/root/Options.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/js/components/root/Options.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -1,7 +1,7 @@
 "use strict";
 
 var React = require("react");
-var config = require("../services/ConfigurationService");
+var config = require("../../services/ConfigurationService");
 
 class Options extends React.Component {
 

Modified: wit/js/components/root/Rapport.js
===================================================================
--- wit/js/components/root/Rapport.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/js/components/root/Rapport.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -3,8 +3,8 @@
 var moment = require("moment");
 
 var React = require("react");
-var FilterBar = require("../components/FilterBar");
-var FilterLogs = require("../components/FilterLogs");
+var FilterBar = require("../FilterBar");
+var FilterLogs = require("../FilterLogs");
 
 class Rapport extends React.Component {
 

Modified: wit/js/components/root/Timer.js
===================================================================
--- wit/js/components/root/Timer.js	2015-05-26 16:08:21 UTC (rev 1500)
+++ wit/js/components/root/Timer.js	2015-05-26 16:15:26 UTC (rev 1501)
@@ -1,9 +1,9 @@
 "use strict";
 
 var React = require("react");
-var Tags = require("../components/Tags");
-var Time = require("../components/Time");
-var ActionsBar = require("../components/ActionsBar");
+var Tags = require("../Tags");
+var Time = require("../Time");
+var ActionsBar = require("../ActionsBar");
 
 class Timer extends React.Component {
     render() {

    

[Sandbox-commits] r1501 - in wit: . js js/components/root

jruchaud＠users.nuiton.org