diff --git a/GanjooRazor/Areas/User/Pages/Index.cshtml b/GanjooRazor/Areas/User/Pages/Index.cshtml
index 02beacfe..77d277ec 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 0e798c89..9fae7162 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,
- SureName = userInfo.SureName,
+ SurName = userInfo.SurName,
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 d10139a1..2e9a6cdb 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,
- SureName = userInfo.SureName,
+ SurName = userInfo.SurName,
NickName = userInfo.NickName,
PhoneNumber = userInfo.PhoneNumber,
Email = userInfo.Email,
diff --git a/GanjooRazor/Pages/LoginPartialEnabledPageModel.cs b/GanjooRazor/Pages/LoginPartialEnabledPageModel.cs
index 6f3f0742..cd10a4de 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.SureName}", cookieOption);
+ Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", 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 96bcbb2a..58a1448b 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.SureName}", cookieOption);
+ Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", 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 63174037..c8465353 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 2784010e..6fe93e2d 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 = "",
- SureName = "",
+ SurName = "",
Password = "",
PasswordConfirmation = ""
};
@@ -213,7 +213,7 @@ namespace GanjooRazor.Pages
Email = FinalViewModel.Email,
Secret = FinalViewModel.Secret,
FirstName = FinalViewModel.FirstName,
- SureName = FinalViewModel.SureName,
+ SurName = FinalViewModel.SurName,
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.SureName}", cookieOption);
+ Response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", 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 a8060caf..4529d860 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.SureName}", cookieOption);
+ response.Cookies.Append("Name", $"{loggedOnUser.User.FirstName} {loggedOnUser.User.SurName}", 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 ed888e2b..7820081c 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,
- SureName = appUser.SureName,
+ SurName = appUser.SureName,
PhoneNumber = appUser.PhoneNumber,
RImageId = appUser.RImageId,
Status = appUser.Status,
diff --git a/RMuseum/RMuseum.csproj b/RMuseum/RMuseum.csproj
index 043ef891..46999062 100644
--- a/RMuseum/RMuseum.csproj
+++ b/RMuseum/RMuseum.csproj
@@ -18,7 +18,7 @@
-
+
@@ -26,7 +26,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index 6fc2dacb..c0089879 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -17655,7 +17655,7 @@
-
+
finalize signup and assign his or him comments to him or her
@@ -17663,7 +17663,8 @@
-
+
+
diff --git a/RMuseum/Services/Implementation/ArtifactService.cs b/RMuseum/Services/Implementation/ArtifactService.cs
index 5b937ebf..db8ff0cb 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,
- SureName = appUser.SureName,
+ SurName = 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,
- SureName = appUser.SureName,
+ SurName = 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,
- SureName = appUser.SureName,
+ SurName = 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,
- SureName = user.SureName,
+ SurName = user.SurName,
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,
- SureName = link.SuggestedBy.SureName,
+ SurName = 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,
- SureName = preLink.SuggestedBy.SureName,
+ SurName = 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,
- SureName = link.SuggestedBy.SureName,
+ SurName = 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 6847ce64..15c41330 100644
--- a/RMuseum/Services/Implementation/GanjoorAppUserService.cs
+++ b/RMuseum/Services/Implementation/GanjoorAppUserService.cs
@@ -177,11 +177,12 @@ namespace RMuseum.Services.Implementation
///
///
///
- ///
+ ///
+ ///
///
- public override async Task> FinalizeSignUp(string email, string secret, string password, string firstName, string sureName)
+ public override async Task> FinalizeSignUp(string email, string secret, string password, string firstName, string surName, string phoneNumber)
{
- RServiceResult res = await base.FinalizeSignUp(email, secret, password, firstName, sureName);
+ RServiceResult res = await base.FinalizeSignUp(email, secret, password, firstName, surName, phoneNumber);
if(res.Result)
{
try
diff --git a/RMuseum/Services/Implementation/RecitationService.cs b/RMuseum/Services/Implementation/RecitationService.cs
index c97461aa..0087bd80 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,
- SureName = p.User.SureName,
+ SurName = 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,
- SureName = p.User.SureName,
+ SurName = 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,
- SureName = defProfile.User.SureName,
+ SurName = 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,
- SureName = p.User.SureName,
+ SurName = 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,
- SureName = p.User.SureName,
+ SurName = p.User.SureName,
PhoneNumber = p.User.PhoneNumber,
RImageId = p.User.RImageId,
Status = p.User.Status,