diff --git a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html index 6eff5e9ed6..91167b0ede 100644 --- a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html @@ -5,61 +5,47 @@
@if (profile$ | async) { -
- @if (selectedTab === 0) { -
-
-

- {{ 'AbpIdentity::ChangePassword' | abpLocalization }} -
-

- + @if (selectedTab === 0) { +
+
+

+ {{ 'AbpIdentity::ChangePassword' | abpLocalization }} +
+

+ -
-
- } - @if (selectedTab === 1) { -
-
-

- {{ 'AbpIdentity::PersonalSettings' | abpLocalization }} -
-

- +
+
+ } + @if (selectedTab === 1) { +
+
+

+ {{ 'AbpIdentity::PersonalSettings' | abpLocalization }} +
+

+ -
-
- } + }"> +
+ } +
} - + \ No newline at end of file diff --git a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts index c9095f63da..5be91d34f7 100644 --- a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts @@ -1,10 +1,9 @@ import { ProfileService } from '@abp/ng.account.core/proxy'; -import { fadeIn, LoadingDirective } from '@abp/ng.theme.shared'; -import { transition, trigger, useAnimation } from '@angular/animations'; +import { LoadingDirective } from '@abp/ng.theme.shared'; import { Component, inject, OnInit } from '@angular/core'; import { eAccountComponents } from '../../enums/components'; import { ManageProfileStateService } from '../../services/manage-profile.state.service'; -import { NgClass, AsyncPipe } from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ReactiveFormsModule } from '@angular/forms'; import { LocalizationPipe, ReplaceableTemplateDirective } from '@abp/ng.core'; import { PersonalSettingsComponent } from '../personal-settings/personal-settings.component'; @@ -13,24 +12,34 @@ import { ChangePasswordComponent } from '../change-password/change-password.comp @Component({ selector: 'abp-manage-profile', templateUrl: './manage-profile.component.html', - animations: [trigger('fadeIn', [transition(':enter', useAnimation(fadeIn))])], styles: [ - //TODO: move static styles ` .min-h-400 { min-height: 400px; } + + .fade-in { + animation: fadeIn 350ms ease both; + } + + @keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } + } `, ], imports: [ - NgClass, AsyncPipe, ReactiveFormsModule, PersonalSettingsComponent, ChangePasswordComponent, LocalizationPipe, ReplaceableTemplateDirective, - LoadingDirective, + LoadingDirective ], }) export class ManageProfileComponent implements OnInit { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html index 732a81c76b..2f9df1ae00 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -1,177 +1,113 @@ @switch (getComponent(prop)) { - @case ('template') { - - } + @case ('template') { + + } } -
+
@switch (getComponent(prop)) { - @case ('input') { - - - } - @case ('hidden') { - - } - @case ('checkbox') { -
- - -
- } - @case ('select') { - - - } - @case ('multiselect') { - - - } - @case ('typeahead') { - -
- - -
- } - @case ('date') { - - - } - @case ('time') { - - - } - @case ('dateTime') { - - - } - @case ('textarea') { - - + @case ('input') { + + + } + @case ('hidden') { + + } + @case ('checkbox') { +
+ + +
+ } + @case ('select') { + + -
+ +
+ } } @if (prop.formText) { - {{ prop.formText | abpLocalization }} + {{ prop.formText | abpLocalization }} } - + \ No newline at end of file diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts index 696ce633a7..09a29a98a9 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts @@ -49,7 +49,7 @@ import { eExtensibleComponents } from '../../enums/components'; import { ExtensibleDateTimePickerComponent } from '../date-time-picker/extensible-date-time-picker.component'; import { NgxValidateCoreModule } from '@ngx-validate/core'; import { ExtensibleFormPropService } from '../../services/extensible-form-prop.service'; -import { AsyncPipe, NgClass, NgComponentOutlet, NgTemplateOutlet } from '@angular/common'; +import { AsyncPipe, NgComponentOutlet, NgTemplateOutlet } from '@angular/common'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { ExtensibleFormMultiselectComponent } from '../multi-select/extensible-form-multiselect.component'; @@ -70,11 +70,10 @@ import { ExtensibleFormMultiselectComponent } from '../multi-select/extensible-f PermissionDirective, LocalizationPipe, AsyncPipe, - NgClass, NgComponentOutlet, NgTemplateOutlet, - FormsModule, - ], + FormsModule +], changeDetection: ChangeDetectionStrategy.OnPush, providers: [ExtensibleFormPropService], viewProviders: [ diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html index b88c2ecbfa..be937e21ca 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html @@ -1,46 +1,35 @@ @if (form) { - @for (groupedProp of groupedPropList.items; track i; let i = $index; let first = $first) { - - @if (isAnyGroupMemberVisible(i, data) && groupedProp.group?.className) { -
- - -
- } @else { - - - } +@for (groupedProp of groupedPropList.items; track i; let i = $index; let first = $first) { + + @if (isAnyGroupMemberVisible(i, data) && groupedProp.group?.className) { +
+ +
+ } @else { + + } + +} } @for (prop of groupedProp.formPropList; let index = $index; let first = $first; track prop.name) { - @if (prop.visible(data)) { - @if (extraProperties.controls[prop.name]) { - - - - } @else { - @if (form.get(prop.name)) { - - } - } - } + @if (prop.visible(data)) { + @if (extraProperties.controls[prop.name]) { + + + + } @else { + @if (form.get(prop.name)) { + + } + } + } } - + \ No newline at end of file diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts index 9d81502291..8b5829754d 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts @@ -17,14 +17,14 @@ import { ExtensionsService } from '../../services/extensions.service'; import { EXTENSIONS_IDENTIFIER } from '../../tokens/extensions.token'; import { selfFactory } from '../../utils/factory.util'; import { ExtensibleFormPropComponent } from './extensible-form-prop.component'; -import { NgClass, NgTemplateOutlet } from '@angular/common'; +import { NgTemplateOutlet } from '@angular/common'; import { PropDataDirective } from '../../directives/prop-data.directive'; @Component({ exportAs: 'abpExtensibleForm', selector: 'abp-extensible-form', templateUrl: './extensible-form.component.html', - imports: [NgClass, NgTemplateOutlet, PropDataDirective, ReactiveFormsModule, ExtensibleFormPropComponent], + imports: [NgTemplateOutlet, PropDataDirective, ReactiveFormsModule, ExtensibleFormPropComponent], changeDetection: ChangeDetectionStrategy.OnPush, viewProviders: [ { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html index c5373aacff..8b0a5744b2 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html @@ -94,7 +94,7 @@ : ('::' + (row['_' + prop.name]?.value | async | abpUtcToLocal:prop.type) | abpLocalization) " (click)=" prop.action && prop.action({ getInjected: getInjected, record: row, index: i }) - " [ngClass]="entityPropTypeClasses[prop.type]" [class.pointer]="prop.action"> + " [class]="entityPropTypeClasses[prop.type]" [class.pointer]="prop.action"> } @else {
+ " [class]="entityPropTypeClasses[prop.type]" [class.pointer]="prop.action"> } } @else { - -
- @for (action of actionList; track action.text) { - - - } -
+
+ +
+ @for (action of actionList; track action.text) { + + + }
+
} @if (actionList.length === 1) { - + } @if (action.visible(data)) { - + } - + @if (!action.showOnlyIcon) { - @if (action.icon) { - {{ action.text | abpLocalization }} - } @else { -
{{ action.text | abpLocalization }}
- } + @if (action.icon) { + {{ action.text | abpLocalization }} + } @else { +
{{ action.text | abpLocalization }}
+ } } @if (action.visible(data)) { - @if (action.tooltip) { - - } @else { - - } + @if (action.tooltip) { + + } @else { + } - + } + \ No newline at end of file diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts index 48bea482ca..9f7c28201e 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts @@ -1,8 +1,8 @@ -import { - ChangeDetectionStrategy, - Component, - Input, - TrackByFunction, +import { + ChangeDetectionStrategy, + Component, + Input, + TrackByFunction, } from '@angular/core'; import { EntityAction, EntityActionList } from '../../models/entity-actions'; import { EXTENSIONS_ACTION_TYPE } from '../../tokens/extensions.token'; @@ -10,7 +10,7 @@ import { AbstractActionsComponent } from '../abstract-actions/abstract-actions.c import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { LocalizationPipe, PermissionDirective } from '@abp/ng.core'; import { EllipsisDirective } from '@abp/ng.theme.shared'; -import { NgClass, NgTemplateOutlet } from '@angular/common'; +import { NgTemplateOutlet } from '@angular/common'; @Component({ exportAs: 'abpGridActions', @@ -18,7 +18,6 @@ import { NgClass, NgTemplateOutlet } from '@angular/common'; NgbDropdownModule, EllipsisDirective, PermissionDirective, - NgClass, LocalizationPipe, NgTemplateOutlet, NgbTooltipModule, diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.html index c39bf59dd1..747ee8963a 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.html @@ -4,26 +4,20 @@ @if (action.visible(data)) { @if (action.component; as component) { - + }@else { - @if (asToolbarAction(action).value; as toolbarAction ) { - - } + @if (asToolbarAction(action).value; as toolbarAction ) { + + } } } } - - + \ No newline at end of file diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.ts index 9dadb7497a..ada52513f3 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.ts @@ -10,7 +10,7 @@ import { EXTENSIONS_ACTION_TYPE } from '../../tokens/extensions.token'; import { AbstractActionsComponent } from '../abstract-actions/abstract-actions.component'; import { CreateInjectorPipe } from '../../pipes/create-injector.pipe'; import { LocalizationPipe, PermissionDirective } from '@abp/ng.core'; -import { NgClass, NgComponentOutlet } from '@angular/common'; +import { NgComponentOutlet } from '@angular/common'; @Component({ exportAs: 'abpPageToolbar', @@ -19,7 +19,6 @@ import { NgClass, NgComponentOutlet } from '@angular/common'; CreateInjectorPipe, PermissionDirective, LocalizationPipe, - NgClass, NgComponentOutlet, ], templateUrl: './page-toolbar.component.html', @@ -33,8 +32,7 @@ import { NgClass, NgComponentOutlet } from '@angular/common'; }) export class PageToolbarComponent extends AbstractActionsComponent> - implements HasCreateInjectorPipe -{ + implements HasCreateInjectorPipe { readonly injector: Injector; defaultBtnClass = 'btn btn-sm btn-primary'; @@ -48,7 +46,7 @@ export class PageToolbarComponent const injector = inject(Injector); super(); - + this.injector = injector; } diff --git a/npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.ts b/npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.ts index b78bfa19ce..6b4f475edd 100644 --- a/npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.ts +++ b/npm/ng-packs/packages/components/lookup/src/lib/lookup-search.component.ts @@ -12,7 +12,7 @@ import { inject, } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { CommonModule } from '@angular/common'; +import { NgTemplateOutlet } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { LocalizationPipe } from '@abp/ng.core'; import { Subject, Observable, debounceTime, distinctUntilChanged, of, finalize } from 'rxjs'; @@ -29,7 +29,7 @@ export type LookupSearchFn = (filter: string) => Observable selector: 'abp-lookup-search', templateUrl: './lookup-search.component.html', styleUrl: './lookup-search.component.scss', - imports: [CommonModule, FormsModule, LocalizationPipe], + imports: [FormsModule, LocalizationPipe, NgTemplateOutlet], changeDetection: ChangeDetectionStrategy.OnPush, }) export class LookupSearchComponent implements OnInit { diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html index e8d76d36f9..62f5dbaf40 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html @@ -1,13 +1,13 @@ @if (visible) { - - -

- {{ 'AbpFeatureManagement::Features' | abpLocalization }} - @if (providerTitle) { - - {{ providerTitle }} - } -

- + + +

+ {{ 'AbpFeatureManagement::Features' | abpLocalization }} + @if (providerTitle) { + - {{ providerTitle }} + } +

+
@@ -35,93 +35,72 @@

{{ selectedGroupDisplayName }}

- @for (feature of features[group.name]; track feature.id || i; let i = $index) { - @let provider = feature.provider.name; - @let isFeatureDisabled = !feature.parentName ? isParentDisabled(feature.name, group.name, provider) : - (provider !== providerName && provider !== defaultProviderName); + @for (feature of features[group.name]; track feature.id || i; let i = $index) { + @let provider = feature.provider.name; + @let isFeatureDisabled = !feature.parentName ? isParentDisabled(feature.name, group.name, provider) : + (provider !== providerName && provider !== defaultProviderName); -
- @switch (feature.valueType?.name) { - @case (valueTypes.ToggleStringValueType) { -
- +
+ @switch (feature.valueType?.name) { + @case (valueTypes.ToggleStringValueType) { +
+ - - + {{ feature.displayName }} + @if (isFeatureDisabled) { + ({{ provider }}) + } + + -
- } - @case (valueTypes.FreeTextStringValueType) { -
- - + "> +
+ } + @case (valueTypes.FreeTextStringValueType) { +
+ + - -
- } - @case (valueTypes.SelectionStringValueType) { - @if (feature.valueType.itemSource?.items?.length) { -
- - - +
+ } + @case (valueTypes.SelectionStringValueType) { + @if (feature.valueType.itemSource?.items?.length) { +
+ + + }
- - - + + @if (description) { + {{ description }} + } + - @if (groups.length) { - +
+
+
} - @if (groups.length) { - + @if (!groups.length) { +
+ {{ 'AbpFeatureManagement::NoFeatureFoundMessage' | abpLocalization }} +
} - - -} +
+ + + + + + @if (groups.length) { + + } + + @if (groups.length) { + + } + + +} \ No newline at end of file diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index 3dd427df84..b2612e9aaf 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -31,7 +31,7 @@ import { import { concat, of } from 'rxjs'; import { finalize, switchMap, take, tap } from 'rxjs/operators'; import { PermissionManagement } from '../models'; -import { NgStyle } from '@angular/common'; + import { FormsModule } from '@angular/forms'; import { Tabs, TabList, Tab, TabPanel, TabContent } from '@angular/aria/tabs'; @@ -97,7 +97,6 @@ type PermissionWithGroupName = PermissionGrantInfoDto & { ], imports: [ FormsModule, - NgStyle, ModalComponent, LocalizationPipe, ButtonComponent, diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts index bb5f6fe6ee..d2e1dae003 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts @@ -25,7 +25,7 @@ import { PermissionDirective } from '@abp/ng.core'; import { NgxValidateCoreModule } from '@ngx-validate/core'; -import { CommonModule } from '@angular/common'; + const { required, email } = Validators; @@ -35,14 +35,13 @@ const { required, email } = Validators; animations: [collapse], imports: [ ReactiveFormsModule, - CommonModule, LocalizationPipe, ButtonComponent, ModalComponent, ModalCloseDirective, NgxValidateCoreModule, - PermissionDirective, - ], + PermissionDirective +], }) export class EmailSettingGroupComponent implements OnInit { private emailSettingsService = inject(EmailSettingsService); diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html index 86e9d40177..daaa6c48ec 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html @@ -1,26 +1,12 @@ @for (alert of service.alerts$ | async; track i; let i = $index) { - -} + +} \ No newline at end of file diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.ts index f40ba2cd91..3e5aa72d8a 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.ts @@ -1,13 +1,13 @@ import { Component, ViewEncapsulation, inject } from '@angular/core'; import { PageAlertService } from '@abp/ng.theme.shared'; -import { NgClass, AsyncPipe } from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { LocalizationPipe, SafeHtmlPipe } from '@abp/ng.core'; @Component({ selector: 'abp-page-alert-container', templateUrl: './page-alert-container.component.html', encapsulation: ViewEncapsulation.None, - imports: [NgClass, AsyncPipe, LocalizationPipe, SafeHtmlPipe], + imports: [AsyncPipe, LocalizationPipe, SafeHtmlPipe], }) export class PageAlertContainerComponent { service = inject(PageAlertService); diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html index 28e408655d..a29fb3323e 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html @@ -1,16 +1,14 @@ + \ No newline at end of file diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts index 27463ea497..a6afd37b12 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts @@ -16,7 +16,7 @@ import { TrackByFunction, ViewChildren, } from '@angular/core'; -import { NgTemplateOutlet, NgClass, AsyncPipe } from '@angular/common'; +import { NgTemplateOutlet, AsyncPipe } from '@angular/common'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { RouterLink } from '@angular/router'; import { EllipsisDirective } from '@abp/ng.theme.shared'; @@ -26,7 +26,6 @@ import { EllipsisDirective } from '@abp/ng.theme.shared'; templateUrl: 'routes.component.html', imports: [ NgTemplateOutlet, - NgClass, AsyncPipe, RouterLink, NgbDropdownModule, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts index 7388eb47ef..47272992fd 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts @@ -10,7 +10,6 @@ import { ViewChild, inject, } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { ABP, StopPropagationDirective } from '@abp/ng.core'; @Component({ @@ -21,16 +20,16 @@ import { ABP, StopPropagationDirective } from '@abp/ng.core'; [id]="buttonId" [attr.type]="buttonType" [attr.form]="formName" - [ngClass]="buttonClass" + [class]="buttonClass" [disabled]="loading || disabled" (click.stop)="click.next($event); abpClick.next($event)" (focus)="focus.next($event); abpFocus.next($event)" (blur)="blur.next($event); abpBlur.next($event)" > - + `, - imports: [CommonModule, StopPropagationDirective], + imports: [StopPropagationDirective], }) export class ButtonComponent implements OnInit { private renderer = inject(Renderer2); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts index 35790054b5..6f8eade8d2 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts @@ -1,12 +1,10 @@ import { Component, HostBinding, Input } from '@angular/core'; -import { NgClass, NgStyle } from '@angular/common'; @Component({ selector: 'abp-card-body', - template: `
+ template: `
`, - imports: [NgClass, NgStyle], }) export class CardBodyComponent { @HostBinding('class') componentClass = 'card-body'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts index 38a798e146..3b96418fbd 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts @@ -1,15 +1,14 @@ import { Component, HostBinding, Input } from '@angular/core'; -import { NgClass, NgStyle } from '@angular/common'; @Component({ selector: 'abp-card-footer', template: ` -
+
`, styles: [], - imports: [NgClass, NgStyle], + imports: [], }) export class CardFooterComponent { @HostBinding('class') componentClass = 'card-footer'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts index 4857913d77..3c31d16d74 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts @@ -1,15 +1,14 @@ import { Component, HostBinding, Input } from '@angular/core'; -import { NgClass, NgStyle } from '@angular/common'; @Component({ selector: 'abp-card-header', template: ` -
+
`, styles: [], - imports: [NgClass, NgStyle], + imports: [], }) export class CardHeaderComponent { @HostBinding('class') componentClass = 'card-header'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts index 42973fdcb0..d65b8a12dc 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts @@ -1,12 +1,11 @@ import { Component, Input } from '@angular/core'; -import { NgClass, NgStyle } from '@angular/common'; @Component({ selector: 'abp-card', - template: `
+ template: `
`, - imports: [NgClass, NgStyle], + imports: [], }) export class CardComponent { @Input() cardClass: string; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts index 8cadf828d1..8da578f9a7 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts @@ -1,6 +1,5 @@ import { Component, EventEmitter, forwardRef, Input, Output } from '@angular/core'; import { NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'; -import { NgClass, NgStyle } from '@angular/common'; import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; @Component({ @@ -12,13 +11,13 @@ import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; [(ngModel)]="value" [id]="checkboxId" [readonly]="checkboxReadonly" - [ngClass]="checkboxClass" - [ngStyle]="checkboxStyle" + [class]="checkboxClass" + [style]="checkboxStyle" (blur)="checkboxBlur.next()" (focus)="checkboxFocus.next()" /> @if (label) { -
- + \ No newline at end of file diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html index edcdc66bc0..83f1f9619e 100644 --- a/templates/app/angular/src/app/home/home.component.html +++ b/templates/app/angular/src/app/home/home.component.html @@ -9,14 +9,12 @@

{{ '::LongWelcomeMessage' | abpLocalization }}

- {{ 'AbpAccount::Login' | abpLocalization }} + {{ + 'AbpAccount::Login' | abpLocalization }} }

Getting Started

- + ">

Web Application Development Tutorial

- + ">

Customize Lepton Theme

Learn how to customize LeptonX Theme as you wish.

- Customize Lepton + Customize Lepton
@@ -60,8 +51,7 @@
- - + + ">
@@ -108,17 +95,14 @@ Explore all ABP users' experiences with the ABP Framework, discover articles and videos on how to use ABP, and join raffles for a chance to win surprise gifts!

- Join ABP Community + Join ABP Community
- + ">
@@ -181,18 +164,12 @@ understanding of the framework and modern web application development techniques.

- + Buy on Amazon US - + Buy on PACKT
@@ -204,8 +181,7 @@
- + ">
@@ -279,10 +254,7 @@ @if(item.icon){ -
+
@if(item.iconType === 'image'){ }@else if(item.iconType === 'icon'){ @@ -307,4 +279,4 @@
- + \ No newline at end of file