Skip to content

Commit e89adb5

Browse files
author
PLAINCONCEPTS\ccanizares
committed
SPA: Change banner and logo
1 parent 7df5670 commit e89adb5

9 files changed

Lines changed: 15 additions & 6 deletions

File tree

docker-compose.override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ services:
3232
basket.api:
3333
environment:
3434
- ConnectionString=basket.data
35-
#- identityUrl=http://13.88.8.119:5105 #Remote
35+
#- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105.
3636
- 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.
3737
ports:
3838
- "5103:5103"
3939

4040
catalog.api:
4141
environment:
4242
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
43-
- ExternalCatalogBaseUrl=http://10.0.75.1:5101 #Local
44-
#- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote
43+
#- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105.
44+
- 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.
4545
ports:
4646
- "5101:5101"
4747

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
2020
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2121
<NuGetPackageImportStamp>
2222
</NuGetPackageImportStamp>

src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static IEnumerable<Client> GetClients(Dictionary<string,string> clientsUr
6161
AllowAccessTokensViaBrowser = true,
6262
RedirectUris = { "http://eshopxamarin/callback.html" },
6363
RequireConsent = false,
64-
PostLogoutRedirectUris = { "http://eshopxamarin/callback.html/index.html" },
64+
PostLogoutRedirectUris = { "http://13.88.8.119:5105/Account/Redirecting", "http://10.6.1.234:5105/Account/Redirecting" },
6565
AllowedCorsOrigins = { "http://eshopxamarin" },
6666
AllowedScopes =
6767
{

src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,12 @@ public async Task<IActionResult> Register(RegisterViewModel model, string return
307307
return RedirectToAction("index", "home");
308308
}
309309

310+
[HttpGet]
311+
public IActionResult Redirecting()
312+
{
313+
return View();
314+
}
315+
310316
private void AddErrors(IdentityResult result)
311317
{
312318
foreach (var error in result.Errors)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<br />
2+
<br />
3+
<p style="width:80%;"><center><span>Redirecting...</span></center></p>
-376 Bytes
Loading
-876 Bytes
Loading
-328 KB
Loading

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<section class="esh-catalog-hero">
22
<div class="container">
3-
<img class="esh-catalog-title" src="../../images/main_banner_text.png" />
3+
<!--<img class="esh-catalog-title" src="../../images/main_banner_text.png" />-->
44
</div>
55
</section>
66

0 commit comments

Comments
 (0)