From 6f1413331881efbc77e04740b25f5b131db608e5 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Mon, 5 May 2025 11:21:21 +0300 Subject: [PATCH] theme basic module standalone migration --- .../account-layout.component.ts | 16 +++++++++++++-- .../auth-wrapper/auth-wrapper.component.ts | 5 ++++- .../tenant-box/tenant-box.component.ts | 4 +++- .../application-layout.component.ts | 16 +++++++++++++-- .../empty-layout/empty-layout.component.ts | 3 ++- .../page-alert-container.component.ts | 4 +++- .../lib/components/routes/routes.component.ts | 8 ++++++-- .../theme-basic/src/lib/theme-basic.module.ts | 20 ++++++------------- 8 files changed, 52 insertions(+), 24 deletions(-) diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts index 91bc91aea0..d9a42d07d0 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts @@ -1,12 +1,24 @@ import { AfterViewInit, Component } from '@angular/core'; -import { eLayoutType, SubscriptionService } from '@abp/ng.core'; +import { CoreModule, eLayoutType, SubscriptionService } from '@abp/ng.core'; import { LayoutService } from '../../services/layout.service'; +import { CommonModule } from '@angular/common'; +import { LogoComponent } from '../logo/logo.component'; +import { RoutesComponent } from '../routes/routes.component'; +import { NavItemsComponent } from '../nav-items/nav-items.component'; +import { AuthWrapperComponent } from './auth-wrapper/auth-wrapper.component'; @Component({ - standalone: false, selector: 'abp-layout-account', templateUrl: './account-layout.component.html', providers: [LayoutService, SubscriptionService], + imports: [ + CommonModule, + CoreModule, + LogoComponent, + RoutesComponent, + NavItemsComponent, + AuthWrapperComponent, + ], }) export class AccountLayoutComponent implements AfterViewInit { // required for dynamic component diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.ts index 8533c0177d..eed1a99a19 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/auth-wrapper/auth-wrapper.component.ts @@ -1,11 +1,14 @@ import { AuthWrapperService } from '@abp/ng.account.core'; import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { CoreModule } from '@abp/ng.core'; +import { TenantBoxComponent } from '../tenant-box/tenant-box.component'; @Component({ - standalone: false, selector: 'abp-auth-wrapper', templateUrl: './auth-wrapper.component.html', providers: [AuthWrapperService], + imports: [CommonModule, CoreModule, TenantBoxComponent], }) export class AuthWrapperComponent { constructor(public service: AuthWrapperService) {} diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.ts index ccf13df4aa..9428911b55 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.ts @@ -1,11 +1,13 @@ import { TenantBoxService } from '@abp/ng.account.core'; import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { CoreModule } from '@abp/ng.core'; @Component({ - standalone: false, selector: 'abp-tenant-box', templateUrl: './tenant-box.component.html', providers: [TenantBoxService], + imports: [CommonModule, CoreModule], }) export class TenantBoxComponent { constructor(public service: TenantBoxService) {} diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts index 7ecd8157f4..cd9d583e71 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts @@ -1,14 +1,26 @@ -import { eLayoutType, SubscriptionService } from '@abp/ng.core'; +import { CoreModule, eLayoutType, SubscriptionService } from '@abp/ng.core'; import { collapseWithMargin, slideFromBottom } from '@abp/ng.theme.shared'; import { AfterViewInit, Component, inject } from '@angular/core'; import { LayoutService } from '../../services/layout.service'; +import { CommonModule } from '@angular/common'; +import { LogoComponent } from '../logo/logo.component'; +import { PageAlertContainerComponent } from '../page-alert-container/page-alert-container.component'; +import { RoutesComponent } from '../routes/routes.component'; +import { NavItemsComponent } from '../nav-items/nav-items.component'; @Component({ - standalone: false, selector: 'abp-layout-application', templateUrl: './application-layout.component.html', animations: [slideFromBottom, collapseWithMargin], providers: [LayoutService, SubscriptionService], + imports: [ + CommonModule, + CoreModule, + LogoComponent, + PageAlertContainerComponent, + RoutesComponent, + NavItemsComponent, + ], }) export class ApplicationLayoutComponent implements AfterViewInit { public readonly service = inject(LayoutService); diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts index 93e66676d3..16cd0951e5 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts @@ -1,10 +1,11 @@ import { Component } from '@angular/core'; import { eLayoutType } from '@abp/ng.core'; +import { RouterModule } from '@angular/router'; @Component({ - standalone: false, selector: 'abp-layout-empty', template: ` `, + imports: [RouterModule], }) export class EmptyLayoutComponent { static type = eLayoutType.empty; 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 ac794a1504..9d3a8336c5 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,11 +1,13 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { PageAlertService } from '@abp/ng.theme.shared'; +import { CommonModule } from '@angular/common'; +import { CoreModule } from '@abp/ng.core'; @Component({ - standalone: false, selector: 'abp-page-alert-container', templateUrl: './page-alert-container.component.html', encapsulation: ViewEncapsulation.None, + imports: [CommonModule, CoreModule], }) export class PageAlertContainerComponent { constructor(public service: PageAlertService) {} 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 dc6b797446..895bdea1a6 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 @@ -1,4 +1,4 @@ -import { ABP, RoutesService, TreeNode } from '@abp/ng.core'; +import { ABP, CoreModule, RoutesService, TreeNode } from '@abp/ng.core'; import { Component, ElementRef, @@ -9,11 +9,15 @@ import { TrackByFunction, ViewChildren, } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { LazyTranslatePipe } from '../../pipes'; +import { RouterModule } from '@angular/router'; @Component({ - standalone: false, selector: 'abp-routes', templateUrl: 'routes.component.html', + imports: [CommonModule, RouterModule, CoreModule, NgbDropdownModule, LazyTranslatePipe], }) export class RoutesComponent { public readonly routesService = inject(RoutesService); diff --git a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts index 91c7b56f74..0deaa5372f 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts @@ -1,7 +1,5 @@ -import { CoreModule } from '@abp/ng.core'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { ModuleWithProviders, NgModule } from '@angular/core'; -import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxValidateCoreModule } from '@ngx-validate/core'; import { AccountLayoutComponent } from './components/account-layout/account-layout.component'; import { AuthWrapperComponent } from './components/account-layout/auth-wrapper/auth-wrapper.component'; @@ -16,18 +14,11 @@ import { PageAlertContainerComponent } from './components/page-alert-container/p import { RoutesComponent } from './components/routes/routes.component'; import { ValidationErrorComponent } from './components/validation-error/validation-error.component'; import { provideThemeBasicConfig } from './providers'; -import { LazyTranslatePipe } from './pipes'; export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, EmptyLayoutComponent]; @NgModule({ - declarations: [ - ...LAYOUTS, - RoutesComponent, - PageAlertContainerComponent, - TenantBoxComponent, - AuthWrapperComponent, - ], + declarations: [], exports: [ ...LAYOUTS, ValidationErrorComponent, @@ -39,17 +30,18 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt PageAlertContainerComponent, ], imports: [ - CoreModule, + ...LAYOUTS, ThemeSharedModule, - NgbCollapseModule, - NgbDropdownModule, NgxValidateCoreModule, - LazyTranslatePipe, ValidationErrorComponent, LogoComponent, NavItemsComponent, CurrentUserComponent, LanguagesComponent, + PageAlertContainerComponent, + TenantBoxComponent, + AuthWrapperComponent, + RoutesComponent, ], }) export class BaseThemeBasicModule {}