From 2ab390fa6ddb5a206a9b7223e315ee28661d5db6 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 29 May 2018 13:35:14 -0400 Subject: [PATCH] Using partial Tag Helper --- eShopOnWeb.sln | 7 ++++++- src/Web/Views/Account/LoginWith2fa.cshtml | 2 +- src/Web/Views/Catalog/Index.cshtml | 6 +++--- src/Web/Views/Manage/ChangePassword.cshtml | 4 ++-- src/Web/Views/Manage/EnableAuthenticator.cshtml | 2 +- src/Web/Views/Manage/ExternalLogins.cshtml | 3 +-- src/Web/Views/Manage/Index.cshtml | 4 ++-- src/Web/Views/Manage/SetPassword.cshtml | 4 ++-- src/Web/Views/Manage/TwoFactorAuthentication.cshtml | 2 +- src/Web/Views/Manage/_Layout.cshtml | 2 +- src/Web/Views/Shared/_Layout.cshtml | 2 +- src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml | 4 ++-- .../Pages/Account/LoginWithRecoveryCode.cshtml | 8 ++++---- .../Pages/Account/Manage/ChangePassword.cshtml | 2 +- .../Pages/Account/Manage/EnableAuthenticator.cshtml | 2 +- src/WebRazorPages/Pages/Account/Manage/Index.cshtml | 2 +- src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml | 2 +- .../Pages/Account/Manage/TwoFactorAuthentication.cshtml | 2 +- src/WebRazorPages/Pages/Account/Manage/_Layout.cshtml | 2 +- src/WebRazorPages/Pages/_Layout.cshtml | 2 +- 20 files changed, 34 insertions(+), 30 deletions(-) diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln index 0fce56b..ab44fde 100644 --- a/eShopOnWeb.sln +++ b/eShopOnWeb.sln @@ -19,7 +19,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "tests\I EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "tests\FunctionalTests\FunctionalTests.csproj", "{7EFB5482-F942-4C3D-94B0-9B70596E6D0A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebRazorPages", "src\WebRazorPages\WebRazorPages.csproj", "{3CA62E98-218E-4A74-BF79-1098900BD421}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRazorPages", "src\WebRazorPages\WebRazorPages.csproj", "{3CA62E98-218E-4A74-BF79-1098900BD421}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0BD72BEA-EF42-4B72-8B69-12A39EC76FBA}" + ProjectSection(SolutionItems) = preProject + docker-compose.yml = docker-compose.yml + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Web/Views/Account/LoginWith2fa.cshtml b/src/Web/Views/Account/LoginWith2fa.cshtml index 2b5097a..39f4443 100644 --- a/src/Web/Views/Account/LoginWith2fa.cshtml +++ b/src/Web/Views/Account/LoginWith2fa.cshtml @@ -36,5 +36,5 @@

@section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } \ No newline at end of file diff --git a/src/Web/Views/Catalog/Index.cshtml b/src/Web/Views/Catalog/Index.cshtml index 228e4c6..76db5ce 100644 --- a/src/Web/Views/Catalog/Index.cshtml +++ b/src/Web/Views/Catalog/Index.cshtml @@ -26,18 +26,18 @@ @if (Model.CatalogItems.Any()) { - @Html.Partial("_pagination", Model.PaginationInfo) +
@foreach (var catalogItem in Model.CatalogItems) {
- @Html.Partial("_product", catalogItem) +
}
- @Html.Partial("_pagination", Model.PaginationInfo) + } else { diff --git a/src/Web/Views/Manage/ChangePassword.cshtml b/src/Web/Views/Manage/ChangePassword.cshtml index 0f7b041..aad7035 100644 --- a/src/Web/Views/Manage/ChangePassword.cshtml +++ b/src/Web/Views/Manage/ChangePassword.cshtml @@ -5,7 +5,7 @@ }

@ViewData["Title"]

-@Html.Partial("_StatusMessage", Model.StatusMessage) +
@@ -31,5 +31,5 @@
@section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/Web/Views/Manage/EnableAuthenticator.cshtml b/src/Web/Views/Manage/EnableAuthenticator.cshtml index 79693d7..9c17ea9 100644 --- a/src/Web/Views/Manage/EnableAuthenticator.cshtml +++ b/src/Web/Views/Manage/EnableAuthenticator.cshtml @@ -48,5 +48,5 @@
@section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/Web/Views/Manage/ExternalLogins.cshtml b/src/Web/Views/Manage/ExternalLogins.cshtml index e6f5687..5256156 100644 --- a/src/Web/Views/Manage/ExternalLogins.cshtml +++ b/src/Web/Views/Manage/ExternalLogins.cshtml @@ -3,8 +3,7 @@ ViewData["Title"] = "Manage your external logins"; ViewData.AddActivePage(ManageNavPages.ExternalLogins); } - -@Html.Partial("_StatusMessage", Model.StatusMessage) + @if (Model.CurrentLogins?.Count > 0) {

Registered Logins

diff --git a/src/Web/Views/Manage/Index.cshtml b/src/Web/Views/Manage/Index.cshtml index c141c95..fff740a 100644 --- a/src/Web/Views/Manage/Index.cshtml +++ b/src/Web/Views/Manage/Index.cshtml @@ -5,7 +5,7 @@ }

@ViewData["Title"]

-@Html.Partial("_StatusMessage", Model.StatusMessage) +
@@ -41,5 +41,5 @@
@section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/Web/Views/Manage/SetPassword.cshtml b/src/Web/Views/Manage/SetPassword.cshtml index 56c3599..ce66f61 100644 --- a/src/Web/Views/Manage/SetPassword.cshtml +++ b/src/Web/Views/Manage/SetPassword.cshtml @@ -5,7 +5,7 @@ }

Set your password

-@Html.Partial("_StatusMessage", Model.StatusMessage) +

You do not have a local username/password for this site. Add a local account so you can log in without an external login. @@ -30,5 +30,5 @@

@section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/Web/Views/Manage/TwoFactorAuthentication.cshtml b/src/Web/Views/Manage/TwoFactorAuthentication.cshtml index a2b52ac..8e75bab 100644 --- a/src/Web/Views/Manage/TwoFactorAuthentication.cshtml +++ b/src/Web/Views/Manage/TwoFactorAuthentication.cshtml @@ -45,5 +45,5 @@ else } @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/Web/Views/Manage/_Layout.cshtml b/src/Web/Views/Manage/_Layout.cshtml index 95dc87d..29c4875 100644 --- a/src/Web/Views/Manage/_Layout.cshtml +++ b/src/Web/Views/Manage/_Layout.cshtml @@ -9,7 +9,7 @@
- @await Html.PartialAsync("_ManageNav") +
@RenderBody() diff --git a/src/Web/Views/Shared/_Layout.cshtml b/src/Web/Views/Shared/_Layout.cshtml index c3b370d..1b71248 100644 --- a/src/Web/Views/Shared/_Layout.cshtml +++ b/src/Web/Views/Shared/_Layout.cshtml @@ -32,7 +32,7 @@ eShop On Web - @await Html.PartialAsync("_LoginPartial") +
diff --git a/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml b/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml index 032ecd9..c960eb8 100644 --- a/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml +++ b/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml @@ -32,10 +32,10 @@

- Don't have access to your authenticator device? You can + Don't have access to your authenticator device? You can log in with a recovery code.

@section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } \ No newline at end of file diff --git a/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml b/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml index 23e1a3a..abaad2a 100644 --- a/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml +++ b/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml @@ -1,5 +1,5 @@ @page -@model LoginWithRecoveryCodeModel +@model LoginWithRecoveryCodeModel @{ ViewData["Title"] = "Recovery code verification"; } @@ -23,7 +23,7 @@ - - @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + +@section Scripts { + } \ No newline at end of file diff --git a/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml b/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml index 7070c8c..5fbe315 100644 --- a/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml +++ b/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml @@ -31,5 +31,5 @@ @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml b/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml index 1d68558..24039cf 100644 --- a/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml +++ b/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml @@ -49,5 +49,5 @@ @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/WebRazorPages/Pages/Account/Manage/Index.cshtml b/src/WebRazorPages/Pages/Account/Manage/Index.cshtml index 681c9ec..78a58e8 100644 --- a/src/WebRazorPages/Pages/Account/Manage/Index.cshtml +++ b/src/WebRazorPages/Pages/Account/Manage/Index.cshtml @@ -41,5 +41,5 @@ @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml b/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml index 8b7dd7f..a85ccac 100644 --- a/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml +++ b/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml @@ -31,5 +31,5 @@ @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml index fabe199..19ba8da 100644 --- a/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml +++ b/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml @@ -45,5 +45,5 @@ else } @section Scripts { - @await Html.PartialAsync("_ValidationScriptsPartial") + } diff --git a/src/WebRazorPages/Pages/Account/Manage/_Layout.cshtml b/src/WebRazorPages/Pages/Account/Manage/_Layout.cshtml index c3f24b6..119c7c0 100644 --- a/src/WebRazorPages/Pages/Account/Manage/_Layout.cshtml +++ b/src/WebRazorPages/Pages/Account/Manage/_Layout.cshtml @@ -9,7 +9,7 @@
- @await Html.PartialAsync("_ManageNav") +
@RenderBody() diff --git a/src/WebRazorPages/Pages/_Layout.cshtml b/src/WebRazorPages/Pages/_Layout.cshtml index 1a89b6a..970be6f 100644 --- a/src/WebRazorPages/Pages/_Layout.cshtml +++ b/src/WebRazorPages/Pages/_Layout.cshtml @@ -32,7 +32,7 @@ eShop On Web - @await Html.PartialAsync("_LoginPartial") +