EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3833 signup: Add a wrapper container and remove refresher

main
Pau Ferrer Ocaña 2022-04-21 15:16:24 +02:00
parent 3627e3fde5
commit e502c73392
2 changed files with 172 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/features/login/pages/email-signup/email-signup.html
View File

@ -17,12 +17,8 @@
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher slot="fixed" [disabled]="!settingsLoaded || isMinor" (ionRefresh)="refreshSettings($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher>
<div class="list-item-limited-width">
<core-loading [hideUntil]="settingsLoaded" *ngIf="!isMinor"> <core-loading [hideUntil]="settingsLoaded" *ngIf="!isMinor">
<div class="list-item-limited-width">
<!-- Site has an unsupported required field. --> <!-- Site has an unsupported required field. -->
<ion-list *ngIf="!allRequiredSupported"> <ion-list *ngIf="!allRequiredSupported">
@ -36,9 +32,9 @@
</ion-button> </ion-button>
</ion-list> </ion-list>
<ng-container *ngIf="allRequiredSupported && settingsLoaded && settings">
<!-- Age verification. --> <!-- Age verification. -->
<form *ngIf="allRequiredSupported && settingsLoaded && settings && ageDigitalConsentVerification" <form *ngIf="ageDigitalConsentVerification" [formGroup]="ageVerificationForm" (ngSubmit)="verifyAge($event)" #ageForm>
[formGroup]="ageVerificationForm" (ngSubmit)="verifyAge($event)" #ageForm>
<ion-item-divider class="ion-text-wrap"> <ion-item-divider class="ion-text-wrap">
<ion-label> <ion-label>
@ -78,8 +74,7 @@
</form> </form>
<!-- Signup form. --> <!-- Signup form. -->
<form *ngIf="allRequiredSupported && settingsLoaded && settings && !ageDigitalConsentVerification" [formGroup]="signupForm" <form *ngIf="!ageDigitalConsentVerification" [formGroup]="signupForm" (ngSubmit)="create($event)" #signupFormEl>
(ngSubmit)="create($event)" #signupFormEl>
<ion-item class="ion-text-wrap ion-text-center"> <ion-item class="ion-text-wrap ion-text-center">
<ion-label> <ion-label>
@ -103,8 +98,8 @@
<ion-label position="stacked"> <ion-label position="stacked">
<span core-mark-required="true">{{ 'core.login.username' | translate }}</span> <span core-mark-required="true">{{ 'core.login.username' | translate }}</span>
</ion-label> </ion-label>
<ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username" <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
autocapitalize="none" autocorrect="off"> formControlName="username" autocapitalize="none" autocorrect="off">
</ion-input> </ion-input>
<core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors> <core-input-errors [control]="signupForm.controls.username" [errorMessages]="usernameErrors"></core-input-errors>
</ion-item> </ion-item>
@ -223,8 +218,11 @@
<!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 --> <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
<input type="submit" class="core-submit-hidden-enter" /> <input type="submit" class="core-submit-hidden-enter" />
</form> </form>
</ng-container>
</div>
</core-loading> </core-loading>
<div class="list-item-limited-width">
<ion-list *ngIf="allRequiredSupported && isMinor"> <ion-list *ngIf="allRequiredSupported && isMinor">
<ion-item-divider class="ion-text-wrap"> <ion-item-divider class="ion-text-wrap">
<ion-label> <ion-label>

12
src/core/features/login/pages/email-signup/email-signup.ts
View File

@ -14,7 +14,6 @@
import { Component, ViewChild, ElementRef, OnInit, ChangeDetectorRef } from '@angular/core'; import { Component, ViewChild, ElementRef, OnInit, ChangeDetectorRef } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
import { IonRefresher } from '@ionic/angular';
import { CoreSites } from '@services/sites'; import { CoreSites } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom'; import { CoreDomUtils } from '@services/utils/dom';
@ -256,17 +255,6 @@ export class CoreLoginEmailSignupPage implements OnInit {
} }
} }
/**
* Pull to refresh.
*
* @param event Event.
*/
refreshSettings(event?: IonRefresher): void {
this.fetchData().finally(() => {
event?.complete();
});
}
/** /**
* Create account. * Create account.
* *