Merge branch 'master' into ng-remove-jquery-dependency

Author: iyilm4z

angular/angular.json

@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -52,6 +53,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -69,6 +76,12 @@
               ]
             },
             "hmr": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -178,7 +191,7 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "css"
+      "style": "css"
     },
     "@schematics/angular:directive": {
       "prefix": "app"

angular/package.json

@@ -13,57 +13,58 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@angular/animations": "^8.2.4",
-    "@angular/common": "^8.2.4",
-    "@angular/compiler": "^8.2.4",
-    "@angular/core": "^8.2.4",
-    "@angular/forms": "^8.2.4",
-    "@angular/platform-browser": "^8.2.4",
-    "@angular/platform-browser-dynamic": "^8.2.4",
-    "@angular/router": "^8.2.4",
+    "@angular/animations": "^9.1.4",
+    "@angular/common": "^9.1.4",
+    "@angular/compiler": "^9.1.4",
+    "@angular/core": "^9.1.4",
+    "@angular/forms": "^9.1.4",
+    "@angular/platform-browser": "^9.1.4",
+    "@angular/platform-browser-dynamic": "^9.1.4",
+    "@angular/router": "^9.1.4",
     "@aspnet/signalr": "^1.1.4",
     "@fortawesome/fontawesome-free": "^5.13.0",
-    "abp-ng2-module": "^5.1.1",
+    "abp-ng2-module": "^6.0.0",
     "abp-web-resources": "^5.1.1",
     "admin-lte-css-only": "^3.0.4",
     "core-js": "^3.2.1",
     "famfamfam-flags": "^1.0.0",
     "lodash": "^4.17.4",
-    "moment": "^2.18.1",
-    "moment-timezone": "^0.5.13",
+    "moment": "2.24.0",
+    "moment-timezone": "^0.5.28",
     "ngx-bootstrap": "^5.6.1",
-    "ngx-pagination": "^4.1.0",
-    "push.js": "1.0.9",
+    "ngx-pagination": "^5.0.0",
+    "push.js": "1.0.12",
     "rxjs": "^6.4.0",
     "sweetalert2": "^9.10.12",
     "ts-helpers": "^1.1.2",
+    "tslib": "^1.10.0",
     "web-animations-js": "^2.3.2",
-    "zone.js": "~0.9.1"
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.2",
-    "@angular/cli": "^8.3.2",
-    "@angular/compiler-cli": "^8.2.4",
+    "@angular-devkit/build-angular": "~0.901.4",
+    "@angular/cli": "^9.1.4",
+    "@angular/compiler-cli": "^9.1.4",
     "@angularclass/hmr": "^2.1.3",
     "@types/jasmine": "^3.4.0",
-    "@types/lodash": "^4.14.62",
+    "@types/lodash": "^4.14.150",
     "@types/moment-timezone": "^0.5.12",
-    "@types/node": "^12.7.3",
-    "codelyzer": "^5.0.1",
+    "@types/node": "^13.13.4",
+    "codelyzer": "^5.1.2",
     "jasmine-core": "^3.3.0",
-    "jasmine-spec-reporter": "^4.2.1",
-    "karma": "^4.3.0",
+    "jasmine-spec-reporter": "^5.0.2",
+    "karma": "^5.0.4",
     "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "^2.0.0",
-    "karma-coverage-istanbul-reporter": "^2.0.4",
-    "karma-jasmine": "^2.0.1",
+    "karma-coverage-istanbul-reporter": "^3.0.0",
+    "karma-jasmine": "^3.1.1",
     "karma-jasmine-html-reporter": "^1.4.0",
-    "nswag": "^13.0.6",
-    "protractor": "^5.1.1",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.19.0",
-    "typescript": "3.4.5",
-    "webpack-bundle-analyzer": "^3.0.3"
+    "nswag": "^13.4.2",
+    "protractor": "^5.4.4",
+    "ts-node": "^8.10.1",
+    "tslint": "^6.1.2",
+    "typescript": "3.8.3",
+    "webpack-bundle-analyzer": "^3.7.0"
   },
   "angular-cli": {}
-}
+}

angular/src/account/account.module.ts

@@ -3,17 +3,10 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { HttpClientJsonpModule } from '@angular/common/http';
 import { HttpClientModule } from '@angular/common/http';
-
 import { ModalModule } from 'ngx-bootstrap/modal';
-
-import { AbpModule } from '@abp/abp.module';
-
 import { AccountRoutingModule } from './account-routing.module';
-
 import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
-
 import { SharedModule } from '@shared/shared.module';
-
 import { AccountComponent } from './account.component';
 import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
@@ -31,7 +24,6 @@ import { TenantChangeDialogComponent } from './tenant/tenant-change-dialog.compo
         FormsModule,
         HttpClientModule,
         HttpClientJsonpModule,
-        AbpModule,
         SharedModule,
         ServiceProxyModule,
         AccountRoutingModule,

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

@@ -20,4 +20,4 @@ export class AccountFooterComponent extends AppComponentBase {
       this.appSession.application.releaseDate.format('YYYYDDMM') +
       ']';
   }
-}
+}

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

@@ -1,5 +1,5 @@
 import { Component, Injector } from '@angular/core';
-import { AbpSessionService } from '@abp/session/abp-session.service';
+import { AbpSessionService } from 'abp-ng2-module';
 import { AppComponentBase } from '@shared/app-component-base';
 import { accountModuleAnimation } from '@shared/animations/routerTransition';
 import { AppAuthService } from '@shared/auth/app-auth.service';

angular/src/account/tenant/tenant-change.component.ts

@@ -15,17 +15,17 @@ export class TenantChangeComponent extends AppComponentBase implements OnInit {
     super(injector);
   }
 
+  get isMultiTenancyEnabled(): boolean {
+    return abp.multiTenancy.isEnabled;
+  }
+
   ngOnInit() {
     if (this.appSession.tenant) {
       this.tenancyName = this.appSession.tenant.tenancyName;
       this.name = this.appSession.tenant.name;
     }
   }
 
-  get isMultiTenancyEnabled(): boolean {
-    return abp.multiTenancy.isEnabled;
-  }
-
   showChangeModal(): void {
     const modal = this._modalService.show(TenantChangeDialogComponent);
     if (this.appSession.tenant) {

angular/src/app/app.module.ts

@@ -3,21 +3,15 @@ import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClientJsonpModule } from '@angular/common/http';
 import { HttpClientModule } from '@angular/common/http';
-
 import { ModalModule } from 'ngx-bootstrap/modal';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { CollapseModule } from 'ngx-bootstrap/collapse';
 import { TabsModule } from 'ngx-bootstrap/tabs';
 import { NgxPaginationModule } from 'ngx-pagination';
-
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-
-import { AbpModule } from '@abp/abp.module';
-
 import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
 import { SharedModule } from '@shared/shared.module';
-
 import { HomeComponent } from '@app/home/home.component';
 import { AboutComponent } from '@app/about/about.component';
 // tenants
@@ -85,7 +79,6 @@ import { SidebarMenuComponent } from './layout/sidebar-menu.component';
     BsDropdownModule,
     CollapseModule,
     TabsModule,
-    AbpModule,
     AppRoutingModule,
     ServiceProxyModule,
     SharedModule,

angular/src/app/layout/sidebar-menu.component.ts

@@ -92,19 +92,14 @@ export class SidebarMenuComponent extends AppComponentBase implements OnInit {
             'https://aspnetzero.com?ref=abptmpl',
             'far fa-circle'
           ),
-          new MenuItem(
-            'Description',
-            'https://aspnetzero.com/?ref=abptmpl#description',
-            'far fa-circle'
-          ),
           new MenuItem(
             'Features',
-            'https://aspnetzero.com/?ref=abptmpl#features',
+            'https://aspnetzero.com/Features?ref=abptmpl',
             'far fa-circle'
           ),
           new MenuItem(
             'Pricing',
-            'https://aspnetzero.com/?ref=abptmpl#pricing',
+            'https://aspnetzero.com/Pricing?ref=abptmpl#pricing',
             'far fa-circle'
           ),
           new MenuItem(

angular/src/app/layout/sidebar.component.ts

@@ -1,12 +1,18 @@
-import { Component, ChangeDetectionStrategy, Renderer2 } from '@angular/core';
+import {
+  Component,
+  ChangeDetectionStrategy,
+  Renderer2,
+  OnInit
+} from '@angular/core';
 import { LayoutStoreService } from '@shared/layout/layout-store.service';
 
 @Component({
+  // tslint:disable-next-line:component-selector
   selector: 'sidebar',
   templateUrl: './sidebar.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class SidebarComponent {
+export class SidebarComponent implements OnInit {
   sidebarExpanded: boolean;
 
   constructor(

angular/src/app/users/change-password/change-password.component.html

@@ -25,7 +25,7 @@ <h1>{{ "UpdatePassword" | localize }}</h1>
                 </label>
                 <div class="col-md-9">
                   <input
-                    type="text"
+                    type="password"
                     class="form-control"
                     name="currentPassword"
                     id="currentPassword"
@@ -48,7 +48,7 @@ <h1>{{ "UpdatePassword" | localize }}</h1>
                 </label>
                 <div class="col-md-9">
                   <input
-                    type="text"
+                    type="password"
                     class="form-control"
                     name="newPassword"
                     id="newPassword"
@@ -75,7 +75,7 @@ <h1>{{ "UpdatePassword" | localize }}</h1>
                 </label>
                 <div class="col-md-9">
                   <input
-                    type="text"
+                    type="password"
                     class="form-control"
                     name="confirmNewPassword"
                     id="confirmNewPassword"