Browse Source

Removed WebUrl from AuthService (#438)

main
Shady Nagy 5 years ago
committed by GitHub
parent
commit
98fb0ee8ce
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor
  2. 2
      src/BlazorAdmin/Pages/CatalogItemPage/Details.razor
  3. 2
      src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor
  4. 2
      src/BlazorAdmin/Pages/CatalogItemPage/List.razor
  5. 1
      src/BlazorAdmin/Services/AuthService.cs

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

@ -26,7 +26,7 @@
<div class="row">
@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">
<dt>

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

@ -27,7 +27,7 @@
<div class="row">
@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

@ -132,7 +132,7 @@
[Parameter]
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 string _badFileMessage = string.Empty;
private string _modalDisplay = "none;";

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

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

1
src/BlazorAdmin/Services/AuthService.cs

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

Loading…
Cancel
Save