Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #401 from NielsPilgaard/feature/login-overhaul
make login+register look better
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,64 +2,53 @@ | |
|
|
||
| @inject SignInManager<ApplicationUser> SignInManager | ||
| @inject ILogger<Login> Logger | ||
| @inject IdentityRedirectManager RedirectManager | ||
|
|
||
| <MudContainer MaxWidth="MaxWidth.Small"> | ||
| <MudPaper Elevation="3" Class="pa-4"> | ||
| <EditForm Model="Input" OnValidSubmit="LoginUser" FormName="login"> | ||
| <StatusMessage Message="@_errorMessage"/> | ||
| <div class="form-floating mb-3"> | ||
| <InputText @bind-Value="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="[email protected]" /> | ||
| <label for="email" class="form-label">Email</label> | ||
| <ValidationMessage For="() => Input.Email" class="text-danger" /> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <InputText type="password" @bind-Value="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="adgangskode" /> | ||
| <label for="password" class="form-label">Adgangskode</label> | ||
| <ValidationMessage For="() => Input.Password" class="text-danger" /> | ||
| </div> | ||
| <div class="checkbox mb-3"> | ||
| <label class="form-label"> | ||
| <InputCheckbox @bind-Value="Input.RememberMe" class="darker-border-checkbox form-check-input" /> | ||
| Husk mig | ||
| </label> | ||
| </div> | ||
| <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Info" FullWidth> | ||
| Log ind | ||
| </MudButton> | ||
| <MudDivider DividerType="DividerType.FullWidth" Class="my-3"/> | ||
| <MudStack> | ||
| <MudLink Href="/Account/ForgotPassword">Glemt din adgangskode?</MudLink> | ||
| <MudLink Href="/Account/ResendEmailConfirmation">Gensend emailbekræftelse</MudLink> | ||
| <MudButton ButtonType="ButtonType.Button" | ||
| Variant="Variant.Filled" | ||
| Color="Color.Success" | ||
| FullWidth | ||
| Href="/Account/Register"> | ||
| Opret ny konto | ||
| </MudButton> | ||
| </MudStack> | ||
| </EditForm> | ||
| </MudPaper> | ||
| <MudPaper Elevation="3" Class="pa-4 mt-4"> | ||
| <ExternalLoginPicker /> | ||
| </MudPaper> | ||
| </MudContainer> | ||
|
|
||
| @code { | ||
| private AlertMessage? _errorMessage; | ||
|
|
||
| [CascadingParameter] | ||
| private HttpContext HttpContext { get; set; } = default!; | ||
|
|
||
|
|
@@ -80,8 +69,7 @@ | |
|
|
||
| public async Task LoginUser() | ||
| { | ||
| var result = await SignInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: true); | ||
| if (result.Succeeded) | ||
| { | ||
| Logger.LogInformation("User logged in."); | ||
|
|
@@ -91,7 +79,7 @@ | |
| { | ||
| RedirectManager.RedirectTo( | ||
| "Account/LoginWith2fa", | ||
| new Dictionary<string, object?> { ["returnUrl"] = ReturnUrl, ["rememberMe"] = Input.RememberMe }); | ||
| } | ||
| else if (result.IsLockedOut) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,44 +13,38 @@ | |
| @inject IdentityRedirectManager RedirectManager | ||
| @inject IDbContextFactory<JordnaerDbContext> DbContextFactory | ||
|
|
||
| <PageTitle>Opret en ny konto</PageTitle> | ||
| @*TODO: This page needs some UI love*@ | ||
| <MudContainer MaxWidth="MaxWidth.Small"> | ||
|
|
||
| <MudPaper Elevation="3" Class="pa-4" > | ||
| <StatusMessage Message="@Message" /> | ||
| <EditForm Model="Input" asp-route-returnUrl="@ReturnUrl" method="post" OnValidSubmit="RegisterUser" FormName="register"> | ||
| <DataAnnotationsValidator /> | ||
| <h2 class="font-open-sans-medium" style="@($"color: {JordnaerPalette.RedHeader}")">Opret en ny konto</h2> | ||
| <hr /> | ||
| <div class="form-floating mb-3"> | ||
| <InputText @bind-Value="Input.Email" class="form-control" autocomplete="email" aria-required="true" placeholder="[email protected]" /> | ||
| <label for="email">Email</label> | ||
| <ValidationMessage For="() => Input.Email" class="text-danger" /> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <InputText type="password" @bind-Value="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="" /> | ||
| <label for="password">Kodeord</label> | ||
| <ValidationMessage For="() => Input.Password" class="text-danger" /> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <InputText type="password" @bind-Value="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="" /> | ||
| <label for="confirm-password">Bekræft kodeord</label> | ||
| <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" /> | ||
| </div> | ||
| <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Success" FullWidth>Opret</MudButton> | ||
| </EditForm> | ||
| </MudPaper> | ||
| <MudPaper Elevation="3" Class="pa-4 mt-4"> | ||
| <ExternalLoginPicker /> | ||
| </MudPaper> | ||
| </MudContainer> | ||
|
|
||
| @code { | ||
| private IEnumerable<IdentityError>? _identityErrors; | ||
|
|
@@ -61,9 +55,9 @@ | |
| [SupplyParameterFromQuery] | ||
| private string? ReturnUrl { get; set; } | ||
|
|
||
| private AlertMessage? Message => _identityErrors is null | ||
| ? null | ||
| : new AlertMessage(_identityErrors.Select(error => error.Description), true); | ||
|
|
||
| public async Task RegisterUser(EditContext editContext) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
