-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #90 from aws/aspnetcore-update
Refresh AWS.Logger.AspNetCore
- Loading branch information
Showing
71 changed files
with
4,999 additions
and
3,474 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
samples/AspNetCore/WebSample/Controllers/HomeController.cs
This file was deleted.
Oops, something went wrong.
6 changes: 4 additions & 2 deletions
6
...NetCore/WebSample/Views/Home/Index.cshtml → ...s/AspNetCore/WebSample/Pages/Index.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.AspNetCore.Mvc.RazorPages; | ||
| using Microsoft.Extensions.Logging; | ||
|
|
||
| namespace WebSample.Pages | ||
| { | ||
| public class IndexModel : PageModel | ||
| { | ||
| ILogger<IndexModel> Logger { get; set; } | ||
|
|
||
| public IndexModel(ILogger<IndexModel> logger) | ||
| { | ||
| Logger = logger; | ||
| } | ||
|
|
||
| public void OnGet() | ||
| { | ||
| Logger.LogInformation("Welcome to the AWS Logger. You are viewing the home page"); | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
samples/AspNetCore/WebSample/Pages/Shared/_CookieConsentPartial.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| @using Microsoft.AspNetCore.Http.Features | ||
|
|
||
| @{ | ||
| var consentFeature = Context.Features.Get<ITrackingConsentFeature>(); | ||
| var showBanner = !consentFeature?.CanTrack ?? false; | ||
| var cookieString = consentFeature?.CreateConsentCookie(); | ||
| } | ||
|
|
||
| @if (showBanner) | ||
| { | ||
| <nav id="cookieConsent" class="navbar navbar-default navbar-fixed-top" role="alert"> | ||
| <div class="container"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#cookieConsent .navbar-collapse"> | ||
| <span class="sr-only">Toggle cookie consent banner</span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <span class="navbar-brand"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></span> | ||
| </div> | ||
| <div class="collapse navbar-collapse"> | ||
| <p class="navbar-text"> | ||
| Use this space to summarize your privacy and cookie use policy. | ||
| </p> | ||
| <div class="navbar-right"> | ||
| <a asp-page="/Privacy" class="btn btn-info navbar-btn">Learn More</a> | ||
| <button type="button" class="btn btn-default navbar-btn" data-cookie-string="@cookieString">Accept</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </nav> | ||
| <script> | ||
| (function () { | ||
| document.querySelector("#cookieConsent button[data-cookie-string]").addEventListener("click", function (el) { | ||
| document.cookie = el.target.dataset.cookieString; | ||
| document.querySelector("#cookieConsent").classList.add("hidden"); | ||
| }, false); | ||
| })(); | ||
| </script> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>@ViewData["Title"] - WebSample</title> | ||
|
|
||
| <environment include="Development"> | ||
| <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" /> | ||
| <link rel="stylesheet" href="~/css/site.css" /> | ||
| </environment> | ||
| <environment exclude="Development"> | ||
| <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" | ||
| asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css" | ||
| asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" /> | ||
| <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" /> | ||
| </environment> | ||
| </head> | ||
| <body> | ||
|
|
||
| <partial name="_CookieConsentPartial" /> | ||
|
|
||
| <div class="container body-content"> | ||
| @RenderBody() | ||
| <hr /> | ||
| </div> | ||
|
|
||
| <environment include="Development"> | ||
| <script src="~/lib/jquery/dist/jquery.js"></script> | ||
| <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script> | ||
| <script src="~/js/site.js" asp-append-version="true"></script> | ||
| </environment> | ||
| <environment exclude="Development"> | ||
| <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.3.1.min.js" | ||
| asp-fallback-src="~/lib/jquery/dist/jquery.min.js" | ||
| asp-fallback-test="window.jQuery" | ||
| crossorigin="anonymous" | ||
| integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT"> | ||
| </script> | ||
| <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" | ||
| asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js" | ||
| asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal" | ||
| crossorigin="anonymous" | ||
| integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd"> | ||
| </script> | ||
| <script src="~/js/site.min.js" asp-append-version="true"></script> | ||
| </environment> | ||
|
|
||
| @RenderSection("Scripts", required: false) | ||
| </body> | ||
| </html> |
18 changes: 18 additions & 0 deletions
18
samples/AspNetCore/WebSample/Pages/Shared/_ValidationScriptsPartial.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <environment include="Development"> | ||
| <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script> | ||
| <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script> | ||
| </environment> | ||
| <environment exclude="Development"> | ||
| <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.17.0/jquery.validate.min.js" | ||
| asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js" | ||
| asp-fallback-test="window.jQuery && window.jQuery.validator" | ||
| crossorigin="anonymous" | ||
| integrity="sha384-rZfj/ogBloos6wzLGpPkkOr/gpkBNLZ6b6yLy4o+ok+t/SAKlL5mvXLr0OXNi1Hp"> | ||
| </script> | ||
| <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js" | ||
| asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" | ||
| asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive" | ||
| crossorigin="anonymous" | ||
| integrity="sha384-ifv0TYDWxBHzvAk2Z0n8R434FL1Rlv/Av18DXE43N/1rvHyOG4izKst0f2iSLdds"> | ||
| </script> | ||
| </environment> |
3 changes: 2 additions & 1 deletion
3
...tCore/WebSample/Views/_ViewImports.cshtml → ...tCore/WebSample/Pages/_ViewImports.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| @using WebSample | ||
| @using WebSample | ||
| @namespace WebSample.Pages | ||
| @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.