Skip to content

Commit 2274545

Browse files
committed
fix(client): fix ngRoute imports
Fix a few places that uses ui-router instead of ngRoute for ngRoute scaffolds. Also changed from es6 imports to using requires.
1 parent 03d1c95 commit 2274545

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

templates/app/client/app/account(auth)/account.routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default function routes($stateProvider) {
3838
});
3939
}<% } %>
4040
<%_ if (filters.ngroute) { _%>
41-
export default function routes($stateProvider) {
41+
export default function routes($routeProvider) {
4242
'ngInject';
4343
$routeProvider
4444
.when('/login', {

templates/app/client/app/account(auth)/index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
'use strict';
22
import angular from 'angular';
3-
import uiRouter from 'angular-ui-router';
3+
<%_ if (filters.ngroute) { _%>
4+
const ngRoute = require('angular-route'); <% } %>
5+
<%_ if (filters.uirouter) { _%>
6+
import uiRouter from 'angular-ui-router';<% } %>
47

58
import routing from './account.routes';
69
import login from './login';
@@ -10,7 +13,10 @@ import signup from './signup';
1013
import oauthButtons from '../../components/oauth-buttons';<% } %>
1114

1215
export default angular.module('<%= scriptAppName %>.account', [
13-
uiRouter,
16+
<%_ if (filters.ngroute) { _%>
17+
ngRoute,<% } %>
18+
<%_ if (filters.uirouter) { _%>
19+
uiRouter,<% } %>
1420
login,
1521
settings,
1622
signup<% if(filters.oauth) { %>,

templates/app/client/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import ngSanitize from 'angular-sanitize';
77
<%_ if(filters.socketio) { _%>
88
import 'angular-socket-io';<% } %>
99
<%_ if(filters.ngroute) { _%>
10-
import ngRoute from 'angular-route';<% } %>
10+
const ngRoute = require('angular-route');<% } %>
1111
<%_ if(filters.uirouter) { _%>
1212
import uiRouter from 'angular-ui-router';<% } %>
1313
<%_ if(filters.uibootstrap) { _%>

templates/app/client/app/main/main.component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import angular from 'angular';
22
<%_ if(filters.ngroute) { _%>
3-
import ngroute from 'angular-route';<% } _%>
3+
const ngRoute = require('angular-route');<% } _%>
44
<%_ if(filters.uirouter) { _%>
55
import uiRouter from 'angular-ui-router';<% } _%>
66

@@ -40,7 +40,7 @@ export class MainController {
4040

4141
export default angular.module('<%= scriptAppName %>.main', [
4242
<%_ if(filters.ngroute) { _%>
43-
ngroute<% } _%>
43+
ngRoute<% } _%>
4444
<%_ if(filters.uirouter) { _%>
4545
uiRouter<% } _%>
4646
])

templates/app/client/components/auth(auth)/auth.module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {routerDecorator} from './router.decorator';
88
import {AuthService} from './auth.service';
99
import {UserResource} from './user.service';
1010
<%_ if (filters.ngroute) { _%>
11-
import ngRoute from 'angular-route';<% } %>
11+
const ngRoute = require('angular-route');<% } %>
1212
<%_ if (filters.uirouter) { _%>
1313
import uiRouter from 'angular-ui-router';<% } %>
1414

0 commit comments

Comments
 (0)