From 7b4716c439baba46133a0f428a0a722112ee4e47 Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Tue, 28 Jun 2022 10:55:12 +0200 Subject: [PATCH 1/2] Filter Webpack warnings --- webpack/webpack.common.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts index 219ee1bcbb..9228d41141 100644 --- a/webpack/webpack.common.ts +++ b/webpack/webpack.common.ts @@ -95,4 +95,7 @@ export const commonExports = { }, ], }, + ignoreWarnings: [ + /src\/themes\/[^/]+\/.*theme.module.ts is part of the TypeScript compilation but it's unused/, + ] }; From 222a12bbba92e652017d3879df2092564ad1e415 Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Tue, 28 Jun 2022 11:19:04 +0200 Subject: [PATCH 2/2] Make RegisterEmailComponent themeable --- .../themed-register-email.component.ts | 25 +++++++++++++++++++ .../register-page-routing.module.ts | 4 +-- src/app/register-page/register-page.module.ts | 2 ++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/app/register-page/register-email/themed-register-email.component.ts diff --git a/src/app/register-page/register-email/themed-register-email.component.ts b/src/app/register-page/register-email/themed-register-email.component.ts new file mode 100644 index 0000000000..6da6899d99 --- /dev/null +++ b/src/app/register-page/register-email/themed-register-email.component.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { ThemedComponent } from '../../shared/theme-support/themed.component'; +import { RegisterEmailComponent } from './register-email.component'; + +/** + * Themed wrapper for RegisterEmailComponent + */ +@Component({ + selector: 'ds-themed-register-email', + styleUrls: [], + templateUrl: '../../shared/theme-support/themed.component.html', +}) +export class ThemedRegisterEmailComponent extends ThemedComponent { + protected getComponentName(): string { + return 'RegisterEmailComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../../themes/${themeName}/app/register-page/register-email/register-email.component`); + } + + protected importUnthemedComponent(): Promise { + return import('./register-email.component'); + } +} diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts index cd448d55ac..31a7681851 100644 --- a/src/app/register-page/register-page-routing.module.ts +++ b/src/app/register-page/register-page-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { RegisterEmailComponent } from './register-email/register-email.component'; +import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component'; import { ItemPageResolver } from '../item-page/item-page.resolver'; import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; @@ -11,7 +11,7 @@ import { RegistrationGuard } from './registration.guard'; RouterModule.forChild([ { path: '', - component: RegisterEmailComponent, + component: ThemedRegisterEmailComponent, data: {title: 'register-email.title'}, }, { diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts index b13dbb6afb..6afb8154ea 100644 --- a/src/app/register-page/register-page.module.ts +++ b/src/app/register-page/register-page.module.ts @@ -7,6 +7,7 @@ import { CreateProfileComponent } from './create-profile/create-profile.componen import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module'; import { ProfilePageModule } from '../profile-page/profile-page.module'; import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; +import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component'; @NgModule({ imports: [ @@ -18,6 +19,7 @@ import { ThemedCreateProfileComponent } from './create-profile/themed-create-pro ], declarations: [ RegisterEmailComponent, + ThemedRegisterEmailComponent, CreateProfileComponent, ThemedCreateProfileComponent ],