aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ExamTemplate/Web/Configurations/ControllerUserMappings.cs10
-rw-r--r--ExamTemplate/Web/Controllers/AccountController.cs36
-rw-r--r--ExamTemplate/Web/Models/User/EditUserWebModel.cs (renamed from ExamTemplate/Web/Models/User/EditUserViewModel.cs)2
-rw-r--r--ExamTemplate/Web/Models/User/LoginUserWebModel.cs (renamed from ExamTemplate/Web/Models/User/LoginUserViewModel.cs)2
-rw-r--r--ExamTemplate/Web/Models/User/RegisterUserWebModel.cs (renamed from ExamTemplate/Web/Models/User/RegisterUserViewModel.cs)2
-rw-r--r--ExamTemplate/Web/Models/User/UserWebModel.cs (renamed from ExamTemplate/Web/Models/User/UserViewModel.cs)2
-rw-r--r--ExamTemplate/Web/Views/Account/Edit.cshtml2
-rw-r--r--ExamTemplate/Web/Views/Account/Login.cshtml2
-rw-r--r--ExamTemplate/Web/Views/Account/Profile.cshtml2
-rw-r--r--ExamTemplate/Web/Views/Account/Register.cshtml2
10 files changed, 31 insertions, 31 deletions
diff --git a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs b/ExamTemplate/Web/Configurations/ControllerUserMappings.cs
index 9b798e6..05c57e2 100644
--- a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs
+++ b/ExamTemplate/Web/Configurations/ControllerUserMappings.cs
@@ -8,11 +8,11 @@ namespace ExamTemplate.Services.Configurations
{
public ControllerUserMappings()
{
- CreateMap<RegisterUserViewModel, RegisterUserServiceModel>();
- CreateMap<LoginUserViewModel, LoginUserServiceModel>();
- CreateMap<UserServiceModel, UserViewModel>();
- CreateMap<UserServiceModel, EditUserViewModel>();
- CreateMap<EditUserViewModel, UserServiceModel>();
+ CreateMap<RegisterUserWebModel, RegisterUserServiceModel>();
+ CreateMap<LoginUserWebModel, LoginUserServiceModel>();
+ CreateMap<UserServiceModel, UserWebModel>();
+ CreateMap<UserServiceModel, EditUserWebModel>();
+ CreateMap<EditUserWebModel, UserServiceModel>();
}
}
}
diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/Controllers/AccountController.cs
index 414304f..2c2eb32 100644
--- a/ExamTemplate/Web/Controllers/AccountController.cs
+++ b/ExamTemplate/Web/Controllers/AccountController.cs
@@ -29,22 +29,22 @@ namespace ExamTemplate.Web.Controllers
[HttpPost]
[AllowAnonymous]
- public async Task<IActionResult> Register(RegisterUserViewModel registerUserViewModel)
+ public async Task<IActionResult> Register(RegisterUserWebModel registerUserWebModel)
{
if (!ModelState.IsValid)
- return View(registerUserViewModel);
+ return View(registerUserWebModel);
- RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map<RegisterUserServiceModel>(registerUserViewModel);
+ RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map<RegisterUserServiceModel>(registerUserWebModel);
bool result = await this._userService.RegisterUserAsync(registerUserServiceModel);
if (result)
- return await this.Login(new LoginUserViewModel {
+ return await this.Login(new LoginUserWebModel {
Username = registerUserServiceModel.Username,
Password = registerUserServiceModel.Password
});
else
- return View(registerUserViewModel);
+ return View(registerUserWebModel);
}
[HttpGet]
@@ -56,19 +56,19 @@ namespace ExamTemplate.Web.Controllers
[HttpPost]
[AllowAnonymous]
- public async Task<IActionResult> Login(LoginUserViewModel loginUserViewModel)
+ public async Task<IActionResult> Login(LoginUserWebModel loginUserWebModel)
{
if (!ModelState.IsValid)
- return View(loginUserViewModel);
+ return View(loginUserWebModel);
- LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map<LoginUserServiceModel>(loginUserViewModel);
+ LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map<LoginUserServiceModel>(loginUserWebModel);
bool result = await this._userService.LoginUserAsync(loginUserServiceModel);
if (result)
return RedirectToAction("Index", "Home");
else
- return View(loginUserViewModel);
+ return View(loginUserWebModel);
}
[HttpPost]
@@ -88,9 +88,9 @@ namespace ExamTemplate.Web.Controllers
if (userServiceModel == default(UserServiceModel))
return RedirectToAction("ErrorNotFound", "Home");
- UserViewModel userViewModel = this._autoMapper.Map<UserViewModel>(userServiceModel);
+ UserWebModel userWebModel = this._autoMapper.Map<UserWebModel>(userServiceModel);
- return View(userViewModel);
+ return View(userWebModel);
}
[HttpGet]
@@ -101,31 +101,31 @@ namespace ExamTemplate.Web.Controllers
if (userServiceModel == default(UserServiceModel))
return RedirectToAction("ErrorNotFound", "Home");
- EditUserViewModel editUserViewModel = this._autoMapper.Map<EditUserViewModel>(userServiceModel);
+ EditUserWebModel editUserWebModel = this._autoMapper.Map<EditUserWebModel>(userServiceModel);
- return View(editUserViewModel);
+ return View(editUserWebModel);
}
[HttpPost]
- public async Task<IActionResult> Edit(EditUserViewModel editUserViewModel)
+ public async Task<IActionResult> Edit(EditUserWebModel editUserWebModel)
{
if (!ModelState.IsValid)
- return View(editUserViewModel);
+ return View(editUserWebModel);
if (!this._userService.IsSignedIn(HttpContext.User))
return RedirectToAction("Login");
UserServiceModel loggedInUser = await this._userService.GetUserByClaimsAsync(HttpContext.User);
- UserServiceModel userServiceModel = this._autoMapper.Map<UserServiceModel>(editUserViewModel);
+ UserServiceModel userServiceModel = this._autoMapper.Map<UserServiceModel>(editUserWebModel);
bool result = await this._userService.EditUserAsync(HttpContext.User, userServiceModel);
if (result)
{
- if (loggedInUser.Username != editUserViewModel.Username)
+ if (loggedInUser.Username != editUserWebModel.Username)
await this._userService.LogoutAsync();
- return RedirectToAction("Profile", new { username = editUserViewModel.Username });
+ return RedirectToAction("Profile", new { username = editUserWebModel.Username });
}
else
return RedirectToAction("Profile", new { username = loggedInUser.Username });
diff --git a/ExamTemplate/Web/Models/User/EditUserViewModel.cs b/ExamTemplate/Web/Models/User/EditUserWebModel.cs
index 56f3d05..119a585 100644
--- a/ExamTemplate/Web/Models/User/EditUserViewModel.cs
+++ b/ExamTemplate/Web/Models/User/EditUserWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
namespace ExamTemplate.Web.Models.User
{
- public class EditUserViewModel
+ public class EditUserWebModel
{
[Required]
[MinLength(1)]
diff --git a/ExamTemplate/Web/Models/User/LoginUserViewModel.cs b/ExamTemplate/Web/Models/User/LoginUserWebModel.cs
index dd917cf..0f4ef73 100644
--- a/ExamTemplate/Web/Models/User/LoginUserViewModel.cs
+++ b/ExamTemplate/Web/Models/User/LoginUserWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
namespace ExamTemplate.Web.Models.User
{
- public class LoginUserViewModel
+ public class LoginUserWebModel
{
[Required]
[MinLength(1)]
diff --git a/ExamTemplate/Web/Models/User/RegisterUserViewModel.cs b/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs
index ef6015b..c443dd2 100644
--- a/ExamTemplate/Web/Models/User/RegisterUserViewModel.cs
+++ b/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
namespace ExamTemplate.Web.Models.User
{
- public class RegisterUserViewModel
+ public class RegisterUserWebModel
{
[Required]
[MinLength(1)]
diff --git a/ExamTemplate/Web/Models/User/UserViewModel.cs b/ExamTemplate/Web/Models/User/UserWebModel.cs
index 4cd815f..af8d6c7 100644
--- a/ExamTemplate/Web/Models/User/UserViewModel.cs
+++ b/ExamTemplate/Web/Models/User/UserWebModel.cs
@@ -1,6 +1,6 @@
namespace ExamTemplate.Web.Models.User
{
- public class UserViewModel
+ public class UserWebModel
{
public string FirstName { get; set; }
public string LastName { get; set; }
diff --git a/ExamTemplate/Web/Views/Account/Edit.cshtml b/ExamTemplate/Web/Views/Account/Edit.cshtml
index 0839cc7..a088742 100644
--- a/ExamTemplate/Web/Views/Account/Edit.cshtml
+++ b/ExamTemplate/Web/Views/Account/Edit.cshtml
@@ -1,4 +1,4 @@
-@model EditUserViewModel
+@model EditUserWebModel
@{
ViewData["Title"] = "Edit Profile";
}
diff --git a/ExamTemplate/Web/Views/Account/Login.cshtml b/ExamTemplate/Web/Views/Account/Login.cshtml
index 82a90c0..daa3f3e 100644
--- a/ExamTemplate/Web/Views/Account/Login.cshtml
+++ b/ExamTemplate/Web/Views/Account/Login.cshtml
@@ -1,4 +1,4 @@
-@model ExamTemplate.Web.Models.User.LoginUserViewModel
+@model LoginUserWebModel
@{
ViewData["Title"] = "Login";
}
diff --git a/ExamTemplate/Web/Views/Account/Profile.cshtml b/ExamTemplate/Web/Views/Account/Profile.cshtml
index 322cb85..33fc882 100644
--- a/ExamTemplate/Web/Views/Account/Profile.cshtml
+++ b/ExamTemplate/Web/Views/Account/Profile.cshtml
@@ -3,7 +3,7 @@
@inject SignInManager<User> SignInManager
@inject UserManager<User> UserManager
-@model UserViewModel
+@model UserWebModel
@{
ViewData["Title"] = Model.Username + "'s Profile";
}
diff --git a/ExamTemplate/Web/Views/Account/Register.cshtml b/ExamTemplate/Web/Views/Account/Register.cshtml
index 9514ed3..e436d72 100644
--- a/ExamTemplate/Web/Views/Account/Register.cshtml
+++ b/ExamTemplate/Web/Views/Account/Register.cshtml
@@ -1,4 +1,4 @@
-@model ExamTemplate.Web.Models.User.RegisterUserViewModel
+@model RegisterUserWebModel
@{
ViewData["Title"] = "Register";
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-14 21:42:49 +0000