From 815b0595816bb628a2bfe3be07d3d7c6a57961f8 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Sat, 18 May 2024 14:21:31 +0330 Subject: [PATCH] upgrading nuget packages --- GanjooRazor/Areas/User/Pages/Index.cshtml | 2 +- GanjooRazor/Areas/User/Pages/Index.cshtml.cs | 2 +- GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs | 2 +- GanjooRazor/Pages/LoginPartialEnabledPageModel.cs | 2 +- GanjooRazor/Pages/ResetPassword.cshtml.cs | 2 +- GanjooRazor/Pages/SignUp.cshtml | 2 +- GanjooRazor/Pages/SignUp.cshtml.cs | 6 +++--- GanjooRazor/Utils/GanjoorSessionChecker.cs | 2 +- .../GanjoorAudio/ViewModels/RecitationViewModel.cs | 2 +- RMuseum/RMuseum.csproj | 12 ++++++------ RMuseum/RMuseum.xml | 2 +- RMuseum/Services/Implementation/ArtifactService.cs | 14 +++++++------- .../Implementation/GanjoorAppUserService.cs | 6 +++--- .../Services/Implementation/RecitationService.cs | 10 +++++----- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/GanjooRazor/Areas/User/Pages/Index.cshtml b/GanjooRazor/Areas/User/Pages/Index.cshtml index 77d277ec..02beacfe 100644 --- a/GanjooRazor/Areas/User/Pages/Index.cshtml +++ b/GanjooRazor/Areas/User/Pages/Index.cshtml @@ -84,7 +84,7 @@ else نام خانوادگی: -
+
diff --git a/GanjooRazor/Areas/User/Pages/Index.cshtml.cs b/GanjooRazor/Areas/User/Pages/Index.cshtml.cs index 9fae7162..0e798c89 100644 --- a/GanjooRazor/Areas/User/Pages/Index.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/Index.cshtml.cs @@ -63,7 +63,7 @@ namespace GanjooRazor.Areas.Panel.Pages Id = userInfo.Id, Username = userInfo.Username, FirstName = userInfo.FirstName, - SurName = userInfo.SurName, + SureName = userInfo.SureName, NickName = userInfo.NickName, PhoneNumber = userInfo.PhoneNumber, Email = userInfo.Email, diff --git a/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs b/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs index 2e9a6cdb..d10139a1 100644 --- a/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs +++ b/GanjooRazor/Areas/User/Pages/MyComments.cshtml.cs @@ -65,7 +65,7 @@ namespace GanjooRazor.Areas.User.Pages Id = userInfo.Id, Username = userInfo.Username, FirstName = userInfo.FirstName, - SurName = userInfo.SurName, + SureName = userInfo.SureName, NickName = userInfo.NickName, PhoneNumber = userInfo.PhoneNumber, Email = userInfo.Email, diff --git a/GanjooRazor/Pages/LoginPartialEnabledPageModel.cs b/GanjooRazor/Pages/LoginPartialEnabledPageModel.cs index cd10a4de..6f3f0742 100644 --- a/GanjooRazor/Pages/LoginPartialEnabledPageModel.cs +++ b/GanjooRazor/Pages/LoginPartialEnabledPageModel.cs @@ -129,7 +129,7 @@ namespace GanjooRazor.Pages Response.Cookies.Append("SessionId", loggedOnUser.SessionId.ToString(), cookieOption); Response.Cookies.Append("Token", loggedOnUser.Token, cookieOption); Response.Cookies.Append("Username", loggedOnUser.User.Username, cookieOption); - Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", cookieOption); + Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SureName}", cookieOption); Response.Cookies.Append("NickName", $"{loggedOnUser.User.NickName}", cookieOption); Response.Cookies.Append("KeepHistory", $"{loggedOnUser.KeepHistory}", cookieOption); diff --git a/GanjooRazor/Pages/ResetPassword.cshtml.cs b/GanjooRazor/Pages/ResetPassword.cshtml.cs index 58a1448b..96bcbb2a 100644 --- a/GanjooRazor/Pages/ResetPassword.cshtml.cs +++ b/GanjooRazor/Pages/ResetPassword.cshtml.cs @@ -244,7 +244,7 @@ namespace GanjooRazor.Pages Response.Cookies.Append("SessionId", loggedOnUser.SessionId.ToString(), cookieOption); Response.Cookies.Append("Token", loggedOnUser.Token, cookieOption); Response.Cookies.Append("Username", loggedOnUser.User.Username, cookieOption); - Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", cookieOption); + Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SureName}", cookieOption); Response.Cookies.Append("NickName", $"{loggedOnUser.User.NickName}", cookieOption); Response.Cookies.Append("KeepHistory", $"{loggedOnUser.KeepHistory}", cookieOption); diff --git a/GanjooRazor/Pages/SignUp.cshtml b/GanjooRazor/Pages/SignUp.cshtml index c8465353..63174037 100644 --- a/GanjooRazor/Pages/SignUp.cshtml +++ b/GanjooRazor/Pages/SignUp.cshtml @@ -160,7 +160,7 @@ نام خانوادگی: - + diff --git a/GanjooRazor/Pages/SignUp.cshtml.cs b/GanjooRazor/Pages/SignUp.cshtml.cs index 6fe93e2d..2784010e 100644 --- a/GanjooRazor/Pages/SignUp.cshtml.cs +++ b/GanjooRazor/Pages/SignUp.cshtml.cs @@ -180,7 +180,7 @@ namespace GanjooRazor.Pages Secret = Secret, Email = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()), FirstName = "", - SurName = "", + SureName = "", Password = "", PasswordConfirmation = "" }; @@ -213,7 +213,7 @@ namespace GanjooRazor.Pages Email = FinalViewModel.Email, Secret = FinalViewModel.Secret, FirstName = FinalViewModel.FirstName, - SurName = FinalViewModel.SurName, + SureName = FinalViewModel.SureName, Password = FinalViewModel.Password }; @@ -256,7 +256,7 @@ namespace GanjooRazor.Pages Response.Cookies.Append("SessionId", loggedOnUser.SessionId.ToString(), cookieOption); Response.Cookies.Append("Token", loggedOnUser.Token, cookieOption); Response.Cookies.Append("Username", loggedOnUser.User.Username, cookieOption); - Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", cookieOption); + Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SureName}", cookieOption); Response.Cookies.Append("NickName", $"{loggedOnUser.User.NickName}", cookieOption); Response.Cookies.Append("KeepHistory", $"{loggedOnUser.KeepHistory}", cookieOption); diff --git a/GanjooRazor/Utils/GanjoorSessionChecker.cs b/GanjooRazor/Utils/GanjoorSessionChecker.cs index 4529d860..a8060caf 100644 --- a/GanjooRazor/Utils/GanjoorSessionChecker.cs +++ b/GanjooRazor/Utils/GanjoorSessionChecker.cs @@ -59,7 +59,7 @@ namespace GanjooRazor.Utils response.Cookies.Append("SessionId", loggedOnUser.SessionId.ToString(), cookieOption); response.Cookies.Append("Token", loggedOnUser.Token, cookieOption); response.Cookies.Append("Username", loggedOnUser.User.Username, cookieOption); - response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", cookieOption); + response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SureName}", cookieOption); response.Cookies.Append("NickName", $"{loggedOnUser.User.NickName}", cookieOption); bool canEditContent = false; diff --git a/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs b/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs index 7820081c..ed888e2b 100644 --- a/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs +++ b/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs @@ -33,7 +33,7 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels Username = appUser.UserName, Email = appUser.Email, FirstName = appUser.FirstName, - SurName = appUser.SureName, + SureName = appUser.SureName, PhoneNumber = appUser.PhoneNumber, RImageId = appUser.RImageId, Status = appUser.Status, diff --git a/RMuseum/RMuseum.csproj b/RMuseum/RMuseum.csproj index 46999062..6b97a163 100644 --- a/RMuseum/RMuseum.csproj +++ b/RMuseum/RMuseum.csproj @@ -20,16 +20,16 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index c0089879..cb19283e 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -17663,7 +17663,7 @@ - + diff --git a/RMuseum/Services/Implementation/ArtifactService.cs b/RMuseum/Services/Implementation/ArtifactService.cs index db8ff0cb..5b937ebf 100644 --- a/RMuseum/Services/Implementation/ArtifactService.cs +++ b/RMuseum/Services/Implementation/ArtifactService.cs @@ -2150,7 +2150,7 @@ namespace RMuseum.Services.Implementation Username = appUser.UserName, Email = appUser.Email, FirstName = appUser.FirstName, - SurName = appUser.SureName, + SureName = appUser.SureName, PhoneNumber = appUser.PhoneNumber, RImageId = appUser.RImageId, Status = appUser.Status, @@ -2260,7 +2260,7 @@ namespace RMuseum.Services.Implementation Username = appUser.UserName, Email = appUser.Email, FirstName = appUser.FirstName, - SurName = appUser.SureName, + SureName = appUser.SureName, PhoneNumber = appUser.PhoneNumber, RImageId = appUser.RImageId, Status = appUser.Status, @@ -2422,7 +2422,7 @@ namespace RMuseum.Services.Implementation Username = appUser.UserName, Email = appUser.Email, FirstName = appUser.FirstName, - SurName = appUser.SureName, + SureName = appUser.SureName, PhoneNumber = appUser.PhoneNumber, RImageId = appUser.RImageId, Status = appUser.Status, @@ -2692,7 +2692,7 @@ namespace RMuseum.Services.Implementation Username = user.Username, Email = user.Email, FirstName = user.FirstName, - SurName = user.SurName, + SureName = user.SureName, PhoneNumber = user.PhoneNumber, RImageId = user.RImageId, Status = user.Status, @@ -2761,7 +2761,7 @@ namespace RMuseum.Services.Implementation Username = link.SuggestedBy.UserName, Email = link.SuggestedBy.Email, FirstName = link.SuggestedBy.FirstName, - SurName = link.SuggestedBy.SureName, + SureName = link.SuggestedBy.SureName, PhoneNumber = link.SuggestedBy.PhoneNumber, RImageId = link.SuggestedBy.RImageId, Status = link.SuggestedBy.Status, @@ -2802,7 +2802,7 @@ namespace RMuseum.Services.Implementation Username = preLink.SuggestedBy.UserName, Email = preLink.SuggestedBy.Email, FirstName = preLink.SuggestedBy.FirstName, - SurName = preLink.SuggestedBy.SureName, + SureName = preLink.SuggestedBy.SureName, PhoneNumber = preLink.SuggestedBy.PhoneNumber, RImageId = preLink.SuggestedBy.RImageId, Status = preLink.SuggestedBy.Status, @@ -2857,7 +2857,7 @@ namespace RMuseum.Services.Implementation Username = link.SuggestedBy.UserName, Email = link.SuggestedBy.Email, FirstName = link.SuggestedBy.FirstName, - SurName = link.SuggestedBy.SureName, + SureName = link.SuggestedBy.SureName, PhoneNumber = link.SuggestedBy.PhoneNumber, RImageId = link.SuggestedBy.RImageId, Status = link.SuggestedBy.Status, diff --git a/RMuseum/Services/Implementation/GanjoorAppUserService.cs b/RMuseum/Services/Implementation/GanjoorAppUserService.cs index 15c41330..3d8f93a5 100644 --- a/RMuseum/Services/Implementation/GanjoorAppUserService.cs +++ b/RMuseum/Services/Implementation/GanjoorAppUserService.cs @@ -177,12 +177,12 @@ namespace RMuseum.Services.Implementation /// /// /// - /// + /// /// /// - public override async Task> FinalizeSignUp(string email, string secret, string password, string firstName, string surName, string phoneNumber) + public override async Task> FinalizeSignUp(string email, string secret, string password, string firstName, string sureName, string phoneNumber) { - RServiceResult res = await base.FinalizeSignUp(email, secret, password, firstName, surName, phoneNumber); + RServiceResult res = await base.FinalizeSignUp(email, secret, password, firstName, sureName, phoneNumber); if(res.Result) { try diff --git a/RMuseum/Services/Implementation/RecitationService.cs b/RMuseum/Services/Implementation/RecitationService.cs index 0087bd80..c97461aa 100644 --- a/RMuseum/Services/Implementation/RecitationService.cs +++ b/RMuseum/Services/Implementation/RecitationService.cs @@ -1683,7 +1683,7 @@ namespace RMuseum.Services.Implementationa Username = p.User.UserName, Email = p.User.Email, FirstName = p.User.FirstName, - SurName = p.User.SureName, + SureName = p.User.SureName, PhoneNumber = p.User.PhoneNumber, RImageId = p.User.RImageId, Status = p.User.Status, @@ -1721,7 +1721,7 @@ namespace RMuseum.Services.Implementationa Username = p.User.UserName, Email = p.User.Email, FirstName = p.User.FirstName, - SurName = p.User.SureName, + SureName = p.User.SureName, PhoneNumber = p.User.PhoneNumber, RImageId = p.User.RImageId, Status = p.User.Status, @@ -1766,7 +1766,7 @@ namespace RMuseum.Services.Implementationa Username = defProfile.User.UserName, Email = defProfile.User.Email, FirstName = defProfile.User.FirstName, - SurName = defProfile.User.SureName, + SureName = defProfile.User.SureName, PhoneNumber = defProfile.User.PhoneNumber, RImageId = defProfile.User.RImageId, Status = defProfile.User.Status, @@ -1943,7 +1943,7 @@ namespace RMuseum.Services.Implementationa Username = p.User.UserName, Email = p.User.Email, FirstName = p.User.FirstName, - SurName = p.User.SureName, + SureName = p.User.SureName, PhoneNumber = p.User.PhoneNumber, RImageId = p.User.RImageId, Status = p.User.Status, @@ -2036,7 +2036,7 @@ namespace RMuseum.Services.Implementationa Username = p.User.UserName, Email = p.User.Email, FirstName = p.User.FirstName, - SurName = p.User.SureName, + SureName = p.User.SureName, PhoneNumber = p.User.PhoneNumber, RImageId = p.User.RImageId, Status = p.User.Status,