diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 909cf4172..4ec82286e 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -5,6 +5,7 @@ services: basket.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5103 - ConnectionString=basket.data #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. @@ -14,6 +15,7 @@ services: catalog.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5101 - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word #- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105. - ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. @@ -23,6 +25,7 @@ services: identity.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5105 - SpaClient=http://localhost:5104 - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word #- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105. @@ -33,6 +36,7 @@ services: ordering.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5102 - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. @@ -42,6 +46,7 @@ services: webspa: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5104 - CatalogUrl=http://localhost:5101 - OrderingUrl=http://localhost:5102 #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. @@ -53,6 +58,7 @@ services: webmvc: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5100 - CatalogUrl=http://catalog.api:5101 - OrderingUrl=http://ordering.api:5102 #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index a3ac96b49..d2b305ce8 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; +using System.IO; namespace Microsoft.eShopOnContainers.Services.Basket.API { @@ -15,7 +11,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5103") .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index 6226dc389..b2e338b8c 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; +using System.IO; namespace Microsoft.eShopOnContainers.Services.Catalog.API { @@ -14,7 +10,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API { var host = new WebHostBuilder() .UseKestrel() - .UseUrls("http://0.0.0.0:5101") .UseIISIntegration() .UseContentRoot(Directory.GetCurrentDirectory()) .UseWebRoot("Pics") diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index b810aae66..2f56fd38d 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -14,18 +14,17 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + + + + + + + + + @@ -66,7 +65,7 @@ - + @@ -78,4 +77,8 @@ + + + + diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 48531ae65..eb999639b 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; +using Microsoft.AspNetCore.Hosting; using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; namespace eShopOnContainers.Identity { @@ -13,7 +9,6 @@ namespace eShopOnContainers.Identity { var host = new WebHostBuilder() .UseKestrel() - .UseUrls("http://0.0.0.0:5105") .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() diff --git a/src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml b/src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml index 5086d12ec..9d0a5ce8a 100644 --- a/src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml +++ b/src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml @@ -6,8 +6,16 @@ eShopOnContainers Identity - - + + + + + + + +
diff --git a/src/Services/Identity/Identity.API/bundleconfig.json b/src/Services/Identity/Identity.API/bundleconfig.json index 7ea58bded..621a937c3 100644 --- a/src/Services/Identity/Identity.API/bundleconfig.json +++ b/src/Services/Identity/Identity.API/bundleconfig.json @@ -5,7 +5,7 @@ "outputFileName": "wwwroot/css/site.min.css", // An array of relative input file paths. Globbing patterns supported "inputFiles": [ - "wwwroot/css/site.css", + "wwwroot/css/**/*.css" ] }, { diff --git a/src/Services/Identity/Identity.API/wwwroot/css/site.css b/src/Services/Identity/Identity.API/wwwroot/css/site.css index a95381dc8..c8dcea80a 100644 --- a/src/Services/Identity/Identity.API/wwwroot/css/site.css +++ b/src/Services/Identity/Identity.API/wwwroot/css/site.css @@ -42,13 +42,13 @@ @font-face { font-family: Montserrat; font-weight: 400; - src: url("/fonts/Montserrat-Regular.eot?") format("eot"),url("/fonts/Montserrat-Regular.woff") format("woff"),url("/fonts/Montserrat-Regular.ttf") format("truetype"),url("/fonts/Montserrat-Regular.svg#Montserrat") format("svg") + src: url("../fonts/Montserrat-Regular.eot?") format("eot"),url("../fonts/Montserrat-Regular.woff") format("woff"),url("../fonts/Montserrat-Regular.ttf") format("truetype"),url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg") } @font-face { font-family: Montserrat; font-weight: 700; - src: url("/fonts/Montserrat-Bold.eot?") format("eot"),url("/fonts/Montserrat-Bold.woff") format("woff"),url("/fonts/Montserrat-Bold.ttf") format("truetype"),url("/fonts/Montserrat-Bold.svg#Montserrat") format("svg") + src: url("../fonts/Montserrat-Bold.eot?") format("eot"),url("../fonts/Montserrat-Bold.woff") format("woff"),url("../fonts/Montserrat-Bold.ttf") format("truetype"),url("../fonts/Montserrat-Bold.svg#Montserrat") format("svg") } body { diff --git a/src/Services/Identity/Identity.API/wwwroot/css/site.less b/src/Services/Identity/Identity.API/wwwroot/css/site.less deleted file mode 100644 index c0836c5c2..000000000 --- a/src/Services/Identity/Identity.API/wwwroot/css/site.less +++ /dev/null @@ -1,923 +0,0 @@ -body { - margin-top: 65px; -} - -.navbar-header { - position:relative; - top:-4px; -} - -.navbar-brand > .icon-banner { - position:relative; - top:-2px; - display:inline; -} - -.icon { - position:relative; - top:-10px; -} - -.page-consent { - .client-logo { - float: left; - - img { - width: 80px; - height: 80px; - } - } - - .consent-buttons { - margin-top: 25px; - } - - .consent-form { - .consent-scopecheck { - display: inline-block; - margin-right: 5px; - } - - .consent-scopecheck[disabled] { - //visibility:hidden; - } - - .consent-description { - margin-left: 25px; - - label { - font-weight: normal; - } - } - - .consent-remember { - padding-left: 16px; - } - } -} - -@font-face { - font-family: Montserrat; - font-weight: 400; - src: url("/fonts/Montserrat-Regular.eot?") format("eot"),url("/fonts/Montserrat-Regular.woff") format("woff"),url("/fonts/Montserrat-Regular.ttf") format("truetype"),url("/fonts/Montserrat-Regular.svg#Montserrat") format("svg") -} - -@font-face { - font-family: Montserrat; - font-weight: 700; - src: url("/fonts/Montserrat-Bold.eot?") format("eot"),url("/fonts/Montserrat-Bold.woff") format("woff"),url("/fonts/Montserrat-Bold.ttf") format("truetype"),url("/fonts/Montserrat-Bold.svg#Montserrat") format("svg") -} - -body { - font-family: Montserrat,sans-serif; - min-width:480px; -} - -.mt-15 { - margin-top:15px; -} - -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 280px; -} - -.select-filter { - background-color: transparent; - padding: 10px; - margin: 10px; - margin-right: 20px; - color: white; - padding-top: 20px; - padding-bottom: 3px; - min-width: 140px; - border-color: #37c7ca; - max-height: 43px; - -webkit-appearance: none; -} - - .select-filter option { - background-color: #00a69c; - } - -select::-ms-expand { - display: none; -} - -.select-filter-wrapper { - z-index: 0; - display:inline-block; - margin-left: -10px; -} - -.select-filter-wrapper::before { - content: attr(data-name); - opacity: 0.5; - z-index: 1; - text-transform: uppercase; - position: absolute; - font-size: 10px; - margin-top: 15px; - margin-left: 21px; - color: white; -} - -.select-filter-arrow { - position: absolute; - margin-left: 130px; - margin-top: 40px; -} - -.btn-brand-small-filter { - margin-top: 10px; - position: absolute; - margin-left: 15px; -} - -/* Carousel */ -.carousel-caption p { - font-size: 20px; - line-height: 1.4; -} - -.layout-cart-image { - height: 36px; - margin-top: 5px; -} - -.layout-cart-badge { - position: absolute; - margin-top: 2px; - margin-left: 14px; - background-color: #83d01b; - padding: 1px; - color: white; - border-radius: 50%; - width: 18px; - height: 18px; - font-size: 12px; - cursor: pointer; -} - -/* buttons and links extension to use brackets: [ click me ] */ -.btn-bracketed:hover:before { - display: inline-block; - content: "["; - padding-right: 0.5em; - color: chartreuse; -} - -.btn-bracketed:hover:after { - display: inline-block; - content: "]"; - padding-left: 0.5em; - color: chartreuse; -} - -.btn-brand { - background-color: #83D01B; - color: white; - padding: 10px 20px 10px 20px; - border-radius: 0px; - border: none; - width: 255px; - display: inline-block; - text-align: center; - text-transform: uppercase; - height: 45px; - font-size: 16px; - font-weight: normal; -} - -.btn-brand::before { - content: '[' -} - -.btn-brand::after { - content: ']' -} - - .btn-brand:hover:before { - padding-right: 5px; - } - - .btn-brand:hover:after { - padding-left: 5px; - } - -.btn-brand-big { - width: 360px; - margin-top: 20px; -} - -.btn-brand-small { - width: 45px; -} - - .btn-brand-small::before { - content: ''; - } - - .btn-brand-small::after { - content: ''; - } - - .btn-brand-small:hover:before { - content: ''; - padding: 0; - } - - .btn-brand-small:hover:after { - content: ''; - padding: 0; - } - -.btn-brand-dark { - background-color: #00a69c; -} - -.btn-brand:hover { - color: white; - background-color: #83D01B; - text-decoration:none; -} - -.btn-brand-dark:hover { - background-color: #00a69c; -} - -.btn-cart { - float: right; - margin-top: 40px; - margin-bottom: 40px; -} - -.btn-catalog-apply { - padding:0; -} - -.form-label { - text-transform: uppercase; - font-weight: normal!important; - text-align: left; - margin-bottom: 10px !important; - color: #404040; -} - -.form-input { - border-radius: 0; - padding: 10px; - height: 45px; -} - -.form-input-small { - max-width: 100px!important; -} - -.form-select { - border-radius: 0; - padding: 10px; - height: 45px; - width: 150px; -} - -/* Make .svg files in the carousel display properly in older browsers */ -.carousel-inner .item img[src$=".svg"] { - width: 100%; -} - -.navbar-inverse { - background-color: #FFF; - border-color: #FFF; -} - - /*.navbar-inverse li { - margin-top: 10px; - }*/ - -.btn-login { - border: 1px solid #00A69C; - height: 36px!important; - margin-right: 10px; - margin-top: 10px; - background-color: white; - color: #00a69c; - text-transform:uppercase; - max-width: 140px; - width: 140px; - padding-top:8px!important; -} - -.btn-login { - font-weight:normal!important; -} - - .btn-login::before { - content: '['; - } - - .btn-login::after { - content: ']'; - } - - .btn-login:hover:before { - content: '[ '; - } - - .btn-login:hover:after { - content: ' ]'; - } - -.navbar-inverse li a { - height: 30px; - padding: 5px 20px; - color: #00A69C !important; -} - -.navbar-brand { - margin-top: 20px; - background-image: url(../images/brand.PNG); - width: 201px; - height: 44px; - margin-left: 0px !important; -} - -.nav > li > a { - color: white; -} - - .nav > li > a:hover, .nav > li > a:focus { - background-color: #00A69C; - font-weight: bolder; - } - -.container-fluid { - padding-left: 0px; - padding-right: 0px; -} - -.home-banner { - width: 100%; - margin-right: 0px; - margin-left: 0px; - background-image: url(../images/main_banner.png); - background-size: cover; - height: 258px; - background-position: center; -} - -.home-banner-text { - margin-top: 70px; -} - -.home-catalog-container { - min-height: 400px; - margin-bottom: 20px; -} - -.home-catalog-filter-container { - background-color: #00A69C; - height:63px; - line-height: 76px; -} - - .home-catalog-filter-container li a { - padding-top: 5px !important; - } - -.home-catalog-filter-brands::before { - content: 'BRAND'; - color: white; - font-size: x-small; - opacity: 0.5; - margin: 10px 0px 0px 15px; -} - -.home-catalog-filter-types::before { - content: 'TYPES'; - color: white; - font-size: x-small; - opacity: 0.5; - margin: 10px 0px 0px 15px; -} - -.home-catalog-item { - margin-top: 10px; - margin-bottom: 10px; -} - -.home-catalog-item-image { - width: 100%; - object-fit: cover; - /* max-width: 320px; */ - text-align: center; -} - -.home-catalog-item-image-addCart { - background-color: #83D01B; - color: white; - display: inline-block; - height: 43px; - padding: 10px 20px 10px 20px; - font-weight: bold; - text-align: center; - margin-top: 10px; - margin-left: 60px; - margin-right: 60px; - font-size: 16px; - font-weight: normal; -} - - .home-catalog-item-image-addCart:hover { - color: white; - text-decoration: none; - } - - -.home-catalog-item-image:hover:after { - cursor: pointer; -} - -.home-catalog-item-title { - text-align: center; - text-transform: uppercase; - font-weight: 300; - font-size: 16px; - margin-top: 20px; -} - -.home-catalog-item-price { - text-align: center; - font-weight: 900; - font-size: 28px; -} - - .home-catalog-item-price::before { - content: '$'; - } - -.home-catalog-noResults { - text-align:center; - margin-top: 100px; -} - -.container .nav .navbar-nav .col-sm-6 ::before { - content: 'BRAND'; -} - -.validation-summary-errors li { - list-style: none; -} - -footer { - background-color: black; - height: 150px; - vertical-align: middle; -} - - footer .brand { - margin-top: 25px; - background-image: url(../images/brand_dark.PNG); - max-width: 231px; - height: 52px; - margin-left: 0px !important; - } - - footer .text { - text-align: right; - width: 100%; - height: 100%; - color: #83D01B; - margin-top: 10px; - } - -.text { - color: #83D01B; -} - -.text:hover { - color: #83D01B; -} - -form .col-md-4 { - text-align: right; -} - -.brand-header-block { - background-color: #00A69C; - height: 63px; -} - - .brand-header-block li { - list-style: none; - display: inline; - opacity: 0.5; - margin-top: 25px; - margin-left: 10px; - /*float: right;*/ - cursor: pointer; - color: white; - } - - .brand-header-block li a { - color: white; - } - - .brand-header-block li a:hover { - text-decoration:none; - } - - .brand-header-block .active { - opacity: 1; - } - - .brand-header-block .active::before { - content: '[ '; - color: greenyellow; - } - - .brand-header-block .active::after { - content: ' ]'; - color: greenyellow; - } - -.brand-header-back { - float: left!important; - margin-top: 20px!important; - text-transform: uppercase; -} - -.account-login-container { - min-height: 70vh; - text-align: center; - padding-top: 40px; -} - -.account-register-container { - min-height: 70vh; - text-align: center !important; - align-content: center; -} - -.cart-index-container { - min-height: 70vh; - padding-top: 40px; - margin-bottom: 30px; - min-width: 992px; -} - -.register-container { - min-height: 70vh; - padding-top: 40px; - margin-bottom: 30px; - padding-left: 30px; -} - -.order-create-container { - min-height: 70vh; - padding-top: 40px; - margin-bottom: 30px; - padding-left: 30px; - min-width: 995px; -} - -.cart-product-column { - max-width: 120px; - text-transform: uppercase; - vertical-align: middle!important; -} - -.order-create-container .cart-product-column { - max-width: 130px; -} - -.cart-product-column-name { - width: 220px; -} - -.cart-subtotal-label { - font-size: 12px; - color: #404040; - margin-top:10px; -} - -.cart-subtotal-value { - font-size: 20px; - color: #00a69c; -} - -.cart-total-label { - font-size: 14px; - color: #404040; - margin-top:10px; -} - -.cart-total-value { - font-size: 28px; - color: #00a69c; - text-align: left; -} - -.cart-product-image { - max-width: 210px; -} - -.cart-section-total { - margin-bottom: 5px; - margin-left: 175px; - text-align: left; -} - -.cart-product-column input { - width: 70px; - text-align: center; -} - -.cart-refresh-button { - margin-top:0; - background-image: url('../images/refresh.svg'); - color: white; - font-size: 8px; - width: 40px; - height: 40px; - background-color:transparent; - border:none; - margin-top: 25px; - margin-left:15px; -} - - .cart-refresh-button:hover { - background-color:transparent; - } - -.cart-totals { - border-bottom:none!important; -} - -.input-validation-error { - border: 1px solid #fb0d0d; -} - -.text-danger { - color: #fb0d0d; - font-size: 12px; -} - -.cart { - border: none !important; -} - -.form-horizontal h4 { - margin-top: 30px; -} - -.form-horizontal .form-group { - margin-right: 0px!important; -} - -.form-control:focus { - border-color: #83d01b; -} - -.form-input-center { - margin: auto; -} - -.order-index-container { - min-height: 70vh; - padding-top: 40px; - margin-bottom: 30px; -} - - .order-index-container .table tbody tr { - border-bottom:none; - } - - .order-index-container .table tbody tr td { - border-top:none; - padding-top:10px; - padding-bottom:10px; - } - - - - .order-index-container .table tbody tr:nth-child(even) { - background-color: #f5f5f5; - } - -.order-create-section-title { - margin-left: -15px; - text-transform: uppercase; -} - -.order-create-section-items { - margin-left: -45px; - width: 102%; -} - -.order-detail-button { - -} - - .order-detail-button a { - color: #83d01b; - } - -.order-detail-container { - min-height: 70vh; - padding-top: 40px; - margin-bottom: 30px; -} - - .order-detail-container .table tbody tr:first-child td{ - border-top:none; - } - - .order-detail-container .table tr{ - border-bottom:none; - } - -.order-detail-section { - margin-top: 50px; -} - -.order-detail-container .table { - margin-left: -7px; -} - -.order-section-total { - margin-bottom: 5px; - margin-left: 40px; - text-align: left; -} - -.fr { - float:right!important; -} - -.down-arrow { - background-image: url('../images/arrow-down.png'); - height: 7px; - width: 10px; - display: inline-block; - margin-left: 20px; -} - -.logout-icon { - background-image: url('../images/logout.PNG'); - display: inline-block; - height:19px; - width:19px; - margin-left: 15px; -} - -.myorders-icon { - background-image: url('../images/my_orders.PNG'); - display: inline-block; - height: 20px; - width: 20px; - margin-left: 15px; -} - -.login-user { - position: absolute!important; - top: 30px; - right: 65px; - cursor:pointer; -} - -.login-user-dropdown { - position: relative; - display: inline-block; -} - -.login-user-dropdown-content { - display: none; - position: absolute; - background-color: #FFFFFF; - min-width: 160px; - box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); - /*left: 100px;*/ - right: 0px; -} - -.login-user-dropdown-content a { - color: black; - padding: 12px 16px; - text-decoration: none; - display: block; - text-align:right; - text-transform:uppercase; -} - -.login-user:hover .login-user-dropdown-content { - display: block; -} - -.down-arrow:hover > .login-user-dropdown-content { - display: block; -} - -.login-user-dropdown-content a:hover { - color: #83d01b; -} - -.es-header { - min-height: 80px!important; -} - -.es-pager-bottom { - margin-top: 40px; -} - -.es-pager-top { - margin-bottom: 20px; - margin-top: 20px; -} - -.es-pager-top ul { - list-style: none; -} - -.es-pager-bottom ul { - list-style: none; -} - -.page-item { - cursor: pointer; -} - -.next { - position: absolute; - right: 15px; - top: 0; -} - -.previous { - position: absolute; - left: 0; - top: 0; -} - -.is-disabled{ - cursor: not-allowed; - opacity: .5; - pointer-events: none; -} - -.table tr { - border-bottom:1px solid #ddd; -} - -.table th { - text-transform: uppercase; -} - - -.navbar-nav { - margin-top: 10px; - margin-bottom: 7.5px; - margin-right: -10px; - float: right; -} - -@media screen and (max-width: 1195px) { - .cart-product-column-name { - display:none; - } -} - -/* Hide/rearrange for smaller screens */ -@media screen and (max-width: 767px) { - /* Hide captions */ - .carousel-caption { - display: none; - } - - footer .text { - text-align: left; - margin-top: -15px; - } - - .cart-product-column-brand { - display:none; - } -} - -@media screen and (min-width: 992px) { - .form-input { - width: 360px; - max-width: 360px; - } -} - - diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index d5daf106e..1a9d705d4 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; +using System.IO; namespace Microsoft.eShopOnContainers.Services.Ordering.API { @@ -15,7 +11,6 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5102") .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs index 1ea310785..ab2d75da8 100644 --- a/src/Web/WebMVC/Controllers/AccountController.cs +++ b/src/Web/WebMVC/Controllers/AccountController.cs @@ -33,15 +33,20 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers ViewData["access_token"] = token.Value; } - return Redirect("/"); + // "Catalog" because UrlHelper doesn't support nameof() for controllers + // https://github.com/aspnet/Mvc/issues/5853 + return RedirectToAction(nameof(CatalogController.Index), "Catalog"); } public IActionResult Signout() { HttpContext.Authentication.SignOutAsync("Cookies"); HttpContext.Authentication.SignOutAsync("oidc"); - - return new SignOutResult("oidc", new AuthenticationProperties { RedirectUri = "/" }); + + // "Catalog" because UrlHelper doesn't support nameof() for controllers + // https://github.com/aspnet/Mvc/issues/5853 + var homeUrl = Url.Action(nameof(CatalogController.Index), "Catalog"); + return new SignOutResult("oidc", new AuthenticationProperties { RedirectUri = homeUrl }); } } } diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index 848e17679..6775c071c 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; +using Microsoft.AspNetCore.Hosting; using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; namespace Microsoft.eShopOnContainers.WebMVC { @@ -14,7 +10,6 @@ namespace Microsoft.eShopOnContainers.WebMVC var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5100") .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Web/WebMVC/Views/Catalog/Index.cshtml b/src/Web/WebMVC/Views/Catalog/Index.cshtml index bd88264b3..ddac94196 100644 --- a/src/Web/WebMVC/Views/Catalog/Index.cshtml +++ b/src/Web/WebMVC/Views/Catalog/Index.cshtml @@ -4,7 +4,7 @@ }
- +
@@ -17,7 +17,7 @@ - +
diff --git a/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml b/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml index faa4280a5..4c8374f66 100644 --- a/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml +++ b/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml @@ -10,7 +10,7 @@ asp-action="Index">
- +
@Model.ItemsCount diff --git a/src/Web/WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml index f7eda24ef..456248b94 100644 --- a/src/Web/WebMVC/Views/Shared/_Layout.cshtml +++ b/src/Web/WebMVC/Views/Shared/_Layout.cshtml @@ -23,7 +23,7 @@ - + @@ -34,7 +34,7 @@
- +
@@ -51,7 +51,7 @@
- +
diff --git a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml index f628c63bf..1b9cde79d 100644 --- a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml +++ b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml @@ -13,7 +13,7 @@
@User.FindFirst(x => x.Type == "preferred_username").Value
- +
@@ -23,14 +23,14 @@ asp-action="Index">
My orders
- +
Log Out
- +
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 3b2e8c147..1c8001afe 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -14,21 +14,19 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + + + + + + + + + + + @@ -63,7 +61,7 @@ - + diff --git a/src/Web/WebMVC/bundleconfig.json b/src/Web/WebMVC/bundleconfig.json index 04754ba71..621a937c3 100644 --- a/src/Web/WebMVC/bundleconfig.json +++ b/src/Web/WebMVC/bundleconfig.json @@ -5,7 +5,7 @@ "outputFileName": "wwwroot/css/site.min.css", // An array of relative input file paths. Globbing patterns supported "inputFiles": [ - "wwwroot/css/site.css" + "wwwroot/css/**/*.css" ] }, { diff --git a/src/Web/WebMVC/wwwroot/css/app.css b/src/Web/WebMVC/wwwroot/css/app.css index 6975836e2..55cbd66aa 100644 --- a/src/Web/WebMVC/wwwroot/css/app.css +++ b/src/Web/WebMVC/wwwroot/css/app.css @@ -1,7 +1,7 @@ @font-face { font-family: Montserrat; font-weight: 400; - src: url(".../fonts/Montserrat-Regular.eot?") format("eot"), url("../fonts/Montserrat-Regular.woff") format("woff"), url("../fonts/Montserrat-Regular.ttf") format("truetype"), url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg"); + src: url("../fonts/Montserrat-Regular.eot?") format("eot"), url("../fonts/Montserrat-Regular.woff") format("woff"), url("../fonts/Montserrat-Regular.ttf") format("truetype"), url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg"); } @font-face { diff --git a/src/Web/WebMVC/wwwroot/css/app.min.css b/src/Web/WebMVC/wwwroot/css/app.min.css deleted file mode 100644 index 0935b57d0..000000000 --- a/src/Web/WebMVC/wwwroot/css/app.min.css +++ /dev/null @@ -1 +0,0 @@ -.esh-basket,.esh-orders,.esh-orders_detail,.esh-orders_new{min-height:80vh}@font-face{font-family:Montserrat;font-weight:400;src:url(../fonts/Montserrat-Regular.eot?) format("eot"),url(../fonts/Montserrat-Regular.woff) format("woff"),url(../fonts/Montserrat-Regular.ttf) format("truetype"),url(../fonts/Montserrat-Regular.svg#Montserrat) format("svg")}@font-face{font-family:Montserrat;font-weight:700;src:url(../fonts/Montserrat-Bold.eot?) format("eot"),url(../fonts/Montserrat-Bold.woff) format("woff"),url(../fonts/Montserrat-Bold.ttf) format("truetype"),url(../fonts/Montserrat-Bold.svg#Montserrat) format("svg")}body,html{font-family:Montserrat,sans-serif;font-size:16px;font-weight:400;z-index:10}*,::after,::before{box-sizing:border-box}.preloading{color:#00A69C;display:block;font-size:1.5rem;left:50%;position:fixed;top:50%;transform:translate(-50%,-50%)}select::-ms-expand{display:none}@media screen and (min-width:992px){.form-input{max-width:360px;width:360px}}.form-input{border-radius:0;height:45px;padding:10px}.form-input-small{max-width:100px!important}.form-input-medium{width:150px!important}.alert{padding-left:0}.alert-danger{background-color:transparent;border:0;color:#FB0D0D;font-size:12px}a,a:active,a:hover,a:visited{color:#000;text-decoration:none;transition:color .35s}a:active,a:hover{color:#75B918;transition:color .35s}.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-footer-text{color:#83D01B;line-height:50px;text-align:right;width:100%}.esh-pager-wrapper{padding-top:1rem;text-align:center}.esh-identity,.esh-orders_new-section--right{text-align:right}.esh-pager-item{margin:0 5vw}.esh-pager-item--navigable{cursor:pointer;display: inline-block;}.esh-pager-item--navigable.is-disabled{opacity: 0;pointer-events: none;}.esh-identity-image,.esh-identity-name{display:inline-block}.esh-pager-item--navigable:hover{color:#83D01B}@media screen and (max-width:1280px){.esh-pager-item{font-size:.85rem}}@media screen and (max-width:1024px){.esh-pager-item{margin:0 4vw}}.esh-identity{line-height:3rem;position:relative}.esh-header-back,.esh-orders-back{line-height:4rem;text-decoration:none;text-transform:uppercase}.esh-identity-section{display:inline-block;width:100%}.esh-identity-name--upper{text-transform:uppercase}@media screen and (max-width:768px){.esh-identity-name{font-size:.85rem}}.esh-identity-drop{background:#FFF;height:0;min-width:14rem;right:0;overflow:hidden;padding:.5rem;position:absolute;top:2.5rem;transition:height .35s}.esh-identity:hover .esh-identity-drop{border:1px solid #EEE;height:7rem;transition:height .35s}.esh-header,.esh-orders-header{background-color:#00A69C;height:4rem}.esh-identity-item{cursor:pointer;display:block;transition:color .35s}.esh-identity-item:hover{color:#75b918;transition:color .35s}.esh-header-back{color:rgba(255,255,255,.5)!important;transition:color .35s}.esh-header-back:hover{color:#FFF!important;transition:color .35s}.esh-orders{overflow-x:hidden}.esh-orders-back{color:rgba(255,255,255,.4);transition:color .35s}.esh-orders-back:hover{color:#FFF;transition:color .35s}.esh-orders-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders-title{text-transform:uppercase}.esh-orders-items{height:2rem;line-height:2rem;position:relative}.esh-orders-items:nth-of-type(2n+1):before{background-color:#EEF;content:'';height:100%;left:0;margin-left:-100vw;position:absolute;top:0;width:200vw;z-index:-1}.esh-orders-item{font-weight:300}.esh-orders-item--hover{opacity:0;pointer-events:none}.esh-orders-items:hover .esh-orders-item--hover{opacity:1;pointer-events:all}.esh-orders-link{color:#83D01B;text-decoration:none;transition:color .35s}.esh-orders-link:hover{color:#75b918;transition:color .35s}.esh-orders_new-header{background-color:#00A69C;height:4rem}.esh-orders_detail-image,.esh-orders_new-image{height:8rem}.esh-orders_new-back{color:rgba(255,255,255,.4);line-height:4rem;text-decoration:none;text-transform:uppercase;transition:color .35s}.esh-orders_new-back:hover{color:#FFF;transition:color .35s}.esh-orders_new-section{padding:1rem 0}.esh-orders_new-placeOrder{background-color:#83D01B;border:0;border-radius:0;color:#FFF;display:inline-block;font-size:1rem;font-weight:400;margin-top:1rem;padding:1rem 1.5rem;text-align:center;text-transform:uppercase;transition:all .35s}.esh-orders_detail-item--mark,.esh-orders_new-item--mark{color:#83D01B}.esh-orders_new-placeOrder:hover{background-color:#4a760f;transition:all .35s}.esh-orders_new-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders_new-title{font-size:1.25rem;text-transform: uppercase;}.esh-orders_detail-item,.esh-orders_new-item{font-size:1rem;font-weight:300}.esh-orders_new-items--border{border-bottom:1px solid #EEE;padding:.5rem 0}.esh-orders_new-items--border:last-of-type{border-color:transparent}.esh-orders_new-item--middle{line-height:8rem}@media screen and (max-width:768px){.esh-orders_new-item--middle{line-height:1rem}}.esh-orders_detail-section{padding:1rem 0}.esh-orders_detail-section--right{text-align:right}.esh-orders_detail-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders_detail-title{text-transform:uppercase}.esh-orders_detail-items--border{border-bottom:1px solid #EEE;padding:.5rem 0}.esh-orders_detail-items--border:last-of-type{border-color:transparent}.esh-orders_detail-item--middle{line-height:8rem}.esh-catalog-hero{background-image:url(../../images/main_banner.png);background-size:cover;height:260px;width:100%}.esh-catalog-title{position:relative;top:74.29px}.esh-catalog-filters{background-color:#00A69C;height:65px}.esh-catalog-filter{background-color:transparent;border-color:#00d9cc;color:#FFF;cursor:pointer;margin-right:1rem;margin-top:.5rem;outline-color:#83D01B;min-width:140px;-webkit-appearance:none;padding:1.5rem .5rem 0}.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-top:.65rem;margin-left:.5rem;position:absolute;text-transform:uppercase;z-index:1}.esh-catalog-button,.esh-catalog-send{color:#FFF;transition:all .35s;cursor:pointer}.esh-catalog-label::after{background-image:url(../../images/arrow-down.png);height:7px;content:'';position:absolute;right:1.5rem;top:2.5rem;width:10px;z-index:1}.esh-catalog-send{background-color:#83D01B;font-size:1rem;transform:translateY(.5rem);padding:.5rem}.esh-catalog-send:hover{background-color:#4a760f;transition:all .35s}.esh-catalog-items{margin-top:1rem}.esh-catalog-item{text-align:center;margin-bottom:1.5rem;width:33%}@media screen and (max-width:1024px){.esh-catalog-item{width:50%}}@media screen and (max-width:768px){.esh-orders_detail-item--middle{line-height:1rem}.esh-catalog-item{width:100%}}.esh-catalog-thumbnail{max-width:370px;width:100%}.esh-catalog-button{background-color:#83D01B;border:none;font-size:1rem;height:3rem;margin-top:1rem;width:80%}.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{text-align:center;font-weight:900;font-size:28px}.esh-catalog-price::before{content:'$'}.esh-basket-titles{padding-bottom:1rem;padding-top:2rem}.esh-basket-titles--clean{padding-bottom:0;padding-top:0}.esh-basket-title{text-transform:uppercase}.esh-basket-items--border{border-bottom:1px solid #EEE;padding:.5rem 0}.esh-basket-items--border:last-of-type{border-color:transparent}.esh-basket-item{font-size:1rem;font-weight:300}.esh-basket-item--middle{line-height:8rem}@media screen and (max-width:1024px){.esh-basket-item--middle{line-height:1rem}}.esh-basket-item--mark{color:#00A69C}.esh-basket-checkout,.esh-basketstatus-badge{color:#FFF;text-align:center;transition:all .35s}.esh-basket-image{height:8rem}.esh-basket-input{line-height:1rem;width:100%}.esh-basket-checkout{border:none;border-radius:0;background-color:#83D01B;display:inline-block;font-size:1rem;font-weight:400;margin-top:1rem;padding:1rem 1.5rem;text-transform:uppercase}.esh-basket-checkout:hover{background-color:#4a760f;transition:all .35s}.esh-basketstatus{cursor:pointer;display: inline-block;float:right;position:relative;transition:all .35s}.esh-basketstatus.is-disabled{opacity:.5;pointer-events:none}.esh-basketstatus-image{height:36px;margin-top:.5rem}.esh-basketstatus-badge{background-color:#83D01B;border-radius:50%;display:block;height:1.5rem;left:50%;position:absolute;top:0;transform:translateX(-38%);width:1.5rem}.esh-basketstatus:hover .esh-basketstatus-badge{background-color:transparent;color:#75b918;transition:all .35s} \ No newline at end of file diff --git a/src/Web/WebMVC/wwwroot/css/site.min.css b/src/Web/WebMVC/wwwroot/css/site.min.css index e69de29bb..f08061a49 100644 --- a/src/Web/WebMVC/wwwroot/css/site.min.css +++ b/src/Web/WebMVC/wwwroot/css/site.min.css @@ -0,0 +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}.esh-app-footer-text{color:#83d01b;line-height:50px;text-align:right;width:100%}@font-face{font-family:Montserrat;font-weight:400;src:url("../fonts/Montserrat-Regular.eot?") format("eot"),url("../fonts/Montserrat-Regular.woff") format("woff"),url("../fonts/Montserrat-Regular.ttf") format("truetype"),url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg")}@font-face{font-family:Montserrat;font-weight:700;src:url("../fonts/Montserrat-Bold.eot?") format("eot"),url("../fonts/Montserrat-Bold.woff") format("woff"),url("../fonts/Montserrat-Bold.ttf") format("truetype"),url("../fonts/Montserrat-Bold.svg#Montserrat") format("svg")}html,body{font-family:Montserrat,sans-serif;font-size:16px;font-weight:400;z-index:10}*,*::after,*::before{box-sizing:border-box}.preloading{color:#00a69c;display:block;font-size:1.5rem;left:50%;position:fixed;top:50%;transform:translate(-50%,-50%)}select::-ms-expand{display:none}@media screen and (min-width:992px){.form-input{max-width:360px;width:360px}}.form-input{border-radius:0;height:45px;padding:10px}.form-input-small{max-width:100px !important}.form-input-medium{width:150px !important}.alert{padding-left:0}.alert-danger{background-color:transparent;border:0;color:#fb0d0d;font-size:12px}a,a:active,a:hover,a:visited{color:#000;text-decoration:none;transition:color .35s}a:hover,a:active{color:#75b918;transition:color .35s}.esh-basket{min-height:80vh}.esh-basket-titles{padding-bottom:1rem;padding-top:2rem}.esh-basket-titles--clean{padding-bottom:0;padding-top:0}.esh-basket-title{text-transform:uppercase}.esh-basket-items--border{border-bottom:1px solid #eee;padding:.5rem 0}.esh-basket-items--border:last-of-type{border-color:transparent}.esh-basket-item{font-size:1rem;font-weight:300}.esh-basket-item--middle{line-height:8rem}@media screen and (max-width:1024px){.esh-basket-item--middle{line-height:1rem}}.esh-basket-item--mark{color:#00a69c}.esh-basket-image{height:8rem}.esh-basket-input{line-height:1rem;width:100%}.esh-basket-checkout{border:none;border-radius:0;background-color:#83d01b;color:#fff;display:inline-block;font-size:1rem;font-weight:400;margin-top:1rem;padding:1rem 1.5rem;text-align:center;text-transform:uppercase;transition:all .35s}.esh-basket-checkout:hover{background-color:#4a760f;transition:all .35s}.esh-basketstatus{cursor:pointer;display:inline-block;float:right;position:relative;transition:all .35s}.esh-basketstatus.is-disabled{opacity:.5;pointer-events:none}.esh-basketstatus-image{height:36px;margin-top:.5rem}.esh-basketstatus-badge{background-color:#83d01b;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem}.esh-basketstatus:hover .esh-basketstatus-badge{background-color:transparent;color:#75b918;transition:all .35s}.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{background-color:transparent;border-color:#00d9cc;color:#fff;cursor:pointer;margin-right:1rem;margin-top:.5rem;outline-color:#83d01b;padding-bottom:0;padding-left:.5rem;padding-right:.5rem;padding-top:1.5rem;min-width:140px;-webkit-appearance:none}.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-top:.65rem;margin-left:.5rem;position:absolute;text-transform:uppercase;z-index:1}.esh-catalog-label::after{background-image:url("../images/arrow-down.png");height:7px;content:'';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;transform:translateY(.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{text-align:center;margin-bottom:1.5rem;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:none;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{text-align:center;font-weight:900;font-size:28px}.esh-catalog-price::before{content:'$'}.esh-orders{min-height:80vh;overflow-x:hidden}.esh-orders-header{background-color:#00a69c;height:4rem}.esh-orders-back{color:rgba(255,255,255,.4);line-height:4rem;text-transform:uppercase;text-decoration:none;transition:color .35s}.esh-orders-back:hover{color:#fff;transition:color .35s}.esh-orders-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders-title{text-transform:uppercase}.esh-orders-items{height:2rem;line-height:2rem;position:relative}.esh-orders-items:nth-of-type(2n+1):before{background-color:#eef;content:'';height:100%;left:0;margin-left:-100vw;position:absolute;top:0;width:200vw;z-index:-1}.esh-orders-item{font-weight:300}.esh-orders-item--hover{opacity:0;pointer-events:none}.esh-orders-items:hover .esh-orders-item--hover{opacity:1;pointer-events:all}.esh-orders-link{color:#83d01b;text-decoration:none;transition:color .35s}.esh-orders-link:hover{color:#75b918;transition:color .35s}.esh-orders_detail{min-height:80vh}.esh-orders_detail-section{padding:1rem 0}.esh-orders_detail-section--right{text-align:right}.esh-orders_detail-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders_detail-title{text-transform:uppercase}.esh-orders_detail-items--border{border-bottom:1px solid #eee;padding:.5rem 0}.esh-orders_detail-items--border:last-of-type{border-color:transparent}.esh-orders_detail-item{font-size:1rem;font-weight:300}.esh-orders_detail-item--middle{line-height:8rem}@media screen and (max-width:768px){.esh-orders_detail-item--middle{line-height:1rem}}.esh-orders_detail-item--mark{color:#83d01b}.esh-orders_detail-image{height:8rem}.esh-orders_new{min-height:80vh}.esh-orders_new-header{background-color:#00a69c;height:4rem}.esh-orders_new-back{color:rgba(255,255,255,.4);line-height:4rem;text-decoration:none;text-transform:uppercase;transition:color .35s}.esh-orders_new-back:hover{color:#fff;transition:color .35s}.esh-orders_new-section{padding:1rem 0}.esh-orders_new-section--right{text-align:right}.esh-orders_new-placeOrder{background-color:#83d01b;border:0;border-radius:0;color:#fff;display:inline-block;font-size:1rem;font-weight:400;margin-top:1rem;padding:1rem 1.5rem;text-align:center;text-transform:uppercase;transition:all .35s}.esh-orders_new-placeOrder:hover{background-color:#4a760f;transition:all .35s}.esh-orders_new-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders_new-title{font-size:1.25rem;text-transform:uppercase}.esh-orders_new-items--border{border-bottom:1px solid #eee;padding:.5rem 0}.esh-orders_new-items--border:last-of-type{border-color:transparent}.esh-orders_new-item{font-size:1rem;font-weight:300}.esh-orders_new-item--middle{line-height:8rem}@media screen and (max-width:768px){.esh-orders_new-item--middle{line-height:1rem}}.esh-orders_new-item--mark{color:#83d01b}.esh-orders_new-image{height:8rem}.esh-header{background-color:#00a69c;height:4rem}.esh-header-back{color:rgba(255,255,255,.5) !important;line-height:4rem;text-transform:uppercase;text-decoration:none;transition:color .35s}.esh-header-back:hover{color:#fff !important;transition:color .35s}.esh-identity{line-height:3rem;position:relative;text-align:right}.esh-identity-section{display:inline-block;width:100%}.esh-identity-name{display:inline-block}.esh-identity-name--upper{text-transform:uppercase}@media screen and (max-width:768px){.esh-identity-name{font-size:.85rem}}.esh-identity-image{display:inline-block}.esh-identity-drop{background:#fff;height:0;min-width:14rem;right:0;overflow:hidden;padding:.5rem;position:absolute;top:2.5rem;transition:height .35s}.esh-identity:hover .esh-identity-drop{border:1px solid #eee;height:7rem;transition:height .35s}.esh-identity-item{cursor:pointer;display:block;transition:color .35s}.esh-identity-item:hover{color:#75b918;transition:color .35s}.esh-pager-wrapper{padding-top:1rem;text-align:center}.esh-pager-item{margin:0 5vw}.esh-pager-item--navigable{display:inline-block;cursor:pointer}.esh-pager-item--navigable.is-disabled{opacity:0;pointer-events:none}.esh-pager-item--navigable:hover{color:#83d01b}@media screen and (max-width:1280px){.esh-pager-item{font-size:.85rem}}@media screen and (max-width:1024px){.esh-pager-item{margin:0 4vw}} \ No newline at end of file diff --git a/src/Web/WebSPA/Program.cs b/src/Web/WebSPA/Program.cs index ffad0461e..3759baa3b 100644 --- a/src/Web/WebSPA/Program.cs +++ b/src/Web/WebSPA/Program.cs @@ -1,6 +1,5 @@ -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Hosting; +using System.IO; namespace eShopConContainers.WebSPA { @@ -11,7 +10,6 @@ namespace eShopConContainers.WebSPA var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5104") .UseIISIntegration() .UseStartup() .Build();