diff --git a/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml index 03f026bda..81b1b018e 100644 --- a/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml +++ b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml @@ -1,82 +1,82 @@ @model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.ConsentViewModel
-
-
- @if (Model.ClientLogoUrl != null) - { - - } -

- @Model.ClientName - is requesting your permission -

-
-
+
+
+ @if (Model.ClientLogoUrl != null) + { + + } +

+ @Model.ClientName + is requesting your permission +

+
+
-
-
- @Html.Partial("_ValidationSummary") +
+
+ -
- + + -
Uncheck the permissions you do not wish to grant.
- - @if (Model.IdentityScopes.Any()) - { -
-
- - Personal Information -
-
    - @foreach (var scope in Model.IdentityScopes) - { - @Html.Partial("_ScopeListItem", scope) - } -
-
- } +
Uncheck the permissions you do not wish to grant.
- @if (Model.ResourceScopes.Any()) - { -
-
- - Application Access -
-
    - @foreach (var scope in Model.ResourceScopes) - { - @Html.Partial("_ScopeListItem", scope) - } -
-
- } + @if (Model.IdentityScopes.Any()) + { +
+
+ + Personal Information +
+
    + @foreach (var scope in Model.IdentityScopes) + { + + } +
+
+ } - @if (Model.AllowRememberConsent) - { -
- -
- } + @if (Model.ResourceScopes.Any()) + { +
+
+ + Application Access +
+
    + @foreach (var scope in Model.ResourceScopes) + { + + } +
+
+ } -
- - - @if (Model.ClientUrl != null) - { - - - @Model.ClientName - - } -
-
-
-
+ @if (Model.AllowRememberConsent) + { +
+ +
+ } + +
+ + + @if (Model.ClientUrl != null) + { + + + @Model.ClientName + + } +
+ +
+
\ No newline at end of file diff --git a/src/Web/WebMVC/Views/Campaigns/Details.cshtml b/src/Web/WebMVC/Views/Campaigns/Details.cshtml index 2cb2648b6..3be60d019 100644 --- a/src/Web/WebMVC/Views/Campaigns/Details.cshtml +++ b/src/Web/WebMVC/Views/Campaigns/Details.cshtml @@ -1,28 +1,30 @@ @{ - ViewData["Title"] = "Campaign details"; - @model CampaignItem + ViewData["Title"] = "Campaign details"; + @model CampaignItem + ICollection
headers = new List
{ + new Header { Controller = "Catalog", Text = "Back to catalog" }, + new Header { Controller = "Campaigns", Text = "Back to Campaigns" } + }; }
-
- -
+
+ +
-@Html.Partial("_Header", new List
() { - new Header() { Controller = "Catalog", Text = "Back to catalog" }, - new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } }) +
-
- Card image cap -
-

@Model.Name

-

@Model.Description

-

- - From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy") - -

-
-
+
+ Card image cap +
+

@Model.Name

+

@Model.Description

+

+ + From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy") + +

+
+
\ No newline at end of file diff --git a/src/Web/WebMVC/Views/Campaigns/Index.cshtml b/src/Web/WebMVC/Views/Campaigns/Index.cshtml index a26c6e9f3..7ac5f283f 100644 --- a/src/Web/WebMVC/Views/Campaigns/Index.cshtml +++ b/src/Web/WebMVC/Views/Campaigns/Index.cshtml @@ -1,72 +1,74 @@ @{ - ViewData["Title"] = "Campaigns"; -@model WebMVC.ViewModels.CampaignViewModel + ViewData["Title"] = "Campaigns"; + @model WebMVC.ViewModels.CampaignViewModel + ICollection
headers = new List
{ + new Header { Controller = "Catalog", Text = "Back to catalog" } + }; }
-
- -
+
+ +
-@Html.Partial("_Header", new List
() { - new Header() { Controller = "Catalog", Text = "Back to catalog" } }) +
-
-
- - @if (!ViewData.ModelState.IsValid) - { -
- @Html.ValidationSummary(false) -
- } +
+
-
-
- UPDATE USER LOCATION -
+ @if (!ViewData.ModelState.IsValid) + { +
+ @Html.ValidationSummary(false) +
+ } -
- - -
-
Lat
- -
+
+
+ UPDATE USER LOCATION +
-
-
Lon
- -
- -
- -
- -
-
-
- @if (Model != null && Model.CampaignItems !=null && Model.CampaignItems.Any()) - { -
- @foreach (var catalogItem in Model.CampaignItems) - { -
- @Html.Partial("_campaign", catalogItem) -
- } -
+
+ - @Html.Partial("_pagination", Model.PaginationInfo) - } - else - { -
- THERE ARE NO CAMPAIGNS -
- } +
+
Lat
+ +
+ +
+
Lon
+ +
+ +
+ +
+
+
+
+
+ @if (Model != null && Model.CampaignItems != null && Model.CampaignItems.Any()) + { +
+ @foreach (var catalogItem in Model.CampaignItems) + { +
+ +
+ } +
+ + + } + else + { +
+ THERE ARE NO CAMPAIGNS +
+ }
diff --git a/src/Web/WebMVC/Views/Cart/Index.cshtml b/src/Web/WebMVC/Views/Cart/Index.cshtml index d9386a1fd..671e47572 100644 --- a/src/Web/WebMVC/Views/Cart/Index.cshtml +++ b/src/Web/WebMVC/Views/Cart/Index.cshtml @@ -5,14 +5,16 @@ @inject IIdentityParser UserManager @{ - ViewData["Title"] = "My Cart"; + ViewData["Title"] = "My Cart"; + ICollection
headers = new List
{ + new Header { Controller = "Catalog", Text = "Back to catalog" } + }; }
-
- @Html.Partial("_Header", new List
() { - new Header() { Controller = "Catalog", Text = "Back to catalog" } }) +
+ - @await Component.InvokeAsync("CartList", new { user = UserManager.Parse(User) }) -
+ @await Component.InvokeAsync("CartList", new { user = UserManager.Parse(User) }) +
diff --git a/src/Web/WebMVC/Views/Catalog/Index.cshtml b/src/Web/WebMVC/Views/Catalog/Index.cshtml index c2ef7f367..cab49e630 100644 --- a/src/Web/WebMVC/Views/Catalog/Index.cshtml +++ b/src/Web/WebMVC/Views/Catalog/Index.cshtml @@ -1,57 +1,57 @@ @{ - ViewData["Title"] = "Catalog"; - @model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel + ViewData["Title"] = "Catalog"; + @model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel }
-
- -
+
+ +
-
-
- - - -
-
+
+
+ + + +
+
-
-
- @if(ViewBag.BasketInoperativeMsg != null) - { - - } -
+
+
+ @if (ViewBag.BasketInoperativeMsg != null) + { + + } +
- @if (Model.CatalogItems.Count() > 0) - { - @Html.Partial("_pagination", Model.PaginationInfo) + @if (Model.CatalogItems.Count() > 0) + { + -
- @foreach (var catalogItem in Model.CatalogItems) - { -
- @Html.Partial("_product", catalogItem) -
- } -
+
+ @foreach (var catalogItem in Model.CatalogItems) + { +
+ +
+ } +
- @Html.Partial("_pagination", Model.PaginationInfo) - } - else - { -
- THERE ARE NO RESULTS THAT MATCH YOUR SEARCH -
- } + + } + else + { +
+ THERE ARE NO RESULTS THAT MATCH YOUR SEARCH +
+ }
diff --git a/src/Web/WebMVC/Views/Order/Create.cshtml b/src/Web/WebMVC/Views/Order/Create.cshtml index 24a987fa9..55f0e182c 100644 --- a/src/Web/WebMVC/Views/Order/Create.cshtml +++ b/src/Web/WebMVC/Views/Order/Create.cshtml @@ -3,103 +3,107 @@ @inject IIdentityParser UserManager @{ - ViewData["Title"] = "New Order"; + ViewData["Title"] = "New Order"; + ICollection
headers = new List
{ + new Header { Controller = "Cart", Text = "Back to cart" } + }; } -@Html.Partial("_Header", new List
() { - new Header() { Controller = "Cart", Text = "Back to cart" } }) + +
-
-
-
- @foreach (var error in ViewData.ModelState.Values.SelectMany(err => err.Errors)) { - - } -
-

Shipping address

-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-

Payment method

-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
+ +
+
+ @foreach (var error in ViewData.ModelState.Values.SelectMany(err => err.Errors)) + { + + } +
+

Shipping address

+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+

Payment method

+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + - @await Html.PartialAsync("_OrderItems") - -
-
-
-
-
- -
-
-
- - - +
+
+
+
+
+ +
+
+
+ + +
@section Scripts { - @{await Html.RenderPartialAsync("_ValidationScriptsPartial");} + } diff --git a/src/Web/WebMVC/Views/Order/Detail.cshtml b/src/Web/WebMVC/Views/Order/Detail.cshtml index 810a59559..a2a481395 100644 --- a/src/Web/WebMVC/Views/Order/Detail.cshtml +++ b/src/Web/WebMVC/Views/Order/Detail.cshtml @@ -3,88 +3,90 @@ @model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order @{ - ViewData["Title"] = "Order Detail"; + ViewData["Title"] = "Order Detail"; + ICollection
headers = new List
{ + new Header { Controller = "Catalog", Text = "Back to catalog" } + }; }
- @Html.Partial("_Header", new List
() { - new Header() { Controller = "Catalog", Text = "Back to catalog" } }) + -
-
-
-
Order number
-
Date
-
Total
-
Status
-
+
+
+
+
Order number
+
Date
+
Total
+
Status
+
-
-
@Model.OrderNumber
-
@Model.Date
-
$@Model.Total
-
@Model.Status
-
-
- -
-
-
Description
-
+
+
@Model.OrderNumber
+
@Model.Date
+
$@Model.Total
+
@Model.Status
+
+
-
-
@Model.Description
-
-
+
+
+
Description
+
-
-
-
Shiping address
-
+
+
@Model.Description
+
+
-
-
@Model.Street
-
+
+
+
Shiping address
+
-
-
@Model.City
-
+
+
@Model.Street
+
-
-
@Model.Country
-
-
+
+
@Model.City
+
-
-
-
ORDER DETAILS
-
+
+
@Model.Country
+
+
- @for (int i = 0; i < Model.OrderItems.Count; i++) - { - var item = Model.OrderItems[i]; -
-
- -
-
@item.ProductName
-
$ @item.UnitPrice.ToString("N2")
-
@item.Units
-
$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")
-
- } -
+
+
+
ORDER DETAILS
+
-
-
-
-
TOTAL
-
+ @for (int i = 0; i < Model.OrderItems.Count; i++) + { + var item = Model.OrderItems[i]; +
+
+ +
+
@item.ProductName
+
$ @item.UnitPrice.ToString("N2")
+
@item.Units
+
$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")
+
+ } +
-
-
-
$ @Model.Total
-
-
-
+
+
+
+
TOTAL
+
+ +
+
+
$ @Model.Total
+
+
+
diff --git a/src/Web/WebMVC/Views/Order/Index.cshtml b/src/Web/WebMVC/Views/Order/Index.cshtml index 524219922..59dc27d3c 100644 --- a/src/Web/WebMVC/Views/Order/Index.cshtml +++ b/src/Web/WebMVC/Views/Order/Index.cshtml @@ -3,45 +3,47 @@ @model IEnumerable @{ - ViewData["Title"] = "My Orders"; + ViewData["Title"] = "My Orders"; + ICollection
headers = new List
{ + new Header { Controller = "Catalog", Text = "Back to catalog" }, + new Header { Text = " / " }, + new Header { Controller = "OrderManagement", Text = "Orders Management" } + }; }
- @Html.Partial("_Header", new List
() { -new Header() { Controller = "Catalog", Text = "Back to catalog" }, -new Header() { Text = " / " }, -new Header() { Controller = "OrderManagement", Text = "Orders Management" } }) + -
-
-
Order number
-
Date
-
Total
-
Status
-
-
- @if (Model != null && Model.Any()) - { - foreach (var item in Model) - { -
-
@Html.DisplayFor(modelItem => item.OrderNumber)
-
@Html.DisplayFor(modelItem => item.Date)
-
$ @Html.DisplayFor(modelItem => item.Total)
-
@Html.DisplayFor(modelItem => item.Status)
-
- Detail -
-
- @if (item.Status.ToLower() == "submitted") - { - Cancel - } -
-
- } - } -
+
+
+
Order number
+
Date
+
Total
+
Status
+
+
+ @if (Model != null && Model.Any()) + { + foreach (var item in Model) + { +
+
@Html.DisplayFor(modelItem => item.OrderNumber)
+
@Html.DisplayFor(modelItem => item.Date)
+
$ @Html.DisplayFor(modelItem => item.Total)
+
@Html.DisplayFor(modelItem => item.Status)
+
+ Detail +
+
+ @if (item.Status.ToLower() == "submitted") + { + Cancel + } +
+
+ } + } +
diff --git a/src/Web/WebMVC/Views/OrderManagement/Index.cshtml b/src/Web/WebMVC/Views/OrderManagement/Index.cshtml index d108f2281..19047fe3d 100644 --- a/src/Web/WebMVC/Views/OrderManagement/Index.cshtml +++ b/src/Web/WebMVC/Views/OrderManagement/Index.cshtml @@ -3,41 +3,43 @@ @model IEnumerable @{ - ViewData["Title"] = "My Orders"; + ViewData["Title"] = "My Orders"; + ICollection
headers = new List
{ + new Header { Controller = "Catalog", Text = "Back to catalog" } + }; }
- @Html.Partial("_Header", new List
() { - new Header() { Controller = "Catalog", Text = "Back to catalog" } }) + -
-
-
Order number
-
Date
-
Total
-
Status
-
-
+
+
+
Order number
+
Date
+
Total
+
Status
+
+
- @foreach (var item in Model) - { -
-
@Html.DisplayFor(modelItem => item.OrderNumber)
-
@Html.DisplayFor(modelItem => item.Date)
-
$ @Html.DisplayFor(modelItem => item.Total)
-
@Html.DisplayFor(modelItem => item.Status)
-
-
- - -
-
-
- } -
+ @foreach (var item in Model) + { +
+
@Html.DisplayFor(modelItem => item.OrderNumber)
+
@Html.DisplayFor(modelItem => item.Date)
+
$ @Html.DisplayFor(modelItem => item.Total)
+
@Html.DisplayFor(modelItem => item.Status)
+
+
+ + +
+
+
+ } +
\ No newline at end of file diff --git a/src/Web/WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml index 5d616afaf..cc97f5047 100644 --- a/src/Web/WebMVC/Views/Shared/_Layout.cshtml +++ b/src/Web/WebMVC/Views/Shared/_Layout.cshtml @@ -1,103 +1,103 @@  - - - @ViewData["Title"] - Microsoft.eShopOnContainers.WebMVC + + + @ViewData["Title"] - Microsoft.eShopOnContainers.WebMVC - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + -
-
-
+
+
+ -
-
+ +
+
+
- @RenderBody() + @RenderBody() -
-
-
+
+
+
-
- -
+
+ +
-
- -
+
+ +
-
-
-
+
+
+
- - - - - - - - - - + + + + + + + + + + - @RenderSection("scripts", required: false) + @RenderSection("scripts", required: false) - @using Microsoft.AspNetCore.Authentication; - @using Microsoft.Extensions.Options - @inject IOptions settings + @using Microsoft.AspNetCore.Authentication; + @using Microsoft.Extensions.Options + @inject IOptions settings - +