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