diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 48fd03b99..41b08da1c 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -32,7 +32,7 @@ services:
basket.api:
environment:
- ConnectionString=basket.data
- #- identityUrl=http://13.88.8.119:5105 #Remote
+ #- 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.
ports:
- "5103:5103"
@@ -40,8 +40,8 @@ services:
catalog.api:
environment:
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
- - ExternalCatalogBaseUrl=http://10.0.75.1:5101 #Local
- #- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote
+ #- 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.
ports:
- "5101:5101"
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
index ffa9c0b55..c9cb8a265 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
@@ -16,7 +16,7 @@
Resources\Resource.Designer.cs
Off
True
- v7.0
+ v6.0
Properties\AndroidManifest.xml
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs b/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs
index 78e3f376c..ee0c9b5e8 100644
--- a/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs
+++ b/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs
@@ -61,7 +61,7 @@ namespace eShopOnContainers.Identity.Configuration
AllowAccessTokensViaBrowser = true,
RedirectUris = { "http://eshopxamarin/callback.html" },
RequireConsent = false,
- PostLogoutRedirectUris = { "http://eshopxamarin/callback.html/index.html" },
+ PostLogoutRedirectUris = { "http://13.88.8.119:5105/Account/Redirecting", "http://10.6.1.234:5105/Account/Redirecting" },
AllowedCorsOrigins = { "http://eshopxamarin" },
AllowedScopes =
{
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs b/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs
index 63c73d119..39b33bd4c 100644
--- a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs
+++ b/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs
@@ -307,6 +307,12 @@ namespace IdentityServer4.Quickstart.UI.Controllers
return RedirectToAction("index", "home");
}
+ [HttpGet]
+ public IActionResult Redirecting()
+ {
+ return View();
+ }
+
private void AddErrors(IdentityResult result)
{
foreach (var error in result.Errors)
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml
new file mode 100644
index 000000000..33275ce3c
--- /dev/null
+++ b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml
@@ -0,0 +1,3 @@
+
+
+
Redirecting...
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png
index 2afd3dccf..c5257cbcf 100644
Binary files a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png and b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png differ
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png
index 44a65364f..23fbb4393 100644
Binary files a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png and b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png differ
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png
index 0f345a385..19541e1ab 100644
Binary files a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png and b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png differ
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html
index 3953ef487..c0aa46ad5 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html
@@ -1,6 +1,6 @@
-
![](../../images/main_banner_text.png)
+