diff --git a/README.md b/README.md index 28b3cda9a..5bf7701ab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,57 @@ # Containerized eShop Sample reference containerized application, cross-platform and microservices architecture. -Powered by .NET Core, Docker and Docker Swarm mode +Powered by Microsoft + + + +#Overview +In this repo you will fin samples that will help you to get introduced into .net core, microservices environment and docker. + + +#Tools +#### Windows +Docker tools for windows + +####Mac +Docker tools for Mac + +##Set up Cpu and Memory +In this demo we will run 3 instances of SQL Server, 6 asp.net core applications and 1 redis server it's important to set up properly the Cpu and Ram assigned to docker. This can be set, once installed docker in your device through the whale icon, right click, settings and in the Advanced option you will need to adjust the default to the new values shown in the image: + + + +#Demo +The demo scenario is based on a ecommerce shop, each service is a .net core web application (basket, catalog, ordering, identity) and this services are consumed by differents web and mobile applications. + +MVC Application: Its an Mvc 6 development where you can find good samples about how to work with microservices in a MVC asp.net core application. + +SPA Application: Developed with Angular2, Typescript and Mvc 6, is another different aproach in web on how to work in a Microservices oriented solution. + +Xamarin Application (Ios, Windows, Android): Its a client application that run in mobile devices (ios, android, windows) and you can find another example on how to build a microservices oriented application. + +#Deploy goblal +In the global directory you will find the scripts needed to run and deploy the demo into your local docker infraestructure. The steps: + + +- build-images.ps1 Build .net applications and docker images: This power shell script that you will find in the root directory of the solution is the responsible of building .net applications and package in a pub folder and use docker commands to build the images needed to run the previously packaged .net applications. + +- Compose containers in your docker local VM: Finally you have to open your favourite command tool pointing to the root directory of the solution where docker-compose.yml file is located and run the command `docker-compose up` + +#Run +Once the deploy process of docker-compose finishes you have to be able to access the services in this urls from your machine: +- Web: http://localhost:5100 +- Web Spa: http://localhost:5104 +- Catalog service: http://localhost:5101 +- Orders service: http://localhost:5102 +- Basket service: http://localhost:5103 +- Identity service: http://localhost:5105 +- Orders data (SQL Server): Server=tcp:localhost,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word; +- Catalog data (SQL Server): Server=tcp:localhost,5434;Database=CatalogDB;User Id=sa;Password=Pass@word +- Identity data (SQL Server): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word +- Basket data (Redis): listening in localhost:6379 + +#Deploy individiual services into docker +Under each project root you will find a readme.md file as this that describes how to run and deploy the service individually into a docker container. + + + diff --git a/add-host-entry.ps1 b/add-host-entry.ps1 new file mode 100644 index 000000000..e373be888 --- /dev/null +++ b/add-host-entry.ps1 @@ -0,0 +1,19 @@ +param([switch]$Elevated) +function Check-Admin { +$currentUser = New-Object Security.Principal.WindowsPrincipal $([Security.Principal.WindowsIdentity]::GetCurrent()) +$currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator) +} +if ((Check-Admin) -eq $false) { +if ($elevated) +{ +# could not elevate, quit +} + +else { + +Start-Process powershell.exe -Verb RunAs -ArgumentList ('-noprofile -noexit -file "{0}" -elevated' -f ($myinvocation.MyCommand.Definition)) +} +exit +} + +ac -Encoding UTF8 C:\Windows\system32\drivers\etc\hosts "127.0.0.1 identity.service" \ No newline at end of file diff --git a/build-image-service-basket.ps1 b/build-image-service-basket.ps1 new file mode 100644 index 000000000..8294f4625 --- /dev/null +++ b/build-image-service-basket.ps1 @@ -0,0 +1,16 @@ +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +#*** Basket service image *** +$basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" +Write-Host "basketPathToJson is $basketPathToJson" -ForegroundColor Yellow +$basketPathToPub = $scriptPath + "\pub\basket" +Write-Host "basketPathToPub is $basketPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $basketPathToJson +dotnet build $basketPathToJson +dotnet publish $basketPathToJson -o $basketPathToPub + +docker build -t eshop/basket.api $basketPathToPub \ No newline at end of file diff --git a/build-image-service-catalog.ps1 b/build-image-service-catalog.ps1 new file mode 100644 index 000000000..7612e4f59 --- /dev/null +++ b/build-image-service-catalog.ps1 @@ -0,0 +1,16 @@ +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +#*** Catalog service image *** +$catalogPathToJson = $scriptPath + "\src\Services\Catalog\Catalog.API\project.json" +Write-Host "catalogPathToJson is $catalogPathToJson" -ForegroundColor Yellow +$catalogPathToPub = $scriptPath + "\pub\catalog" +Write-Host "catalogPathToPub is $catalogPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $catalogPathToJson +dotnet build $catalogPathToJson +dotnet publish $catalogPathToJson -o $catalogPathToPub + +docker build -t eshop/catalog.api $catalogPathToPub \ No newline at end of file diff --git a/build-image-service-identity.ps1 b/build-image-service-identity.ps1 new file mode 100644 index 000000000..00c8d0076 --- /dev/null +++ b/build-image-service-identity.ps1 @@ -0,0 +1,16 @@ +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +# *** identitySvc image *** +$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\eShopOnContainers.Identity\project.json" +Write-Host "identitySvcPathToJson is $identitySvcPathToJson" -ForegroundColor Yellow +$identitySvcPathToPub = $scriptPath + "\pub\identity" +Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $identitySvcPathToJson +dotnet build $identitySvcPathToJson +dotnet publish $identitySvcPathToJson -o $identitySvcPathToPub + +docker build -t eshop/identity $identitySvcPathToPub \ No newline at end of file diff --git a/build-image-service-orders.ps1 b/build-image-service-orders.ps1 new file mode 100644 index 000000000..6212bd60e --- /dev/null +++ b/build-image-service-orders.ps1 @@ -0,0 +1,16 @@ +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +#*** Ordering service image *** +$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" +Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow +$orderingPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $orderingPathToJson +dotnet build $orderingPathToJson +dotnet publish $orderingPathToJson -o $orderingPathToPub + +docker build -t eshop/ordering.api $orderingPathToPub \ No newline at end of file diff --git a/build-image-web-spa.ps1 b/build-image-web-spa.ps1 new file mode 100644 index 000000000..e28757366 --- /dev/null +++ b/build-image-web-spa.ps1 @@ -0,0 +1,77 @@ +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +$pubFolderToDelete = $scriptPath + "\pub" +remove-item -path $pubFolderToDelete -Force -Recurse -ErrorAction SilentlyContinue + +# *** WebSPA image *** +$webSPAPathToJson = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\project.json" +Write-Host "webSPAPathToJson is $webSPAPathToJson" -ForegroundColor Yellow +$webSPAPathToPub = $scriptPath + "\pub\webSPA" +$webSPAPathToNpmBat = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\buildspa.bat" +Write-Host "webSPAPathToPub is $webSPAPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $webSPAPathToJson +dotnet build $webSPAPathToJson +# Start-Process "cmd.exe" "/c " + $webSPAPathToNpmBat +dotnet publish $webSPAPathToJson -o $webSPAPathToPub + +# *** identitySvc image *** +$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\eShopOnContainers.Identity\project.json" +Write-Host "identitySvcPathToJson is $identitySvcPathToJson" -ForegroundColor Yellow +$identitySvcPathToPub = $scriptPath + "\pub\identity" +Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $identitySvcPathToJson +dotnet build $identitySvcPathToJson +dotnet publish $identitySvcPathToJson -o $identitySvcPathToPub + + +#*** Catalog service image *** +$catalogPathToJson = $scriptPath + "\src\Services\Catalog\Catalog.API\project.json" +Write-Host "catalogPathToJson is $catalogPathToJson" -ForegroundColor Yellow +$catalogPathToPub = $scriptPath + "\pub\catalog" +Write-Host "catalogPathToPub is $catalogPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $catalogPathToJson +dotnet build $catalogPathToJson +dotnet publish $catalogPathToJson -o $catalogPathToPub + +#*** Ordering service image *** +$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" +Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow +$orderingPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $orderingPathToJson +dotnet build $orderingPathToJson +dotnet publish $orderingPathToJson -o $orderingPathToPub + +#*** Basket service image *** +$basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" +Write-Host "basketPathToJson is $basketPathToJson" -ForegroundColor Yellow +$basketPathToPub = $scriptPath + "\pub\basket" +Write-Host "basketPathToPub is $basketPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $basketPathToJson +dotnet build $basketPathToJson +dotnet publish $basketPathToJson -o $basketPathToPub + +#!/bin/bash +# Delete all containers +docker rm $(docker ps -a -q) -f +# Delete all images +docker rmi $(docker images -q) + +#*** build docker images *** +docker build -t eshop/catalog.api $catalogPathToPub +docker build -t eshop/ordering.api $orderingPathToPub +docker build -t eshop/basket.api $basketPathToPub +docker build -t eshop/webspa $webSPAPathToPub +docker build -t eshop/identity $identitySvcPathToPub \ No newline at end of file diff --git a/build-image-web.ps1 b/build-image-web.ps1 new file mode 100644 index 000000000..1a2b06fdb --- /dev/null +++ b/build-image-web.ps1 @@ -0,0 +1,75 @@ +$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path + +Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow + +$pubFolderToDelete = $scriptPath + "..\..\pub" +remove-item -path $pubFolderToDelete -Force -Recurse -ErrorAction SilentlyContinue +#cmd /c "rd /s pub" /q + +# *** WebMVC image *** +$webPathToJson = $scriptPath + "\src\Web\WebMVC\project.json" +Write-Host "webPathToJson is $webPathToJson" -ForegroundColor Yellow +$webPathToPub = $scriptPath + "\pub\webMVC" +Write-Host "webPathToPub is $webPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $webPathToJson +dotnet build $webPathToJson +dotnet publish $webPathToJson -o $webPathToPub + +# *** identitySvc image *** +$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\eShopOnContainers.Identity\project.json" +Write-Host "identitySvcPathToJson is $identitySvcPathToJson" -ForegroundColor Yellow +$identitySvcPathToPub = $scriptPath + "\pub\identity" +Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $identitySvcPathToJson +dotnet build $identitySvcPathToJson +dotnet publish $identitySvcPathToJson -o $identitySvcPathToPub + +#*** Catalog service image *** +$catalogPathToJson = $scriptPath + "\src\Services\Catalog\Catalog.API\project.json" +Write-Host "catalogPathToJson is $catalogPathToJson" -ForegroundColor Yellow +$catalogPathToPub = $scriptPath + "\pub\catalog" +Write-Host "catalogPathToPub is $catalogPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $catalogPathToJson +dotnet build $catalogPathToJson +dotnet publish $catalogPathToJson -o $catalogPathToPub + +#*** Ordering service image *** +$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" +Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow +$orderingPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $orderingPathToJson +dotnet build $orderingPathToJson +dotnet publish $orderingPathToJson -o $orderingPathToPub + +#*** Basket service image *** +$basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" +Write-Host "basketPathToJson is $basketPathToJson" -ForegroundColor Yellow +$basketPathToPub = $scriptPath + "\pub\basket" +Write-Host "basketPathToPub is $basketPathToPub" -ForegroundColor Yellow + +Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue +dotnet restore $basketPathToJson +dotnet build $basketPathToJson +dotnet publish $basketPathToJson -o $basketPathToPub + +#!/bin/bash +# Delete all containers +docker rm $(docker ps -a -q) -f +# Delete all images +docker rmi $(docker images -q) + +#*** build docker images *** +docker build -t eshop/web $webPathToPub +docker build -t eshop/catalog.api $catalogPathToPub +docker build -t eshop/ordering.api $orderingPathToPub +docker build -t eshop/basket.api $basketPathToPub +docker build -t eshop/identity $identitySvcPathToPub \ No newline at end of file diff --git a/build-images.ps1 b/build-images.ps1 index 2bdda0059..054e6b59d 100644 --- a/build-images.ps1 +++ b/build-images.ps1 @@ -1,11 +1,9 @@ - $scriptPath = Split-Path $script:MyInvocation.MyCommand.Path Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow $pubFolderToDelete = $scriptPath + "\pub" remove-item -path $pubFolderToDelete -Force -Recurse -ErrorAction SilentlyContinue -#cmd /c "rd /s pub" /q # *** WebMVC image *** $webPathToJson = $scriptPath + "\src\Web\WebMVC\project.json" @@ -18,17 +16,18 @@ dotnet restore $webPathToJson dotnet build $webPathToJson dotnet publish $webPathToJson -o $webPathToPub + # *** WebSPA image *** $webSPAPathToJson = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\project.json" Write-Host "webSPAPathToJson is $webSPAPathToJson" -ForegroundColor Yellow $webSPAPathToPub = $scriptPath + "\pub\webSPA" -#$webSPAPathToNpmBat = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\buildspa.bat" +$webSPAPathToNpmBat = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\buildspa.bat" Write-Host "webSPAPathToPub is $webSPAPathToPub" -ForegroundColor Yellow Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue dotnet restore $webSPAPathToJson dotnet build $webSPAPathToJson -#Start-Process "cmd.exe" "/c " + $webSPAPathToNpmBat +# Start-Process "cmd.exe" "/c " + $webSPAPathToNpmBat dotnet publish $webSPAPathToJson -o $webSPAPathToPub # *** identitySvc image *** @@ -76,6 +75,12 @@ dotnet restore $basketPathToJson dotnet build $basketPathToJson dotnet publish $basketPathToJson -o $basketPathToPub +#!/bin/bash +# Delete all containers +docker rm $(docker ps -a -q) -f +# Delete all images +docker rmi $(docker images -q) + #*** build docker images *** docker build -t eshop/web $webPathToPub docker build -t eshop/catalog.api $catalogPathToPub diff --git a/docker-compose.yml b/docker-compose.yml index 43417ea65..725c9cfc8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,17 +2,18 @@ version: '2' services: webmvc: - image: eshop/web${TAG} + image: eshop/web build: context: . dockerfile: Dockerfile environment: - CatalogUrl=http://catalog.api - OrderingUrl=http://ordering.api - - IdentityUrl=http://identity.service + #- IdentityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. + - IdentityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. - BasketUrl=http://basket.api ports: - - "5100:80" + - "5100:5100" depends_on: - identity.service - basket.api @@ -25,7 +26,8 @@ services: environment: - CatalogUrl=http://catalog.api - OrderingUrl=http://ordering.api - - IdentityUrl=http://identity.service + #- IdentityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. + - IdentityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. - BasketUrl=http://basket.api ports: - "5104:80" @@ -33,12 +35,48 @@ services: - basket.api - identity.service + identity.service: + image: eshop/identity + environment: + - SpaClient=http://localhost:5104 + - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word + #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. + - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. + ports: + - "5105:5105" + depends_on: + - identity.data + + identity.data: + image: microsoft/mssql-server-linux + environment: + - SA_PASSWORD=Pass@word + - ACCEPT_EULA=Y + ports: + - "5433:1433" + + basket.api: + image: eshop/basket.api + environment: + - ConnectionString=basket.data + #- identityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. + - identityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. + build: + context: . + dockerfile: Dockerfile + ports: + - "5103:5103" + depends_on: + - basket.data + - identity.service + + basket.data: + image: redis + catalog.api: image: eshop/catalog.api environment: - ConnectionString=Server=catalog.data;Database=CatalogDB;User Id=sa;Password=Pass@word - expose: - - "80" ports: - "5101:80" depends_on: @@ -58,8 +96,6 @@ services: - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word ports: - "5102:80" - extra_hosts: - - "CESARDLBOOKVHD:10.0.75.1" depends_on: - ordering.data @@ -70,39 +106,3 @@ services: - ACCEPT_EULA=Y ports: - "5432:1433" - - identity.service: - image: eshop/identity - environment: - - Spa:http://webspa - - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;User Id=sa;Password=Pass@word - expose: - - "80" - ports: - - "5105:80" - depends_on: - - identity.data - - identity.data: - image: microsoft/mssql-server-linux - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" - - basket.api: - image: eshop/basket.api - environment: - - ConnectionString=basket.data - build: - context: . - dockerfile: Dockerfile - ports: - - "5103:80" - depends_on: - - basket.data - - identity.service - - basket.data: - image: redis \ No newline at end of file diff --git a/img/docker_settings.png b/img/docker_settings.png new file mode 100644 index 000000000..d53286fbd Binary files /dev/null and b/img/docker_settings.png differ diff --git a/img/eshop_cover.png b/img/eshop_cover.png new file mode 100644 index 000000000..5e2f01b87 Binary files /dev/null and b/img/eshop_cover.png differ diff --git a/push-images-to-registry.ps1 b/push-images-to-registry.ps1 deleted file mode 100644 index d567cf8bb..000000000 --- a/push-images-to-registry.ps1 +++ /dev/null @@ -1,4 +0,0 @@ - -docker push eshop/web -docker push eshop/catalog.api -docker push eshop/ordering.api \ No newline at end of file diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index ed9866dc2..712aafef8 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -17,7 +17,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() - .UseUrls("http://localhost:5008") .Build(); host.Run(); diff --git a/src/Services/Basket/Basket.API/Project_Readme.html b/src/Services/Basket/Basket.API/Project_Readme.html deleted file mode 100644 index 1a0f5b51a..000000000 --- a/src/Services/Basket/Basket.API/Project_Readme.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - Welcome to ASP.NET Core - - - - - - -
-
-

This application consists of:

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
- - -
- - - diff --git a/src/Services/Basket/Basket.API/README.md b/src/Services/Basket/Basket.API/README.md new file mode 100644 index 000000000..aa8a68c02 --- /dev/null +++ b/src/Services/Basket/Basket.API/README.md @@ -0,0 +1,24 @@ +# Containerized eShop - Basket Service +Sample reference containerized application, cross-platform and microservices architecture. +Powered by Microsoft + +#Overview +This sample runs a microservices oriented application and a .net core Mvc application that consumes this services. You can find more information about how to set up docker in your machine in the global directory solution. + +#Deploy +In the global directory you will find the scripts needed to run and deploy the demo into your local docker infraestructure. + +- build-image-services-basket.ps1 Build .net applications and docker images: This power shell script that you will find in the root directory of the solution is the responsible of building .net applications and package in a pub folder and use docker commands to build the images needed to run the previously packaged .net applications. + +- Compose containers in your docker local VM: Finally you have to open your favourite command tool pointing to the root directory of this project where docker-compose.yml file is located and run the command `docker-compose up` + +#Run +Once the deploy process of docker-compose finishes you have to be able to access the services in this urls: +- Basket service: http://localhost:5103 +- Identity service: http://localhost:5105 +- Basket data (Redis): listening in localhost:6379 +- Identity data (SQL Server): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word + + + + diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 070e10b86..f558b2e12 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -68,9 +68,11 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API // Use frameworks app.UseCors("CorsPolicy"); + var identityUrl = Configuration.GetValue(typeof(string), "IdentityUrl"); + app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions { - Authority = "http://localhost:5000", + Authority = identityUrl.ToString(), ScopeName = "basket", RequireHttpsMetadata = false }); diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json index 4a7f5b126..413de6ab8 100644 --- a/src/Services/Basket/Basket.API/appsettings.json +++ b/src/Services/Basket/Basket.API/appsettings.json @@ -7,6 +7,6 @@ "Microsoft": "Information" } }, - "identityUrl": "http://localhost:5000", + "IdentityUrl": "http://localhost:5105", "ConnectionString": "127.0.0.1" } diff --git a/src/Services/Basket/Basket.API/docker-compose.dev.debug.yml b/src/Services/Basket/Basket.API/docker-compose.dev.debug.yml deleted file mode 100644 index b2d89a04d..000000000 --- a/src/Services/Basket/Basket.API/docker-compose.dev.debug.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '2' - -services: - basket.api: - build: - args: - source: obj/Docker/empty/ - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - environment: - - ASPNETCORE_ENVIRONMENT=Development - - DOTNET_USE_POLLING_FILE_WATCHER=1 - volumes: - - .:/app - - ~/.nuget/packages:/root/.nuget/packages:ro - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Services/Basket/Basket.API/docker-compose.dev.release.yml b/src/Services/Basket/Basket.API/docker-compose.dev.release.yml deleted file mode 100644 index 259308345..000000000 --- a/src/Services/Basket/Basket.API/docker-compose.dev.release.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '2' - -services: - basket.api: - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - volumes: - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Services/Basket/Basket.API/docker-compose.yml b/src/Services/Basket/Basket.API/docker-compose.yml index 208b8dc37..0935fc210 100644 --- a/src/Services/Basket/Basket.API/docker-compose.yml +++ b/src/Services/Basket/Basket.API/docker-compose.yml @@ -2,29 +2,35 @@ version: '2' services: basket.api: - image: user/basket.api${TAG} + image: eshop/basket.api environment: - ConnectionString=basket.data + #- identityUrl=http://104.40.62.65:5105 #Remote: VM Needs to have public access at 5105. + - identityUrl=http://identity.service:5105 #Local: You need a entry in windows host file to run identity in local docker. build: context: . dockerfile: Dockerfile ports: - - "32783:80" + - "5103:5103" depends_on: - basket.data + - identity.service basket.data: image: redis identity.service: image: eshop/identity - expose: - - "80" + environment: + - SpaClient=http://localhost:5104 + - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word + #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. + - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. ports: - - "5105:80" + - "5105:5105" depends_on: - identity.data - + identity.data: image: microsoft/mssql-server-linux environment: diff --git a/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs b/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs new file mode 100644 index 000000000..e6ade8cc5 --- /dev/null +++ b/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 + +namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers +{ + public class HomeController : Controller + { + // GET: // + public IActionResult Index() + { + return new RedirectResult("~/swagger/ui"); + } + } +} diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 3e3ef42e8..8bbc926f9 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -1,5 +1,5 @@ -FROM microsoft/aspnetcore:latest +FROM microsoft/aspnetcore:1.0.1 WORKDIR /app EXPOSE 80 -ADD . /app +COPY . /app ENTRYPOINT dotnet Catalog.API.dll \ No newline at end of file diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs index 105ef79cf..28d484d2d 100644 --- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs +++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs @@ -1,44 +1,60 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure { using EntityFrameworkCore; + using Extensions.Logging; using Microsoft.AspNetCore.Builder; + using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; public class CatalogContextSeed { - public static async Task SeedAsync(IApplicationBuilder applicationBuilder) + public static async Task SeedAsync(IApplicationBuilder applicationBuilder, ILoggerFactory loggerFactory, int? retry = 0) { - var context = (CatalogContext)applicationBuilder - .ApplicationServices.GetService(typeof(CatalogContext)); - - using (context) + int retryForAvaiability = retry.Value; + try { - context.Database.Migrate(); + var context = (CatalogContext)applicationBuilder + .ApplicationServices.GetService(typeof(CatalogContext)); - if (!context.CatalogBrands.Any()) - { - context.CatalogBrands.AddRange( - GetPreconfiguredCatalogBrands()); + //using (context) + //{ + context.Database.Migrate(); - await context.SaveChangesAsync(); - } + if (!context.CatalogBrands.Any()) + { + context.CatalogBrands.AddRange( + GetPreconfiguredCatalogBrands()); - if (!context.CatalogTypes.Any()) - { - context.CatalogTypes.AddRange( - GetPreconfiguredCatalogTypes()); + await context.SaveChangesAsync(); + } - await context.SaveChangesAsync(); - } + if (!context.CatalogTypes.Any()) + { + context.CatalogTypes.AddRange( + GetPreconfiguredCatalogTypes()); - if (!context.CatalogItems.Any()) - { - context.CatalogItems.AddRange( - GetPreconfiguredItems()); + await context.SaveChangesAsync(); + } + + if (!context.CatalogItems.Any()) + { + context.CatalogItems.AddRange( + GetPreconfiguredItems()); - await context.SaveChangesAsync(); + await context.SaveChangesAsync(); + } + //} + } + catch (Exception ex) + { + if (retryForAvaiability < 10) + { + retryForAvaiability++; + var log = loggerFactory.CreateLogger("catalog seed"); + log.LogError(ex.Message); + await SeedAsync(applicationBuilder, loggerFactory, retryForAvaiability); } } } diff --git a/src/Services/Catalog/Catalog.API/README.md b/src/Services/Catalog/Catalog.API/README.md new file mode 100644 index 000000000..5616bab52 --- /dev/null +++ b/src/Services/Catalog/Catalog.API/README.md @@ -0,0 +1,21 @@ +# Containerized eShop - Catalog Service +Sample reference containerized application, cross-platform and microservices architecture. +Powered by Microsoft + +#Overview +This sample runs a microservices oriented application and a .net core Mvc application that consumes this services. You can find more information about how to set up docker in your machine in the global directory solution. + +#Deploy +In the global directory you will find the scripts needed to run and deploy the demo into your local docker infraestructure. + +- build-image-services-catalog.ps1 Build .net applications and docker images: This power shell script that you will find in the root directory of the solution is the responsible of building .net applications and package in a pub folder and use docker commands to build the images needed to run the previously packaged .net applications. + +- Compose containers in your docker local VM: Finally you have to open your favourite command tool pointing to the root directory of this project where docker-compose.yml file is located and run the command `docker-compose up` + +#Run +Once the deploy process of docker-compose finishes you have to be able to access the services in this urls: +- Catalog service: http://localhost:5101 +- Catalog data (SQL Server): Server=tcp:localhost,5434;Database=CatalogDB;User Id=sa;Password=Pass@word + + + diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 1507cf408..67218969a 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -8,6 +8,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; + using System; + using System.Threading; + using System.Threading.Tasks; public class Startup { @@ -45,7 +48,6 @@ }); // Add framework services. - services.AddSwaggerGen(); services.ConfigureSwaggerGen(options => { @@ -68,9 +70,7 @@ .AllowCredentials()); }); - services.AddMvc(mvcoptions => - { - }); + services.AddMvc(); } public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) @@ -85,18 +85,19 @@ loggerFactory.AddConsole(Configuration.GetSection("Logging")); loggerFactory.AddDebug(); - //Seed Data - - CatalogContextSeed.SeedAsync(app) - .Wait(); - // Use frameworks app.UseCors("CorsPolicy"); - app.UseMvc(); + app.UseMvcWithDefaultRoute(); app.UseSwagger() .UseSwaggerUi(); + + //Seed Data + CatalogContextSeed.SeedAsync(app, loggerFactory) + .Wait(); + + } } } diff --git a/src/Services/Identity/eShopOnContainers.Identity/Configuration/ClientCallBackUrls.cs b/src/Services/Identity/eShopOnContainers.Identity/Configuration/ClientCallBackUrls.cs deleted file mode 100644 index 10bd2e420..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Configuration/ClientCallBackUrls.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace eShopOnContainers.Identity.Configuration -{ - public class ClientCallBackUrls - { - public string Spa { get; set; } - } -} diff --git a/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs b/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs index c7e5189e5..3d413dcc7 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs +++ b/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs @@ -6,14 +6,6 @@ namespace eShopOnContainers.Identity.Configuration { public class Config { - private readonly IOptions _settings; - - public Config(IOptions settings) - { - _settings = settings; - - } - // scopes define the resources in your system public static IEnumerable GetScopes() { @@ -38,7 +30,7 @@ namespace eShopOnContainers.Identity.Configuration } // client want to access resources (aka scopes) - public static IEnumerable GetClients() + public static IEnumerable GetClients(Dictionary clientsUrl) { return new List { @@ -49,9 +41,9 @@ namespace eShopOnContainers.Identity.Configuration ClientName = "eShop SPA OpenId Client", AllowedGrantTypes = GrantTypes.Implicit, AllowAccessTokensViaBrowser = true, - RedirectUris = { "http://localhost:5003/callback.html" }, - PostLogoutRedirectUris = { "http://localhost:5003/index.html" }, - AllowedCorsOrigins = { "http://localhost:5003" }, + RedirectUris = { $"{clientsUrl["Spa"]}/callback.html" }, + PostLogoutRedirectUris = { $"{clientsUrl["Spa"]}/index.html" }, + AllowedCorsOrigins = { $"{clientsUrl["Spa"]}" }, AllowedScopes = { StandardScopes.OpenId.Name, @@ -66,9 +58,9 @@ namespace eShopOnContainers.Identity.Configuration ClientName = "eShop Xamarin OpenId Client", AllowedGrantTypes = GrantTypes.Implicit, AllowAccessTokensViaBrowser = true, - RedirectUris = { "http://localhost:5003/callback.html" }, - PostLogoutRedirectUris = { "http://localhost:5003/index.html" }, - AllowedCorsOrigins = { "http://localhost:5003" }, + RedirectUris = { "http://eshopxamarin/callback.html" }, + PostLogoutRedirectUris = { "http://eshopxamarin/callback.html/index.html" }, + AllowedCorsOrigins = { "http://eshopxamarin" }, AllowedScopes = { StandardScopes.OpenId.Name, @@ -85,17 +77,17 @@ namespace eShopOnContainers.Identity.Configuration { new Secret("secret".Sha256()) }, - ClientUri = "http://localhost:2114", + ClientUri = $"{clientsUrl["Mvc"]}", // public uri of the client AllowedGrantTypes = GrantTypes.HybridAndClientCredentials, RedirectUris = new List { - "http://localhost:2114/signin-oidc" + $"{clientsUrl["Mvc"]}/signin-oidc", + "http://104.40.62.65:5100/signin-oidc" }, PostLogoutRedirectUris = new List { - "http://localhost:2114/" + $"{clientsUrl["Mvc"]}/" }, - LogoutUri = "http://localhost:2114/signout-oidc", AllowedScopes = new List { StandardScopes.OpenId.Name, diff --git a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs b/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs index 58f1cf52b..c441e5976 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs +++ b/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs @@ -202,8 +202,9 @@ namespace IdentityServer4.Quickstart.UI.Controllers // hack: try/catch to handle social providers that throw await HttpContext.Authentication.SignOutAsync(idp, new AuthenticationProperties { RedirectUri = url }); } - catch(NotSupportedException) + catch(Exception ex) { + _logger.LogCritical(ex.Message); } } @@ -247,73 +248,6 @@ namespace IdentityServer4.Quickstart.UI.Controllers return new ChallengeResult(provider, props); } - /// - /// Post processing of external authentication - /// - [HttpGet] - public async Task ExternalLoginCallback(string returnUrl) - { - // read external identity from the temporary cookie - var info = await HttpContext.Authentication.GetAuthenticateInfoAsync(IdentityServerConstants.ExternalCookieAuthenticationScheme); - //var tempUser = info?.Principal; - //if (tempUser == null) - //{ - // throw new Exception("External authentication error"); - //} - - //// retrieve claims of the external user - //var claims = tempUser.Claims.ToList(); - - //// try to determine the unique id of the external user - the most common claim type for that are the sub claim and the NameIdentifier - //// depending on the external provider, some other claim type might be used - //var userIdClaim = claims.FirstOrDefault(x => x.Type == JwtClaimTypes.Subject); - //if (userIdClaim == null) - //{ - // userIdClaim = claims.FirstOrDefault(x => x.Type == ClaimTypes.NameIdentifier); - //} - //if (userIdClaim == null) - //{ - // throw new Exception("Unknown userid"); - //} - - //// remove the user id claim from the claims collection and move to the userId property - //// also set the name of the external authentication provider - //claims.Remove(userIdClaim); - //var provider = info.Properties.Items["scheme"]; - //var userId = userIdClaim.Value; - - //// check if the external user is already provisioned - //var user = _loginService.FindByExternalProvider(provider, userId); - //if (user == null) - //{ - // // this sample simply auto-provisions new external user - // // another common approach is to start a registrations workflow first - // user = _loginService.AutoProvisionUser(provider, userId, claims); - //} - - //var additionalClaims = new List(); - - //// if the external system sent a session id claim, copy it over - //var sid = claims.FirstOrDefault(x => x.Type == JwtClaimTypes.SessionId); - //if (sid != null) - //{ - // additionalClaims.Add(new Claim(JwtClaimTypes.SessionId, sid.Value)); - //} - - //// issue authentication cookie for user - //await HttpContext.Authentication.SignInAsync(user.Subject, user.Username, provider, additionalClaims.ToArray()); - - //// delete temporary cookie used during external authentication - //await HttpContext.Authentication.SignOutAsync(IdentityServerConstants.ExternalCookieAuthenticationScheme); - - //// validate return URL and redirect back to authorization endpoint - //if (_interaction.IsValidReturnUrl(returnUrl)) - //{ - // return Redirect(returnUrl); - //} - - return Redirect("~/"); - } // GET: /Account/Register [HttpGet] @@ -361,6 +295,10 @@ namespace IdentityServer4.Quickstart.UI.Controllers } } + if (returnUrl != null) { + return Redirect(returnUrl); + } + return RedirectToAction("index", "home"); } diff --git a/src/Services/Identity/eShopOnContainers.Identity/Dockerfile b/src/Services/Identity/eShopOnContainers.Identity/Dockerfile index 8e55d6c06..d08c2afad 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Dockerfile +++ b/src/Services/Identity/eShopOnContainers.Identity/Dockerfile @@ -2,6 +2,5 @@ FROM microsoft/aspnetcore:1.0.1 ENTRYPOINT ["dotnet", "eShopOnContainers.Identity.dll"] ARG source=. WORKDIR /app -ENV ASPNETCORE_URLS http://*:80 -EXPOSE 80 -COPY $source . \ No newline at end of file +ENV ASPNETCORE_URLS http://*:5105 +COPY $source . diff --git a/src/Services/Identity/eShopOnContainers.Identity/Program.cs b/src/Services/Identity/eShopOnContainers.Identity/Program.cs index 5bfe9805e..23d4b8060 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Program.cs +++ b/src/Services/Identity/eShopOnContainers.Identity/Program.cs @@ -13,9 +13,9 @@ namespace eShopOnContainers.Identity { var host = new WebHostBuilder() .UseKestrel() - //.UseUrls("http://localhost:5000") + .UseUrls("http://0.0.0.0:5105") .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + //.UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Services/Identity/eShopOnContainers.Identity/README.md b/src/Services/Identity/eShopOnContainers.Identity/README.md new file mode 100644 index 000000000..e8c915ad8 --- /dev/null +++ b/src/Services/Identity/eShopOnContainers.Identity/README.md @@ -0,0 +1,25 @@ +# Containerized eShop - Identity Service +Sample reference containerized application, cross-platform and microservices architecture. +Powered by Microsoft + +#Overview +This sample runs a microservices oriented application and a .net core Mvc application that consumes this services. You can find more information about how to set up docker in your machine in the global directory solution. + +#Considerations +This service is a identity provider implemented with identity server 4, to implement this scenario is needed a public authority so to complete this flow in our local docker infrastructure we have to add a entry in our host file (windows) or equivalent in other platforms: + +identity.service 127.0.0.1 + +In the root directory of this solution you'll find add-host.ps1 script that does this work for you (requires elevation permission). + +#Deploy +In the global directory you will find the scripts needed to run and deploy the demo into your local docker infraestructure. + +- build-image-services-identity.ps1 Build .net applications and docker images: This power shell script that you will find in the root directory of the solution is the responsible of building .net applications and package in a pub folder and use docker commands to build the images needed to run the previously packaged .net applications. + +- Compose containers in your docker local VM: Finally you have to open your favourite command tool pointing to the root directory of this project where docker-compose.yml file is located and run the command `docker-compose up` + +#Run +Once the deploy process of docker-compose finishes you have to be able to access the services in this urls: +- Identity service: http://localhost:5105 +- Identity data (SQL Server): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word diff --git a/src/Services/Identity/eShopOnContainers.Identity/Startup.cs b/src/Services/Identity/eShopOnContainers.Identity/Startup.cs index 6275d9cd8..7c38b74bd 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Startup.cs +++ b/src/Services/Identity/eShopOnContainers.Identity/Startup.cs @@ -14,6 +14,7 @@ using eShopOnContainers.Identity.Models; using eShopOnContainers.Identity.Services; using eShopOnContainers.Identity.Configuration; using IdentityServer4.Services; +using System.Threading; namespace eShopOnContainers.Identity { @@ -56,17 +57,18 @@ namespace eShopOnContainers.Identity services.AddTransient(); services.AddTransient, EFLoginService>(); + //callbacks urls from config: + Dictionary clientUrls = new Dictionary(); + clientUrls.Add("Mvc", Configuration.GetValue("MvcClient")); + clientUrls.Add("Spa", Configuration.GetValue("SpaClient")); + // Adds IdentityServer services.AddIdentityServer() .AddTemporarySigningCredential() .AddInMemoryScopes(Config.GetScopes()) - .AddInMemoryClients(Config.GetClients()) + .AddInMemoryClients(Config.GetClients(clientUrls)) .AddAspNetIdentity() .Services.AddTransient(); - - //Configuration Settings: - services.AddOptions(); - services.Configure(Configuration.GetSection("ClientCallBackUrls")); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -100,17 +102,29 @@ namespace eShopOnContainers.Identity template: "{controller=Home}/{action=Index}/{id?}"); }); + MigrateDb(app); + } + + int retries = 0; + + private void MigrateDb(IApplicationBuilder app) + { try { var context = (ApplicationDbContext)app - .ApplicationServices.GetService(typeof(ApplicationDbContext)); - + .ApplicationServices.GetService(typeof(ApplicationDbContext)); using (context) { context.Database.Migrate(); } + + } + catch (Exception) + { + retries++; + if (retries < 2) + MigrateDb(app); } - catch (Exception) { } } } } diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml index aa327f5b2..e008f672c 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml +++ b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml @@ -9,7 +9,7 @@ }
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml index 9fb328361..24a2afbb1 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml +++ b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml @@ -6,7 +6,7 @@
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/_Login.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/_Login.cshtml deleted file mode 100644 index a07ddb99d..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/_Login.cshtml +++ /dev/null @@ -1,49 +0,0 @@ -@*@model eShopOnContainers.Identity.Models.AccountViewModels.LoginViewModel - -*@ \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Home/Index.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Home/Index.cshtml index 329ece8ae..bd2846075 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Home/Index.cshtml +++ b/src/Services/Identity/eShopOnContainers.Identity/Views/Home/Index.cshtml @@ -1,4 +1,4 @@ -
+

diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Shared/_Layout.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Shared/_Layout.cshtml index 1119a0820..4447e189e 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Shared/_Layout.cshtml +++ b/src/Services/Identity/eShopOnContainers.Identity/Views/Shared/_Layout.cshtml @@ -3,51 +3,60 @@ - IdentityServer4 + eShopOnContainers Identity - -
-
-
- - - - - IdentityServer4 - - +
+
+
+
+ +
+ +
+ + @if (User.Identity.IsAuthenticated) + { + + }
- - @if (User.Identity.IsAuthenticated) - { - - }
- -
+ +
@RenderBody() +

+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ @RenderSection("scripts", required: false) diff --git a/src/Services/Identity/eShopOnContainers.Identity/appsettings.json b/src/Services/Identity/eShopOnContainers.Identity/appsettings.json index 4b630798d..ee6bcb9a1 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/appsettings.json +++ b/src/Services/Identity/eShopOnContainers.Identity/appsettings.json @@ -1,11 +1,10 @@ { "ConnectionStrings": { - //"DefaultConnection": "Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;User Id=sa;Password=Pass@word" - "DefaultConnection": "Server=127.0.0.1,5433;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;User Id=sa;Password=Pass@word" - }, - "ClientsCallBackUrls": { - "Spa": "http://localhost:5003" + "DefaultConnection": "Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word" + //"DefaultConnection": "Server=127.0.0.1,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word" }, + "MvcClient": "http://localhost:5100", + "SpaClient": "http://localhost:5104", "Logging": { "IncludeScopes": false, "LogLevel": { diff --git a/src/Services/Identity/eShopOnContainers.Identity/bundleconfig.json b/src/Services/Identity/eShopOnContainers.Identity/bundleconfig.json index f909fa798..7ea58bded 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/bundleconfig.json +++ b/src/Services/Identity/eShopOnContainers.Identity/bundleconfig.json @@ -6,7 +6,6 @@ // An array of relative input file paths. Globbing patterns supported "inputFiles": [ "wwwroot/css/site.css", - "wwwroot/css/sitemvc.css" ] }, { diff --git a/src/Services/Identity/eShopOnContainers.Identity/docker-compose.yml b/src/Services/Identity/eShopOnContainers.Identity/docker-compose.yml index b5ce2282d..c342407ce 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/docker-compose.yml +++ b/src/Services/Identity/eShopOnContainers.Identity/docker-compose.yml @@ -1,18 +1,15 @@ version: '2' services: - identity.service: - image: eshop/identity - build: - context: . - dockerfile: Dockerfile +identity.service: + image: eshop/identity environment: - - ConnectionString=Server=identity.data;Initial Catalog=CatalogData;User Id=sa;Password=Pass@word - - Spa=http://localhost/5003 - expose: - - "80" + - SpaClient=http://localhost:5104 + - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word + #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. + - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. ports: - - "5101:80" + - "5105:5105" depends_on: - identity.data @@ -22,4 +19,4 @@ services: - SA_PASSWORD=Pass@word - ACCEPT_EULA=Y ports: - - "5434:1433" + - "5433:1433" diff --git a/src/Services/Identity/eShopOnContainers.Identity/project.json b/src/Services/Identity/eShopOnContainers.Identity/project.json index 037e21966..a63963893 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/project.json +++ b/src/Services/Identity/eShopOnContainers.Identity/project.json @@ -97,9 +97,9 @@ "prepublish": [ "bower install", "dotnet bundle" - ], - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + //"postpublish": [ + // "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" + //] } } diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.css b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.css index 38132678e..9360d24ba 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.css +++ b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.css @@ -36,4 +36,869 @@ } .page-consent .consent-form .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 { + padding-top: 80px; + /*padding-bottom: 20px;*/ + 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; +} + + .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; + } } \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.less b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.less index 75bdb5d9c..4e8d26a3a 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.less +++ b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.less @@ -524,7 +524,7 @@ form .col-md-4 { opacity: 0.5; margin-top: 25px; margin-left: 10px; - float: right; + /*float: right;*/ cursor: pointer; color: white; } diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.min.css b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.min.css index eeaee41b5..42d91742f 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.min.css +++ b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/site.min.css @@ -1 +1 @@ -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}.page-consent .client-logo img{width:80px;height:80px}.page-consent .consent-buttons{margin-top:25px}.page-consent .consent-form .consent-scopecheck{display:inline-block;margin-right:5px}.page-consent .consent-form .consent-description{margin-left:25px}.page-consent .consent-form .consent-description label{font-weight:normal}.page-consent .consent-form .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{padding-top:80px;font-family:Montserrat,sans-serif;min-width:480px}.mt-15{margin-top:15px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.select-filter{background-color:transparent;padding:10px;margin:10px;margin-right:20px;color:#fff;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:.5;z-index:1;text-transform:uppercase;position:absolute;font-size:10px;margin-top:15px;margin-left:21px;color:#fff}.select-filter-arrow{position:absolute;margin-left:130px;margin-top:40px}.btn-brand-small-filter{margin-top:10px;position:absolute;margin-left:15px}.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:#fff;border-radius:50%;width:18px;height:18px;font-size:12px;cursor:pointer}.btn-bracketed:hover:before{display:inline-block;content:"[";padding-right:.5em;color:#7fff00}.btn-bracketed:hover:after{display:inline-block;content:"]";padding-left:.5em;color:#7fff00}.btn-brand{background-color:#83d01b;color:#fff;padding:10px 20px 10px 20px;border-radius:0;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:#fff;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}.carousel-inner .item img[src$=".svg"]{width:100%}.navbar-inverse{background-color:#fff;border-color:#fff}.btn-login{border:1px solid #00a69c;height:36px!important;margin-right:10px;margin-top:10px;background-color:#fff;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:0 !important}.nav>li>a{color:#fff}.nav>li>a:hover,.nav>li>a:focus{background-color:#00a69c;font-weight:bolder}.container-fluid{padding-left:0;padding-right:0}.home-banner{width:100%;margin-right:0;margin-left:0;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}.home-catalog-filter-container li a{padding-top:5px !important}.home-catalog-filter-brands::before{content:'BRAND';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-filter-types::before{content:'TYPES';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-item{margin-top:10px;margin-bottom:10px}.home-catalog-item-image{width:100%;object-fit:cover;text-align:center}.home-catalog-item-image-addCart{background-color:#83d01b;color:#fff;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:#fff;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:#000;height:150px;vertical-align:middle}footer .brand{margin-top:25px;background-image:url(../images/brand_dark.PNG);max-width:231px;height:52px;margin-left:0 !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:.5;margin-top:25px;margin-left:10px;float:right;cursor:pointer;color:#fff}.brand-header-block li a{color:#fff}.brand-header-block li a:hover{text-decoration:none}.brand-header-block .active{opacity:1}.brand-header-block .active::before{content:'[ ';color:#adff2f}.brand-header-block .active::after{content:' ]';color:#adff2f}.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:#fff;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:0!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 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:#fff;min-width:160px;box-shadow:0 8px 16px 0 rgba(0,0,0,.2);right:0}.login-user-dropdown-content a{color:#000;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}}@media screen and (max-width:767px){.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}} \ No newline at end of file +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}.page-consent .client-logo img{width:80px;height:80px}.page-consent .consent-buttons{margin-top:25px}.page-consent .consent-form .consent-scopecheck{display:inline-block;margin-right:5px}.page-consent .consent-form .consent-description{margin-left:25px}.page-consent .consent-form .consent-description label{font-weight:normal}.page-consent .consent-form .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{padding-top:80px;font-family:Montserrat,sans-serif;min-width:480px}.mt-15{margin-top:15px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.select-filter{background-color:transparent;padding:10px;margin:10px;margin-right:20px;color:#fff;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:.5;z-index:1;text-transform:uppercase;position:absolute;font-size:10px;margin-top:15px;margin-left:21px;color:#fff}.select-filter-arrow{position:absolute;margin-left:130px;margin-top:40px}.btn-brand-small-filter{margin-top:10px;position:absolute;margin-left:15px}.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:#fff;border-radius:50%;width:18px;height:18px;font-size:12px;cursor:pointer}.btn-bracketed:hover:before{display:inline-block;content:"[";padding-right:.5em;color:#7fff00}.btn-bracketed:hover:after{display:inline-block;content:"]";padding-left:.5em;color:#7fff00}.btn-brand{background-color:#83d01b;color:#fff;padding:10px 20px 10px 20px;border-radius:0;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:#fff;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}.carousel-inner .item img[src$=".svg"]{width:100%}.navbar-inverse{background-color:#fff;border-color:#fff}.btn-login{border:1px solid #00a69c;height:36px!important;margin-right:10px;margin-top:10px;background-color:#fff;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:0 !important}.nav>li>a{color:#fff}.nav>li>a:hover,.nav>li>a:focus{background-color:#00a69c;font-weight:bolder}.container-fluid{padding-left:0;padding-right:0}.home-banner{width:100%;margin-right:0;margin-left:0;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}.home-catalog-filter-container li a{padding-top:5px !important}.home-catalog-filter-brands::before{content:'BRAND';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-filter-types::before{content:'TYPES';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-item{margin-top:10px;margin-bottom:10px}.home-catalog-item-image{width:100%;object-fit:cover;text-align:center}.home-catalog-item-image-addCart{background-color:#83d01b;color:#fff;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:#fff;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:#000;height:150px;vertical-align:middle}footer .brand{margin-top:25px;background-image:url(../images/brand_dark.PNG);max-width:231px;height:52px;margin-left:0 !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:.5;margin-top:25px;margin-left:10px;cursor:pointer;color:#fff}.brand-header-block li a{color:#fff}.brand-header-block li a:hover{text-decoration:none}.brand-header-block .active{opacity:1}.brand-header-block .active::before{content:'[ ';color:#adff2f}.brand-header-block .active::after{content:' ]';color:#adff2f}.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:#fff;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:0!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 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:#fff;min-width:160px;box-shadow:0 8px 16px 0 rgba(0,0,0,.2);right:0}.login-user-dropdown-content a{color:#000;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}}@media screen and (max-width:767px){.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}} \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/sitemvc.css b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/sitemvc.css deleted file mode 100644 index e02abfc9b..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/sitemvc.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/sitemvc.min.css b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/sitemvc.min.css deleted file mode 100644 index 35d022759..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/css/sitemvc.min.css +++ /dev/null @@ -1 +0,0 @@ -@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{padding-top:80px;font-family:Montserrat,sans-serif;min-width:480px}.mt-15{margin-top:15px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.select-filter{background-color:transparent;padding:10px;margin:10px;margin-right:20px;color:#fff;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:.5;z-index:1;text-transform:uppercase;position:absolute;font-size:10px;margin-top:15px;margin-left:21px;color:#fff}.select-filter-arrow{position:absolute;margin-left:130px;margin-top:40px}.btn-brand-small-filter{margin-top:10px;position:absolute;margin-left:15px}.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:#fff;border-radius:50%;width:18px;height:18px;font-size:12px;cursor:pointer}.btn-bracketed:hover:before{display:inline-block;content:"[";padding-right:.5em;color:#7fff00}.btn-bracketed:hover:after{display:inline-block;content:"]";padding-left:.5em;color:#7fff00}.btn-brand{background-color:#83d01b;color:#fff;padding:10px 20px 10px 20px;border-radius:0;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:#fff;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}.carousel-inner .item img[src$=".svg"]{width:100%}.navbar-inverse{background-color:#fff;border-color:#fff}.btn-login{border:1px solid #00a69c;height:36px!important;margin-right:10px;margin-top:10px;background-color:#fff;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:0 !important}.nav>li>a{color:#fff}.nav>li>a:hover,.nav>li>a:focus{background-color:#00a69c;font-weight:bolder}.container-fluid{padding-left:0;padding-right:0}.home-banner{width:100%;margin-right:0;margin-left:0;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}.home-catalog-filter-container li a{padding-top:5px !important}.home-catalog-filter-brands::before{content:'BRAND';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-filter-types::before{content:'TYPES';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-item{margin-top:10px;margin-bottom:10px}.home-catalog-item-image{width:100%;object-fit:cover;text-align:center}.home-catalog-item-image-addCart{background-color:#83d01b;color:#fff;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:#fff;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:#000;height:150px;vertical-align:middle}footer .brand{margin-top:25px;background-image:url(../images/brand_dark.PNG);max-width:231px;height:52px;margin-left:0 !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:.5;margin-top:25px;margin-left:10px;float:right;cursor:pointer;color:#fff}.brand-header-block li a{color:#fff}.brand-header-block li a:hover{text-decoration:none}.brand-header-block .active{opacity:1}.brand-header-block .active::before{content:'[ ';color:#adff2f}.brand-header-block .active::after{content:' ]';color:#adff2f}.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:#fff;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:0!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 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:#fff;min-width:160px;box-shadow:0 8px 16px 0 rgba(0,0,0,.2);right:0}.login-user-dropdown-content a{color:#000;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}}@media screen and (max-width:767px){.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}} \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/favicon.ico b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/favicon.ico index ee470e42f..e499a7453 100644 Binary files a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/favicon.ico and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/favicon.ico differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/arrow-down.png b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/arrow-down.png new file mode 100644 index 000000000..1ebe2e929 Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/arrow-down.png differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/arrow-right.svg b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/arrow-right.svg new file mode 100644 index 000000000..1258243c3 --- /dev/null +++ b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/arrow-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/brand.PNG b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/brand.PNG new file mode 100644 index 000000000..2afd3dccf Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/brand.PNG differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/brand_dark.PNG b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/brand_dark.PNG new file mode 100644 index 000000000..44a65364f Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/brand_dark.PNG differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/cart.png b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/cart.png new file mode 100644 index 000000000..158bcf797 Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/cart.png differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/logout.PNG b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/logout.PNG new file mode 100644 index 000000000..9915b9862 Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/logout.PNG differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner.png b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner.png new file mode 100644 index 000000000..0f345a385 Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner.png differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner_text.png b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner_text.png new file mode 100644 index 000000000..47315ef58 Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner_text.png differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner_text.svg b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner_text.svg new file mode 100644 index 000000000..58ce73af0 --- /dev/null +++ b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/main_banner_text.svg @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/my_orders.PNG b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/my_orders.PNG new file mode 100644 index 000000000..145be925b Binary files /dev/null and b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/my_orders.PNG differ diff --git a/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/refresh.svg b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/refresh.svg new file mode 100644 index 000000000..75096d3fe --- /dev/null +++ b/src/Services/Identity/eShopOnContainers.Identity/wwwroot/images/refresh.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs b/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs new file mode 100644 index 000000000..496fc57fc --- /dev/null +++ b/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 + +namespace Microsoft.eShopOnContainers.Services.Ordering.API.Controllers +{ + public class HomeController : Controller + { + // GET: // + public IActionResult Index() + { + return new RedirectResult("~/swagger/ui"); + } + } +} diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index ddefe1f0f..680022268 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -1,9 +1,4 @@ FROM microsoft/aspnetcore:1.0.1 -# Other .NET images -# FROM microsoft/dotnet:1.0.0-preview2-sdk -# FROM microsoft/dotnet:1.0.0-core -# FROM microsoft/aspnetcore -# FROM microsoft/dotnet:1.0.0-preview2-windowsservercore-sdk # Entry point through the copied assembly ENTRYPOINT ["dotnet", "Ordering.API.dll"] @@ -11,14 +6,3 @@ ARG source=. WORKDIR /app EXPOSE 80 COPY $source . - - -################# -# Entry point running the SDK --> Requires heavy Docker .NET image, not for production -# Restore NuGet packages -#RUN ["dotnet", "restore"] -# Build the .NET Core app -#RUN ["dotnet", "build"] -# Entrypoint -#ENTRYPOINT ["dotnet", "run"] -################# diff --git a/src/Services/Ordering/Ordering.API/README.md b/src/Services/Ordering/Ordering.API/README.md new file mode 100644 index 000000000..28c98a2fb --- /dev/null +++ b/src/Services/Ordering/Ordering.API/README.md @@ -0,0 +1,26 @@ +# Containerized eShop - Orders Service +Sample reference containerized application, cross-platform and microservices architecture. +Powered by Microsoft + +#Overview +This sample runs a microservices oriented application and a .net core Mvc application that consumes this services. You can find more information about how to set up docker in your machine in the global directory solution. + +#Deploy +In the global directory you will find the scripts needed to run and deploy the demo into your local docker infraestructure. + +- build-image-services-orders.ps1 Build .net applications and docker images: This power shell script that you will find in the root directory of the solution is the responsible of building .net applications and package in a pub folder and use docker commands to build the images needed to run the previously packaged .net applications. + +- Compose containers in your docker local VM: Finally you have to open your favourite command tool pointing to the root directory of this project where docker-compose.yml file is located and run the command `docker-compose up` + +#Run +Once the deploy process of docker-compose finishes you have to be able to access the services in this urls: +- Orders service: http://localhost:5102 +- Identity service: http://localhost:5105 +- Orders data (SQL Server): Server=tcp:localhost,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word; +- Identity data (SQL Server): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word + + + + + + diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 58c3d8442..1c2cfa5d9 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -15,6 +15,8 @@ using Ordering.Infrastructure; using System; using System.Reflection; + using System.Threading; + using System.Threading.Tasks; public class Startup { @@ -41,7 +43,7 @@ { // Add framework services. - services.AddMvc(options=> + services.AddMvc(options => { options.Filters.Add(typeof(HttpGlobalExceptionFilter)); @@ -52,7 +54,7 @@ .AddDbContext(options => { options.UseSqlServer(Configuration["ConnectionString"], - sqlop=>sqlop.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name)); + sqlop => sqlop.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name)); }); services.AddSwaggerGen(); @@ -96,12 +98,13 @@ app.UseDeveloperExceptionPage(); } - OrderingContextSeed.SeedAsync(app).Wait(); - app.UseMvc(); + app.UseMvcWithDefaultRoute(); app.UseSwagger() .UseSwaggerUi(); + + OrderingContextSeed.SeedAsync(app).Wait(); } } } diff --git a/src/Services/Ordering/Ordering.API/docker-compose.dev.debug.yml b/src/Services/Ordering/Ordering.API/docker-compose.dev.debug.yml deleted file mode 100644 index 100898a3b..000000000 --- a/src/Services/Ordering/Ordering.API/docker-compose.dev.debug.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '2' - -services: - ordering.api: - build: - args: - source: obj/Docker/empty/ - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - environment: - - ASPNETCORE_ENVIRONMENT=Development - - DOTNET_USE_POLLING_FILE_WATCHER=1 - volumes: - - .:/app - - ~/.nuget/packages:/root/.nuget/packages:ro - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Services/Ordering/Ordering.API/docker-compose.dev.release.yml b/src/Services/Ordering/Ordering.API/docker-compose.dev.release.yml deleted file mode 100644 index ee2a6e458..000000000 --- a/src/Services/Ordering/Ordering.API/docker-compose.dev.release.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '2' - -services: - ordering.api: - labels: - - "com.microsoft.visualstudio.targetoperatingsystem=linux" - volumes: - - ~/clrdbg:/clrdbg:ro - entrypoint: tail -f /dev/null diff --git a/src/Services/Ordering/Ordering.API/docker-compose.yml b/src/Services/Ordering/Ordering.API/docker-compose.yml index 4a31a1a26..fa2f70fb7 100644 --- a/src/Services/Ordering/Ordering.API/docker-compose.yml +++ b/src/Services/Ordering/Ordering.API/docker-compose.yml @@ -2,21 +2,38 @@ version: '2' services: ordering.api: - image: eshop/ordering.api${TAG} - build: - context: . - dockerfile: Dockerfile + image: eshop/ordering.api environment: - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word ports: - - "81:80" + - "5102:80" depends_on: - ordering.data ordering.data: image: microsoft/mssql-server-linux - environment: - - ACCEPT_EULA=Y - - SA_PASSWORD=Pass@word + environment: + - SA_PASSWORD=Pass@word + - ACCEPT_EULA=Y + ports: + - "5432:1433" + + identity.service: + image: eshop/identity + environment: + - SpaClient=http://localhost:5104 + - ConnectionString=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word + #- MvcClient=http://104.40.62.65:5100 #Remote: VM Needs to have public access at 5105. + - MvcClient=http://localhost:5100 #Local: You need a entry in windows host file to run identity in local docker. + ports: + - "5105:5105" + depends_on: + - identity.data + + identity.data: + image: microsoft/mssql-server-linux + environment: + - SA_PASSWORD=Pass@word + - ACCEPT_EULA=Y ports: - - "1433:1433" \ No newline at end of file + - "5433:1433" \ No newline at end of file diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs index 7ff768895..5f0e69f1c 100644 --- a/src/Web/WebMVC/Controllers/AccountController.cs +++ b/src/Web/WebMVC/Controllers/AccountController.cs @@ -38,6 +38,8 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers public IActionResult Signout() { + HttpContext.Authentication.SignOutAsync("Cookies"); + HttpContext.Authentication.SignOutAsync("oidc"); return new SignOutResult("oidc", new AuthenticationProperties { RedirectUri = "/" }); } } diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index b5328fd54..8e105bd5e 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -2,6 +2,5 @@ FROM microsoft/aspnetcore:1.0.1 ENTRYPOINT ["dotnet", "WebMVC.dll"] ARG source=. WORKDIR /app -ENV ASPNETCORE_URLS http://*:80 -EXPOSE 80 -COPY $source . \ No newline at end of file +ENV ASPNETCORE_URLS http://0.0.0.0:5100 +COPY $source . diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index f0ac25961..0e78c2560 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -14,7 +14,8 @@ namespace Microsoft.eShopOnContainers.WebMVC var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() + //.UseIISIntegration() + .UseUrls("http://0.0.0.0:5100") .UseStartup() .Build(); diff --git a/src/Web/WebMVC/README.md b/src/Web/WebMVC/README.md new file mode 100644 index 000000000..c11a2544b --- /dev/null +++ b/src/Web/WebMVC/README.md @@ -0,0 +1,31 @@ +# Containerized eShop - Web Mvc +Sample reference containerized application, cross-platform and microservices architecture. +Powered by Microsoft + +#Overview +This sample runs a microservices oriented application and a .net core Mvc application that consumes this services. You can find more information about how to set up docker in your machine in the global directory solution. + +#Deploy +In the global directory you will find the scripts needed to run and deploy the demo into your local docker infraestructure. + +- build-image-web.ps1 Build .net applications and docker images: This power shell script that you will find in the root directory of the solution is the responsible of building .net applications and package in a pub folder and use docker commands to build the images needed to run the previously packaged .net applications. + +- Compose containers in your docker local VM: Finally you have to open your favourite command tool pointing to the root directory of this project where docker-compose.yml file is located and run the command `docker-compose up` + +#Run +Once the deploy process of docker-compose finishes you have to be able to access the services in this urls: +- Web: http://localhost:5100 +- Catalog service: http://localhost:5101 +- Orders service: http://localhost:5102 +- Basket service: http://localhost:5103 +- Identity service: http://localhost:5105 +- Orders data (SQL Server): Server=tcp:localhost,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word; +- Catalog data (SQL Server): Server=tcp:localhost,5434;Database=CatalogDB;User Id=sa;Password=Pass@word +- Identity data (SQL Server): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word +- Basket data (Redis): listening in localhost:6379 + + + + + + diff --git a/src/Web/WebMVC/Services/CatalogService.cs b/src/Web/WebMVC/Services/CatalogService.cs index aa7240400..9885ed4bf 100644 --- a/src/Web/WebMVC/Services/CatalogService.cs +++ b/src/Web/WebMVC/Services/CatalogService.cs @@ -9,6 +9,7 @@ using System.Net.Http; using Microsoft.AspNetCore.Mvc.Rendering; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Microsoft.Extensions.Logging; namespace Microsoft.eShopOnContainers.WebMVC.Services { @@ -18,9 +19,12 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services private HttpClient _apiClient; private readonly string _remoteServiceBaseUrl; - public CatalogService(IOptions settings) { + public CatalogService(IOptions settings, ILoggerFactory loggerFactory) { _settings = settings; _remoteServiceBaseUrl = $"{_settings.Value.CatalogUrl}/api/v1/catalog/"; + + var log = loggerFactory.CreateLogger("catalog service"); + log.LogDebug(settings.Value.CatalogUrl); } public async Task GetCatalogItems(int page,int take, int? brand, int? type) diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index b9e64d15b..50d254556 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -12,6 +12,8 @@ using Microsoft.eShopOnContainers.WebMVC.Services; using System.IdentityModel.Tokens.Jwt; using Microsoft.IdentityModel.Tokens; using Microsoft.AspNetCore.Http; +using System.Threading; +using Microsoft.Extensions.Options; namespace Microsoft.eShopOnContainers.WebMVC { @@ -20,17 +22,20 @@ namespace Microsoft.eShopOnContainers.WebMVC public Startup(IHostingEnvironment env) { var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); + .SetBasePath(env.ContentRootPath) + .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) // Settings for the application + .AddEnvironmentVariables(); // override settings with environment variables set in compose. + - if (env.IsDevelopment()) - { - // For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709 - builder.AddUserSecrets(); - } + //if (env.IsDevelopment()) + //{ + // // For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709 + // builder.AddUserSecrets(); + //} + + //builder.AddJsonFile("appsettings.override.json"); + //builder.AddEnvironmentVariables(); - builder.AddEnvironmentVariables(); Configuration = builder.Build(); } @@ -40,6 +45,7 @@ namespace Microsoft.eShopOnContainers.WebMVC public void ConfigureServices(IServiceCollection services) { services.AddMvc(); + services.Configure(Configuration); // Add application services. services.AddSingleton(); @@ -48,8 +54,6 @@ namespace Microsoft.eShopOnContainers.WebMVC services.AddSingleton(); //CCE: Once services are integrated, a singleton is not needed we can left transient. services.AddTransient(); services.AddTransient, IdentityParser>(); - - services.Configure(Configuration); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -74,16 +78,23 @@ namespace Microsoft.eShopOnContainers.WebMVC app.UseCookieAuthentication(new CookieAuthenticationOptions { - AuthenticationScheme = "cookies", + AuthenticationScheme = "Cookies", AutomaticAuthenticate = true, }); + var identityUrl = Configuration.GetValue(typeof(string), "IdentityUrl"); + var callBackUrl = Configuration.GetValue(typeof(string), "CallBackUrl"); + var log = loggerFactory.CreateLogger("identity"); + + log.LogDebug(identityUrl.ToString()); + log.LogDebug(callBackUrl.ToString()); + var oidcOptions = new OpenIdConnectOptions { AuthenticationScheme = "oidc", - SignInScheme = "cookies", - - Authority = "http://localhost:5000", + SignInScheme = "Cookies", + Authority = identityUrl.ToString(), + PostLogoutRedirectUri = callBackUrl.ToString(), ClientId = "mvc", ClientSecret = "secret", ResponseType = "code id_token", @@ -98,6 +109,7 @@ namespace Microsoft.eShopOnContainers.WebMVC oidcOptions.Scope.Add("orders"); oidcOptions.Scope.Add("basket"); + //Wait untill identity service is ready on compose. app.UseOpenIdConnectAuthentication(oidcOptions); app.UseMvc(routes => diff --git a/src/Web/WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml index d08b381a4..45d2f2c73 100644 --- a/src/Web/WebMVC/Views/Shared/_Layout.cshtml +++ b/src/Web/WebMVC/Views/Shared/_Layout.cshtml @@ -27,9 +27,6 @@
- @*@Html.ActionLink("Claims", "Claims", "Account") - @Html.ActionLink("Call Api", "Claims", "Account") - @Html.ActionLink("Log Out", "Signout", "Account")*@ @await Html.PartialAsync("_LoginPartial")
diff --git a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml index e304c8c69..a16b1fe5a 100644 --- a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml +++ b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml @@ -4,7 +4,8 @@ @inject IIdentityParser UserManager -@if(Context.User.Identity.IsAuthenticated) +@*@if (Context.User.Identity.IsAuthenticated)*@ +@if (User.FindFirst(x => x.Type == "preferred_username") != null) {