[DURACOM-307] apply migration script to conflicted files resolved in favor of Angular 18 update

This commit is contained in:
FrancescoMolinaro
2025-03-10 18:11:22 +01:00
parent 1aa9faeb2f
commit 51c95de793
193 changed files with 7962 additions and 6485 deletions

View File

@@ -1,37 +1,45 @@
<form class="form-login"
(ngSubmit)="submit()"
[formGroup]="form" novalidate>
(ngSubmit)="submit()"
[formGroup]="form" novalidate>
<input [attr.aria-label]="'login.form.email' |translate"
autocomplete="username"
autofocus
class="form-control form-control-lg position-relative"
formControlName="email"
placeholder="{{'login.form.email' | translate}}"
required
type="email"
[attr.data-test]="'email' | dsBrowserOnly">
autocomplete="username"
autofocus
class="form-control form-control-lg position-relative"
formControlName="email"
placeholder="{{'login.form.email' | translate}}"
required
type="email"
[attr.data-test]="'email' | dsBrowserOnly">
<input [attr.aria-label]="'login.form.password' |translate"
autocomplete="current-password"
class="form-control form-control-lg position-relative mb-3"
placeholder="{{'login.form.password' | translate}}"
formControlName="password"
required
type="password"
[attr.data-test]="'password' | dsBrowserOnly">
<div *ngIf="(error | async) && hasError" class="alert alert-danger" role="alert"
@fadeOut>{{ (error | async) | translate }}</div>
<div *ngIf="(message | async) && hasMessage" class="alert alert-info" role="alert"
@fadeOut>{{ (message | async) | translate }}</div>
autocomplete="current-password"
class="form-control form-control-lg position-relative mb-3"
placeholder="{{'login.form.password' | translate}}"
formControlName="password"
required
type="password"
[attr.data-test]="'password' | dsBrowserOnly">
@if ((error | async) && hasError) {
<div class="alert alert-danger" role="alert"
@fadeOut>{{ (error | async) | translate }}</div>
}
@if ((message | async) && hasMessage) {
<div class="alert alert-info" role="alert"
@fadeOut>{{ (message | async) | translate }}</div>
}
<button class="btn btn-lg btn-primary w-100" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
[dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
</form>
[dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
</form>
<ng-container *ngIf="canShowDivider$ | async">
<div class="mt-2">
<a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]"
[attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
<a class="dropdown-item" *ngIf="canForgot$ | async" [routerLink]="[getForgotRoute()]"
[attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
</div>
</ng-container>
@if (canShowDivider$ | async) {
<div class="mt-2">
@if (canRegister$ | async) {
<a class="dropdown-item" [routerLink]="[getRegisterRoute()]"
[attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
}
@if (canForgot$ | async) {
<a class="dropdown-item" [routerLink]="[getForgotRoute()]"
[attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
}
</div>
}