Merge branch 'master' of https://github.com/aspnetboilerplate/module-zero-core-template

Author: ismcagdas

angular/AbpCompanyName.AbpProjectName.AngularUI.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <Compile Remove="dist" />
-    <None Include="App.config" />
+    <None Include="app.config" />
     <None Update="wwwroot\**\*;web.config">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </None>

angular/package.json

@@ -9,7 +9,8 @@
     "hmr": "ng serve --host 0.0.0.0 --port 4200 --hmr",
     "test": "ng test",
     "pree2e": "webdriver-manager update --standalone false --gecko false",
-    "e2e": "protractor"
+    "e2e": "protractor",
+    "lint": "tslint --force --project src/tsconfig.json src/**/*.ts -t verbose"
   },
   "private": true,
   "dependencies": {

angular/src/AppPreBootstrap.ts

@@ -33,11 +33,11 @@ export class AppPreBootstrap {
     }
 
     private static getCurrentClockProvider(currentProviderName: string): abp.timing.IClockProvider {
-        if (currentProviderName === "unspecifiedClockProvider") {
+        if (currentProviderName === 'unspecifiedClockProvider') {
             return abp.timing.unspecifiedClockProvider;
         }
 
-        if (currentProviderName === "utcClockProvider") {
+        if (currentProviderName === 'utcClockProvider') {
             return abp.timing.utcClockProvider;
         }
 
@@ -50,7 +50,7 @@ export class AppPreBootstrap {
             method: 'GET',
             headers: {
                 Authorization: 'Bearer ' + abp.auth.getToken(),
-                '.AspNetCore.Culture': abp.utils.getCookieValue("Abp.Localization.CultureName"),
+                '.AspNetCore.Culture': abp.utils.getCookieValue('Abp.Localization.CultureName'),
                 'Abp.TenantId': abp.multiTenancy.getTenantIdCookie()
             }
         }).done(result => {

angular/src/account/account-routing.module.ts

@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
@@ -21,4 +21,4 @@ import { AccountComponent } from './account.component';
         RouterModule
     ]
 })
-export class AccountRoutingModule { }
+export class AccountRoutingModule { }

angular/src/account/account.component.ts

@@ -1,4 +1,4 @@
-import { Component, ViewContainerRef, OnInit, ViewEncapsulation, Injector } from '@angular/core';
+import { Component, ViewContainerRef, OnInit, ViewEncapsulation, Injector } from '@angular/core';
 import { LoginService } from './login/login.service';
 import { AppComponentBase } from '@shared/app-component-base';
 
@@ -11,11 +11,11 @@ import { AppComponentBase } from '@shared/app-component-base';
 })
 export class AccountComponent extends AppComponentBase implements OnInit {
 
-    private viewContainerRef: ViewContainerRef;
-
     versionText: string;
     currentYear: number;
 
+    private viewContainerRef: ViewContainerRef;
+
     public constructor(
         injector: Injector,
         private _loginService: LoginService
@@ -33,4 +33,4 @@ export class AccountComponent extends AppComponentBase implements OnInit {
     ngOnInit(): void {
         $('body').attr('class', 'login-page');
     }
-}
+}

angular/src/account/layout/account-languages.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Injector } from '@angular/core';
+import { Component, OnInit, Injector } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
 
 import * as _ from 'lodash';
@@ -28,12 +28,12 @@ export class AccountLanguagesComponent extends AppComponentBase implements OnIni
 
     changeLanguage(languageName: string): void {
         abp.utils.setCookieValue(
-            "Abp.Localization.CultureName",
+            'Abp.Localization.CultureName',
             languageName,
-            new Date(new Date().getTime() + 5 * 365 * 86400000), //5 year
+            new Date(new Date().getTime() + 5 * 365 * 86400000), // 5 year
             abp.appPath
         );
 
         location.reload();
     }
-}
+}

angular/src/account/login/login.component.ts

@@ -1,4 +1,4 @@
-import { Component, Injector } from '@angular/core';
+import { Component, Injector } from '@angular/core';
 import { AbpSessionService } from '@abp/session/abp-session.service';
 import { AppComponentBase } from '@shared/app-component-base';
 import { accountModuleAnimation } from '@shared/animations/routerTransition';
@@ -10,7 +10,7 @@ import { LoginService } from './login.service';
   animations: [accountModuleAnimation()]
 })
 export class LoginComponent extends AppComponentBase {
-  submitting: boolean = false;
+  submitting = false;
 
   constructor(
     injector: Injector,

angular/src/account/login/login.service.ts

@@ -1,15 +1,15 @@
+import { TokenService } from '@abp/auth/token.service';
+import { LogService } from '@abp/log/log.service';
+import { MessageService } from '@abp/message/message.service';
+import { UtilsService } from '@abp/utils/utils.service';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-import { TokenAuthServiceProxy, AuthenticateModel, AuthenticateResultModel, ExternalLoginProviderInfoModel, ExternalAuthenticateModel, ExternalAuthenticateResultModel } from '@shared/service-proxies/service-proxies';
-import { UrlHelper } from '@shared/helpers/UrlHelper';
 import { AppConsts } from '@shared/AppConsts';
-
-import { MessageService } from '@abp/message/message.service';
-import { LogService } from '@abp/log/log.service';
-import { TokenService } from '@abp/auth/token.service';
-import { UtilsService } from '@abp/utils/utils.service';
+import { UrlHelper } from '@shared/helpers/UrlHelper';
+import { AuthenticateModel, AuthenticateResultModel, TokenAuthServiceProxy } from '@shared/service-proxies/service-proxies';
 import { finalize } from 'rxjs/operators';
 
+
 @Injectable()
 export class LoginService {
 
@@ -36,7 +36,7 @@ export class LoginService {
 
         this._tokenAuthService
             .authenticate(this.authenticateModel)
-            .pipe(finalize(() => { finallyCallback() }))
+            .pipe(finalize(() => { finallyCallback(); }))
             .subscribe((result: AuthenticateResultModel) => {
                 this.processAuthenticateResult(result);
             });
@@ -46,11 +46,15 @@ export class LoginService {
         this.authenticateResult = authenticateResult;
 
         if (authenticateResult.accessToken) {
-            //Successfully logged in
-            this.login(authenticateResult.accessToken, authenticateResult.encryptedAccessToken, authenticateResult.expireInSeconds, this.rememberMe);
+            // Successfully logged in
+            this.login(
+                authenticateResult.accessToken,
+                authenticateResult.encryptedAccessToken,
+                authenticateResult.expireInSeconds,
+                this.rememberMe);
 
         } else {
-            //Unexpected result!
+            // Unexpected result!
 
             this._logService.warn('Unexpected authenticateResult!');
             this._router.navigate(['account/login']);
@@ -59,7 +63,7 @@ export class LoginService {
 
     private login(accessToken: string, encryptedAccessToken: string, expireInSeconds: number, rememberMe?: boolean): void {
 
-        var tokenExpireDate = rememberMe ? (new Date(new Date().getTime() + 1000 * expireInSeconds)) : undefined;
+        const tokenExpireDate = rememberMe ? (new Date(new Date().getTime() + 1000 * expireInSeconds)) : undefined;
 
         this._tokenService.setToken(
             accessToken,
@@ -73,7 +77,7 @@ export class LoginService {
             abp.appPath
         );
 
-        var initialUrl = UrlHelper.initialUrl;
+        let initialUrl = UrlHelper.initialUrl;
         if (initialUrl.indexOf('/login') > 0) {
             initialUrl = AppConsts.appBaseUrl;
         }

angular/src/account/register/register.component.ts

@@ -1,18 +1,18 @@
-import { Component, Injector } from "@angular/core";
-import { Router } from "@angular/router";
-import { finalize } from "rxjs/operators";
-import { AppComponentBase } from "@shared/app-component-base";
-import { accountModuleAnimation } from "@shared/animations/routerTransition";
+import { Component, Injector } from '@angular/core';
+import { Router } from '@angular/router';
+import { finalize } from 'rxjs/operators';
+import { AppComponentBase } from '@shared/app-component-base';
+import { accountModuleAnimation } from '@shared/animations/routerTransition';
 import {
   AccountServiceProxy,
   RegisterInput,
   RegisterOutput
-} from "@shared/service-proxies/service-proxies";
-import { LoginService } from "../login/login.service";
+} from '@shared/service-proxies/service-proxies';
+import { LoginService } from '../login/login.service';
 
 @Component({
-  templateUrl: "./register.component.html",
-  animations: [accountModuleAnimation()], 
+  templateUrl: './register.component.html',
+  animations: [accountModuleAnimation()],
   styles: [
     `
       mat-form-field {
@@ -26,7 +26,7 @@ import { LoginService } from "../login/login.service";
 })
 export class RegisterComponent extends AppComponentBase {
   model: RegisterInput = new RegisterInput();
-  saving: boolean = false;
+  saving = false;
 
   constructor(
     injector: Injector,
@@ -38,7 +38,7 @@ export class RegisterComponent extends AppComponentBase {
   }
 
   back(): void {
-    this._router.navigate(["/login"]);
+    this._router.navigate(['/login']);
   }
 
   save(): void {
@@ -52,12 +52,12 @@ export class RegisterComponent extends AppComponentBase {
       )
       .subscribe((result: RegisterOutput) => {
         if (!result.canLogin) {
-          this.notify.success(this.l("SuccessfullyRegistered"));
-          this._router.navigate(["/login"]);
+          this.notify.success(this.l('SuccessfullyRegistered'));
+          this._router.navigate(['/login']);
           return;
         }
 
-        //Autheticate
+        // Autheticate
         this.saving = true;
         this._loginService.authenticateModel.userNameOrEmailAddress = this.model.userName;
         this._loginService.authenticateModel.password = this.model.password;

angular/src/app/about/about.component.ts

@@ -1,4 +1,4 @@
-import { Component, Injector, AfterViewInit } from '@angular/core';
+import { Component, Injector, AfterViewInit } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
 import { appModuleAnimation } from '@shared/animations/routerTransition';
 
@@ -13,4 +13,4 @@ export class AboutComponent extends AppComponentBase {
     ) {
         super(injector);
     }
-}
+}