diff --git a/npm/ng-packs/packages/account/src/lib/account.module.ts b/npm/ng-packs/packages/account/src/lib/account.module.ts index d30ad3485b..fbfe6a7226 100644 --- a/npm/ng-packs/packages/account/src/lib/account.module.ts +++ b/npm/ng-packs/packages/account/src/lib/account.module.ts @@ -1,33 +1,17 @@ import { CoreModule } from '@abp/ng.core'; -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ThemeSharedModule } from '@abp/ng.theme.shared'; +import { NgModule } from '@angular/core'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgxValidateCoreModule } from '@ngx-validate/core'; +import { TableModule } from 'primeng/table'; import { AccountRoutingModule } from './account-routing.module'; import { LoginComponent } from './components/login/login.component'; import { RegisterComponent } from './components/register/register.component'; -import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { TenantBoxComponent } from './components/tenant-box/tenant-box.component'; -import { Options } from './models/options'; -import { ACCOUNT_OPTIONS, optionsFactory } from './tokens/options.token'; -import { TableModule } from 'primeng/table'; -import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; -import { NgxValidateCoreModule } from '@ngx-validate/core'; @NgModule({ declarations: [LoginComponent, RegisterComponent, TenantBoxComponent], imports: [CoreModule, AccountRoutingModule, ThemeSharedModule, TableModule, NgbDropdownModule, NgxValidateCoreModule], exports: [], }) -export class AccountModule { - static forRoot(options = {} as Options): ModuleWithProviders { - return { - ngModule: AccountModule, - providers: [ - { provide: ACCOUNT_OPTIONS, useValue: options }, - { - provide: 'ACCOUNT_OPTIONS', - useFactory: optionsFactory, - deps: [ACCOUNT_OPTIONS], - }, - ], - }; - } -} +export class AccountModule {} diff --git a/npm/ng-packs/packages/account/src/lib/root-account.module.ts b/npm/ng-packs/packages/account/src/lib/root-account.module.ts new file mode 100644 index 0000000000..beca480223 --- /dev/null +++ b/npm/ng-packs/packages/account/src/lib/root-account.module.ts @@ -0,0 +1,20 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { Options } from './models/options'; +import { ACCOUNT_OPTIONS, optionsFactory } from './tokens/options.token'; + +@NgModule({}) +export class RootAccountModule { + static forRoot(options = {} as Options): ModuleWithProviders { + return { + ngModule: RootAccountModule, + providers: [ + { provide: ACCOUNT_OPTIONS, useValue: options }, + { + provide: 'ACCOUNT_OPTIONS', + useFactory: optionsFactory, + deps: [ACCOUNT_OPTIONS], + }, + ], + }; + } +} diff --git a/npm/ng-packs/packages/account/src/public-api.ts b/npm/ng-packs/packages/account/src/public-api.ts index 2a8e2468ab..d75f7155f1 100644 --- a/npm/ng-packs/packages/account/src/public-api.ts +++ b/npm/ng-packs/packages/account/src/public-api.ts @@ -1,7 +1,4 @@ -/* - * Public API Surface of auth - */ - +export * from './lib/root-account.module'; export * from './lib/account.module'; export * from './lib/components'; export * from './lib/constants/routes'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts b/npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts new file mode 100644 index 0000000000..cb60351a07 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/root-feature-management.module.ts @@ -0,0 +1,11 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; + +@NgModule({}) +export class RootFeatureManagementModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootFeatureManagementModule, + providers: [], + }; + } +} diff --git a/npm/ng-packs/packages/feature-management/src/public-api.ts b/npm/ng-packs/packages/feature-management/src/public-api.ts index 047ac00914..a13bb6c526 100644 --- a/npm/ng-packs/packages/feature-management/src/public-api.ts +++ b/npm/ng-packs/packages/feature-management/src/public-api.ts @@ -1,2 +1,3 @@ +export * from './lib/root-feature-management.module'; export * from './lib/feature-management.module'; export * from './lib/components'; diff --git a/npm/ng-packs/packages/identity/src/lib/root-identity.module.ts b/npm/ng-packs/packages/identity/src/lib/root-identity.module.ts new file mode 100644 index 0000000000..c5cc5efaaa --- /dev/null +++ b/npm/ng-packs/packages/identity/src/lib/root-identity.module.ts @@ -0,0 +1,11 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; + +@NgModule({}) +export class RootIdentityModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootIdentityModule, + providers: [], + }; + } +} diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts index be547b1c34..e3de2483e4 100644 --- a/npm/ng-packs/packages/identity/src/public-api.ts +++ b/npm/ng-packs/packages/identity/src/public-api.ts @@ -2,6 +2,7 @@ * Public API Surface of identity */ +export * from './lib/root-identity.module'; export * from './lib/identity.module'; export * from './lib/actions/identity.actions'; export * from './lib/components/roles/roles.component'; diff --git a/npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts b/npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts new file mode 100644 index 0000000000..a61fbc6b64 --- /dev/null +++ b/npm/ng-packs/packages/permission-management/src/lib/root-permission-management.module.ts @@ -0,0 +1,11 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; + +@NgModule({}) +export class RootPermissionManagementModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootPermissionManagementModule, + providers: [], + }; + } +} diff --git a/npm/ng-packs/packages/permission-management/src/public-api.ts b/npm/ng-packs/packages/permission-management/src/public-api.ts index 3182363f25..bf45b06676 100644 --- a/npm/ng-packs/packages/permission-management/src/public-api.ts +++ b/npm/ng-packs/packages/permission-management/src/public-api.ts @@ -2,6 +2,7 @@ * Public API Surface of permission-management */ +export * from './lib/root-permission-management.module'; export * from './lib/permission-management.module'; export * from './lib/actions'; export * from './lib/components'; diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.html b/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.html index 60da5a0508..6397e17a1f 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.html +++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.html @@ -1,9 +1,9 @@
-

{{'AbpSettingManagement::Settings' | abpLocalization}}

+

{{ 'AbpSettingManagement::Settings' | abpLocalization }}

@@ -16,7 +16,12 @@
-
-

Lepton theme settings

-
- -
-
-
-
-
- - - - -
-
- - - - -
-
- -
-
-
-
- -
-
-
- -
-
-
-

Account

-
- -
-
-
-
-
- -
-
-
-
-

Two factor login settings

-
- -
-
-
-
- -
-
-
- -
+
diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.ts b/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.ts index d61df13012..645f7e2c2c 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.ts +++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting/setting.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { SettingTab } from '@abp/ng.theme.shared'; +import { SettingTab, fade } from '@abp/ng.theme.shared'; import { InitialService } from '../services/initial.service'; @Component({ diff --git a/npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts b/npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts new file mode 100644 index 0000000000..120d9fc444 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/src/lib/root-setting-management.module.ts @@ -0,0 +1,11 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; + +@NgModule({}) +export class RootSettingManagementModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootSettingManagementModule, + providers: [], + }; + } +} diff --git a/npm/ng-packs/packages/setting-management/src/public-api.ts b/npm/ng-packs/packages/setting-management/src/public-api.ts index 1a713b6a24..6ef085fc8e 100644 --- a/npm/ng-packs/packages/setting-management/src/public-api.ts +++ b/npm/ng-packs/packages/setting-management/src/public-api.ts @@ -1,3 +1,4 @@ +export * from './lib/root-setting-management.module'; export * from './lib/setting-management.module'; export * from './lib/components'; export * from './lib/constants'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts new file mode 100644 index 0000000000..a147f2a36a --- /dev/null +++ b/npm/ng-packs/packages/tenant-management/src/lib/root-tenant-management.module.ts @@ -0,0 +1,11 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; + +@NgModule({}) +export class RootTenantManagementModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootTenantManagementModule, + providers: [], + }; + } +} diff --git a/npm/ng-packs/packages/tenant-management/src/public-api.ts b/npm/ng-packs/packages/tenant-management/src/public-api.ts index 9bae9a9edb..6b2ae2d388 100644 --- a/npm/ng-packs/packages/tenant-management/src/public-api.ts +++ b/npm/ng-packs/packages/tenant-management/src/public-api.ts @@ -1,3 +1,4 @@ +export * from './lib/root-tenant-management.module'; export * from './lib/tenant-management.module'; export * from './lib/actions'; export * from './lib/components'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 639c6e5979..6d31540305 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -44,10 +44,10 @@ export function appendScript(injector: Injector) { targetSelector: '.form-group', blueprints: { email: `AbpAccount::ThisFieldIsNotAValidEmailAddress.`, - max: `AbpAccount::ThisFieldMustBeAStringWithAMaximumLengthOf{1}[{{ max }}]`, + max: `AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]`, maxlength: `AbpAccount::ThisFieldMustBeAStringWithAMaximumLengthOf{1}[{{ requiredLength }}]`, - min: `AbpAccount::ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}[{{ min }},{{ max }}]`, - minlength: `AbpAccount::ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}[{{ min }},{{ max }}]`, + min: `AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]`, + minlength: `AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf[{{ min }},{{ max }}]`, required: `AbpAccount::ThisFieldIsRequired.`, passwordMismatch: `AbpIdentity::Identity.PasswordConfirmationFailed`, }, diff --git a/templates/app/angular/src/app/app.module.ts b/templates/app/angular/src/app/app.module.ts index a0dcd98c76..86b2d1b7be 100644 --- a/templates/app/angular/src/app/app.module.ts +++ b/templates/app/angular/src/app/app.module.ts @@ -11,6 +11,9 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { SharedModule } from './shared/shared.module'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; +import { RootAccountModule } from '@abp/ng.account'; +import { RootIdentityModule } from '@abp/ng.identity'; +import { RootTenantManagementModule } from '@abp/ng.tenant-management'; @NgModule({ declarations: [AppComponent], @@ -26,6 +29,10 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared'; layouts: LAYOUTS, }, }), + RootAccountModule.forRoot({ redirectUrl: '/' }), + RootIdentityModule.forRoot(), + RootTenantManagementModule.forRoot(), + OAuthModule.forRoot(), NgxsModule.forRoot([]), NgxsReduxDevtoolsPluginModule.forRoot({ disabled: environment.production }),