From bb5d48735dd4baf26872f8afc196d3759644e67a Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Wed, 15 Feb 2017 10:44:59 -0500 Subject: [PATCH 1/4] update build script for Mac Until adding these, the project would not build correctly on a Mac. script working for SPA Add execute permissions to build-bits.sh on macOS fix a rebase / automatic merge issue. Somehow, the MVC image got in there twice. update content nodes Bug workaround for for the CLI. It turns out that the CLI does not handle content nodes that have multiple paths. Instead, multiple nodes are needed. use the standard names for the web docker images. fix a typo and update the csproj content listings. Also, execute nom install as part of publishing the spa application. --- build-bits.sh | 43 ++++++++++++++----- docker-compose.override.yml | 22 +++++----- docker-compose.yml | 4 +- .../Basket/Basket.API/Basket.API.csproj | 5 ++- .../Catalog/Catalog.API/Catalog.API.csproj | 10 ++++- .../Identity/Identity.API/Identity.API.csproj | 11 ++++- .../Ordering/Ordering.API/Ordering.API.csproj | 5 ++- src/Web/WebMVC/WebMVC.csproj | 14 +++++- .../eShopOnContainers.WebSPA.csproj | 21 ++++++++- 9 files changed, 106 insertions(+), 29 deletions(-) mode change 100644 => 100755 build-bits.sh diff --git a/build-bits.sh b/build-bits.sh old mode 100644 new mode 100755 index 4e86be0e9..6575b4f7c --- a/build-bits.sh +++ b/build-bits.sh @@ -1,12 +1,35 @@ #!/bin/sh -#dotnet restore -rm -rf ./pub -dotnet publish "$(pwd)/src/Web/WebMVC/project.json" -o "$(pwd)/pub/webMVC" -dotnet publish "$(pwd)/src/Services/Catalog/Catalog.API/project.json" -o "$(pwd)/pub/catalog" -dotnet publish "$(pwd)/src/Services/Ordering/Ordering.API/project.json" -o "$(pwd)/pub/ordering" -dotnet publish "$(pwd)/src/Services/Basket/Basket.API/project.json" -o "$(pwd)/pub/basket" -docker build -t eshop/web "$(pwd)/pub/webMVC" -docker build -t eshop/catalog.api "$(pwd)/pub/catalog" -docker build -t eshop/ordering.api "$(pwd)/pub/ordering" -docker build -t eshop/basket.api "$(pwd)/pub/basket" \ No newline at end of file +projectList=( + "src/Services/Catalog/Catalog.API" + "src/Services/Basket/Basket.API" + "src/Services/Ordering/Ordering.API" + "src/Services/Identity/Identity.API" + "src/Web/WebMVC" + "src/Web/WebSPA/eShopOnContainers.WebSPA" +) + +for project in "${projectList[@]}" +do + echo -e "\e[33mWorking on $(pwd)/$project" + echo -e "\e[33m\tRemoving old publish output" + pushd $(pwd)/$project + rm -rf obj/Docker/publish + echo -e "\e[33m\tRestoring project" + dotnet restore + echo -e "\e[33m\tBuilding and publishing projects" + dotnet publish -o obj/Docker/publish + popd +done + +# remove old docker images: +images=$(docker images --filter=reference="eshop/*" -q) +if [ -n "$images" ]; then + docker rm $(docker ps -a -q) -f + echo "Deleting eShop images in local Docker repo" + echo $images + docker rmi $(docker images --filter=reference="eshop/*" -q) -f +fi + +# No need to build the images, docker build or docker compose will +# do that using the images and containers defined in the docker-compose.yml file. diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c07f0081d..7d5fd0903 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,12 +1,13 @@ version: '2' services: + basket.api: environment: - ASPNETCORE_ENVIRONMENT=Development - ConnectionString=basket.data #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - - identityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. ports: - "5103:5103" @@ -15,18 +16,17 @@ services: - ASPNETCORE_ENVIRONMENT=Development - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word #- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105. - - ExternalCatalogBaseUrl=http://10.0.75.1:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. ports: - "5101:5101" - identity.api: environment: - ASPNETCORE_ENVIRONMENT=Development - SpaClient=http://localhost:5104 - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word #- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105. - - MvcClient=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. + - MvcClient=http://localhost:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105. ports: - "5105:5105" @@ -35,18 +35,18 @@ services: - ASPNETCORE_ENVIRONMENT=Development - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - - identityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. ports: - "5102:5102" - eshoponcontainers.webspa: + webspa: environment: - ASPNETCORE_ENVIRONMENT=Development - - CatalogUrl=http://10.0.75.1:5101 - - OrderingUrl=http://10.0.75.1:5102 + - CatalogUrl=http://localhost:5101 + - OrderingUrl=http://localhost:5102 #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - - IdentityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - - BasketUrl=http://10.0.75.1:5103 + - IdentityUrl=http://localhost:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - BasketUrl=http://localhost:5103 ports: - "5104:5104" @@ -56,7 +56,7 @@ services: - CatalogUrl=http://catalog.api:5101 - OrderingUrl=http://ordering.api:5102 #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - - IdentityUrl=http://10.0.75.1:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - IdentityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - BasketUrl=http://basket.api:5103 ports: - "5100:5100" diff --git a/docker-compose.yml b/docker-compose.yml index 896663669..e5f83475b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,8 +34,8 @@ services: depends_on: - sql.data - eshoponcontainers.webspa: - image: eshop/eshoponcontainers.webspa + webspa: + image: eshop/webspa build: context: ./src/Web/WebSPA/eShopOnContainers.WebSPA dockerfile: Dockerfile diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index 925653aa0..fc040b3b0 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -13,7 +13,10 @@ - + + PreserveNewest + + PreserveNewest diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 2b473fd55..15be6a8c2 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -13,12 +13,20 @@ ..\..\..\..\docker-compose.dcproj + - + + PreserveNewest + + + PreserveNewest + + PreserveNewest + diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 4f7e870a1..b810aae66 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -14,7 +14,16 @@ - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index ba1f30465..d83aed609 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -14,7 +14,10 @@ - + + PreserveNewest + + PreserveNewest diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 8cc66b8ff..3b2e8c147 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -14,7 +14,19 @@ - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj index 4cbee8d8e..3a7cf00b8 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj @@ -17,7 +17,25 @@ - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest @@ -50,6 +68,7 @@ + From 6fdfe09b0acf9e69855f416559a9b644de6bebe8 Mon Sep 17 00:00:00 2001 From: etomas Date: Wed, 22 Feb 2017 08:39:00 +0100 Subject: [PATCH 2/4] Solves #46 (by moving property configuration at the end of OnModelCreating) --- .../Ordering/Ordering.Infrastructure/OrderingContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs index 34815b524..73d831eaf 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs +++ b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs @@ -31,12 +31,12 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity
(ConfigureAddress); - modelBuilder.Entity(ConfigureBuyer); modelBuilder.Entity(ConfigurePayment); modelBuilder.Entity(ConfigureOrder); modelBuilder.Entity(ConfigureOrderItems); modelBuilder.Entity(ConfigureCardTypes); modelBuilder.Entity(ConfigureOrderStatus); + modelBuilder.Entity(ConfigureBuyer); } void ConfigureAddress(EntityTypeBuilder
addressConfiguration) From dc8ae55c7aacf028dba3353f2ef9f25115edc1b8 Mon Sep 17 00:00:00 2001 From: etomas Date: Wed, 22 Feb 2017 09:16:31 +0100 Subject: [PATCH 3/4] Renaming WebSpa Fixes #51 --- docker-compose.vs.debug.yml | 6 +- docker-compose.vs.release.yml | 2 +- docker-compose.yml | 2 +- eShopOnContainers-ServicesAndWebApps.sln | 102 +++++++++--------- .../.dockerignore | 0 .../{eShopOnContainers.WebSPA => }/.gitignore | 0 .../{eShopOnContainers.WebSPA => }/.npmignore | 0 .../.sass-lint.yml | 0 .../AppSettings.cs | 0 .../Client/custom-typings.d.ts | 0 .../Client/fonts/Montserrat-Bold.eot | Bin .../Client/fonts/Montserrat-Bold.svg | 0 .../Client/fonts/Montserrat-Bold.ttf | Bin .../Client/fonts/Montserrat-Bold.woff | Bin .../Client/fonts/Montserrat-Bold.woff2 | Bin .../Client/fonts/Montserrat-Regular.eot | Bin .../Client/fonts/Montserrat-Regular.svg | 0 .../Client/fonts/Montserrat-Regular.ttf | Bin .../Client/fonts/Montserrat-Regular.woff | Bin .../Client/fonts/Montserrat-Regular.woff2 | Bin .../Client/globals.scss | 0 .../Client/images/arrow-down.png | Bin .../Client/images/arrow-right.svg | 0 .../Client/images/brand.png | Bin .../Client/images/brand_dark.png | Bin .../Client/images/cart.png | Bin .../Client/images/logout.png | Bin .../Client/images/main_banner.png | Bin .../Client/images/main_banner_text.png | Bin .../Client/images/my_orders.png | Bin .../Client/main.ts | 0 .../Client/modules/_variables.scss | 0 .../Client/modules/app.component.html | 0 .../Client/modules/app.component.scss | 0 .../Client/modules/app.component.ts | 0 .../Client/modules/app.module.ts | 0 .../Client/modules/app.routes.ts | 0 .../Client/modules/app.service.ts | 0 .../basket-status.component.html | 0 .../basket-status.component.scss | 0 .../basket-status/basket-status.component.ts | 0 .../modules/basket/basket.component.html | 0 .../modules/basket/basket.component.scss | 0 .../Client/modules/basket/basket.component.ts | 0 .../Client/modules/basket/basket.module.ts | 0 .../Client/modules/basket/basket.service.ts | 0 .../modules/catalog/catalog.component.html | 0 .../modules/catalog/catalog.component.scss | 0 .../modules/catalog/catalog.component.ts | 0 .../Client/modules/catalog/catalog.module.ts | 0 .../Client/modules/catalog/catalog.service.ts | 0 .../orders-detail.component.html | 0 .../orders-detail.component.scss | 0 .../orders-detail/orders-detail.component.ts | 0 .../orders-new/orders-new.component.html | 0 .../orders-new/orders-new.component.scss | 0 .../orders/orders-new/orders-new.component.ts | 0 .../modules/orders/orders.component.html | 0 .../modules/orders/orders.component.scss | 0 .../Client/modules/orders/orders.component.ts | 0 .../Client/modules/orders/orders.module.ts | 0 .../Client/modules/orders/orders.service.ts | 0 .../shared/components/header/header.html | 0 .../shared/components/header/header.scss | 0 .../shared/components/header/header.ts | 0 .../shared/components/identity/identity.html | 0 .../shared/components/identity/identity.scss | 0 .../shared/components/identity/identity.ts | 0 .../page-not-found.component.html | 0 .../page-not-found.component.scss | 0 .../page-not-found.component.spec.ts | 0 .../page-not-found.component.ts | 0 .../shared/components/pager/pager.html | 0 .../shared/components/pager/pager.scss | 0 .../modules/shared/components/pager/pager.ts | 0 .../modules/shared/models/basket.model.ts | 0 .../modules/shared/models/basketItem.model.ts | 0 .../modules/shared/models/catalog.model.ts | 0 .../shared/models/catalogBrand.model.ts | 0 .../shared/models/catalogItem.model.ts | 0 .../shared/models/catalogType.model.ts | 0 .../shared/models/configuration.model.ts | 0 .../modules/shared/models/identity.model.ts | 0 .../modules/shared/models/order.model.ts | 0 .../modules/shared/models/orderItem.model.ts | 0 .../modules/shared/models/pager.model.ts | 0 .../shared/pipes/uppercase.pipe.spec.ts | 0 .../modules/shared/pipes/uppercase.pipe.ts | 0 .../shared/services/basket.wrapper.service.ts | 0 .../shared/services/configuration.service.ts | 0 .../modules/shared/services/data.service.ts | 0 .../shared/services/notification.service.ts | 0 .../shared/services/security.service.ts | 0 .../shared/services/storage.service.ts | 0 .../Client/modules/shared/shared.module.ts | 0 .../Client/polyfills.ts | 0 .../Client/vendor.ts | 0 .../{eShopOnContainers.WebSPA => }/Dockerfile | 0 .../{eShopOnContainers.WebSPA => }/Program.cs | 0 .../Properties/launchSettings.json | 0 .../{eShopOnContainers.WebSPA => }/README.md | 0 .../Server/Controllers/HomeController.cs | 0 .../{eShopOnContainers.WebSPA => }/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 ...Containers.WebSPA.csproj => WebSPA.csproj} | 4 +- .../appsettings.json | 0 .../config/helpers.js | 0 .../config/webpack.config.dev.js | 0 .../config/webpack.config.js | 0 .../config/webpack.config.prod.js | 0 .../config/webpack.config.vendor.js | 0 .../package.json | 0 .../tsconfig.json | 0 .../tslint.json | 0 .../typedoc.json | 0 .../{eShopOnContainers.WebSPA => }/web.config | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/web.config | 0 121 files changed, 58 insertions(+), 58 deletions(-) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/.dockerignore (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/.gitignore (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/.npmignore (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/.sass-lint.yml (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/AppSettings.cs (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/custom-typings.d.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Bold.eot (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Bold.svg (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Bold.ttf (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Bold.woff (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Bold.woff2 (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Regular.eot (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Regular.svg (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Regular.ttf (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Regular.woff (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/fonts/Montserrat-Regular.woff2 (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/globals.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/arrow-down.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/arrow-right.svg (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/brand.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/brand_dark.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/cart.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/logout.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/main_banner.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/main_banner_text.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/images/my_orders.png (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/main.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/_variables.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/app.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/app.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/app.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/app.module.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/app.routes.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/app.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket-status/basket-status.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket-status/basket-status.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket-status/basket-status.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket.module.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/basket/basket.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/catalog/catalog.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/catalog/catalog.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/catalog/catalog.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/catalog/catalog.module.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/catalog/catalog.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders-detail/orders-detail.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders-detail/orders-detail.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders-detail/orders-detail.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders-new/orders-new.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders-new/orders-new.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders-new/orders-new.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders.module.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/orders/orders.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/header/header.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/header/header.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/header/header.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/identity/identity.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/identity/identity.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/identity/identity.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/page-not-found/page-not-found.component.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/page-not-found/page-not-found.component.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/page-not-found/page-not-found.component.spec.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/page-not-found/page-not-found.component.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/pager/pager.html (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/pager/pager.scss (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/components/pager/pager.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/basket.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/basketItem.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/catalog.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/catalogBrand.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/catalogItem.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/catalogType.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/configuration.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/identity.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/order.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/orderItem.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/models/pager.model.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/pipes/uppercase.pipe.spec.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/pipes/uppercase.pipe.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/services/basket.wrapper.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/services/configuration.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/services/data.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/services/notification.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/services/security.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/services/storage.service.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/modules/shared/shared.module.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/polyfills.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Client/vendor.ts (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Dockerfile (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Program.cs (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Properties/launchSettings.json (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/README.md (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Server/Controllers/HomeController.cs (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Startup.cs (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Views/Home/Index.cshtml (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Views/Shared/_Layout.cshtml (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Views/_ViewImports.cshtml (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/Views/_ViewStart.cshtml (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj => WebSPA.csproj} (96%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/appsettings.json (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/config/helpers.js (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/config/webpack.config.dev.js (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/config/webpack.config.js (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/config/webpack.config.prod.js (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/config/webpack.config.vendor.js (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/package.json (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/tsconfig.json (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/tslint.json (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/typedoc.json (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/web.config (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/wwwroot/favicon.ico (100%) rename src/Web/WebSPA/{eShopOnContainers.WebSPA => }/wwwroot/web.config (100%) diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml index 4d6571e99..2446fdb2c 100644 --- a/docker-compose.vs.debug.yml +++ b/docker-compose.vs.debug.yml @@ -61,15 +61,15 @@ services: labels: - "com.microsoft.visualstudio.targetoperatingsystem=linux" - eshoponcontainers.webspa: - image: eshop/eshoponcontainers.webspa:dev + webspa: + image: eshop/webspa:dev build: args: source: ${DOCKER_BUILD_SOURCE} environment: - DOTNET_USE_POLLING_FILE_WATCHER=1 volumes: - - ./src/Web/WebSPA/eShopOnContainers.WebSPA:/app + - ./src/Web/WebSPA:/app - ~/.nuget/packages:/root/.nuget/packages:ro - ~/clrdbg:/clrdbg:ro entrypoint: tail -f /dev/null diff --git a/docker-compose.vs.release.yml b/docker-compose.vs.release.yml index 17248ac5c..4ea31f8ca 100644 --- a/docker-compose.vs.release.yml +++ b/docker-compose.vs.release.yml @@ -41,7 +41,7 @@ services: labels: - "com.microsoft.visualstudio.targetoperatingsystem=linux" - eshoponcontainers.webspa: + webspa: build: args: source: ${DOCKER_BUILD_SOURCE} diff --git a/docker-compose.yml b/docker-compose.yml index e5f83475b..f3baeb346 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,7 +37,7 @@ services: webspa: image: eshop/webspa build: - context: ./src/Web/WebSPA/eShopOnContainers.WebSPA + context: ./src/Web/WebSPA dockerfile: Dockerfile depends_on: - identity.api diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index fe855d789..1b5b870ed 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.Domain", "src\Serv EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebMVC", "src\Web\WebMVC\WebMVC.csproj", "{F0333D8E-0B27-42B7-B2C6-78F3657624E2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "eShopOnContainers.WebSPA", "src\Web\WebSPA\eShopOnContainers.WebSPA\eShopOnContainers.WebSPA.csproj", "{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.Infrastructure", "src\Services\Ordering\Ordering.Infrastructure\Ordering.Infrastructure.csproj", "{95F1F07C-4D92-4742-BD07-E5B805AAB651}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "test\Services\FunctionalTests\FunctionalTests.csproj", "{621E7211-58D0-45FD-9600-1CB490BD930E}" @@ -48,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.API", "src\Service EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSPA", "src\Web\WebSPA\WebSPA.csproj", "{F16E3C6A-1C94-4EAB-BE91-099618060B68}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -206,54 +206,6 @@ Global {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|x64.ActiveCfg = Release|Any CPU {F0333D8E-0B27-42B7-B2C6-78F3657624E2}.Release|x86.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|ARM.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhone.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x64.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x64.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x86.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.AppStore|x86.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|ARM.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhone.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x64.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x64.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x86.ActiveCfg = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Debug|x86.Build.0 = Debug|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|Any CPU.Build.0 = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|ARM.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|ARM.Build.0 = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhone.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhone.Build.0 = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x64.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x64.Build.0 = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x86.ActiveCfg = Release|Any CPU - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2}.Release|x86.Build.0 = Release|Any CPU {95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {95F1F07C-4D92-4742-BD07-E5B805AAB651}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -494,6 +446,54 @@ Global {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x64.Build.0 = Release|Any CPU {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.ActiveCfg = Release|Any CPU {FEA0C318-FFED-4D39-8781-265718CA43DD}.Release|x86.Build.0 = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|x64.ActiveCfg = Release|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|x64.Build.0 = Release|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|x86.ActiveCfg = Release|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Ad-Hoc|x86.Build.0 = Release|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|ARM.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|iPhone.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|x64.ActiveCfg = Release|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|x64.Build.0 = Release|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|x86.ActiveCfg = Release|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.AppStore|x86.Build.0 = Release|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|ARM.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|iPhone.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|x64.ActiveCfg = Debug|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|x64.Build.0 = Debug|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|x86.ActiveCfg = Debug|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Debug|x86.Build.0 = Debug|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|Any CPU.Build.0 = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|ARM.ActiveCfg = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|ARM.Build.0 = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|iPhone.ActiveCfg = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|iPhone.Build.0 = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|x64.ActiveCfg = Release|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|x64.Build.0 = Release|x64 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|x86.ActiveCfg = Release|x86 + {F16E3C6A-1C94-4EAB-BE91-099618060B68}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -511,10 +511,10 @@ Global {231226CE-690B-4979-8870-9A79D80928E2} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} {F5598DCB-6DDE-4661-AD9D-A55612DA7E76} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} {F0333D8E-0B27-42B7-B2C6-78F3657624E2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} - {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} {95F1F07C-4D92-4742-BD07-E5B805AAB651} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} {621E7211-58D0-45FD-9600-1CB490BD930E} = {EF0337F2-ED00-4643-89FD-EE10863F1870} {7796F5D8-31FC-45A4-B673-19DE5BA194CF} = {EF0337F2-ED00-4643-89FD-EE10863F1870} {A579E108-5445-403D-A407-339AC4D1611B} = {24CD3B53-141E-4A07-9B0D-796641E1CF78} + {F16E3C6A-1C94-4EAB-BE91-099618060B68} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} EndGlobalSection EndGlobal diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/.dockerignore b/src/Web/WebSPA/.dockerignore similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/.dockerignore rename to src/Web/WebSPA/.dockerignore diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/.gitignore b/src/Web/WebSPA/.gitignore similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/.gitignore rename to src/Web/WebSPA/.gitignore diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/.npmignore b/src/Web/WebSPA/.npmignore similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/.npmignore rename to src/Web/WebSPA/.npmignore diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/.sass-lint.yml b/src/Web/WebSPA/.sass-lint.yml similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/.sass-lint.yml rename to src/Web/WebSPA/.sass-lint.yml diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/AppSettings.cs b/src/Web/WebSPA/AppSettings.cs similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/AppSettings.cs rename to src/Web/WebSPA/AppSettings.cs diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/custom-typings.d.ts b/src/Web/WebSPA/Client/custom-typings.d.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/custom-typings.d.ts rename to src/Web/WebSPA/Client/custom-typings.d.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.eot b/src/Web/WebSPA/Client/fonts/Montserrat-Bold.eot similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.eot rename to src/Web/WebSPA/Client/fonts/Montserrat-Bold.eot diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.svg b/src/Web/WebSPA/Client/fonts/Montserrat-Bold.svg similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.svg rename to src/Web/WebSPA/Client/fonts/Montserrat-Bold.svg diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.ttf b/src/Web/WebSPA/Client/fonts/Montserrat-Bold.ttf similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.ttf rename to src/Web/WebSPA/Client/fonts/Montserrat-Bold.ttf diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.woff b/src/Web/WebSPA/Client/fonts/Montserrat-Bold.woff similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.woff rename to src/Web/WebSPA/Client/fonts/Montserrat-Bold.woff diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.woff2 b/src/Web/WebSPA/Client/fonts/Montserrat-Bold.woff2 similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Bold.woff2 rename to src/Web/WebSPA/Client/fonts/Montserrat-Bold.woff2 diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.eot b/src/Web/WebSPA/Client/fonts/Montserrat-Regular.eot similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.eot rename to src/Web/WebSPA/Client/fonts/Montserrat-Regular.eot diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.svg b/src/Web/WebSPA/Client/fonts/Montserrat-Regular.svg similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.svg rename to src/Web/WebSPA/Client/fonts/Montserrat-Regular.svg diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.ttf b/src/Web/WebSPA/Client/fonts/Montserrat-Regular.ttf similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.ttf rename to src/Web/WebSPA/Client/fonts/Montserrat-Regular.ttf diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.woff b/src/Web/WebSPA/Client/fonts/Montserrat-Regular.woff similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.woff rename to src/Web/WebSPA/Client/fonts/Montserrat-Regular.woff diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.woff2 b/src/Web/WebSPA/Client/fonts/Montserrat-Regular.woff2 similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/fonts/Montserrat-Regular.woff2 rename to src/Web/WebSPA/Client/fonts/Montserrat-Regular.woff2 diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/globals.scss b/src/Web/WebSPA/Client/globals.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/globals.scss rename to src/Web/WebSPA/Client/globals.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/arrow-down.png b/src/Web/WebSPA/Client/images/arrow-down.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/arrow-down.png rename to src/Web/WebSPA/Client/images/arrow-down.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/arrow-right.svg b/src/Web/WebSPA/Client/images/arrow-right.svg similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/arrow-right.svg rename to src/Web/WebSPA/Client/images/arrow-right.svg diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png b/src/Web/WebSPA/Client/images/brand.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png rename to src/Web/WebSPA/Client/images/brand.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png b/src/Web/WebSPA/Client/images/brand_dark.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png rename to src/Web/WebSPA/Client/images/brand_dark.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/cart.png b/src/Web/WebSPA/Client/images/cart.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/cart.png rename to src/Web/WebSPA/Client/images/cart.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/logout.png b/src/Web/WebSPA/Client/images/logout.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/logout.png rename to src/Web/WebSPA/Client/images/logout.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png b/src/Web/WebSPA/Client/images/main_banner.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png rename to src/Web/WebSPA/Client/images/main_banner.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner_text.png b/src/Web/WebSPA/Client/images/main_banner_text.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner_text.png rename to src/Web/WebSPA/Client/images/main_banner_text.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/my_orders.png b/src/Web/WebSPA/Client/images/my_orders.png similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/my_orders.png rename to src/Web/WebSPA/Client/images/my_orders.png diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/main.ts b/src/Web/WebSPA/Client/main.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/main.ts rename to src/Web/WebSPA/Client/main.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/_variables.scss b/src/Web/WebSPA/Client/modules/_variables.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/_variables.scss rename to src/Web/WebSPA/Client/modules/_variables.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html b/src/Web/WebSPA/Client/modules/app.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html rename to src/Web/WebSPA/Client/modules/app.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss b/src/Web/WebSPA/Client/modules/app.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss rename to src/Web/WebSPA/Client/modules/app.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.ts b/src/Web/WebSPA/Client/modules/app.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.ts rename to src/Web/WebSPA/Client/modules/app.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.module.ts b/src/Web/WebSPA/Client/modules/app.module.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.module.ts rename to src/Web/WebSPA/Client/modules/app.module.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.routes.ts b/src/Web/WebSPA/Client/modules/app.routes.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.routes.ts rename to src/Web/WebSPA/Client/modules/app.routes.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.service.ts b/src/Web/WebSPA/Client/modules/app.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.service.ts rename to src/Web/WebSPA/Client/modules/app.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.html b/src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.html rename to src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.scss b/src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.scss rename to src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.ts b/src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.ts rename to src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html b/src/Web/WebSPA/Client/modules/basket/basket.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html rename to src/Web/WebSPA/Client/modules/basket/basket.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss b/src/Web/WebSPA/Client/modules/basket/basket.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss rename to src/Web/WebSPA/Client/modules/basket/basket.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.ts b/src/Web/WebSPA/Client/modules/basket/basket.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.ts rename to src/Web/WebSPA/Client/modules/basket/basket.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts b/src/Web/WebSPA/Client/modules/basket/basket.module.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts rename to src/Web/WebSPA/Client/modules/basket/basket.module.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.service.ts b/src/Web/WebSPA/Client/modules/basket/basket.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.service.ts rename to src/Web/WebSPA/Client/modules/basket/basket.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html rename to src/Web/WebSPA/Client/modules/catalog/catalog.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.scss b/src/Web/WebSPA/Client/modules/catalog/catalog.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.scss rename to src/Web/WebSPA/Client/modules/catalog/catalog.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts rename to src/Web/WebSPA/Client/modules/catalog/catalog.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.module.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts rename to src/Web/WebSPA/Client/modules/catalog/catalog.module.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.service.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.service.ts rename to src/Web/WebSPA/Client/modules/catalog/catalog.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html b/src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html rename to src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss b/src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss rename to src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.ts b/src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.ts rename to src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.html b/src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.html rename to src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.scss b/src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.scss rename to src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.ts b/src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.ts rename to src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html b/src/Web/WebSPA/Client/modules/orders/orders.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html rename to src/Web/WebSPA/Client/modules/orders/orders.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss b/src/Web/WebSPA/Client/modules/orders/orders.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss rename to src/Web/WebSPA/Client/modules/orders/orders.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.ts b/src/Web/WebSPA/Client/modules/orders/orders.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.ts rename to src/Web/WebSPA/Client/modules/orders/orders.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts b/src/Web/WebSPA/Client/modules/orders/orders.module.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts rename to src/Web/WebSPA/Client/modules/orders/orders.module.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.service.ts b/src/Web/WebSPA/Client/modules/orders/orders.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.service.ts rename to src/Web/WebSPA/Client/modules/orders/orders.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.html b/src/Web/WebSPA/Client/modules/shared/components/header/header.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.html rename to src/Web/WebSPA/Client/modules/shared/components/header/header.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss b/src/Web/WebSPA/Client/modules/shared/components/header/header.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss rename to src/Web/WebSPA/Client/modules/shared/components/header/header.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.ts b/src/Web/WebSPA/Client/modules/shared/components/header/header.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.ts rename to src/Web/WebSPA/Client/modules/shared/components/header/header.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.html b/src/Web/WebSPA/Client/modules/shared/components/identity/identity.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.html rename to src/Web/WebSPA/Client/modules/shared/components/identity/identity.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss b/src/Web/WebSPA/Client/modules/shared/components/identity/identity.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss rename to src/Web/WebSPA/Client/modules/shared/components/identity/identity.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.ts b/src/Web/WebSPA/Client/modules/shared/components/identity/identity.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.ts rename to src/Web/WebSPA/Client/modules/shared/components/identity/identity.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.html b/src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.html rename to src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.scss b/src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.scss rename to src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.spec.ts b/src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.spec.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.spec.ts rename to src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.spec.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.ts b/src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.ts rename to src/Web/WebSPA/Client/modules/shared/components/page-not-found/page-not-found.component.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.html b/src/Web/WebSPA/Client/modules/shared/components/pager/pager.html similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.html rename to src/Web/WebSPA/Client/modules/shared/components/pager/pager.html diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss b/src/Web/WebSPA/Client/modules/shared/components/pager/pager.scss similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss rename to src/Web/WebSPA/Client/modules/shared/components/pager/pager.scss diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.ts b/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.ts rename to src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/basket.model.ts b/src/Web/WebSPA/Client/modules/shared/models/basket.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/basket.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/basket.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/basketItem.model.ts b/src/Web/WebSPA/Client/modules/shared/models/basketItem.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/basketItem.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/basketItem.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalog.model.ts b/src/Web/WebSPA/Client/modules/shared/models/catalog.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalog.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/catalog.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalogBrand.model.ts b/src/Web/WebSPA/Client/modules/shared/models/catalogBrand.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalogBrand.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/catalogBrand.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalogItem.model.ts b/src/Web/WebSPA/Client/modules/shared/models/catalogItem.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalogItem.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/catalogItem.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalogType.model.ts b/src/Web/WebSPA/Client/modules/shared/models/catalogType.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/catalogType.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/catalogType.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/configuration.model.ts b/src/Web/WebSPA/Client/modules/shared/models/configuration.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/configuration.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/configuration.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/identity.model.ts b/src/Web/WebSPA/Client/modules/shared/models/identity.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/identity.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/identity.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/order.model.ts b/src/Web/WebSPA/Client/modules/shared/models/order.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/order.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/order.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/orderItem.model.ts b/src/Web/WebSPA/Client/modules/shared/models/orderItem.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/orderItem.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/orderItem.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/pager.model.ts b/src/Web/WebSPA/Client/modules/shared/models/pager.model.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/models/pager.model.ts rename to src/Web/WebSPA/Client/modules/shared/models/pager.model.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/pipes/uppercase.pipe.spec.ts b/src/Web/WebSPA/Client/modules/shared/pipes/uppercase.pipe.spec.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/pipes/uppercase.pipe.spec.ts rename to src/Web/WebSPA/Client/modules/shared/pipes/uppercase.pipe.spec.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/pipes/uppercase.pipe.ts b/src/Web/WebSPA/Client/modules/shared/pipes/uppercase.pipe.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/pipes/uppercase.pipe.ts rename to src/Web/WebSPA/Client/modules/shared/pipes/uppercase.pipe.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/basket.wrapper.service.ts b/src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/basket.wrapper.service.ts rename to src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/configuration.service.ts b/src/Web/WebSPA/Client/modules/shared/services/configuration.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/configuration.service.ts rename to src/Web/WebSPA/Client/modules/shared/services/configuration.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/data.service.ts b/src/Web/WebSPA/Client/modules/shared/services/data.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/data.service.ts rename to src/Web/WebSPA/Client/modules/shared/services/data.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/notification.service.ts b/src/Web/WebSPA/Client/modules/shared/services/notification.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/notification.service.ts rename to src/Web/WebSPA/Client/modules/shared/services/notification.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/security.service.ts b/src/Web/WebSPA/Client/modules/shared/services/security.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/security.service.ts rename to src/Web/WebSPA/Client/modules/shared/services/security.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/storage.service.ts b/src/Web/WebSPA/Client/modules/shared/services/storage.service.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/storage.service.ts rename to src/Web/WebSPA/Client/modules/shared/services/storage.service.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/shared.module.ts b/src/Web/WebSPA/Client/modules/shared/shared.module.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/shared.module.ts rename to src/Web/WebSPA/Client/modules/shared/shared.module.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/polyfills.ts b/src/Web/WebSPA/Client/polyfills.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/polyfills.ts rename to src/Web/WebSPA/Client/polyfills.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/vendor.ts b/src/Web/WebSPA/Client/vendor.ts similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Client/vendor.ts rename to src/Web/WebSPA/Client/vendor.ts diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile rename to src/Web/WebSPA/Dockerfile diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Program.cs b/src/Web/WebSPA/Program.cs similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Program.cs rename to src/Web/WebSPA/Program.cs diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Properties/launchSettings.json b/src/Web/WebSPA/Properties/launchSettings.json similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Properties/launchSettings.json rename to src/Web/WebSPA/Properties/launchSettings.json diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/README.md b/src/Web/WebSPA/README.md similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/README.md rename to src/Web/WebSPA/README.md diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Server/Controllers/HomeController.cs b/src/Web/WebSPA/Server/Controllers/HomeController.cs similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Server/Controllers/HomeController.cs rename to src/Web/WebSPA/Server/Controllers/HomeController.cs diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Startup.cs rename to src/Web/WebSPA/Startup.cs diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Views/Home/Index.cshtml b/src/Web/WebSPA/Views/Home/Index.cshtml similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Views/Home/Index.cshtml rename to src/Web/WebSPA/Views/Home/Index.cshtml diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Views/Shared/_Layout.cshtml b/src/Web/WebSPA/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Views/Shared/_Layout.cshtml rename to src/Web/WebSPA/Views/Shared/_Layout.cshtml diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Views/_ViewImports.cshtml b/src/Web/WebSPA/Views/_ViewImports.cshtml similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Views/_ViewImports.cshtml rename to src/Web/WebSPA/Views/_ViewImports.cshtml diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Views/_ViewStart.cshtml b/src/Web/WebSPA/Views/_ViewStart.cshtml similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/Views/_ViewStart.cshtml rename to src/Web/WebSPA/Views/_ViewStart.cshtml diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj similarity index 96% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj rename to src/Web/WebSPA/WebSPA.csproj index 3a7cf00b8..0d30295a7 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/eShopOnContainers.WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -4,13 +4,13 @@ netcoreapp1.1 portable true - eShopOnContainers.WebSPA + WebSPA Exe eShopOnContainers.WebSPA aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119 1.1.0 $(PackageTargetFallback);dotnet5.6;portable-net45+win8 - ..\..\..\..\docker-compose.dcproj + ..\..\..\docker-compose.dcproj false true diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/appsettings.json b/src/Web/WebSPA/appsettings.json similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/appsettings.json rename to src/Web/WebSPA/appsettings.json diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/config/helpers.js b/src/Web/WebSPA/config/helpers.js similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/config/helpers.js rename to src/Web/WebSPA/config/helpers.js diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.dev.js b/src/Web/WebSPA/config/webpack.config.dev.js similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.dev.js rename to src/Web/WebSPA/config/webpack.config.dev.js diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.js b/src/Web/WebSPA/config/webpack.config.js similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.js rename to src/Web/WebSPA/config/webpack.config.js diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.prod.js b/src/Web/WebSPA/config/webpack.config.prod.js similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.prod.js rename to src/Web/WebSPA/config/webpack.config.prod.js diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.vendor.js b/src/Web/WebSPA/config/webpack.config.vendor.js similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.vendor.js rename to src/Web/WebSPA/config/webpack.config.vendor.js diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/package.json b/src/Web/WebSPA/package.json similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/package.json rename to src/Web/WebSPA/package.json diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/tsconfig.json b/src/Web/WebSPA/tsconfig.json similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/tsconfig.json rename to src/Web/WebSPA/tsconfig.json diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/tslint.json b/src/Web/WebSPA/tslint.json similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/tslint.json rename to src/Web/WebSPA/tslint.json diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/typedoc.json b/src/Web/WebSPA/typedoc.json similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/typedoc.json rename to src/Web/WebSPA/typedoc.json diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/web.config b/src/Web/WebSPA/web.config similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/web.config rename to src/Web/WebSPA/web.config diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/wwwroot/favicon.ico b/src/Web/WebSPA/wwwroot/favicon.ico similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/wwwroot/favicon.ico rename to src/Web/WebSPA/wwwroot/favicon.ico diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/wwwroot/web.config b/src/Web/WebSPA/wwwroot/web.config similarity index 100% rename from src/Web/WebSPA/eShopOnContainers.WebSPA/wwwroot/web.config rename to src/Web/WebSPA/wwwroot/web.config From d6629addf8cbffdc1b1035eafc822ea0b8d22448 Mon Sep 17 00:00:00 2001 From: etomas Date: Wed, 22 Feb 2017 09:16:57 +0100 Subject: [PATCH 4/4] Msising sln update for #51 --- eShopOnContainers.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln index 63d62bb9c..9b3746fe5 100644 --- a/eShopOnContainers.sln +++ b/eShopOnContainers.sln @@ -49,7 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Code", "Shared Code" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{9CC7814B-72A6-465B-A61C-57B512DEE303}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "eShopOnContainers.WebSPA", "src\Web\WebSPA\eShopOnContainers.WebSPA\eShopOnContainers.WebSPA.csproj", "{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSPA", "src\Web\WebSPA\WebSPA.csproj"", "{9842DB3A-1391-48C7-A49C-2FABD0A18AC2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{B7B1D395-4E06-4036-BE86-C216756B9367}" EndProject