danvics/rdt-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed enter button press on the login and setup pages.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

60
client/src/app/login/login.component.html
View file

@ -5,37 +5,39 @@
<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">
<div class="field"> <form (ngSubmit)="login()">
<label for="" class="label">Username</label> <div class="field">
<div class="control has-icons-left"> <label for="" class="label">Username</label>
<input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required /> <div class="control has-icons-left">
<span class="icon is-small is-left"> <input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required />
<i class="fa fa-envelope"></i> <span class="icon is-small is-left">
</span> <i class="fa fa-envelope"></i>
</span>
</div>
</div> </div>
</div> <div class="field">
<div class="field"> <label for="" class="label" name="password">Password</label>
<label for="" class="label" name="password">Password</label> <div class="control has-icons-left">
<div class="control has-icons-left"> <input type="password" class="input" required name="password" [(ngModel)]="password" />
<input type="password" class="input" required name="password" [(ngModel)]="password" /> <span class="icon is-small is-left">
<span class="icon is-small is-left"> <i class="fa fa-lock"></i>
<i class="fa fa-lock"></i> </span>
</span> </div>
</div> </div>
</div> <div class="field">
<div class="field"> <button
<button class="button is-success"
class="button is-success" type="submit"
(click)="login()" [ngClass]="{ 'is-loading': loggingIn }"
[ngClass]="{ 'is-loading': loggingIn }" [disabled]="loggingIn"
[disabled]="loggingIn" >
> Login
Login </button>
</button> </div>
</div> <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>

59
client/src/app/setup/setup.component.html
View file

@ -8,37 +8,38 @@
<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>
<div class="field"> <form (ngSubmit)="setup()">
<label for="" class="label">Username</label> <div class="field">
<div class="control has-icons-left"> <label for="" class="label">Username</label>
<input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required /> <div class="control has-icons-left">
<span class="icon is-small is-left"> <input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required />
<i class="fa fa-envelope"></i> <span class="icon is-small is-left">
</span> <i class="fa fa-envelope"></i>
</span>
</div>
</div> </div>
</div> <div class="field">
<div class="field"> <label for="" class="label" name="password">Password</label>
<label for="" class="label" name="password">Password</label> <div class="control has-icons-left">
<div class="control has-icons-left"> <input type="password" class="input" required name="password" [(ngModel)]="password" />
<input type="password" class="input" required name="password" [(ngModel)]="password" /> <span class="icon is-small is-left">
<span class="icon is-small is-left"> <i class="fa fa-lock"></i>
<i class="fa fa-lock"></i> </span>
</span> </div>
</div> </div>
</div> <div class="field">
<div class="field"> <button
<button class="button is-success"
class="button is-success" [ngClass]="{ 'is-loading': working }"
(click)="setup()" [disabled]="working"
[ngClass]="{ 'is-loading': working }" >
[disabled]="working" Setup
> </button>
Setup </div>
</button> <div class="notification is-danger is-light" *ngIf="error?.length > 0">
</div> {{ error }}
<div class="notification is-danger is-light" *ngIf="error?.length > 0"> </div>
{{ error }} </form>
</div>
</div> </div>
<div class="box" *ngIf="step === 2"> <div class="box" *ngIf="step === 2">

5
server/RdtClient.Service/Services/Authentication.cs
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;