MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

minor styling changes and cleanup

This commit is contained in:
Sofia Papacharalampous 2024-03-22 17:26:26 +02:00
parent 5e1cbc94a0
commit d310e24d7c
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dmp-frontend/src/app/core/model/configuration-models/auth-providers.model.ts
View File

@ -34,7 +34,6 @@ export class AuthProviders {
} }
public find(providerName: string, culture: string): AuthProvider | undefined { public find(providerName: string, culture: string): AuthProvider | undefined {
return this.authProviders.find(p => p.name === providerName && p.cultures.includes(culture)); return this.authProviders.find(p => p.name === providerName && p.cultures.includes(culture));
} }
} }

12
dmp-frontend/src/app/ui/user-profile/user-profile.component.html
View File

@ -47,7 +47,7 @@
<div class="row user-credential" *ngIf="userCredential.data"> <div class="row user-credential" *ngIf="userCredential.data">
<div class="col-auto mail-text pr-0">{{userCredential.data.email}}</div> <div class="col-auto mail-text pr-0">{{userCredential.data.email}}</div>
<ng-container *ngFor="let providerIcon of getProviderIcons(userCredential, userLanguage)"> <ng-container *ngFor="let providerIcon of getProviderIcons(userCredential, userLanguage)">
<span class="providerIcon"></span> <span [ngClass]="providerIcon"></span>
</ng-container> </ng-container>
<!-- <span *ngIf="hasProvider(userCredential, 'Google')" class="googleIcon"></span> --> <!-- <span *ngIf="hasProvider(userCredential, 'Google')" class="googleIcon"></span> -->
<!-- <span *ngIf="hasProvider(userCredential, 'Facebook')" class="facebookIcon"></span> --> <!-- <span *ngIf="hasProvider(userCredential, 'Facebook')" class="facebookIcon"></span> -->
@ -80,7 +80,7 @@
</div> </div>
<!-- Organization --> <!-- Organization -->
<div class="row mb-5"> <div class="row mb-5">
<div class="col-6"> <div class="col-12 col-lg-6">
<div class="row"> <div class="row">
<div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.ORGANIZATION' | translate}}</div> <div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.ORGANIZATION' | translate}}</div>
</div> </div>
@ -93,7 +93,7 @@
</div> </div>
</div> </div>
<!-- Role --> <!-- Role -->
<div class="col-6"> <div class="col-12 col-lg-6">
<div class="row"> <div class="row">
<div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.ROLE' | translate}}</div> <div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.ROLE' | translate}}</div>
</div> </div>
@ -123,7 +123,7 @@
</div> </div>
<!-- Timezone --> <!-- Timezone -->
<div class="row mb-5"> <div class="row mb-5">
<div class="col-4"> <div class="col-12 col-lg-4">
<div class="row"> <div class="row">
<div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.TIMEZONE' | translate}} *</div> <div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.TIMEZONE' | translate}} *</div>
</div> </div>
@ -142,7 +142,7 @@
</div> </div>
</div> </div>
<!-- Culture --> <!-- Culture -->
<div class="col-4"> <div class="col-12 col-lg-4">
<div class="row"> <div class="row">
<div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.CULTURE' | translate}} *</div> <div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.CULTURE' | translate}} *</div>
</div> </div>
@ -161,7 +161,7 @@
</div> </div>
</div> </div>
<!-- Language --> <!-- Language -->
<div class="col-4"> <div class="col-12 col-lg-4">
<div class="row"> <div class="row">
<div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.LANGUAGE' | translate}} *</div> <div class="col-auto mb-1 field-title">{{'USER-PROFILE.SETTINGS.LANGUAGE' | translate}} *</div>
</div> </div>

2
dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
View File

@ -338,8 +338,6 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
}); });
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) { if (result) {
console.log('email result:');
console.log(result);
this.userService.mergeAccount({ email: result.email }) this.userService.mergeAccount({ email: result.email })
.subscribe(result => { .subscribe(result => {
if (result) { if (result) {