From 5185ca9505e10edd1dd9b489243497cc72bb4c00 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 30 Jul 2019 15:01:33 +0300 Subject: [PATCH] feature(ng-template): sync changes --- templates/app/angular/.npmrc | 1 - templates/app/angular/package.json | 10 ++++++---- templates/app/angular/src/app/app-routing.module.ts | 7 +++++++ .../app/lazy-libs/tenant-management-wrapper.module.ts | 7 +++++++ .../app/angular/src/environments/environment.hmr.ts | 6 +++--- .../app/angular/src/environments/environment.prod.ts | 6 +++--- templates/app/angular/src/environments/environment.ts | 6 +++--- 7 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 templates/app/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts diff --git a/templates/app/angular/.npmrc b/templates/app/angular/.npmrc index aecaef9b5c..5d05609c19 100644 --- a/templates/app/angular/.npmrc +++ b/templates/app/angular/.npmrc @@ -1,2 +1 @@ -@abp:registry=http://192.168.1.45:4873/ @volo:registry=http://192.168.1.45:4873/ \ No newline at end of file diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index eb194cf824..b638f21535 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -5,16 +5,18 @@ "ng": "ng", "start": "ng serve", "start:hmr": "ng serve --configuration hmr", - "build": "ng build --configuration production", + "build": "ng build", + "build:prod": "ng build --configuration production", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" }, "private": true, "dependencies": { - "@abp/ng.account": "^1.1.6", - "@abp/ng.identity": "^1.1.7", - "@abp/ng.theme.basic": "^1.1.6", + "@abp/ng.account": "^0.7.6", + "@abp/ng.identity": "^0.7.6", + "@abp/ng.tenant-management": "^0.7.6", + "@abp/ng.theme.basic": "^0.7.6", "@angular/animations": "~8.1.2", "@angular/common": "~8.1.2", "@angular/compiler": "~8.1.2", diff --git a/templates/app/angular/src/app/app-routing.module.ts b/templates/app/angular/src/app/app-routing.module.ts index 180d105513..ddd76272f4 100644 --- a/templates/app/angular/src/app/app-routing.module.ts +++ b/templates/app/angular/src/app/app-routing.module.ts @@ -3,6 +3,7 @@ import { ACCOUNT_ROUTES } from '@abp/ng.account'; import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ABP } from '@abp/ng.core'; +import { TENANT_MANAGEMENT_ROUTES } from '@abp/ng.tenant-management'; const routes: Routes = [ { path: '', redirectTo: '/home', pathMatch: 'full' }, @@ -25,6 +26,12 @@ const routes: Routes = [ loadChildren: () => import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule), data: { routes: IDENTITY_ROUTES }, }, + { + path: 'tenant-management', + loadChildren: () => + import('./lazy-libs/tenant-management-wrapper.module').then(m => m.TenantManagementWrapperModule), + data: { routes: TENANT_MANAGEMENT_ROUTES }, + }, ]; @NgModule({ diff --git a/templates/app/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts b/templates/app/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts new file mode 100644 index 0000000000..63eabda505 --- /dev/null +++ b/templates/app/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts @@ -0,0 +1,7 @@ +import { NgModule } from '@angular/core'; +import { TenantManagementModule } from '@abp/ng.tenant-management'; + +@NgModule({ + imports: [TenantManagementModule], +}) +export class TenantManagementWrapperModule {} diff --git a/templates/app/angular/src/environments/environment.hmr.ts b/templates/app/angular/src/environments/environment.hmr.ts index 6fbe707934..d398dfa23a 100644 --- a/templates/app/angular/src/environments/environment.hmr.ts +++ b/templates/app/angular/src/environments/environment.hmr.ts @@ -3,9 +3,9 @@ export const environment = { hmr: true, oAuthConfig: { issuer: 'http://localhost:44392', - clientId: 'MyAbpProject_ConsoleTestApp', + clientId: 'MyProjectName_ConsoleTestApp', dummyClientSecret: '1q2w3e*', - scope: 'MyAbpProject', + scope: 'MyProjectName', showDebugInformation: true, oidc: false, requireHttps: false, @@ -16,6 +16,6 @@ export const environment = { }, }, localization: { - defaultResourceName: 'MyAbpProject', + defaultResourceName: 'MyProjectName', }, }; diff --git a/templates/app/angular/src/environments/environment.prod.ts b/templates/app/angular/src/environments/environment.prod.ts index ecf41fb7e7..5be6799223 100644 --- a/templates/app/angular/src/environments/environment.prod.ts +++ b/templates/app/angular/src/environments/environment.prod.ts @@ -3,9 +3,9 @@ export const environment = { hmr: false, oAuthConfig: { issuer: 'http://localhost:44392', - clientId: 'MyAbpProject_ConsoleTestApp', + clientId: 'MyProjectName_ConsoleTestApp', dummyClientSecret: '1q2w3e*', - scope: 'MyAbpProject', + scope: 'MyProjectName', showDebugInformation: true, oidc: false, requireHttps: false, @@ -16,6 +16,6 @@ export const environment = { }, }, localization: { - defaultResourceName: 'MyAbpProject', + defaultResourceName: 'MyProjectName', }, }; diff --git a/templates/app/angular/src/environments/environment.ts b/templates/app/angular/src/environments/environment.ts index 9c7f9aa2e4..cc0687e922 100644 --- a/templates/app/angular/src/environments/environment.ts +++ b/templates/app/angular/src/environments/environment.ts @@ -3,9 +3,9 @@ export const environment = { hmr: false, oAuthConfig: { issuer: 'http://localhost:44392', - clientId: 'MyAbpProject_ConsoleTestApp', + clientId: 'MyProjectName_ConsoleTestApp', dummyClientSecret: '1q2w3e*', - scope: 'MyAbpProject', + scope: 'MyProjectName', showDebugInformation: true, oidc: false, requireHttps: false, @@ -16,6 +16,6 @@ export const environment = { }, }, localization: { - defaultResourceName: 'MyAbpProject', + defaultResourceName: 'MyProjectName', }, };