Fixed enter button press on the login and setup pages.

This commit is contained in:
Roger Far 2021-07-18 14:22:12 -06:00
parent e4d522b00e
commit 3e832cc416
3 changed files with 66 additions and 58 deletions

View file

@ -5,6 +5,7 @@
<div class="column is-5-tablet is-5-desktop is-5-widescreen"> <div class="column is-5-tablet is-5-desktop is-5-widescreen">
<img src="../../assets/logo.png" /> <img src="../../assets/logo.png" />
<div class="box"> <div class="box">
<form (ngSubmit)="login()">
<div class="field"> <div class="field">
<label for="" class="label">Username</label> <label for="" class="label">Username</label>
<div class="control has-icons-left"> <div class="control has-icons-left">
@ -26,7 +27,7 @@
<div class="field"> <div class="field">
<button <button
class="button is-success" class="button is-success"
(click)="login()" type="submit"
[ngClass]="{ 'is-loading': loggingIn }" [ngClass]="{ 'is-loading': loggingIn }"
[disabled]="loggingIn" [disabled]="loggingIn"
> >
@ -36,6 +37,7 @@
<div class="notification is-danger is-light" *ngIf="error?.length > 0"> <div class="notification is-danger is-light" *ngIf="error?.length > 0">
{{ error }} {{ error }}
</div> </div>
</form>
</div> </div>
</div> </div>
</div> </div>

View file

@ -8,6 +8,7 @@
<div class="notification is-primary"> <div class="notification is-primary">
Welcome to RealDebrid Client. Please create your account by entering a username and password. Welcome to RealDebrid Client. Please create your account by entering a username and password.
</div> </div>
<form (ngSubmit)="setup()">
<div class="field"> <div class="field">
<label for="" class="label">Username</label> <label for="" class="label">Username</label>
<div class="control has-icons-left"> <div class="control has-icons-left">
@ -29,7 +30,6 @@
<div class="field"> <div class="field">
<button <button
class="button is-success" class="button is-success"
(click)="setup()"
[ngClass]="{ 'is-loading': working }" [ngClass]="{ 'is-loading': working }"
[disabled]="working" [disabled]="working"
> >
@ -39,6 +39,7 @@
<div class="notification is-danger is-light" *ngIf="error?.length > 0"> <div class="notification is-danger is-light" *ngIf="error?.length > 0">
{{ error }} {{ error }}
</div> </div>
</form>
</div> </div>
<div class="box" *ngIf="step === 2"> <div class="box" *ngIf="step === 2">

View file

@ -37,6 +37,11 @@ namespace RdtClient.Service.Services
public async Task<SignInResult> Login(String userName, String password) public async Task<SignInResult> Login(String userName, String password)
{ {
if (String.IsNullOrWhiteSpace(userName) || String.IsNullOrWhiteSpace(password))
{
return SignInResult.Failed;
}
var result = await _signInManager.PasswordSignInAsync(userName, password, true, false); var result = await _signInManager.PasswordSignInAsync(userName, password, true, false);
return result; return result;