refactoring the login
This commit is contained in:
parent
2f645b7f0f
commit
9289207085
18 changed files with 209 additions and 368 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<div class="login-page">
|
||||
<div class="lead">
|
||||
<h1>Login</h1>
|
||||
<h1>Signin</h1>
|
||||
<p>Choose how to login</p>
|
||||
</div>
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<form asp-route="Login">
|
||||
<form asp-route="Signin">
|
||||
<input type="hidden" asp-for="ReturnUrl" />
|
||||
|
||||
<div class="form-group">
|
||||
|
|
@ -84,4 +84,4 @@
|
|||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<div class="login-page">
|
||||
<div class="lead">
|
||||
<h1>Login</h1>
|
||||
<h1>Signin</h1>
|
||||
<p>Choose how to login</p>
|
||||
</div>
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<form asp-action="Login" method="POST" asp-controller="Account">
|
||||
<form asp-action="Signin" method="POST" asp-controller="Account">
|
||||
<input type="hidden" asp-for="ReturnUrl" />
|
||||
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@model BlogPostCreateViewModel
|
||||
@model BlogPostEditViewModel
|
||||
|
||||
@{
|
||||
ViewData["Title"] = "Blog post edition";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
@model BlogPostEditViewModel
|
||||
|
||||
@{
|
||||
ViewData["Title"] = "Blog post edition";
|
||||
}
|
||||
|
|
@ -55,7 +54,6 @@
|
|||
<h2 title="Titre du post" class="blogtitle" id="titleview" >@Model.Title</h2>
|
||||
|
||||
|
||||
<div title="Contenu du post" id="contentview"><asciidoc>@Model.Content</asciidoc></div>
|
||||
|
||||
<hr>
|
||||
<form asp-action="Edit">
|
||||
|
|
@ -84,7 +82,8 @@
|
|||
<div class="form-group mdcoding">
|
||||
<label asp-for="Content" class="col-md-2 control-label" ></label>
|
||||
<div class="col-md-10">
|
||||
<textarea asp-for="Content" class="form-control" id="Content" data-from="contentview">
|
||||
<textarea asp-for="Content" class="form-control"
|
||||
id="Content" data-from="contentview">
|
||||
</textarea>
|
||||
<span asp-validation-for="Content" class="text-danger" >
|
||||
</span>
|
||||
|
|
@ -112,6 +111,14 @@
|
|||
</div>
|
||||
</form>
|
||||
@await Component.InvokeAsync("Directory","")
|
||||
|
||||
|
||||
<hr />
|
||||
|
||||
<div id="prev">
|
||||
<asciidoc>@Model.Content</asciidoc>
|
||||
</div>
|
||||
|
||||
<div >
|
||||
@{ await Html.RenderPartialAsync("_PostFilesPartial"); }
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
|
||||
|
||||
@using Yavsc.ViewModels.Account
|
||||
@model SignInModel
|
||||
@{
|
||||
ViewData["Title"] = "Log in";
|
||||
}
|
||||
|
||||
<div class="jumbotron">
|
||||
<h1>@ViewData["Title"]</h1>
|
||||
<hr/>
|
||||
|
||||
<h2 class="lead text-left">Use a local account to log in</h2>
|
||||
<form asp-action="SignIn" class="form-horizontal" role="form">
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
<div class="form-group">
|
||||
<label for="EMail" class="col-md-2 control-label">Username</label>
|
||||
<div class="col-md-10">
|
||||
<input asp-for="UserName" class="form-control" autocomplete="email" aria-required="true" placeholder="UserName" />
|
||||
<span asp-validation-for="UserName" 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" autocomplete="current-password" aria-required="true" placeholder="password" />
|
||||
<span asp-validation-for="Password" class="text-danger"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-2 col-md-10">
|
||||
<div class="checkbox">
|
||||
<input asp-for="RememberMe" />
|
||||
<label for="RememberMe" class="control-label">Remember me</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-2 col-md-10">
|
||||
<button type="submit" class="btn btn-light btn-success" name="submit.Signin">Login</button>
|
||||
</div>
|
||||
</div>
|
||||
<p>
|
||||
<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>
|
||||
</p>
|
||||
<input type="hidden" name="Provider" value="LOCAL" />
|
||||
<input type="hidden" name="ReturnUrl" value="@Model.ReturnUrl" />
|
||||
|
||||
@Html.AntiForgeryToken()
|
||||
</form>
|
||||
|
||||
<hr/>
|
||||
<h2 class="lead text-left">Use another service to log in:</h2>
|
||||
|
||||
</div>
|
||||
|
|
@ -52,7 +52,7 @@ else
|
|||
<a class="nav-link" asp-controller="Account" asp-action="Register" >Register</a>
|
||||
</li>
|
||||
<li class="dropdown-item">
|
||||
<a class="nav-link" asp-controller="Account" asp-action="Signin" asp-route-ReturnUrl="~/" >Signin</a>
|
||||
<a class="nav-link" asp-controller="Account" asp-action="Signin" asp-route-ReturnUrl="~/" asp-route-AllowRememberLogin="true" >Signin</a>
|
||||
</li>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
@using Yavsc.Abstract.Models.Messaging;
|
||||
@using Yavsc.Billing;
|
||||
@using Yavsc.Server.Models.Calendar;
|
||||
@using Yavsc.ViewModels.Blog;
|
||||
@using Yavsc.ViewModels.Haircut;
|
||||
@using Yavsc.ViewModels.Administration;
|
||||
@using Yavsc.ViewModels.Account;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue