diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml index 4c8eb042..5b5737b2 100644 --- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml +++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml @@ -184,7 +184,7 @@ else پیشنهاد دهنده: - @Model.Correction.UserNickname + @Model.Correction.UserNickname diff --git a/GanjooRazor/Areas/User/Pages/Edits.cshtml b/GanjooRazor/Areas/User/Pages/Edits.cshtml index 207aecfc..919a1be8 100644 --- a/GanjooRazor/Areas/User/Pages/Edits.cshtml +++ b/GanjooRazor/Areas/User/Pages/Edits.cshtml @@ -18,11 +18,37 @@ else if (@Model.CanEdit) { -
-

- ویرایش‌های همه -

-
+ @if (Model.Profile != null) + { + +
+

+ @Model.Profile.NickName + + @if (!string.IsNullOrEmpty(Model.Profile.Website)) + { + 🌐 + } + + +

+ + @if (!string.IsNullOrEmpty(Model.Profile.Bio)) + { + @Html.Raw(Model.Profile.Bio) + } +
+
+ } + else + { +
+

+ ویرایش‌های همه +

+
+ } + } @if (Model.Corrections.Count == 0) diff --git a/GanjooRazor/Areas/User/Pages/Edits.cshtml.cs b/GanjooRazor/Areas/User/Pages/Edits.cshtml.cs index 5a97e0fd..0acdaece 100644 --- a/GanjooRazor/Areas/User/Pages/Edits.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/Edits.cshtml.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; @@ -9,6 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using RMuseum.Models.Auth.ViewModel; using RMuseum.Models.Ganjoor; using RMuseum.Models.Ganjoor.ViewModels; using RSecurityBackend.Models.Generic; @@ -38,6 +40,13 @@ namespace GanjooRazor.Areas.User.Pages /// public bool AllUsersEdits { get; set; } + /// + /// filteredUserId + /// + public Guid? filteredUserId { get; set; } + + public GanjoorUserPublicProfile Profile { get; set; } + /// /// Corrections /// @@ -80,6 +89,19 @@ namespace GanjooRazor.Areas.User.Pages { url = $"{APIRoot.Url}/api/ganjoor/corrections/all?PageNumber={pageNumber}&PageSize=20"; } + filteredUserId = string.IsNullOrEmpty(Request.Query["UserId"]) ? null : Guid.Parse(Request.Query["UserId"]); + if (filteredUserId != null) + { + url += $"&userId={filteredUserId}"; + var responseUserProfile = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/user/profile/{filteredUserId}"); + if (!responseUserProfile.IsSuccessStatusCode) + { + LastError = JsonConvert.DeserializeObject(await responseUserProfile.Content.ReadAsStringAsync()); + return Page(); + } + + Profile = JsonConvert.DeserializeObject(await responseUserProfile.Content.ReadAsStringAsync()); + } } var response = await secureClient.GetAsync(url); if (!response.IsSuccessStatusCode)