Skip to content

Use latest Bootstrap and jQuery #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2019
Merged

Use latest Bootstrap and jQuery #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions samples/Mvc.Client/Controllers/AuthenticationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ namespace Mvc.Client.Controllers
public class AuthenticationController : Controller
{
[HttpGet("~/signin")]
public async Task<IActionResult> SignIn()
{
return View("SignIn", await HttpContext.GetExternalProvidersAsync());
}
public async Task<IActionResult> SignIn() => View("SignIn", await HttpContext.GetExternalProvidersAsync());

[HttpPost("~/signin")]
public async Task<IActionResult> SignIn([FromForm] string provider)
Expand Down
4 changes: 2 additions & 2 deletions samples/Mvc.Client/Views/Authentication/SignIn.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<h1>Authentication</h1>
<p class="lead text-left">Sign in using one of these external providers:</p>

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

<button class="btn btn-lg btn-success" type="submit">Connect using @scheme.DisplayName</button>
<button class="btn btn-lg btn-success m-1" type="submit">Connect using @scheme.DisplayName</button>
</form>
}
</div>
17 changes: 9 additions & 8 deletions samples/Mvc.Client/Views/Home/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
@model string

<div class="jumbotron">
@if (User?.Identity?.IsAuthenticated ?? false) {
<div class="jumbotron">
@if (User?.Identity?.IsAuthenticated ?? false)
{
<h1>Welcome, @User.Identity.Name</h1>

<p>
@foreach (var claim in Context.User.Claims) {
<div>@claim.Type: <b>@claim.Value</b></div>
@foreach (var claim in Context.User.Claims)
{
<div><code>@claim.Type</code>: <strong>@claim.Value</strong></div>
}
</p>

<a class="btn btn-lg btn-danger" href="/signout?returnUrl=%2F">Sign out</a>
}

else {
else
{
<h1>Welcome, anonymous</h1>
<a class="btn btn-lg btn-success" href="/signin?returnUrl=%2F">Sign in</a>
}
Expand Down
18 changes: 10 additions & 8 deletions samples/Mvc.Client/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,26 @@
<meta name="description" content="" />
<meta name="author" content="" />

<title>Mvc.Client (OSOS sample)</title>
<title>Mvc.Client (OpenID 2.0 sample)</title>

<link href="~/stylesheets/bootstrap.min.css" rel="stylesheet" />
<link href="~/stylesheets/jumbotron-narrow.css" rel="stylesheet" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.slim.min.js" integrity="sha256-pasqAKBDmFT4eHoN2ndd6lN370kFiGUFyTiUHWhU7k8=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/umd/popper.min.js" integrity="sha256-fTuUgtT7O2rqoImwjrhDgbXTKUwyxxujIMRIK7TbuNU=" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<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">
</head>

<body>
<div class="container">
<main class="container">
<div class="header">
<h3 class="text-muted">Your application (Mvc.Client)</h3>
</div>

@RenderBody()

<div class="footer">
<p>&copy; Your company 2014</p>
</div>
<footer>
<p>&copy; Your company @DateTime.UtcNow.Year</p>
</footer>

</div>
</main>
</body>
</html>
Binary file removed samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.eot
View file
Open in desktop
Binary file not shown.
229 changes: 0 additions & 229 deletions samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.svg
View file
Open in desktop

This file was deleted.

Binary file removed samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed samples/Mvc.Client/wwwroot/fonts/glyphicons-halflings-regular.woff
View file
Open in desktop
Binary file not shown.
Loading