Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed WebUrl from AuthService (#438)

Browse Source
This commit is contained in:
Shady Nagy
2020-07-29 18:21:40 +02:00
committed by GitHub
parent b640926a19
commit 98fb0ee8ce
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor
View File

@@ -26,7 +26,7 @@
<div class="row"> <div class="row">
@if (HasPicture) @if (HasPicture)
{ {
<img class="col-md-6 esh-picture" src="@($"{Auth.WebUrl}{_item.PictureUri}")"> <img class="col-md-6 esh-picture" src="@($"{_item.PictureUri}")">
} }
<dl class="col-md-@(HasPicture ? "6" : "12") dl-horizontal"> <dl class="col-md-@(HasPicture ? "6" : "12") dl-horizontal">
<dt> <dt>

2
src/BlazorAdmin/Pages/CatalogItemPage/Details.razor
View File

@@ -27,7 +27,7 @@
<div class="row"> <div class="row">
@if (HasPicture) @if (HasPicture)
{ {
<img class="col-md-6 esh-picture" src="@($"{Auth.WebUrl}{_item.PictureUri}")"> <img class="col-md-6 esh-picture" src="@($"{_item.PictureUri}")">
} }

2
src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor
View File

@@ -132,7 +132,7 @@
[Parameter] [Parameter]
public EventCallback<string> OnCloseClick { get; set; } public EventCallback<string> OnCloseClick { get; set; }
private string LoadPicture => string.IsNullOrEmpty(_item.PictureBase64) ? string.IsNullOrEmpty(_item.PictureUri) ? string.Empty : $"{Auth.WebUrl}{_item.PictureUri}" : $"data:image/png;base64, {_item.PictureBase64}"; private string LoadPicture => string.IsNullOrEmpty(_item.PictureBase64) ? string.IsNullOrEmpty(_item.PictureUri) ? string.Empty : $"{_item.PictureUri}" : $"data:image/png;base64, {_item.PictureBase64}";
private bool HasPicture => !(string.IsNullOrEmpty(_item.PictureBase64) && string.IsNullOrEmpty(_item.PictureUri)); private bool HasPicture => !(string.IsNullOrEmpty(_item.PictureBase64) && string.IsNullOrEmpty(_item.PictureUri));
private string _badFileMessage = string.Empty; private string _badFileMessage = string.Empty;
private string _modalDisplay = "none;"; private string _modalDisplay = "none;";

2
src/BlazorAdmin/Pages/CatalogItemPage/List.razor
View File

@@ -40,7 +40,7 @@ else
{ {
<tr @onclick="@(() => DetailsClick(item.Id))"> <tr @onclick="@(() => DetailsClick(item.Id))">
<td> <td>
<img class="img-thumbnail" src="@($"{Auth.WebUrl}{item.PictureUri}")"> <img class="img-thumbnail" src="@($"{item.PictureUri}")">
</td> </td>
<td>@Services.CatalogTypeServices.List.GetTypeName(catalogTypes, item.CatalogTypeId)</td> <td>@Services.CatalogTypeServices.List.GetTypeName(catalogTypes, item.CatalogTypeId)</td>
<td>@Services.CatalogBrandServices.List.GetBrandName(catalogBrands, item.CatalogBrandId)</td> <td>@Services.CatalogBrandServices.List.GetBrandName(catalogBrands, item.CatalogBrandId)</td>

1
src/BlazorAdmin/Services/AuthService.cs
View File

@@ -17,7 +17,6 @@ namespace BlazorAdmin.Services
private static bool InDocker { get; set; } private static bool InDocker { get; set; }
public string ApiUrl => Constants.GetApiUrl(InDocker); public string ApiUrl => Constants.GetApiUrl(InDocker);
public string WebUrl => Constants.GetWebUrl(InDocker);
public bool IsLoggedIn { get; set; } public bool IsLoggedIn { get; set; }
public string UserName { get; set; } public string UserName { get; set; }