ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use relative paths & URLs

Browse Source
This commit is contained in:
Charles Lowell 2017-02-23 10:02:35 -08:00
parent 3df4f3a206
commit 7755f30618
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Services/Identity/Identity.API/wwwroot/css/site.css
View File

@ -42,13 +42,13 @@
@font-face { @font-face {
font-family: Montserrat; font-family: Montserrat;
font-weight: 400; 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-face {
font-family: Montserrat; font-family: Montserrat;
font-weight: 700; 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 { body {

9
src/Web/WebMVC/Controllers/AccountController.cs
View File

@ -33,7 +33,9 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
ViewData["access_token"] = token.Value; 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() public IActionResult Signout()
@ -41,7 +43,10 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
HttpContext.Authentication.SignOutAsync("Cookies"); HttpContext.Authentication.SignOutAsync("Cookies");
HttpContext.Authentication.SignOutAsync("oidc"); 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 });
} }
} }
} }

4
src/Web/WebMVC/Views/Catalog/Index.cshtml
View File

@ -4,7 +4,7 @@
} }
<section class="esh-catalog-hero"> <section class="esh-catalog-hero">
<div class="container"> <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> </div>
</section> </section>
@ -17,7 +17,7 @@
<label class="esh-catalog-label" data-title="type"> <label class="esh-catalog-label" data-title="type">
<select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select> <select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select>
</label> </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> </form>
</div> </div>
</section> </section>

2
src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml
View File

@ -10,7 +10,7 @@
asp-action="Index"> asp-action="Index">
<div class="esh-basketstatus-image"> <div class="esh-basketstatus-image">
<img src="../images/cart.png" /> <img src="~/images/cart.png" />
</div> </div>
<div class="esh-basketstatus-badge"> <div class="esh-basketstatus-badge">
@Model.ItemsCount @Model.ItemsCount

4
src/Web/WebMVC/Views/Shared/_Layout.cshtml
View File

@ -34,7 +34,7 @@
<section class="col-lg-7 col-md-6 col-xs-12"> <section class="col-lg-7 col-md-6 col-xs-12">
<a class="navbar-brand" routerLink="catalog"> <a class="navbar-brand" routerLink="catalog">
<a asp-area="" asp-controller="Catalog" asp-action="Index"> <a asp-area="" asp-controller="Catalog" asp-action="Index">
<img src="../images/brand.png" /> <img src="~/images/brand.png" />
</a> </a>
</section> </section>
@ -51,7 +51,7 @@
<article class="row"> <article class="row">
<section class="col-sm-6"> <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>
<section class="col-sm-6"> <section class="col-sm-6">

6
src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml
View File

@ -13,7 +13,7 @@
<section class="esh-identity-section"> <section class="esh-identity-section">
<div class="esh-identity-name">@User.FindFirst(x => x.Type == "preferred_username").Value</div> <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>
<section class="esh-identity-drop"> <section class="esh-identity-drop">
@ -23,14 +23,14 @@
asp-action="Index"> asp-action="Index">
<div class="esh-identity-name esh-identity-name--upper">My orders</div> <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>
<a class="esh-identity-item" <a class="esh-identity-item"
href="javascript:document.getElementById('logoutForm').submit()"> href="javascript:document.getElementById('logoutForm').submit()">
<div class="esh-identity-name esh-identity-name--upper">Log Out</div> <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> </a>
</section> </section>
</form> </form>

2
src/Web/WebMVC/wwwroot/css/app.css
View File

@ -1,7 +1,7 @@
@font-face { @font-face {
font-family: Montserrat; font-family: Montserrat;
font-weight: 400; 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-face {