From 5c1bcbb256c0b1b8bb948d256ee5e4c8162d12c3 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 8 Oct 2019 11:55:30 +0300 Subject: [PATCH] feat(module-template): add identity, tenant management, setting-management modules #1652 --- .../packages/core/src/lib/states/config.state.ts | 1 + templates/module/angular/package.json | 3 +++ .../module/angular/src/app/app-routing.module.ts | 14 ++++++++++++++ templates/module/angular/src/app/app.module.ts | 6 ++++++ .../src/app/lazy-libs/identity-wrapper.module.ts | 7 +++++++ .../lazy-libs/setting-management-wrapper.module.ts | 7 +++++++ .../lazy-libs/tenant-management-wrapper.module.ts | 7 +++++++ 7 files changed, 45 insertions(+) create mode 100644 templates/module/angular/src/app/lazy-libs/identity-wrapper.module.ts create mode 100644 templates/module/angular/src/app/lazy-libs/setting-management-wrapper.module.ts create mode 100644 templates/module/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts index 1c0f533079..08bb79a171 100644 --- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts @@ -230,6 +230,7 @@ export class ConfigState { }); } + if (typeof localization !== 'string') localization = ''; return localization || defaultValue || key; }, ); diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 93edc29006..37f54f145d 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,6 +15,9 @@ "dependencies": { "@abp/ng.account": "^0.9.0", "@abp/ng.theme.basic": "^0.9.0", + "@abp/ng.identity": "^0.9.0", + "@abp/ng.tenant-management": "^0.9.0", + "@abp/ng.setting-management": "^0.9.0", "@angular/animations": "~8.2.8", "@angular/common": "~8.2.8", "@angular/compiler": "~8.2.8", diff --git a/templates/module/angular/src/app/app-routing.module.ts b/templates/module/angular/src/app/app-routing.module.ts index 30dacd8547..1714a2e06e 100644 --- a/templates/module/angular/src/app/app-routing.module.ts +++ b/templates/module/angular/src/app/app-routing.module.ts @@ -12,10 +12,24 @@ const routes: Routes = [ } as ABP.Route, }, }, + { + path: 'identity', + loadChildren: () => import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule), + }, + { + path: 'tenant-management', + loadChildren: () => + import('./lazy-libs/tenant-management-wrapper.module').then(m => m.TenantManagementWrapperModule), + }, { path: 'account', loadChildren: () => import('./lazy-libs/account-wrapper.module').then(m => m.AccountWrapperModule), }, + { + path: 'setting-management', + loadChildren: () => + import('./lazy-libs/setting-management-wrapper.module').then(m => m.SettingManagementWrapperModule), + }, { path: 'my-project-name', loadChildren: () => import('./lazy-libs/my-project-name-wrapper.module').then(m => m.MyProjectNameWrapperModule), diff --git a/templates/module/angular/src/app/app.module.ts b/templates/module/angular/src/app/app.module.ts index 60ab3844ca..b670735c59 100644 --- a/templates/module/angular/src/app/app.module.ts +++ b/templates/module/angular/src/app/app.module.ts @@ -12,6 +12,9 @@ import { AppComponent } from './app.component'; import { SharedModule } from './shared/shared.module'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { AccountConfigModule } from '@abp/ng.account.config'; +import { IdentityConfigModule } from '@abp/ng.identity.config'; +import { TenantManagementConfigModule } from '@abp/ng.tenant-management.config'; +import { SettingManagementConfigModule } from '@abp/ng.setting-management.config'; import { MyProjectNameConfigModule } from '../../projects/my-project-name-config/src/public-api'; @NgModule({ @@ -27,6 +30,9 @@ import { MyProjectNameConfigModule } from '../../projects/my-project-name-config OAuthModule.forRoot(), NgxsModule.forRoot([]), AccountConfigModule.forRoot({ redirectUrl: '/' }), + IdentityConfigModule, + TenantManagementConfigModule, + SettingManagementConfigModule, MyProjectNameConfigModule, BrowserModule, BrowserAnimationsModule, diff --git a/templates/module/angular/src/app/lazy-libs/identity-wrapper.module.ts b/templates/module/angular/src/app/lazy-libs/identity-wrapper.module.ts new file mode 100644 index 0000000000..fed1dcd1ec --- /dev/null +++ b/templates/module/angular/src/app/lazy-libs/identity-wrapper.module.ts @@ -0,0 +1,7 @@ +import { NgModule } from '@angular/core'; +import { IdentityModule } from '@abp/ng.identity'; + +@NgModule({ + imports: [IdentityModule], +}) +export class IdentityWrapperModule {} diff --git a/templates/module/angular/src/app/lazy-libs/setting-management-wrapper.module.ts b/templates/module/angular/src/app/lazy-libs/setting-management-wrapper.module.ts new file mode 100644 index 0000000000..e5f3db8878 --- /dev/null +++ b/templates/module/angular/src/app/lazy-libs/setting-management-wrapper.module.ts @@ -0,0 +1,7 @@ +import { NgModule } from '@angular/core'; +import { SettingManagementModule } from '@abp/ng.setting-management'; + +@NgModule({ + imports: [SettingManagementModule], +}) +export class SettingManagementWrapperModule {} diff --git a/templates/module/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts b/templates/module/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts new file mode 100644 index 0000000000..63eabda505 --- /dev/null +++ b/templates/module/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 {}