Skip to content

refactor: migrate to control flow #2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+456 −439
Open

refactor: migrate to control flow #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 115 additions & 98 deletions ...s/src/lib/components/po-modal-password-recovery/po-modal-password-recovery.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,117 +2,134 @@
#recoveryModal
p-hide-close
p-size="auto"
[ngSwitch]="modalType"
[p-components-size]="componentsSize"
[p-primary-action]="primaryAction"
[p-secondary-action]="secondaryAction"
[p-title]="modalTitle"
>
<div class="po-modal-password-recovery-wrapper">
<div *ngSwitchCase="'email'" class="po-modal-password-recovery-content po-row">
<div class="po-modal-password-recovery-text po-md-12 po-mb-1">
{{ emailModalPhrases.firstPhrase }}
</div>
<div class="po-mb-2 po-md-12">
<form #emailForm="ngForm">
<div *ngIf="modalPasswordRecoveryTypeAll">
<po-radio-group
name="type"
[(ngModel)]="chosenTypeFormOption"
[p-options]="typeFormOptions"
[p-size]="componentsSize"
(p-change)="getInputType($event)"
>
</po-radio-group>
@switch (modalType) {
@case ('email') {
<div class="po-modal-password-recovery-content po-row">
<div class="po-modal-password-recovery-text po-md-12 po-mb-1">
{{ emailModalPhrases.firstPhrase }}
</div>
<div class="po-mb-2 po-md-12">
<form #emailForm="ngForm">
@if (modalPasswordRecoveryTypeAll) {
<div>
<po-radio-group
name="type"
[(ngModel)]="chosenTypeFormOption"
[p-options]="typeFormOptions"
[p-size]="componentsSize"
(p-change)="getInputType($event)"
>
</po-radio-group>
</div>
}

<div class="po-mt-1">
<po-email
*ngIf="type === 'email' || type === 'all'"
name="email"
[(ngModel)]="email"
p-required
[p-label]="literals.insertEmail"
[p-size]="componentsSize"
(p-change-model)="formModelChangesCheck(emailForm)"
>
</po-email>
<div class="po-mt-1">
@if (type === 'email' || type === 'all') {
<po-email
name="email"
[(ngModel)]="email"
p-required
[p-label]="literals.insertEmail"
[p-size]="componentsSize"
(p-change-model)="formModelChangesCheck(emailForm)"
>
</po-email>
}

<po-input
*ngIf="type === 'sms'"
name="sms"
[(ngModel)]="phone"
p-icon="ICON_TELEPHONE"
p-required
[p-label]="literals.insertPhone"
[p-mask]="phoneMask"
[p-maxlength]="maxLength"
[p-minlength]="minLength"
[p-size]="componentsSize"
(p-change-model)="formModelChangesCheck(emailForm)"
>
</po-input>
</div>
@if (type === 'sms') {
<po-input
name="sms"
[(ngModel)]="phone"
p-icon="ICON_TELEPHONE"
p-required
[p-label]="literals.insertPhone"
[p-mask]="phoneMask"
[p-maxlength]="maxLength"
[p-minlength]="minLength"
[p-size]="componentsSize"
(p-change-model)="formModelChangesCheck(emailForm)"
>
</po-input>
}
</div>

<div class="po-field-container-bottom po-field-container-error-container">
<po-modal-password-recovery-error-message
*ngIf="invalidEmail && control.dirty"
[p-text]="type === 'sms' ? literals.phoneErrorMessagePhrase : literals.emailErrorMessagePhrase"
>
</po-modal-password-recovery-error-message>
<div class="po-field-container-bottom po-field-container-error-container">
@if (invalidEmail && control.dirty) {
<po-modal-password-recovery-error-message
[p-text]="type === 'sms' ? literals.phoneErrorMessagePhrase : literals.emailErrorMessagePhrase"
>
</po-modal-password-recovery-error-message>
}
</div>
</form>
</div>
<div class="po-modal-password-recovery-text po-md-12">
{{ emailModalPhrases.secondPhrase }}
@if (contactEmail) {
<span>
{{ literals.prepositionIn }}
<a class="po-modal-password-recovery-link" href="mailto:{{ contactEmail }}" target="_self">
{{ contactEmail }}
</a>
</span>
}
{{ endpoint }}
</div>
</form>
</div>
<div class="po-modal-password-recovery-text po-md-12">
{{ emailModalPhrases.secondPhrase }}
<span *ngIf="contactEmail">
{{ literals.prepositionIn }}
<a class="po-modal-password-recovery-link" href="mailto:{{ contactEmail }}" target="_self">
{{ contactEmail }}
</a>
</span>
{{ endpoint }}
</div>
</div>
</div>
}

<div #smsCodeModal *ngSwitchCase="'smsCode'" class="po-modal-password-recovery-content po-row">
<div class="po-modal-password-recovery-text po-md-12 po-mb-1">{{ literals.sentSmsCodePhrase }}</div>
<div class="po-mb-2 po-md-12">
<form #smsCodeForm="ngForm">
<po-input
name="sms"
[(ngModel)]="smsCode"
p-maxlength="11"
p-minlength="11"
p-required
[p-label]="literals.insertCode"
[p-mask]="codeMask"
[p-size]="componentsSize"
(p-change-model)="formModelChangesCheck(smsCodeForm)"
>
</po-input>
<div class="po-field-container-bottom po-field-container-error-container">
<po-modal-password-recovery-error-message
*ngIf="invalidEmail"
[p-text]="smsCodeErrorMessage || this.literals.smsCodeErrorMessagePhrase"
>
</po-modal-password-recovery-error-message>
<po-modal-password-recovery-error-message *ngIf="showCustomCodeError" [p-text]="codeError">
</po-modal-password-recovery-error-message>
@case ('smsCode') {
<div #smsCodeModal class="po-modal-password-recovery-content po-row">
<div class="po-modal-password-recovery-text po-md-12 po-mb-1">{{ literals.sentSmsCodePhrase }}</div>
<div class="po-mb-2 po-md-12">
<form #smsCodeForm="ngForm">
<po-input
name="sms"
[(ngModel)]="smsCode"
p-maxlength="11"
p-minlength="11"
p-required
[p-label]="literals.insertCode"
[p-mask]="codeMask"
[p-size]="componentsSize"
(p-change-model)="formModelChangesCheck(smsCodeForm)"
>
</po-input>
<div class="po-field-container-bottom po-field-container-error-container">
@if (invalidEmail) {
<po-modal-password-recovery-error-message
[p-text]="smsCodeErrorMessage || this.literals.smsCodeErrorMessagePhrase"
>
</po-modal-password-recovery-error-message>
}
@if (showCustomCodeError) {
<po-modal-password-recovery-error-message [p-text]="codeError">
</po-modal-password-recovery-error-message>
}
</div>
</form>
</div>
</form>
</div>
<div class="po-modal-password-recovery-text po-md-12">
{{ literals.sendAgainPhrase }}
<span class="po-modal-password-recovery-link" (click)="resendSmsCode()">{{ literals.sendAgain }}</span>
</div>
</div>
<div class="po-modal-password-recovery-text po-md-12">
{{ literals.sendAgainPhrase }}
<span class="po-modal-password-recovery-link" (click)="resendSmsCode()">{{ literals.sendAgain }}</span>
</div>
</div>
}

<div #confirmationModal *ngSwitchCase="'confirmation'" class="po-modal-password-recovery-content po-row">
<img class="po-modal-password-recovery-user-image po-mb-2" src="./assets/images/email-sent.svg" />
<div class="po-modal-password-recovery-text">
{{ literals.emailSentConfirmationPhrase }}
</div>
</div>
@case ('confirmation') {
<div #confirmationModal class="po-modal-password-recovery-content po-row">
<img class="po-modal-password-recovery-user-image po-mb-2" src="./assets/images/email-sent.svg" />
<div class="po-modal-password-recovery-text">
{{ literals.emailSentConfirmationPhrase }}
</div>
</div>
}
}
</div>
</po-modal>
104 changes: 53 additions & 51 deletions .../ui/src/lib/components/po-calendar/po-calendar-wrapper/po-calendar-wrapper.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="po-calendar-wrapper">
<ng-container *ngIf="isDayVisible">
@if (isDayVisible) {
<po-calendar-header
[p-hide-previous]="isEndPart"
[p-hide-next]="isStartPart && !responsive"
Expand All @@ -9,90 +9,92 @@
<span class="po-clickable po-mr-1" (click)="selectDisplayMode('month')">{{ displayMonth }}</span>
<span class="po-clickable" (click)="selectDisplayMode('year')">{{ displayYear }}</span>
</po-calendar-header>

<div class="po-calendar-content">
<div class="po-calendar-labels">
<div class="po-calendar-label" *ngFor="let weekDay of displayWeekDays">
{{ weekDay }}
</div>
@for (weekDay of displayWeekDays; track weekDay) {
<div class="po-calendar-label">
{{ weekDay }}
</div>
}
</div>

<div class="po-calendar-content-list-day">
<div
*ngFor="let day of displayDays"
class="po-calendar-day"
[ngClass]="getDayBackgroundColor(day)"
(click)="onSelectDate(day)"
(mouseenter)="onMouseEnter(day)"
(mouseleave)="onMouseLeave()"
attr-calendar
>
<span *ngIf="day !== 0" [ngClass]="getDayForegroundColor(day)">
{{ day.getDate() }}
</span>
</div>
@for (day of displayDays; track day) {
<div
class="po-calendar-day"
[ngClass]="getDayBackgroundColor($any(day))"
(click)="onSelectDate($any(day))"
(mouseenter)="onMouseEnter(day)"
(mouseleave)="onMouseLeave()"
attr-calendar
>
@if (day !== 0) {
<span [ngClass]="getDayForegroundColor($any(day))">
{{ $any(day).getDate() }}
</span>
}
</div>
}
</div>
</div>
</ng-container>
}

<ng-container *ngIf="isMonthVisible">
@if (isMonthVisible) {
<po-calendar-header (p-previous)="updateYear(-1)" (p-next)="updateYear(1)">
<span class="po-clickable" (click)="selectDisplayMode('year')">
{{ displayYear }}
</span>
</po-calendar-header>

<div class="po-calendar-content">
<div class="po-calendar-labels">
<div class="po-calendar-label">
{{ monthLabel }}
</div>
</div>
<div class="po-calendar-content-list-month">
<div
*ngFor="let month of displayMonths; let i = index"
class="po-calendar-month"
[ngClass]="getBackgroundColor(i, displayMonthNumber)"
(click)="onSelectMonth(displayYear, i)"
attr-calendar
>
<span [ngClass]="getForegroundColor(i, displayMonthNumber)">
{{ month }}
</span>
</div>
@for (month of displayMonths; track month; let i = $index) {
<div
class="po-calendar-month"
[ngClass]="getBackgroundColor(i, displayMonthNumber)"
(click)="onSelectMonth(displayYear, i)"
attr-calendar
>
<span [ngClass]="getForegroundColor(i, displayMonthNumber)">
{{ month }}
</span>
</div>
}
</div>
</div>
</ng-container>
}

<ng-container *ngIf="isYearVisible">
@if (isYearVisible) {
<po-calendar-header (p-previous)="updateYear(-10)" (p-next)="updateYear(10)">
{{ displayStartDecade }} - {{ displayFinalDecade }}
</po-calendar-header>

<div class="po-calendar-content">
<div class="po-calendar-labels">
<div class="po-calendar-label">
{{ yearLabel }}
</div>
</div>

<div class="po-calendar-content-list-year">
<div
*ngFor="let year of displayDecade; let i = index"
class="po-calendar-year"
[ngClass]="getBackgroundColor(year, currentYear)"
(click)="onSelectYear(year, displayMonthNumber)"
attr-calendar
>
<span [ngClass]="getForegroundColor(year, currentYear)">
{{ year }}
</span>
</div>
@for (year of displayDecade; track year; let i = $index) {
<div
class="po-calendar-year"
[ngClass]="getBackgroundColor(year, currentYear)"
(click)="onSelectYear(year, displayMonthNumber)"
attr-calendar
>
<span [ngClass]="getForegroundColor(year, currentYear)">
{{ year }}
</span>
</div>
}
</div>
</div>
</ng-container>
}

<ng-container *ngIf="!range">
@if (!range) {
<div class="po-calendar-footer">
<div class="po-calendar-footer-today">
<button
Expand All @@ -107,5 +109,5 @@
</button>
</div>
</div>
</ng-container>
}
</div>
Loading