commit 7d994a8ca555cea83ff598730627750f7e9f2b94
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Mar 20 16:10:12 2017 -0700
committer Matteo Scandolo <teo@onlab.us> Thu Mar 23 16:53:31 2017 -0700
tree ab8508e219c62b27b93ba2f5587c92a01bcc18bf
parent 7964174ac796707c2d20d6ad0c9c5993ff1ca244

[CORD-1044] Improving vTR GUI

Change-Id: Ie6a66b8d7b6bc05d234a527254aec5bfa3405f38

xos/gui/.dockerignore

diff --git a/xos/gui/.dockerignore b/xos/gui/.dockerignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/xos/gui/.dockerignore
@@ -0,0 +1 @@
+node_modules

xos/gui/src/app/components/vtr/vtr-dashboard.html

diff --git a/xos/gui/src/app/components/vtr/vtr-dashboard.html b/xos/gui/src/app/components/vtr/vtr-dashboard.html
index f089f4e..7020b35 100644
--- a/xos/gui/src/app/components/vtr/vtr-dashboard.html
+++ b/xos/gui/src/app/components/vtr/vtr-dashboard.html
@@ -1,4 +1,3 @@
-<pre>{{vm.subscribers | json}}</pre>
 <div class="row">
   <div class="col-xs-12">
     <h1>vTR Dashboard</h1>

xos/gui/src/index.ts

diff --git a/xos/gui/src/index.ts b/xos/gui/src/index.ts
index 03d248c..970bed5 100644
--- a/xos/gui/src/index.ts
+++ b/xos/gui/src/index.ts
@@ -4,7 +4,6 @@
 import 'angular-ui-router';
 import 'angular-resource';
 import 'angular-cookies';
-import routesConfig from './routes';
 import {xosVtrDashboardComponent} from './app/components/vtr/vtr-dashboard';
 import {XosVtrTruckroll} from './app/services/truckroll.resource';
 
@@ -12,14 +11,13 @@
     'ui.router',
     'app'
   ])
-  .config(routesConfig)
   .service('XosVtrTruckroll', XosVtrTruckroll)
   .component('xosVtrDashboardComponent', xosVtrDashboardComponent)
-  .run(function($log: ng.ILogService, XosNavigationService: any) {
+  .run(function($log: ng.ILogService, XosNavigationService: any, XosRuntimeStates: any) {
     $log.info('[xos-vtr-gui-extension] App is running');
 
     XosNavigationService.add({
-      label: 'vTR',
+      label: 'Vtr',
       state: 'xos.vtr',
     });
 
@@ -28,4 +26,15 @@
       state: 'xos.vtr.dashboard',
       parent: 'xos.vtr'
     });
+
+    XosRuntimeStates.addState(`xos.vtr`, {
+      abstract: true,
+      template: '<div ui-view></div>'
+    });
+
+    XosRuntimeStates.addState(`xos.vtr.dashboard`, {
+      url: 'vtr/dashboard',
+      parent: 'xos.vtr',
+      component: 'xosVtrDashboardComponent'
+    });
   });

xos/gui/src/routes.ts

diff --git a/xos/gui/src/routes.ts b/xos/gui/src/routes.ts
deleted file mode 100644
index 84abd47..0000000
--- a/xos/gui/src/routes.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export default routesConfig;
-
-function routesConfig($stateProvider: angular.ui.IStateProvider, $locationProvider: angular.ILocationProvider) {
-  $locationProvider.html5Mode(false).hashPrefix('');
-
-  $stateProvider
-  .state('xos.vtr', {
-      abstract: true,
-      template: '<div ui-view></div>'
-    })
-    .state('xos.vtr.dashboard', {
-      url: 'vtr/dashboard',
-      parent: 'xos.vtr',
-      component: 'xosVtrDashboardComponent'
-    });
-}