From 7755f3061876f3d36f948c63164852e9248094bb Mon Sep 17 00:00:00 2001
From: Charles Lowell <chlowe@microsoft.com>
Date: Thu, 23 Feb 2017 10:02:35 -0800
Subject: [PATCH] Use relative paths & URLs

---
 .../Identity/Identity.API/wwwroot/css/site.css        |  4 ++--
 src/Web/WebMVC/Controllers/AccountController.cs       | 11 ++++++++---
 src/Web/WebMVC/Views/Catalog/Index.cshtml             |  4 ++--
 .../Views/Shared/Components/Cart/Default.cshtml       |  2 +-
 src/Web/WebMVC/Views/Shared/_Layout.cshtml            |  4 ++--
 src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml      |  6 +++---
 src/Web/WebMVC/wwwroot/css/app.css                    |  2 +-
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Services/Identity/Identity.API/wwwroot/css/site.css b/src/Services/Identity/Identity.API/wwwroot/css/site.css
index a95381dc8..c8dcea80a 100644
--- a/src/Services/Identity/Identity.API/wwwroot/css/site.css
+++ b/src/Services/Identity/Identity.API/wwwroot/css/site.css
@@ -42,13 +42,13 @@
 @font-face {
     font-family: Montserrat;
     font-weight: 400;
-    src: url("/fonts/Montserrat-Regular.eot?") format("eot"),url("/fonts/Montserrat-Regular.woff") format("woff"),url("/fonts/Montserrat-Regular.ttf") format("truetype"),url("/fonts/Montserrat-Regular.svg#Montserrat") format("svg")
+    src: url("../fonts/Montserrat-Regular.eot?") format("eot"),url("../fonts/Montserrat-Regular.woff") format("woff"),url("../fonts/Montserrat-Regular.ttf") format("truetype"),url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg")
 }
 
 @font-face {
     font-family: Montserrat;
     font-weight: 700;
-    src: url("/fonts/Montserrat-Bold.eot?") format("eot"),url("/fonts/Montserrat-Bold.woff") format("woff"),url("/fonts/Montserrat-Bold.ttf") format("truetype"),url("/fonts/Montserrat-Bold.svg#Montserrat") format("svg")
+    src: url("../fonts/Montserrat-Bold.eot?") format("eot"),url("../fonts/Montserrat-Bold.woff") format("woff"),url("../fonts/Montserrat-Bold.ttf") format("truetype"),url("../fonts/Montserrat-Bold.svg#Montserrat") format("svg")
 }
 
 body {
diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs
index 0f14cf45f..b6506c2d1 100644
--- a/src/Web/WebMVC/Controllers/AccountController.cs
+++ b/src/Web/WebMVC/Controllers/AccountController.cs
@@ -33,15 +33,20 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
                 ViewData["access_token"] = token.Value;
             }
 
-            return Redirect("/");
+            // "Catalog" because UrlHelper doesn't support nameof() for controllers
+            // https://github.com/aspnet/Mvc/issues/5853
+            return RedirectToAction(nameof(CatalogController.Index), "Catalog");
         }
 
         public IActionResult Signout()
         {
             HttpContext.Authentication.SignOutAsync("Cookies");
             HttpContext.Authentication.SignOutAsync("oidc");
-             
-            return new SignOutResult("oidc", new AuthenticationProperties { RedirectUri = "/" });
+
+            // "Catalog" because UrlHelper doesn't support nameof() for controllers
+            // https://github.com/aspnet/Mvc/issues/5853
+            var homeUrl = Url.Action(nameof(CatalogController.Index), "Catalog");
+            return new SignOutResult("oidc", new AuthenticationProperties { RedirectUri = homeUrl });
         }
     }
 }
diff --git a/src/Web/WebMVC/Views/Catalog/Index.cshtml b/src/Web/WebMVC/Views/Catalog/Index.cshtml
index 439293111..8fe288fd8 100644
--- a/src/Web/WebMVC/Views/Catalog/Index.cshtml
+++ b/src/Web/WebMVC/Views/Catalog/Index.cshtml
@@ -4,7 +4,7 @@
 }
 <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>
 
@@ -17,7 +17,7 @@
             <label class="esh-catalog-label" data-title="type">
                 <select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select>
             </label>
-            <input class="esh-catalog-send" type="image" src="images/arrow-right.svg" />
+            <input class="esh-catalog-send" type="image" src="~/images/arrow-right.svg" />
         </form>
     </div>
 </section>
diff --git a/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml b/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml
index e8699f930..6be55d67a 100644
--- a/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml
+++ b/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml
@@ -10,7 +10,7 @@
    asp-action="Index">
 
     <div class="esh-basketstatus-image">
-        <img src="../images/cart.png" />
+        <img src="~/images/cart.png" />
     </div>
     <div class="esh-basketstatus-badge">
         @Model.ItemsCount
diff --git a/src/Web/WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml
index f7eda24ef..28eada0d0 100644
--- a/src/Web/WebMVC/Views/Shared/_Layout.cshtml
+++ b/src/Web/WebMVC/Views/Shared/_Layout.cshtml
@@ -34,7 +34,7 @@
                 <section class="col-lg-7 col-md-6 col-xs-12">
                     <a class="navbar-brand" routerLink="catalog">
                         <a asp-area="" asp-controller="Catalog" asp-action="Index">
-                            <img src="../images/brand.png" />
+                            <img src="~/images/brand.png" />
                         </a>
                 </section>
 
@@ -51,7 +51,7 @@
             <article class="row">
 
                 <section class="col-sm-6">
-                    <img class="esh-app-footer-brand" src="../images/brand_dark.png" />
+                    <img class="esh-app-footer-brand" src="~/images/brand_dark.png" />
                 </section>
 
                 <section class="col-sm-6">
diff --git a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml
index 0d987d9fe..38659cc06 100644
--- a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml
+++ b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml
@@ -13,7 +13,7 @@
                 <section class="esh-identity-section">
 
                     <div class="esh-identity-name">@User.FindFirst(x => x.Type == "preferred_username").Value</div>
-                    <img class="esh-identity-image" src="../images/arrow-down.png">
+                    <img class="esh-identity-image" src="~/images/arrow-down.png">
                 </section>
 
                 <section class="esh-identity-drop">
@@ -23,14 +23,14 @@
                        asp-action="Index">
 
                         <div class="esh-identity-name esh-identity-name--upper">My orders</div>
-                        <img class="esh-identity-image" src="../images/my_orders.png">
+                        <img class="esh-identity-image" src="~/images/my_orders.png">
                     </a>
 
                     <a class="esh-identity-item"
                        href="javascript:document.getElementById('logoutForm').submit()">
 
                         <div class="esh-identity-name esh-identity-name--upper">Log Out</div>
-                        <img class="esh-identity-image" src="../images/logout.png">
+                        <img class="esh-identity-image" src="~/images/logout.png">
                     </a>
                 </section>
             </form>
diff --git a/src/Web/WebMVC/wwwroot/css/app.css b/src/Web/WebMVC/wwwroot/css/app.css
index 6975836e2..55cbd66aa 100644
--- a/src/Web/WebMVC/wwwroot/css/app.css
+++ b/src/Web/WebMVC/wwwroot/css/app.css
@@ -1,7 +1,7 @@
 @font-face {
     font-family: Montserrat;
     font-weight: 400;
-    src: url(".../fonts/Montserrat-Regular.eot?") format("eot"), url("../fonts/Montserrat-Regular.woff") format("woff"), url("../fonts/Montserrat-Regular.ttf") format("truetype"), url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg");
+    src: url("../fonts/Montserrat-Regular.eot?") format("eot"), url("../fonts/Montserrat-Regular.woff") format("woff"), url("../fonts/Montserrat-Regular.ttf") format("truetype"), url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg");
 }
 
 @font-face {