ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'vs2017'

Browse Source
This commit is contained in:
etomas 2017-03-03 19:40:55 +01:00
commit 29473b455f
22 changed files with 79 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.override.yml
View File

@ -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.

9
src/Services/Basket/Basket.API/Program.cs
View File

@ -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<Startup>()
.Build();

9
src/Services/Catalog/Catalog.API/Program.cs
View File

@ -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")

29
src/Services/Identity/Identity.API/Identity.API.csproj
View File

@ -14,18 +14,17 @@
</PropertyGroup>
<ItemGroup>
<Content Update="wwwroot;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\**\*;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="web.config;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include=".dockerignore">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<None Include="wwwroot\css\*.min.css" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\fonts\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\images\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\js\*.min.js" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\*.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\bootstrap\dist\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\jquery*\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<Content Update="wwwroot\**\*;" CopyToPublishDirectory="Never" />
<Content Update="Views\**\*;" CopyToPublishDirectory="PreserveNewest" />
<Content Update="web.config" CopyToPublishDirectory="PreserveNewest" />
<Content Update=".dockerignore" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
@ -66,7 +65,7 @@
</Target>
<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0-msbuild3-final" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild3-final" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
@ -78,4 +77,8 @@
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\css\" />
</ItemGroup>
</Project>

7
src/Services/Identity/Identity.API/Program.cs
View File

@ -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<Startup>()

12
src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml
View File

@ -6,8 +6,16 @@
<title>eShopOnContainers Identity</title>
<link rel="icon" type="image/x-icon" href="~/favicon.ico" />
<link rel="shortcut icon" type="image/x-icon" href="~/favicon.ico" />
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="~/css/site.css" />
<environment names="Development">
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="~/css/site.css" />
</environment>
<environment names="Staging,Production">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/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>
<div class="navbar navbar-inverse navbar-fixed-top es-header">

2
src/Services/Identity/Identity.API/bundleconfig.json
View File

@ -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"
]
},
{

4
src/Services/Identity/Identity.API/wwwroot/css/site.css
View File

@ -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 {

923
src/Services/Identity/Identity.API/wwwroot/css/site.less
View File

@ -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;
}
}

9
src/Services/Ordering/Ordering.API/Program.cs
View File

@ -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<Startup>()
.Build();

11
src/Web/WebMVC/Controllers/AccountController.cs
View File

@ -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 });
}
}
}

7
src/Web/WebMVC/Program.cs
View File

@ -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<Startup>()
.Build();

4
src/Web/WebMVC/Views/Catalog/Index.cshtml
View File

@ -4,7 +4,7 @@
}
<section class="esh-catalog-hero">
<div class="container">
<img class="esh-catalog-title" src="../images/main_banner_text.png" />
<img class="esh-catalog-title" src="~/images/main_banner_text.png" />
</div>
</section>
@ -17,7 +17,7 @@
<label class="esh-catalog-label" data-title="type">
<select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select>
</label>
<input class="esh-catalog-send" type="image" src="images/arrow-right.svg" />
<input class="esh-catalog-send" type="image" src="~/images/arrow-right.svg" />
</form>
</div>
</section>

2
src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml
View File

@ -10,7 +10,7 @@
asp-action="Index">
<div class="esh-basketstatus-image">
<img src="../images/cart.png" />
<img src="~/images/cart.png" />
</div>
<div class="esh-basketstatus-badge">
@Model.ItemsCount

6
src/Web/WebMVC/Views/Shared/_Layout.cshtml
View File

@ -23,7 +23,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/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/app.min.css" asp-append-version="true" />
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
</environment>
</head>
<body>
@ -34,7 +34,7 @@
<section class="col-lg-7 col-md-6 col-xs-12">
<a class="navbar-brand" routerLink="catalog">
<a asp-area="" asp-controller="Catalog" asp-action="Index">
<img src="../images/brand.png" />
<img src="~/images/brand.png" />
</a>
</section>
@ -51,7 +51,7 @@
<article class="row">
<section class="col-sm-6">
<img class="esh-app-footer-brand" src="../images/brand_dark.png" />
<img class="esh-app-footer-brand" src="~/images/brand_dark.png" />
</section>
<section class="col-sm-6">

6
src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml
View File

@ -13,7 +13,7 @@
<section class="esh-identity-section">
<div class="esh-identity-name">@User.FindFirst(x => x.Type == "preferred_username").Value</div>
<img class="esh-identity-image" src="../images/arrow-down.png">
<img class="esh-identity-image" src="~/images/arrow-down.png">
</section>
<section class="esh-identity-drop">
@ -23,14 +23,14 @@
asp-action="Index">
<div class="esh-identity-name esh-identity-name--upper">My orders</div>
<img class="esh-identity-image" src="../images/my_orders.png">
<img class="esh-identity-image" src="~/images/my_orders.png">
</a>
<a class="esh-identity-item"
href="javascript:document.getElementById('logoutForm').submit()">
<div class="esh-identity-name esh-identity-name--upper">Log Out</div>
<img class="esh-identity-image" src="../images/logout.png">
<img class="esh-identity-image" src="~/images/logout.png">
</a>
</section>
</form>

30
src/Web/WebMVC/WebMVC.csproj
View File

@ -14,21 +14,19 @@
</PropertyGroup>
<ItemGroup>
<Content Update="wwwroot\**\*;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\**\*;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="appsettings.json;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="web.config">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update=".dockerignore">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<None Include="wwwroot\css\*.min.css" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\fonts\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\images\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\js\*.min.js" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\*.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\bootstrap\dist\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\jquery*\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\tether\dist\**\*" CopyToPublishDirectory="PreserveNewest" />
<Content Update="wwwroot\**\*;" CopyToPublishDirectory="Never" />
<Content Update="Views\**\*;" CopyToPublishDirectory="PreserveNewest" />
<Content Update="appsettings.json;" CopyToPublishDirectory="PreserveNewest" />
<Content Update="web.config" CopyToPublishDirectory="PreserveNewest" />
<Content Update=".dockerignore" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
@ -63,7 +61,7 @@
</Target>
<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild3-final" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
</ItemGroup>

2
src/Web/WebMVC/bundleconfig.json
View File

@ -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"
]
},
{

2
src/Web/WebMVC/wwwroot/css/app.css
View File

@ -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 {

1
src/Web/WebMVC/wwwroot/css/app.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
src/Web/WebMVC/wwwroot/css/site.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
src/Web/WebSPA/Program.cs
View File

@ -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<Startup>()
.Build();