Commit bef0d4f9 authored by Emily Jensen's avatar Emily Jensen

"Merge with dev"

Merge branch 'dev' into 178-style-reset-password-verify-page
parents c169d2f6 d7b0754e
<DockLayout stretchLastChild="true" class="auth-container">
<StackLayout class="auth-form-body">
<FlexboxLayout flexDirection="row" alignItems="center" justifyContent="space-between" class="auth-header">
<app-heading text="Reset Password"></app-heading>
<app-button
height="36"
text="Back to Login"
type="border"
(tap)="goToLogin()"
></app-button>
</FlexboxLayout>
<StackLayout orientation="vertical">
<Label class="p-10 m-b-10" *ngIf="errorMessage" [text]="errorMessage" backgroundColor="#f0f0f0" flexGrow="1"></Label>
<app-text-field
autocorrect="false"
autocapitalizationType="none"
label="Email"
keyboardType="email"
returnKeyType="next"
[isFormSubmitted]="form.isSubmitted"
[ngrxFormControl]="form.controls.email"
></app-text-field>
<Label
*ngIf="form.errors._email && form.isSubmitted"
class="text-label text-label--error"
text="Enter your account's email address."
textWrap="true"
></Label>
<app-server-select
*ngIf="!hasFinished"
[showUrlControl]="form.controls.showUrl"
[urlControl]="form.controls.url"
[formErrors]="form.errors"
></app-server-select>
</StackLayout>
</StackLayout>
</DockLayout>
......@@ -6,7 +6,7 @@ import {
EventEmitter,
OnInit
} from "@angular/core";
import { RouterExtensions } from "nativescript-angular/router";
import { FormGroupState } from "ngrx-forms";
import { IResetPasswordForm } from "./reset-password.reducer";
......@@ -33,7 +33,7 @@ export class ResetPasswordComponent implements OnInit {
@Output()
reset = new EventEmitter();
constructor() {}
constructor(private routerExtensions: RouterExtensions) {}
ngOnInit() {}
......@@ -48,4 +48,8 @@ export class ResetPasswordComponent implements OnInit {
this.reset.emit();
// setTimeout(() => this.emailInput.nativeElement.focus(), 0);
}
goToLogin() {
this.routerExtensions.navigate(["/login"], { clearHistory: true });
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment