Skip to content

Commit 603504d

Browse files
committed
Merge branch 'main' into feature/widgets
# Conflicts: # README.md
2 parents cba5210 + 996255c commit 603504d

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

AdminLTEWithASPNETCore/Areas/Identity/Pages/Account/ExternalLogin.cshtml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@
1515
logging in.
1616
</p>
1717

18-
<div class="row">
19-
<div class="col-md-4">
20-
<form asp-page-handler="Confirmation" asp-route-returnUrl="@Model.ReturnUrl" method="post">
21-
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
22-
<div class="form-group">
23-
<label asp-for="Input.Email"></label>
24-
<input asp-for="Input.Email" class="form-control" />
25-
<span asp-validation-for="Input.Email" class="text-danger"></span>
26-
</div>
27-
<button type="submit" class="btn btn-primary">Register</button>
28-
</form>
18+
<form asp-page-handler="Confirmation" asp-route-returnUrl="@Model.ReturnUrl" method="post">
19+
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
20+
<div class="form-group">
21+
<label asp-for="Input.Email"></label>
22+
<input asp-for="Input.Email" class="form-control" />
23+
<span asp-validation-for="Input.Email" class="text-danger"></span>
2924
</div>
30-
</div>
25+
<button type="submit" class="btn btn-primary">Register</button>
26+
</form>
3127

3228
@section Scripts {
3329
<partial name="_ValidationScriptsPartial" />

AdminLTEWithASPNETCore/Areas/Identity/Pages/Account/Login.cshtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,26 @@
6565
@foreach (var provider in Model.ExternalLogins)
6666
{
6767
string logo = "";
68+
string cssButton = "btn-primary";
6869
switch (provider.Name)
6970
{
7071
case "Facebook":
7172
logo = "<i class=\"fab fa-facebook mr-2\"></i>";
7273
break;
7374
case "Google":
7475
logo = "<i class=\"fab fa-google-plus mr-2\"></i>";
76+
cssButton = "btn-danger";
7577
break;
7678
case "Microsoft":
7779
logo = "<i class=\"fab fa-microsoft mr-2\"></i>";
7880
break;
7981
case "Twitter":
8082
logo = "<i class=\"fab fa-twitter mr-2\"></i>";
83+
cssButton = "btn-info";
8184
break;
8285
}
8386

84-
<button type="submit" class="btn btn-block btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@Html.Raw(logo) @provider.DisplayName</button>
87+
<button type="submit" class="btn btn-block @cssButton" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@Html.Raw(logo) @provider.DisplayName</button>
8588
}
8689
</p>
8790
</div>

AdminLTEWithASPNETCore/Startup.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Microsoft.Extensions.DependencyInjection;
1414
using Microsoft.Extensions.Hosting;
1515
using Microsoft.Extensions.Options;
16+
using Microsoft.IdentityModel.Logging;
1617
using Microsoft.IdentityModel.Tokens;
1718
using System;
1819
using System.Collections.Generic;
@@ -209,6 +210,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, Applicat
209210
{
210211
if (env.IsDevelopment())
211212
{
213+
IdentityModelEventSource.ShowPII = true;
212214
app.UseDeveloperExceptionPage();
213215
}
214216
else

0 commit comments

Comments
 (0)