Merge pull request #2 from aspnetboilerplate/master

Sync 4.6.0

Author: kayagultekin

.gitattributes

@@ -0,0 +1,2 @@
+**/wwwroot/lib/** linguist-vendored
+**/wwwroot/css/** linguist-vendored

angular/.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:4200",
+            "sourceMaps": true,
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

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/angular.json

@@ -31,6 +31,7 @@
               }
             ],
             "styles": [
+              "node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/assets/fonts/roboto/roboto.css",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
               "node_modules/simple-line-icons/css/simple-line-icons.css",

angular/package-lock.json

@@ -9,16 +9,19 @@
     "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/animations": "^7.1.3",
+    "@angular/animations": "^7.1.4",
+    "@angular/cdk": "^7.2.0",
     "@angular/common": "^7.1.3",
     "@angular/compiler": "^7.1.3",
     "@angular/core": "^7.1.3",
     "@angular/forms": "^7.1.3",
     "@angular/http": "^7.1.3",
+    "@angular/material": "^7.2.0",
     "@angular/platform-browser": "^7.1.3",
     "@angular/platform-browser-dynamic": "^7.1.3",
     "@angular/router": "^7.1.3",
@@ -42,6 +45,7 @@
     "famfamfam-flags": "^1.0.0",
     "flot": "^0.8.0-alpha",
     "font-awesome": "^4.7.0",
+    "hammerjs": "^2.0.8",
     "jquery": "^3.1.1",
     "jquery-countto": "^1.2.0",
     "jquery-migrate": "^3.0.0",

angular/package.json

@@ -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/AppPreBootstrap.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-routing.module.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/account.component.ts

@@ -15,14 +15,16 @@ import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module
 import { SharedModule } from '@shared/shared.module';
 
 import { AccountComponent } from './account.component';
-import { TenantChangeComponent } from './tenant/tenant-change.component';
-import { TenantChangeModalComponent } from './tenant/tenant-change-modal.component';
 import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
 import { AccountLanguagesComponent } from './layout/account-languages.component';
 
 import { LoginService } from './login/login.service';
 
+// tenants
+import { TenantChangeComponent } from './tenant/tenant-change.component';
+import { TenantChangeDialogComponent } from './tenant/tenant-change-dialog.component';
+
 @NgModule({
     imports: [
         CommonModule,
@@ -37,14 +39,19 @@ import { LoginService } from './login/login.service';
     ],
     declarations: [
         AccountComponent,
-        TenantChangeComponent,
-        TenantChangeModalComponent,
         LoginComponent,
         RegisterComponent,
-        AccountLanguagesComponent
+        AccountLanguagesComponent,
+        // tenant
+        TenantChangeComponent,
+        TenantChangeDialogComponent,
     ],
     providers: [
         LoginService
+    ],
+    entryComponents: [
+        // tenant
+        TenantChangeDialogComponent
     ]
 })
 export class AccountModule {