From 70d7cc95a446ac35be5cd0c0b830de32c80381fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= Date: Wed, 26 Sep 2018 18:12:52 +0200 Subject: [PATCH] Migrate WebMVC app to bootstrap 4 --- src/Web/WebMVC/Views/Campaigns/Details.cshtml | 14 ++--- src/Web/WebMVC/Views/Campaigns/Index.cshtml | 36 +++++++------ .../WebMVC/Views/Campaigns/_campaign.cshtml | 14 ++--- src/Web/WebMVC/Views/Order/Create.cshtml | 2 +- src/Web/WebMVC/Views/Order/Detail.cshtml | 46 ++++++++-------- src/Web/WebMVC/Views/Order/Index.cshtml | 22 ++++---- src/Web/WebMVC/Views/Order/_OrderItems.cshtml | 18 +++---- .../WebMVC/Views/OrderManagement/Index.cshtml | 20 +++---- .../Shared/Components/CartList/Default.cshtml | 53 +++++++++---------- src/Web/WebMVC/Views/Shared/_Layout.cshtml | 4 +- src/Web/WebMVC/WebMVC.csproj | 1 + src/Web/WebMVC/libman.json | 18 +------ src/Web/WebMVC/wwwroot/css/app.component.css | 4 ++ .../WebMVC/wwwroot/css/app.component.min.css | 2 +- src/Web/WebMVC/wwwroot/css/app.component.scss | 4 ++ .../css/campaigns/campaigns.component.css | 7 +++ .../wwwroot/css/catalog/catalog.component.css | 1 + .../css/catalog/catalog.component.min.css | 2 +- .../css/catalog/catalog.component.scss | 1 + 19 files changed, 137 insertions(+), 132 deletions(-) diff --git a/src/Web/WebMVC/Views/Campaigns/Details.cshtml b/src/Web/WebMVC/Views/Campaigns/Details.cshtml index 2cb2648b6..df3b600e1 100644 --- a/src/Web/WebMVC/Views/Campaigns/Details.cshtml +++ b/src/Web/WebMVC/Views/Campaigns/Details.cshtml @@ -15,14 +15,14 @@
Card image cap -
+

@Model.Name

-

@Model.Description

-

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

+

@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..7bfe7edd5 100644 --- a/src/Web/WebMVC/Views/Campaigns/Index.cshtml +++ b/src/Web/WebMVC/Views/Campaigns/Index.cshtml @@ -27,24 +27,28 @@
UPDATE USER LOCATION
+
+
+ - - - -
-
Lat
- -
+
+
+ Lat +
+ +
-
-
Lon
- -
- -
- -
-
+
+
+ Lon +
+ +
+ +
+ +
+

diff --git a/src/Web/WebMVC/Views/Campaigns/_campaign.cshtml b/src/Web/WebMVC/Views/Campaigns/_campaign.cshtml index c0a074b12..260e76555 100644 --- a/src/Web/WebMVC/Views/Campaigns/_campaign.cshtml +++ b/src/Web/WebMVC/Views/Campaigns/_campaign.cshtml @@ -1,9 +1,10 @@ @model CampaignItem -
-
+ +
+ @Model.Name +

@Model.Name

- @Model.Name @if (ViewBag.IsCampaignDetailFunctionActive == true) { @@ -11,11 +12,12 @@ else { - } + }
-
+
From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy")
- +
+ diff --git a/src/Web/WebMVC/Views/Order/Create.cshtml b/src/Web/WebMVC/Views/Order/Create.cshtml index 24a987fa9..d9b06c67f 100644 --- a/src/Web/WebMVC/Views/Order/Create.cshtml +++ b/src/Web/WebMVC/Views/Order/Create.cshtml @@ -87,7 +87,7 @@ @await Html.PartialAsync("_OrderItems")
-
+
diff --git a/src/Web/WebMVC/Views/Order/Detail.cshtml b/src/Web/WebMVC/Views/Order/Detail.cshtml index 810a59559..5b7dadf25 100644 --- a/src/Web/WebMVC/Views/Order/Detail.cshtml +++ b/src/Web/WebMVC/Views/Order/Detail.cshtml @@ -13,51 +13,51 @@
-
Order number
-
Date
-
Total
-
Status
+
Order number
+
Date
+
Total
+
Status
-
@Model.OrderNumber
-
@Model.Date
-
$@Model.Total
-
@Model.Status
+
@Model.OrderNumber
+
@Model.Date
+
$@Model.Total
+
@Model.Status
-
Description
+
Description
-
@Model.Description
+
@Model.Description
-
Shiping address
+
Shiping address
-
@Model.Street
+
@Model.Street
-
@Model.City
+
@Model.City
-
@Model.Country
+
@Model.Country
-
ORDER DETAILS
+
ORDER DETAILS
@for (int i = 0; i < Model.OrderItems.Count; i++) @@ -67,23 +67,23 @@
-
@item.ProductName
-
$ @item.UnitPrice.ToString("N2")
-
@item.Units
-
$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")
+
@item.ProductName
+
$ @item.UnitPrice.ToString("N2")
+
@item.Units
+
$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")
}
-
-
TOTAL
+
+
TOTAL
-
-
$ @Model.Total
+
+
$ @Model.Total
diff --git a/src/Web/WebMVC/Views/Order/Index.cshtml b/src/Web/WebMVC/Views/Order/Index.cshtml index 524219922..43cb389c1 100644 --- a/src/Web/WebMVC/Views/Order/Index.cshtml +++ b/src/Web/WebMVC/Views/Order/Index.cshtml @@ -14,25 +14,25 @@ new Header() { Controller = "OrderManagement", Text = "Orders Management" } })
-
Order number
-
Date
-
Total
-
Status
-
+
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)
-
+
@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/Order/_OrderItems.cshtml b/src/Web/WebMVC/Views/Order/_OrderItems.cshtml index 6feaa9838..d6abe93dc 100644 --- a/src/Web/WebMVC/Views/Order/_OrderItems.cshtml +++ b/src/Web/WebMVC/Views/Order/_OrderItems.cshtml @@ -3,7 +3,7 @@
-
Order details
+
Order details
@for (int i = 0; i < Model.OrderItems.Count; i++) @@ -15,32 +15,32 @@
-
+
@item.ProductName
-
+
$ @item.UnitPrice.ToString("N2")
-
+
@item.Units
-
$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")
+
$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")
}
-
-
Total
+
+
Total
-
-
+
+
$ @Model.Total.ToString("N2")
diff --git a/src/Web/WebMVC/Views/OrderManagement/Index.cshtml b/src/Web/WebMVC/Views/OrderManagement/Index.cshtml index d108f2281..acceace31 100644 --- a/src/Web/WebMVC/Views/OrderManagement/Index.cshtml +++ b/src/Web/WebMVC/Views/OrderManagement/Index.cshtml @@ -12,21 +12,21 @@
-
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)
-
+
@Html.DisplayFor(modelItem => item.OrderNumber)
+
@Html.DisplayFor(modelItem => item.Date)
+
$ @Html.DisplayFor(modelItem => item.Total)
+
@Html.DisplayFor(modelItem => item.Status)
+
- -
-
$ @Math.Round(item.Quantity * item.UnitPrice, 2).ToString("N2")
-
-
- -
-
+
+
+ +
+
@item.ProductName
+
$ @item.UnitPrice.ToString("N2")
+
+ + +
+
$ @Math.Round(item.Quantity * item.UnitPrice, 2).ToString("N2")
+
@if (item.OldUnitPrice != 0) @@ -63,21 +58,21 @@
-
-
Total
+
+
Total
-
-
$ @Model.Total()
+
+
$ @Model.Total()
-
-
+
+
-
+
diff --git a/src/Web/WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml index 8e3c4ffb2..8e874bd33 100644 --- a/src/Web/WebMVC/Views/Shared/_Layout.cshtml +++ b/src/Web/WebMVC/Views/Shared/_Layout.cshtml @@ -32,11 +32,11 @@ -
+
-
+
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index dc095876e..a753b7bf4 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -20,6 +20,7 @@ + diff --git a/src/Web/WebMVC/libman.json b/src/Web/WebMVC/libman.json index b5d65aac0..ce37e055b 100644 --- a/src/Web/WebMVC/libman.json +++ b/src/Web/WebMVC/libman.json @@ -8,28 +8,14 @@ }, { "provider": "unpkg", - "library": "bootstrap@3.3.7", + "library": "bootstrap@4.1.3", "files": [ "dist/css/bootstrap.css", "dist/css/bootstrap.css.map", "dist/css/bootstrap.min.css", "dist/css/bootstrap.min.css.map", - "dist/css/bootstrap-theme.css", - "dist/css/bootstrap-theme.css.map", - "dist/css/bootstrap-theme.min.css", - "dist/css/bootstrap-theme.min.css.map", - "dist/fonts/glyphicons-halflings-regular.eot", - "dist/fonts/glyphicons-halflings-regular.svg", - "dist/fonts/glyphicons-halflings-regular.ttf", - "dist/fonts/glyphicons-halflings-regular.woff", - "dist/fonts/glyphicons-halflings-regular.woff2", "dist/js/bootstrap.js", - "dist/js/bootstrap.min.js", - "fonts/glyphicons-halflings-regular.eot", - "fonts/glyphicons-halflings-regular.svg", - "fonts/glyphicons-halflings-regular.ttf", - "fonts/glyphicons-halflings-regular.woff", - "fonts/glyphicons-halflings-regular.woff2" + "dist/js/bootstrap.min.js" ], "destination": "wwwroot/lib/bootstrap/" }, diff --git a/src/Web/WebMVC/wwwroot/css/app.component.css b/src/Web/WebMVC/wwwroot/css/app.component.css index 174f86d42..92c89ff48 100644 --- a/src/Web/WebMVC/wwwroot/css/app.component.css +++ b/src/Web/WebMVC/wwwroot/css/app.component.css @@ -12,3 +12,7 @@ width: 230px; } +.esh-app-header { + margin: 15px; +} + diff --git a/src/Web/WebMVC/wwwroot/css/app.component.min.css b/src/Web/WebMVC/wwwroot/css/app.component.min.css index fc9af00e8..025695c38 100644 --- a/src/Web/WebMVC/wwwroot/css/app.component.min.css +++ b/src/Web/WebMVC/wwwroot/css/app.component.min.css @@ -1 +1 @@ -.esh-app-footer{background-color:#000;border-top:1px solid #eee;margin-top:2.5rem;padding-bottom:2.5rem;padding-top:2.5rem;width:100%;}.esh-app-footer-brand{height:50px;width:230px;} \ No newline at end of file +.esh-app-footer{background-color:#000;border-top:1px solid #eee;margin-top:2.5rem;padding-bottom:2.5rem;padding-top:2.5rem;width:100%;}.esh-app-footer-brand{height:50px;width:230px;}.esh-app-header{margin:15px;} \ No newline at end of file diff --git a/src/Web/WebMVC/wwwroot/css/app.component.scss b/src/Web/WebMVC/wwwroot/css/app.component.scss index e823b6f32..ce15d34e7 100644 --- a/src/Web/WebMVC/wwwroot/css/app.component.scss +++ b/src/Web/WebMVC/wwwroot/css/app.component.scss @@ -20,4 +20,8 @@ } } + + &-header{ + margin:15px; + } } \ No newline at end of file diff --git a/src/Web/WebMVC/wwwroot/css/campaigns/campaigns.component.css b/src/Web/WebMVC/wwwroot/css/campaigns/campaigns.component.css index af3c6a899..e65758db7 100644 --- a/src/Web/WebMVC/wwwroot/css/campaigns/campaigns.component.css +++ b/src/Web/WebMVC/wwwroot/css/campaigns/campaigns.component.css @@ -73,6 +73,12 @@ width: 80%; } +.esh-campaigns-card-footer-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + .esh-campaigns-form-button { background-color: #83D01B; border: none; @@ -81,6 +87,7 @@ font-size: 1rem; transition: all 0.35s; width: 80%; + margin-top: -15px; } .esh-campaigns-button.is-disabled { diff --git a/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.css b/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.css index 69794babb..749e79ed6 100644 --- a/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.css +++ b/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.css @@ -71,6 +71,7 @@ margin-top: -1.5rem; padding: 0.5rem; transition: all 0.35s; + margin-bottom: -6px; } .esh-catalog-send:hover { diff --git a/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.min.css b/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.min.css index f376f59e0..963374e1e 100644 --- a/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.min.css +++ b/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.min.css @@ -1 +1 @@ -.esh-catalog-hero{background-image:url("../../images/main_banner.png");background-size:cover;height:260px;width:100%;}.esh-catalog-title{position:relative;top:74.28571px;}.esh-catalog-filters{background-color:#00a69c;height:65px;}.esh-catalog-filter{-webkit-appearance:none;background-color:transparent;border-color:#00d9cc;color:#fff;cursor:pointer;margin-right:1rem;margin-top:.5rem;min-width:140px;outline-color:#83d01b;padding-bottom:0;padding-left:.5rem;padding-right:.5rem;padding-top:1.5rem;}.esh-catalog-filter option{background-color:#00a69c;}.esh-catalog-label{display:inline-block;position:relative;z-index:0;}.esh-catalog-label::before{color:rgba(255,255,255,.5);content:attr(data-title);font-size:.65rem;margin-left:.5rem;margin-top:.65rem;position:absolute;text-transform:uppercase;z-index:1;}.esh-catalog-label::after{background-image:url("../../images/arrow-down.png");content:'';height:7px;position:absolute;right:1.5rem;top:2.5rem;width:10px;z-index:1;}.esh-catalog-send{background-color:#83d01b;color:#fff;cursor:pointer;font-size:1rem;margin-top:-1.5rem;padding:.5rem;transition:all .35s;}.esh-catalog-send:hover{background-color:#4a760f;transition:all .35s;}.esh-catalog-items{margin-top:1rem;}.esh-catalog-item{margin-bottom:1.5rem;text-align:center;width:33%;display:inline-block;float:none !important;}@media screen and (max-width:1024px){.esh-catalog-item{width:50%;}}@media screen and (max-width:768px){.esh-catalog-item{width:100%;}}.esh-catalog-thumbnail{max-width:370px;width:100%;}.esh-catalog-button{background-color:#83d01b;border:0;color:#fff;cursor:pointer;font-size:1rem;height:3rem;margin-top:1rem;transition:all .35s;width:80%;}.esh-catalog-button.is-disabled{opacity:.5;pointer-events:none;}.esh-catalog-button:hover{background-color:#4a760f;transition:all .35s;}.esh-catalog-name{font-size:1rem;font-weight:300;margin-top:.5rem;text-align:center;text-transform:uppercase;}.esh-catalog-price{font-size:28px;font-weight:900;text-align:center;}.esh-catalog-price::before{content:'$';} \ No newline at end of file +.esh-catalog-hero{background-image:url("../../images/main_banner.png");background-size:cover;height:260px;width:100%;}.esh-catalog-title{position:relative;top:74.28571px;}.esh-catalog-filters{background-color:#00a69c;height:65px;}.esh-catalog-filter{-webkit-appearance:none;background-color:transparent;border-color:#00d9cc;color:#fff;cursor:pointer;margin-right:1rem;margin-top:.5rem;min-width:140px;outline-color:#83d01b;padding-bottom:0;padding-left:.5rem;padding-right:.5rem;padding-top:1.5rem;}.esh-catalog-filter option{background-color:#00a69c;}.esh-catalog-label{display:inline-block;position:relative;z-index:0;}.esh-catalog-label::before{color:rgba(255,255,255,.5);content:attr(data-title);font-size:.65rem;margin-left:.5rem;margin-top:.65rem;position:absolute;text-transform:uppercase;z-index:1;}.esh-catalog-label::after{background-image:url("../../images/arrow-down.png");content:'';height:7px;position:absolute;right:1.5rem;top:2.5rem;width:10px;z-index:1;}.esh-catalog-send{background-color:#83d01b;color:#fff;cursor:pointer;font-size:1rem;margin-top:-1.5rem;padding:.5rem;transition:all .35s;margin-bottom:-6px;}.esh-catalog-send:hover{background-color:#4a760f;transition:all .35s;}.esh-catalog-items{margin-top:1rem;}.esh-catalog-item{margin-bottom:1.5rem;text-align:center;width:33%;display:inline-block;float:none !important;}@media screen and (max-width:1024px){.esh-catalog-item{width:50%;}}@media screen and (max-width:768px){.esh-catalog-item{width:100%;}}.esh-catalog-thumbnail{max-width:370px;width:100%;}.esh-catalog-button{background-color:#83d01b;border:0;color:#fff;cursor:pointer;font-size:1rem;height:3rem;margin-top:1rem;transition:all .35s;width:80%;}.esh-catalog-button.is-disabled{opacity:.5;pointer-events:none;}.esh-catalog-button:hover{background-color:#4a760f;transition:all .35s;}.esh-catalog-name{font-size:1rem;font-weight:300;margin-top:.5rem;text-align:center;text-transform:uppercase;}.esh-catalog-price{font-size:28px;font-weight:900;text-align:center;}.esh-catalog-price::before{content:'$';} \ No newline at end of file diff --git a/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.scss b/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.scss index 56291fdd2..bcf0377d2 100644 --- a/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.scss +++ b/src/Web/WebMVC/wwwroot/css/catalog/catalog.component.scss @@ -80,6 +80,7 @@ margin-top: -$filter-padding * 3; padding: $filter-padding; transition: all $animation-speed-default; + margin-bottom: -6px; &:hover { background-color: $color-secondary-darker;