fix name clashing with LoginComponent (#3792)

This commit is contained in:
Denys Vuika 2024-04-15 14:04:11 -04:00 committed by GitHub
parent 6c5dab6216
commit 5a760c0d93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 10 deletions

View File

@ -63,7 +63,6 @@ import { STORE_INITIAL_APP_DATA } from '@alfresco/aca-shared/store';
import { ShellModule, SHELL_APP_SERVICE, SHELL_AUTH_TOKEN } from '@alfresco/adf-core/shell';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { APP_ROUTES } from './app.routes';
import { LoginComponent } from './components/login/login.component';
import { MatIconRegistry } from '@angular/material/icon';
registerLocaleData(localeFr);
@ -89,7 +88,6 @@ registerLocaleData(localeSv);
TranslateModule.forRoot(),
CoreModule.forRoot(),
CoreExtensionsModule.forRoot(),
LoginComponent,
environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule,
!environment.production ? StoreDevtoolsModule.instrument({ maxAge: 25 }) : [],
RouterModule.forRoot(APP_ROUTES, {

View File

@ -23,7 +23,7 @@
*/
import { BlankPageComponent } from '@alfresco/adf-core';
import { LoginComponent } from './components/login/login.component';
import { AppLoginComponent } from './components/login/app-login.component';
export const APP_ROUTES = [
{
@ -32,7 +32,7 @@ export const APP_ROUTES = [
},
{
path: 'login',
component: LoginComponent,
component: AppLoginComponent,
data: {
title: 'APP.SIGN_IN'
}

View File

@ -1,6 +1,5 @@
<adf-login
[copyrightText]="'application.copyright' | adfAppConfig | translate"
providers="ECM"
successRoute="/personal-files"
logoImageUrl="./assets/images/alfresco-logo.svg"
backgroundImageUrl="./assets/images/Wallpaper-BG-generic.svg"

View File

@ -22,14 +22,14 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import { AppConfigModule, LoginModule } from '@alfresco/adf-core';
import { AppConfigModule, LoginComponent } from '@alfresco/adf-core';
import { Component, ViewEncapsulation } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
@Component({
standalone: true,
imports: [LoginModule, AppConfigModule, TranslateModule],
templateUrl: './login.component.html',
imports: [LoginComponent, AppConfigModule, TranslateModule],
templateUrl: './app-login.component.html',
encapsulation: ViewEncapsulation.None
})
export class LoginComponent {}
export class AppLoginComponent {}

View File

@ -14,7 +14,7 @@ The extension loader callbacks are invoked when hitting the `root logged-in rout
export const APP_ROUTES: Routes = [
{
path: 'login',
component: LoginComponent,
component: AppLoginComponent,
data: {
title: 'APP.SIGN_IN'
}