Skip to content

Commit 3d14e28

Browse files
enkodellcenkodellc
authored
Merge pull request #148 from Oleg26Dev/master
Fixed: Exit from Login dialog #139
2 parents 0f08e51 + 5d5bb07 commit 3d14e28

File tree

2 files changed

+60
-32
lines changed

2 files changed

+60
-32
lines changed

‎src/BlazorBoilerplate.CommonUI/Pages/Account/Login.razor

+49-31
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,48 @@
11
@page "/account/login"
2+
@page "/account/login/{returnurl}"
3+
24
@layout LoginLayout
35
@inject NavigationManager navigationManager
46
@inject AuthenticationStateProvider authStateProvider
57
@inject IMatToaster matToaster
68
@inject AppState appState
9+
@inject NavigationManager NavigationManager
10+
11+
<MatCard>
12+
<div class="hidden-mdc-down">
13+
<MatIconButton Icon="exit_to_app" Class="float-left" @onclick="GoBack" />
14+
<MatIconButton Icon="home" Class="float-left" Link="/" />
15+
</div>
716

8-
<MatCard>
9-
<MatIconButton Icon="home" Link="/" Class="float-right"></MatIconButton>
10-
<div class="logo">
11-
<a href="/" title="Blazor Boilerplate Home"><img src="_content/BlazorBoilerplate.CommonUI/images/blazorboilerplate.svg" style="width:100px;" title="Blazor Boilerplate Home" alt="Blazor Boilerplate" /><br />Blazor Boilerplate</a>
12-
<br />
13-
<h4>Log In</h4>
14-
User -> Username: <b>user</b> Password: <b>user123</b><br />
15-
Admin -> Username: <b>admin</b> Password: <b>admin123</b><br />
16-
</div>
17-
<EditForm Model="@loginParameters" OnValidSubmit="@SubmitLogin">
18-
<DataAnnotationsValidator />
19-
<ValidationSummary />
20-
<fieldset>
21-
<div class="form-group">
22-
<MatTextField @bind-Value="@loginParameters.UserName" Label="User Name" Icon="person" IconTrailing="true" FullWidth="true" Required="true"></MatTextField>
23-
</div>
24-
<div class="form-group">
25-
<MatTextField @bind-Value="@loginParameters.Password" Label="Password" Icon="lock_outline" IconTrailing="true" FullWidth="true" Required="true" Type="password"></MatTextField>
26-
</div>
27-
<div class="form-group">
28-
<MatCheckbox @bind-Value="@loginParameters.RememberMe" class="filled-in chk-col-blue">Remember Me</MatCheckbox>
29-
<MatButton class="float-right" Type="submit" Raised="true">Login</MatButton>
30-
</div>
31-
<hr />
32-
<div>
33-
<MatButton class="float-left" OnClick="@Register" Raised="true">Create account</MatButton>
34-
<MatButton class="float-right" OnClick="@GoogleSignIn" Raised="true">Sign in with <img height="18" style="margin-left: 5px" src="https://www.google.pl/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png" /></MatButton><br />
35-
</div>
36-
</fieldset>
37-
</EditForm>
38-
</MatCard>
17+
<div class="logo">
18+
<a href="/" title="Blazor Boilerplate Home"><img src="_content/BlazorBoilerplate.CommonUI/images/blazorboilerplate.svg" style="width:100px;" title="Blazor Boilerplate Home" alt="Blazor Boilerplate" /><br />Blazor Boilerplate</a>
19+
<br />
20+
<h4>Log In</h4>
21+
User -> Username: <b>user</b> Password: <b>user123</b><br />
22+
Admin -> Username: <b>admin</b> Password: <b>admin123</b><br />
23+
</div>
24+
<EditForm Model="@loginParameters" OnValidSubmit="@SubmitLogin">
25+
<DataAnnotationsValidator />
26+
<ValidationSummary />
27+
<fieldset>
28+
<div class="form-group">
29+
<MatTextField @bind-Value="@loginParameters.UserName" Label="User Name" Icon="person" IconTrailing="true" FullWidth="true" Required="true"></MatTextField>
30+
</div>
31+
<div class="form-group">
32+
<MatTextField @bind-Value="@loginParameters.Password" Label="Password" Icon="lock_outline" IconTrailing="true" FullWidth="true" Required="true" Type="password"></MatTextField>
33+
</div>
34+
<div class="form-group">
35+
<MatCheckbox @bind-Value="@loginParameters.RememberMe" class="filled-in chk-col-blue">Remember Me</MatCheckbox>
36+
<MatButton class="float-right" Type="submit" Raised="true">Login</MatButton>
37+
</div>
38+
<hr />
39+
<div>
40+
<MatButton class="float-left" OnClick="@Register" Raised="true">Create account</MatButton>
41+
<MatButton class="float-right" OnClick="@GoogleSignIn" Raised="true">Sign in with <img height="18" style="margin-left: 5px" src="https://www.google.pl/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png" /></MatButton><br />
42+
</div>
43+
</fieldset>
44+
</EditForm>
45+
</MatCard>
3946
<MatAccordion>
4047
<MatExpansionPanel @bind-Expanded="@forgotPasswordToggle">
4148
<MatExpansionPanelSummary>
@@ -59,11 +66,22 @@
5966
</MatAccordion>
6067

6168
@code {
69+
6270
string navigateTo = "";
6371
bool forgotPasswordToggle = false;
6472
LoginDto loginParameters { get; set; } = new LoginDto();
6573
ForgotPasswordDto forgotPasswordParameters { get; set; } = new ForgotPasswordDto();
6674

75+
[Parameter]
76+
public string ReturnUrl { get; set; }
77+
78+
private void GoBack()
79+
{
80+
if (string.IsNullOrEmpty(ReturnUrl))
81+
ReturnUrl = "";
82+
NavigationManager.NavigateTo(ReturnUrl, forceLoad: false);
83+
}
84+
6785
[CascadingParameter]
6886
Task<AuthenticationState> authenticationStateTask { get; set; }
6987

‎src/BlazorBoilerplate.CommonUI/Shared/Layouts/MainLayout.razor

+11-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@
5555
<MatTooltip Tooltip="Github Repository">
5656
<MatIconButton Link="https://github.com/enkodellc/blazorboilerplate" RefBack="@context"><i class="fa fa-github" aria-hidden="true"></i></MatIconButton>
5757
</MatTooltip>
58-
<Login></Login>
58+
@*<Login></Login>*@
59+
<MatTooltip Tooltip="Login">
60+
<MatIconButton @onclick="CallLogin" RefBack="@context"><i class="material-icons">account_box</i></MatIconButton>
61+
</MatTooltip>
5962
</MatAppBarSection>
6063
</MatAppBarRow>
6164
</MatAppBar>
@@ -79,6 +82,13 @@
7982
bool _navMinified = false;
8083
public string bbDrawerClass = "";
8184

85+
86+
private void CallLogin()
87+
{
88+
var returnUrl =
89+
navigationManager.ToBaseRelativePath(navigationManager.Uri);
90+
navigationManager.NavigateTo($"/account/Login/{returnUrl}", forceLoad: false);
91+
}
8292
[CascadingParameter]
8393
Task<AuthenticationState> authenticationStateTask { get; set; }
8494

0 commit comments

Comments
 (0)