Skip to content

Commit fe6767c

Browse files
martincostellomartincostello
committed
Use latest Bootstrap and jQuery
Update to latest Bootstrap and jQuery versions. Sort provider names. Improve HTML.
1 parent 68c5ee1 commit fe6767c

21 files changed

+22
-21284
lines changed

‎samples/Mvc.Client/Controllers/AuthenticationController.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ namespace Mvc.Client.Controllers
1515
public class AuthenticationController : Controller
1616
{
1717
[HttpGet("~/signin")]
18-
public async Task<IActionResult> SignIn()
19-
{
20-
return View("SignIn", await HttpContext.GetExternalProvidersAsync());
21-
}
18+
public async Task<IActionResult> SignIn() => View("SignIn", await HttpContext.GetExternalProvidersAsync());
2219

2320
[HttpPost("~/signin")]
2421
public async Task<IActionResult> SignIn([FromForm] string provider)

‎samples/Mvc.Client/Views/Authentication/SignIn.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<h1>Authentication</h1>
66
<p class="lead text-left">Sign in using one of these external providers:</p>
77

8-
@foreach (var scheme in Model)
8+
@foreach (var scheme in Model.OrderBy(p => p.DisplayName))
99
{
1010
<form action="/signin" method="post">
1111
<input type="hidden" name="Provider" value="@scheme.Name" />
1212
<input type="hidden" name="ReturnUrl" value="@ViewBag.ReturnUrl" />
1313

14-
<button class="btn btn-lg btn-success" type="submit">Connect using @scheme.DisplayName</button>
14+
<button class="btn btn-lg btn-success m-1" type="submit">Connect using @scheme.DisplayName</button>
1515
</form>
1616
}
1717
</div>

‎samples/Mvc.Client/Views/Home/Index.cshtml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
@model string
2-
3-
<div class="jumbotron">
4-
@if (User?.Identity?.IsAuthenticated ?? false) {
1+
<div class="jumbotron">
2+
@if (User?.Identity?.IsAuthenticated ?? false)
3+
{
54
<h1>Welcome, @User.Identity.Name</h1>
65

76
<p>
8-
@foreach (var claim in Context.User.Claims) {
9-
<div>@claim.Type: <b>@claim.Value</b></div>
7+
@foreach (var claim in Context.User.Claims)
8+
{
9+
<div><code>@claim.Type</code>: <strong>@claim.Value</strong></div>
1010
}
1111
</p>
12-
12+
1313
<a class="btn btn-lg btn-danger" href="/signout?returnUrl=%2F">Sign out</a>
1414
}
1515

16-
else {
16+
else
17+
{
1718
<h1>Welcome, anonymous</h1>
1819
<a class="btn btn-lg btn-success" href="/signin?returnUrl=%2F">Sign in</a>
1920
}

‎samples/Mvc.Client/Views/Shared/_Layout.cshtml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,26 @@
77
<meta name="description" content="" />
88
<meta name="author" content="" />
99

10-
<title>Mvc.Client (OSOS sample)</title>
10+
<title>Mvc.Client (OpenID 2.0 sample)</title>
1111

12-
<link href="~/stylesheets/bootstrap.min.css" rel="stylesheet" />
13-
<link href="~/stylesheets/jumbotron-narrow.css" rel="stylesheet" />
12+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.slim.min.js" integrity="sha256-pasqAKBDmFT4eHoN2ndd6lN370kFiGUFyTiUHWhU7k8=" crossorigin="anonymous"></script>
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/umd/popper.min.js" integrity="sha256-fTuUgtT7O2rqoImwjrhDgbXTKUwyxxujIMRIK7TbuNU=" crossorigin="anonymous"></script>
14+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
15+
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
1416
</head>
1517

1618
<body>
17-
<div class="container">
19+
<main class="container">
1820
<div class="header">
1921
<h3 class="text-muted">Your application (Mvc.Client)</h3>
2022
</div>
2123

2224
@RenderBody()
2325

24-
<div class="footer">
25-
<p>&copy; Your company 2014</p>
26-
</div>
26+
<footer>
27+
<p>&copy; Your company @DateTime.UtcNow.Year</p>
28+
</footer>
2729

28-
</div>
30+
</main>
2931
</body>
3032
</html>

‎samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.eot

-19.9 KB
Binary file not shown.

‎samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.svg

Lines changed: 0 additions & 229 deletions
This file was deleted.

‎samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.ttf

-40.3 KB
Binary file not shown.

‎samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.woff

-22.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)