Got a login
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
<h2>@ViewData["Title"]</h2>
|
||||
|
||||
<form asp-controller="Account" asp-action="ForgotPassword" method="post" class="form-horizontal" role="form">
|
||||
<h4>Enter your user name or e-mail."]</h4>
|
||||
<h4>Enter your user name or e-mail.</h4>
|
||||
<hr />
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
<div class="form-group">
|
||||
|
@ -4,5 +4,5 @@
|
||||
|
||||
<h2>@ViewData["Title"].</h2>
|
||||
<p>
|
||||
PleaseCheckYourEmail"]
|
||||
PleaseCheckYourEmail
|
||||
</p>
|
||||
|
@ -9,7 +9,6 @@
|
||||
<h4>Reset your password.</h4>
|
||||
<hr />
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
<input asp-for="Code" type="hidden" />
|
||||
<div class="form-group">
|
||||
<label asp-for="Email" class="col-md-2 control-label"></label>
|
||||
<div class="col-md-10">
|
||||
|
@ -34,7 +34,7 @@
|
||||
<div class="col-md-offset-2 col-md-10">
|
||||
<button type="submit" class="btn btn-default">Change password</button>
|
||||
|
||||
<a asp-action="ForgotPassword" asp-controller="Account">Forgot your password?"]</a>
|
||||
<a asp-action="ForgotPassword" asp-controller="Account">Forgot your password?</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
|
||||
@using Yavsc.ViewModels.Account
|
||||
@model SignInViewModel
|
||||
@model SignInModel
|
||||
@{
|
||||
ViewData["Title"] = "Log in";
|
||||
}
|
||||
@ -11,20 +11,19 @@
|
||||
<hr/>
|
||||
|
||||
<h2 class="lead text-left">Use a local account to log in</h2>
|
||||
<form action="@Constants.LoginPath" method="post" class="form-horizontal" role="form">
|
||||
|
||||
<form asp-action="SignIn" class="form-horizontal" role="form">
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
<div class="form-group">
|
||||
<label for="UserName" class="col-md-2 control-label">UserName</label>
|
||||
<label for="EMail" class="col-md-2 control-label">EMail</label>
|
||||
<div class="col-md-10">
|
||||
<input asp-for="UserName" class="form-control" />
|
||||
<span asp-validation-for="UserName" class="text-danger"></span>
|
||||
<input asp-for="EMail" class="form-control" autocomplete="email" aria-required="true" placeholder="name@example.com" />
|
||||
<span asp-validation-for="EMail" class="text-danger"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="Password" class="col-md-2 control-label">Password</label>
|
||||
<div class="col-md-10">
|
||||
<input asp-for="Password" class="form-control" />
|
||||
<input asp-for="Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
|
||||
<span asp-validation-for="Password" class="text-danger"></span>
|
||||
</div>
|
||||
</div>
|
||||
@ -45,7 +44,7 @@
|
||||
<a asp-action="Register" asp-controller="Account">Register as a new user?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a asp-action="ForgotPassword" asp-controller="Account">Forgot your password?"]</a>
|
||||
<a asp-action="ForgotPassword" asp-controller="Account">Forgot your password</a>
|
||||
</p>
|
||||
<input type="hidden" name="Provider" value="LOCAL" />
|
||||
<input type="hidden" name="ReturnUrl" value="@Model.ReturnUrl" />
|
||||
@ -55,25 +54,5 @@
|
||||
|
||||
<hr/>
|
||||
<h2 class="lead text-left">Use another service to log in:</h2>
|
||||
@if (Model.ExternalProviders==null || Model.ExternalProviders.Count() == 0)
|
||||
{
|
||||
<div>
|
||||
<p>
|
||||
There are no external authentication services configured. See <a href="http://go.microsoft.com/fwlink/?LinkID=532715">this article</a>
|
||||
for details on setting up this ASP.NET application to support logging in via external services.
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
@foreach (var description in Model.ExternalProviders) {
|
||||
<form action="@Constants.LoginPath" method="post">
|
||||
<input type="hidden" name="Provider" value="@description.AuthenticationScheme" />
|
||||
<input type="hidden" name="ReturnUrl" value="@Model.ReturnUrl" />
|
||||
<button class="btn btn-lg btn-success" type="submit" name="Submit.Login">Connect using @description.DisplayName</button>
|
||||
@Html.AntiForgeryToken()
|
||||
</form>
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</div>
|
||||
|
@ -1,54 +1,62 @@
|
||||
@using System.Security.Claims
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
@inject UserManager<ApplicationUser> UserManager
|
||||
|
||||
@if (User.IsSignedIn())
|
||||
<ul class="navbar-nav">
|
||||
@if (SignInManager.IsSignedIn(User))
|
||||
{
|
||||
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li>
|
||||
<a asp-controller="Manage" class="navbar-link" asp-action="Index" title="Manage">
|
||||
<img src="/Avatars/@(User.GetUserName()).xs.png" asp-append-version="true" class="smalltofhol" />
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Plateforme <span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a asp-controller="Bug" asp-action="Index">Bugs</a></li>
|
||||
<li><a asp-controller="HyperLink" asp-action="Index">HyperLink</a></li>
|
||||
<li><a asp-controller="LiveFlow" asp-action="Index">LiveFlow</a></li>
|
||||
<li><a asp-controller="Feature" asp-action="Index">Features</a></li>
|
||||
</ul>
|
||||
@if (User.IsInRole(Constants.AdminGroupName)) {
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Administration <span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a asp-controller="Administration" asp-action="Index">Index</a></li>
|
||||
<li><a asp-controller="Activity" asp-action="Index">Activités</a></li>
|
||||
<li><a asp-controller="CommandForms" asp-action="Index">Formulaires</a></li>
|
||||
<li><a asp-controller="Notifications" asp-action="Index">Notifications</a></li>
|
||||
<li><a asp-controller="SIRENExceptions" asp-action="Index">Excéptions au numéro de SIREN</a></li>
|
||||
<li><a asp-controller="Client" asp-action="Index">Accès API</a></li>
|
||||
<li><a asp-controller="MailingTemplate" asp-action="Index">Emailing</a></li>
|
||||
</ul>
|
||||
</li>}
|
||||
<li>
|
||||
<a asp-controller="Manage" class="navbar-link" asp-action="Index" title="Manage">
|
||||
<img src="/Avatars/@(User.GetUserName()).xs.png" asp-append-version="true" class="smalltofhol" />
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Plateforme <span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a asp-controller="Bug" asp-action="Index">Bugs</a></li>
|
||||
<li><a asp-controller="HyperLink" asp-action="Index">HyperLink</a></li>
|
||||
<li><a asp-controller="LiveFlow" asp-action="Index">LiveFlow</a></li>
|
||||
<li><a asp-controller="Feature" asp-action="Index">Features</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@if (User.IsInRole(Constants.AdminGroupName)) {
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
Administration <span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a asp-controller="Administration" asp-action="Index">Index</a></li>
|
||||
<li><a asp-controller="Activity" asp-action="Index">Activités</a></li>
|
||||
<li><a asp-controller="CommandForms" asp-action="Index">Formulaires</a></li>
|
||||
<li><a asp-controller="Notifications" asp-action="Index">Notifications</a></li>
|
||||
<li><a asp-controller="SIRENExceptions" asp-action="Index">Excéptions au numéro de SIREN</a></li>
|
||||
<li><a asp-controller="Client" asp-action="Index">Accès API</a></li>
|
||||
<li><a asp-controller="MailingTemplate" asp-action="Index">Emailing</a></li>
|
||||
</ul>
|
||||
</li>}
|
||||
|
||||
<li>
|
||||
<form asp-controller="Account" asp-action="LogOff"
|
||||
method="post" id="logoutForm">
|
||||
<button type="submit" class="btn navbar-btn" >Logout</button>
|
||||
<input type="hidden" name="ReturnUrl" value="/" />
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" asp-controller="ApiKeys" asp-action="Index" title="Api Keys">Your API keys</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })">
|
||||
<button type="submit" class="nav-link btn btn-link">Logout</button>
|
||||
</form>
|
||||
</li>
|
||||
}
|
||||
else
|
||||
{
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a class="navbar-link" asp-controller="Account" asp-action="Register" asp-route-returnurl="@Url.Action()" >Register</a></li>
|
||||
|
||||
<li><a class="navbar-link" asp-controller="Account" asp-action="SignIn" asp-route-returnurl="@Url.Action()" >Login</a></li>
|
||||
</ul>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" asp-area="Identity" asp-page="/Account/Register">Register</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" asp-area="Identity" asp-page="/Account/Login">Login</a>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
|
Reference in New Issue
Block a user