Using ui-router instead of ngRoute
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json
index 7ecd065..672aedc 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json
@@ -20,7 +20,7 @@
"jquery": "~2.1.4",
"angular-mocks": "~1.4.7",
"angular": "~1.4.7",
- "angular-route": "~1.4.7",
+ "angular-ui-router": "~0.2.15",
"angular-cookies": "~1.4.7",
"angular-resource": "~1.4.7",
"ng-lodash": "~0.3.0",
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js
index 0988978..b1c1756 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js
@@ -43,7 +43,11 @@
'/xosHelpers/src': options.helpers
},
middleware: function(req, res, next){
- if(req.url.indexOf('no_hyperlinks') !== -1){
+ if(
+ req.url.indexOf('/xos/') !== -1 ||
+ req.url.indexOf('/xoslib/') !== -1 ||
+ req.url.indexOf('/hpcapi/') !== -1
+ ){
proxy.web(req, res);
}
else{
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/index.html b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/index.html
index 21404f1..6f07294 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/index.html
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/index.html
@@ -12,7 +12,7 @@
<div class="container">
<div ng-app="xos.<%= name %>">
- <ng-view></ng-view>
+ <div ui-view></div>
</div>
</div>
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/js/main.js b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/js/main.js
index ae7f956..ac8d19d 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/js/main.js
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/js/main.js
@@ -2,22 +2,20 @@
angular.module('xos.<%= name %>', [
'ngResource',
- 'ngRoute',
'ngCookies',
'ngLodash',
+ 'ui.router',
'xos.helpers'
])
-.config(($routeProvider) => {
-
- $routeProvider
- .when('/', {
+.config(($stateProvider, $urlRouterProvider) => {
+ $urlRouterProvider.otherwise('/');
+ $stateProvider
+ .state('user-list', {
+ url: '/',
template: '<users-list></users-list>'
- })
- .otherwise('/');
+ });
})
.config(function($httpProvider){
- // add X-CSRFToken header for update, create, delete (!GET)
- $httpProvider.interceptors.push('SetCSRFToken');
$httpProvider.interceptors.push('NoHyperlinks');
})
.directive('usersList', function(){