hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-19 07:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/main' into task/main/CST-15074

Browse Source 
# Conflicts:
#	src/app/shared/log-in/log-in.component.ts
#	src/themes/custom/app/shared/log-in/log-in.component.ts
This commit is contained in:
Vincenzo Mecca
2025-03-12 16:55:15 +01:00
parent 4d4fe529a5 4b921a641c
commit 0e56427789
935 changed files with 19616 additions and 17787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/shared/log-in/log-in.component.ts
View File

@@ -1,8 +1,4 @@
import {
AsyncPipe,
NgFor,
NgIf,
} from '@angular/common';
import { AsyncPipe } from '@angular/common';
import {
ChangeDetectionStrategy,
Component,
@@ -13,7 +9,6 @@ import {
select,
Store,
} from '@ngrx/store';
import { TranslateModule } from '@ngx-translate/core';
import uniqBy from 'lodash/uniqBy';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
@@ -32,6 +27,7 @@ import { hasValue } from '../empty.util';
import { ThemedLoadingComponent } from '../loading/themed-loading.component';
import { LogInContainerComponent } from './container/log-in-container.component';
import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
import { TranslateModule } from '@ngx-translate/core';
@Component({
selector: 'ds-base-log-in',
@@ -39,7 +35,7 @@ import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
styleUrls: ['./log-in.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [NgIf, ThemedLoadingComponent, NgFor, LogInContainerComponent, AsyncPipe, TranslateModule],
imports: [ThemedLoadingComponent, LogInContainerComponent, AsyncPipe, TranslateModule],
})
export class LogInComponent implements OnInit {