fix(client): fix remaining TS errors

Author: Awk34

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

@@ -1,20 +1,21 @@
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-<%_ if (filters.uirouter) { -%>
+<%_ if(filters.uirouter) { -%>
 import { UIRouterModule } from 'ui-router-ng2';<% } %>
-<%_ if (filters.ngroute) { -%>
+<%_ if(filters.ngroute) { -%>
 import { RouterModule, Routes } from '@angular/router';<% } %>
 <%_ if(filters.oauth) { -%>
 import { DirectivesModule } from '../../components/directives.module';<% } %>
 
-import { STATES } from './account.routes';
+<%_ if(filters.uirouter) { -%>
+import { STATES } from './account.routes';<% } %>
 
 import { LoginComponent } from './login/login.component';
 import { SettingsComponent } from './settings/settings.component';
 import { SignupComponent } from './signup/signup.component';
 
-<%_ if (filters.ngroute) { -%>
+<%_ if(filters.ngroute) { -%>
 const accountRoutes: Routes = [{
   path: 'login',
   component: LoginComponent,
@@ -31,11 +32,11 @@ const accountRoutes: Routes = [{
     imports: [
         FormsModule,
         BrowserModule,
-        <%_ if (filters.uirouter) { -%>
+        <%_ if(filters.uirouter) { -%>
         UIRouterModule.forChild({
             states: STATES,
         }),<% } %>
-        <%_ if (filters.ngroute) { -%>
+        <%_ if(filters.ngroute) { -%>
         RouterModule.forChild(accountRoutes),<% } %>
         <%_ if(filters.oauth) { -%>
         DirectivesModule,<% } %>

templates/app/client/app/account(auth)/signup/signup.component.js

@@ -56,7 +56,7 @@ export class SignupComponent {
     })
     .then(() => {
       // Account created, redirect to home
-      <% if(filters.ngroute) { %>this.$location.path('/');<% } -%>
+      <% if(filters.ngroute) { %>this.Router.navigateByUrl('/home');<% } -%>
       <% if(filters.uirouter) { %>this.StateService.go('main');<% } -%>
     })
     .catch(err => {

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

@@ -9,7 +9,7 @@ import { AdminComponent } from './admin.component';
 
 <%_ if(filters.uirouter) { -%>
 import { STATES } from './admin.routes';<% } %>
-<%_ if (filters.ngroute) { -%>
+<%_ if(filters.ngroute) { -%>
 const adminRoutes: Routes = [{
   path: 'admin',
   component: AdminComponent,

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

@@ -9,6 +9,7 @@ import { SocketService } from '../../components/socket/socket.service';
     styles: [require('./main.<%=styleExt%>')],
 })
 export class MainComponent implements OnInit<% if(filters.ws) { %>, OnDestroy<% } %> {
+  Http;
   <%_ if(filters.ws) { -%>
   SocketService;<% } %>
   awesomeThings = [];

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

@@ -22,6 +22,9 @@ export class AuthService {
   _currentUser: User = new User();
   @Output() currentUserChanged = new EventEmitter(true);
   userRoles = constants.userRoles || [];
+  Http;
+  AuthHttp;
+  UserService;
 
   static parameters = [Http, AuthHttp, UserService];
   constructor(<%= private() %>http: Http, <%= private() %>authHttp: AuthHttp, <%= private() %>userService: UserService) {
@@ -31,6 +34,7 @@ export class AuthService {
 
     if(localStorage.getItem('id_token')) {
       this.UserService.get().toPromise()
+        .then(extractData)
         .then((user: User) => {
           this.currentUser = user;
         })
@@ -146,7 +150,7 @@ export class AuthService {
    * @param  {Function} [callback] - function(user)
    * @return {Promise}
    */
-  getCurrentUser(callback?) {
+  getCurrentUser(callback<% if(filters.ts) { %>?<% } %>) {
     safeCb(callback)(this.currentUser);
     return Promise.resolve(this.currentUser);
   }
@@ -185,7 +189,7 @@ export class AuthService {
    * @param  {Function|*} [callback] - optional, function(is)
    * @return {Promise}
    */
-  isAdmin(callback?) {
+  isAdmin(callback<% if(filters.ts) { %>?<% } %>) {
     return this.getCurrentUser().then(user => {
       var is = user.role === 'admin';
       safeCb(callback)(is);

templates/app/client/components/auth(auth)/user.service.js

@@ -22,6 +22,8 @@ function handleError(err) {
 
 @Injectable()
 export class UserService {
+  AuthHttp;
+
   static parameters = [AuthHttp];
   constructor(<%= private() %>authHttp: AuthHttp) {
     this.AuthHttp = authHttp;
@@ -32,7 +34,7 @@ export class UserService {
       .map((res:Response) => res.json())
       .catch(handleError);
   }
-  get(user: UserType = {id: 'me'}): Observable<UserType> {
+  get(user<% if(filters.ts) { %>: UserType<% } %> = {id: 'me'}): Observable<UserType> {
     return this.AuthHttp.get(`/api/users/${user.id || user._id}`)
       .map((res:Response) => res.json())
       .catch(handleError);

templates/app/client/components/navbar/navbar.component.js

@@ -12,14 +12,17 @@ import { AuthService } from '../auth/auth.service';<% } %>
 })
 export class NavbarComponent {
   isCollapsed = true;
-  isLoggedIn;
-  isAdmin;
-  currentUser = {};
   menu = [{
     title: 'Home',
     <% if(filters.uirouter) { %>'state': 'main'<% } else { %>'link': '/home'<% } %>,
   }];
+  <%_ if(filters.ngroute) { -%>
+  Router;<% } %>
   <%_ if(filters.auth) { -%>
+  isAdmin;
+  isLoggedIn;
+  currentUser = {};
+  AuthService;
 
   static parameters = [AuthService<% if(filters.uirouter) { %>, StateService<% } else { %>, Router<% } %>];
   constructor(<%= private() %>authService: AuthService<% if(filters.uirouter) { %>, <%= private() %>stateService: StateService<% } else { %>, <%= private() %>router: Router<% } %>) {

test/fixtures/.yo-rc.json

@@ -18,7 +18,7 @@
       "flow": false,
       "html": true,
       "sass": true,
-      "uirouter": true,
+      "ngroute": true,
       "bootstrap": true,
       "uibootstrap": true,
       "ws": true,
@@ -41,11 +41,10 @@
     "moduleName": "",
     "modulePrompt": true,
     "filters": [
-      "uirouter",
+      "ngroute",
       "mocha",
       "expect",
       "should",
-      "uirouter",
       "es6",
       "webpack"
     ],