Browse Source

SPA: Change banner and logo

pull/49/merge
PLAINCONCEPTS\ccanizares 8 years ago
parent
commit
e89adb5b30
9 changed files with 15 additions and 6 deletions
  1. +3
    -3
      docker-compose.override.yml
  2. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
  3. +1
    -1
      src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs
  4. +6
    -0
      src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs
  5. +3
    -0
      src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml
  6. BIN
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png
  7. BIN
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png
  8. BIN
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png
  9. +1
    -1
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html

+ 3
- 3
docker-compose.override.yml View File

@ -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"


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj View File

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>


+ 1
- 1
src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs View File

@ -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 =
{


+ 6
- 0
src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs View File

@ -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)


+ 3
- 0
src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml View File

@ -0,0 +1,3 @@
<br />
<br />
<p style="width:80%;"><center><span>Redirecting...</span></center></p>

BIN
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand.png View File

Before After
Width: 201  |  Height: 44  |  Size: 5.1 KiB Width: 201  |  Height: 44  |  Size: 4.7 KiB

BIN
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/brand_dark.png View File

Before After
Width: 231  |  Height: 51  |  Size: 5.1 KiB Width: 201  |  Height: 44  |  Size: 4.3 KiB

BIN
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/images/main_banner.png View File

Before After
Width: 1920  |  Height: 258  |  Size: 713 KiB Width: 1918  |  Height: 258  |  Size: 385 KiB

+ 1
- 1
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html View File

@ -1,6 +1,6 @@
<section class="esh-catalog-hero">
<div class="container">
<img class="esh-catalog-title" src="../../images/main_banner_text.png" />
<!--<img class="esh-catalog-title" src="../../images/main_banner_text.png" />-->
</div>
</section>


Loading…
Cancel
Save