r1252 - in wit: . js js/components - Sandbox-commits

24 Apr 2015

Author: jruchaud
Date: 2015-04-24 21:01:18 +0000 (Fri, 24 Apr 2015)
New Revision: 1252

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

Log:
Use react-router to manage path (sorry sam for the bother)

Added:
   wit/js/Timer.js
Removed:
   wit/js/App.js
Modified:
   wit/index.html
   wit/js/components/FilterBar.js
   wit/js/main.js
   wit/package.json

Modified: wit/index.html
===================================================================

--- wit/index.html	2015-04-24 13:01:37 UTC (rev 1251)
+++ wit/index.html	2015-04-24 21:01:18 UTC (rev 1252)
@@ -14,7 +14,7 @@
         <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/App.js"></script>
+        <script type="text/jsx" src="js/Timer.js"></script>
         <script type="text/jsx" src="js/Rapport.js"></script>
         <script type="text/jsx" src="js/UserActivity.js"></script>
         <script type="text/jsx" src="js/main.js"></script>
@@ -28,35 +28,11 @@
         <script type="text/javascript" src="node_modules/less/dist/less.min.js"></script>
         
         <script type="text/javascript">
-            function userActivity () {
-                var gui = require('nw.gui');
-                var new_win = gui.Window.open('index.html#userActivity', {
-                    position: 'center',
-                    toolbar: true
-                });
-            }
+            
         </script>
 
     </head>
-    <body>
-        <div class="container-fluid">
-        
-            <div class="navbar navbar-default">
-                <div class="navbar-header pull-left">
-                  <a class="navbar-brand" href="#">WIT</a>
-                </div>
+    
+    <body></body>
 
-                <div class="nav navbar-header pull-right">
-                    <ul class="nav pull-right">
-                        <li class="pull-left"><a href="#">Timer</a></li>
-                        <li class="pull-left"><a href="#rapport">Rapport</a></li>
-                        <li class="pull-left"><a href="#">Tags</a></li>
-                        <li class="pull-left"><a href="#">Options</a></li>
-                        <li class="pull-left" onClick="userActivity()"><a href="#">Help !</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div id="content"></div>
-        </div>
-    </body>
 </html>

Deleted: wit/js/App.js
===================================================================
--- wit/js/App.js	2015-04-24 13:01:37 UTC (rev 1251)
+++ wit/js/App.js	2015-04-24 21:01:18 UTC (rev 1252)
@@ -1,13 +0,0 @@
-/** @jsx React.DOM */
-
-var App = React.createClass({
-    render: function() {
-        return (
-            <div>
-                <Time />
-                <Tags />
-                <ActionsBar />
-            </div>
-        );
-    }
-});

Added: wit/js/Timer.js
===================================================================
--- wit/js/Timer.js	                        (rev 0)
+++ wit/js/Timer.js	2015-04-24 21:01:18 UTC (rev 1252)
@@ -0,0 +1,13 @@
+/** @jsx React.DOM */
+
+var Timer = React.createClass({
+    render: function() {
+        return (
+            <div>
+                <Time />
+                <Tags />
+                <ActionsBar />
+            </div>
+        );
+    }
+});

Modified: wit/js/components/FilterBar.js
===================================================================
--- wit/js/components/FilterBar.js	2015-04-24 13:01:37 UTC (rev 1251)
+++ wit/js/components/FilterBar.js	2015-04-24 21:01:18 UTC (rev 1252)
@@ -34,11 +34,11 @@
     render: function() {
         
         return (
-            <form class="form-inline">
+            <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>
-            </form>
+            </div>
         );
     }
 });

Modified: wit/js/main.js
===================================================================
--- wit/js/main.js	2015-04-24 13:01:37 UTC (rev 1251)
+++ wit/js/main.js	2015-04-24 21:01:18 UTC (rev 1252)
@@ -1,24 +1,65 @@
 /** @jsx React.DOM */
 
+// Popup Idle 
+// Options with idle time + nb tags
+// Route
+// Dropdown rapport week/day/month
+
+global.document = window.document;
+global.navigator = window.navigator;
+
+var React = require('react');
 var timer = require('./js/TimerService.js');
+var Router = require('react-router');
 var user = require('./js/UserActivityService.js');
 
-(function() {
-    var app, hash = location.hash;
-    switch (hash) {
-        case "#rapport":
-          app = <Rapport/>;
-          break;
-        case "#userActivity":
-          app = <UserActivity/>;
-          break;
-        default:
-          app = <App/>
-          break;
-    }
+var DefaultRoute = Router.DefaultRoute;
+var Link = Router.Link;
+var Route = Router.Route;
+var RouteHandler = Router.RouteHandler;
 
-    React.render(
-        app,
-        document.getElementById('content')
+var App = React.createClass({
+   userActivity : function() {
+        var gui = require('nw.gui');
+        var new_win = gui.Window.open('index.html#/activity', {
+            position: 'center',
+            toolbar: true
+        });
+   },
+    
+  render: function() {
+    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 to="app">Timer</Link></li>
+                        <li className="pull-left"><Link to="rapport">Rapport</Link></li>
+                        <li className="pull-left"><a href="#">Tags</a></li>
+                        <li className="pull-left"><a href="#">Options</a></li>
+                        <li className="pull-left"><Link to="activity">Help</Link></li>
+                    </ul>
+                </div>
+            </div>
+            <RouteHandler/>
+        </div>
     );
-})();
+  }
+});
+
+var routes = (
+  <Route name="app" path="/" handler={App}>
+    <Route name="rapport" handler={Rapport}/>
+    <Route name="activity" handler={UserActivity}/>
+    <DefaultRoute handler={Timer}/>
+  </Route>
+);
+
+Router.run(routes, function (Handler) {
+  React.render(<Handler/>, document.body);
+});

Modified: wit/package.json
===================================================================
--- wit/package.json	2015-04-24 13:01:37 UTC (rev 1251)
+++ wit/package.json	2015-04-24 21:01:18 UTC (rev 1252)
@@ -15,6 +15,7 @@
     "moment": "^2.10.2",
     "nedb": "^1.1.2",
     "react": "^0.13.1",
+    "react-router": "^0.13.2",
     "x11": "^1.0.3",
     "xprop": "^0.0.0"
   },

    

r1252 - in wit: . js js/components

jruchaud＠users.nuiton.org

tags

participants (1)