From d066d187f9e3348d56d0752d7a3966fbf5ff88f7 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Fri, 7 May 2021 15:41:05 +0300
Subject: Added user edit view model validations

---
 ExamTemplate/Web/Controllers/UserController.cs    |  3 +++
 ExamTemplate/Web/Models/User/EditUserViewModel.cs | 10 +++++++++
 ExamTemplate/Web/Views/User/EditProfile.cshtml    | 25 ++++++++++++-----------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ExamTemplate/Web/Controllers/UserController.cs b/ExamTemplate/Web/Controllers/UserController.cs
index 2e5978b..c855c39 100644
--- a/ExamTemplate/Web/Controllers/UserController.cs
+++ b/ExamTemplate/Web/Controllers/UserController.cs
@@ -106,6 +106,9 @@ namespace ExamTemplate.Web.Controllers
 		[Route("/EditProfile")]
 		public async Task<IActionResult> EditProfile(EditUserViewModel editUserViewModel)
 		{
+			if (!ModelState.IsValid)
+				return View(editUserViewModel);
+
 			if (!this._userService.IsSignedIn(HttpContext.User))
 				return RedirectToAction("Login");
 
diff --git a/ExamTemplate/Web/Models/User/EditUserViewModel.cs b/ExamTemplate/Web/Models/User/EditUserViewModel.cs
index baae751..56f3d05 100644
--- a/ExamTemplate/Web/Models/User/EditUserViewModel.cs
+++ b/ExamTemplate/Web/Models/User/EditUserViewModel.cs
@@ -1,9 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace ExamTemplate.Web.Models.User
 {
 	public class EditUserViewModel
 	{
+		[Required]
+		[MinLength(1)]
 		public string FirstName { get; set; }
+
+		[Required]
+		[MinLength(1)]
 		public string LastName { get; set; }
+
+		[Required]
+		[MinLength(1)]
 		public string Username { get; set; }
 	}
 }
diff --git a/ExamTemplate/Web/Views/User/EditProfile.cshtml b/ExamTemplate/Web/Views/User/EditProfile.cshtml
index fef77f1..d53b3d7 100644
--- a/ExamTemplate/Web/Views/User/EditProfile.cshtml
+++ b/ExamTemplate/Web/Views/User/EditProfile.cshtml
@@ -3,17 +3,18 @@
     ViewData["Title"] = "Edit Profile";
 }
 
-<p>
-	<form asp-controller="User" asp-action="EditProfile" method="post">
-		<label asp-for="Username">Username:</label>
-		<input type="text" asp-for="Username" placeholder="@Model.Username">
+<form asp-controller="User" asp-action="EditProfile" method="post">
+	<label asp-for="Username">Username:</label>
+	<input type="text" asp-for="Username" placeholder="@Model.Username">
+	<span asp-validation-for="Username" class="form-error"></span>
 
-		<label asp-for="FirstName">First Name:</label>
-		<input type="text" asp-for="FirstName" placeholder="@Model.FirstName">
+	<label asp-for="FirstName">First Name:</label>
+	<input type="text" asp-for="FirstName" placeholder="@Model.FirstName">
+	<span asp-validation-for="FirstName" class="form-error"></span>
 
-		<label asp-for="LastName">Last Name:</label>
-		<input type="text" asp-for="LastName" placeholder="@Model.LastName">
-
-		<input type="submit" value="Update Profile">
-	</form>
-</p>
+	<label asp-for="LastName">Last Name:</label>
+	<input type="text" asp-for="LastName" placeholder="@Model.LastName">
+	<span asp-validation-for="LastName" class="form-error"></span>
+	
+	<input type="submit" value="Update Profile">
+</form>
-- 
cgit v1.2.3