From 82d270a66b8ffca28e321f29b2eb90b2412ac9a7 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sat, 8 May 2021 18:10:08 +0300
Subject: Implemented authorization; Replaced Role with IdentityRole<Guid>;
 Renamed UserController to AccountController, updated links

---
 ExamTemplate/Web/Views/Account/Edit.cshtml     | 20 +++++++++++++++++++
 ExamTemplate/Web/Views/Account/Login.cshtml    | 14 +++++++++++++
 ExamTemplate/Web/Views/Account/Profile.cshtml  | 27 ++++++++++++++++++++++++++
 ExamTemplate/Web/Views/Account/Register.cshtml | 20 +++++++++++++++++++
 ExamTemplate/Web/Views/Shared/_Navbar.cshtml   |  8 ++++----
 ExamTemplate/Web/Views/User/EditProfile.cshtml | 20 -------------------
 ExamTemplate/Web/Views/User/Login.cshtml       | 14 -------------
 ExamTemplate/Web/Views/User/Profile.cshtml     | 27 --------------------------
 ExamTemplate/Web/Views/User/Register.cshtml    | 20 -------------------
 9 files changed, 85 insertions(+), 85 deletions(-)
 create mode 100644 ExamTemplate/Web/Views/Account/Edit.cshtml
 create mode 100644 ExamTemplate/Web/Views/Account/Login.cshtml
 create mode 100644 ExamTemplate/Web/Views/Account/Profile.cshtml
 create mode 100644 ExamTemplate/Web/Views/Account/Register.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/EditProfile.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/Login.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/Profile.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/Register.cshtml

(limited to 'ExamTemplate/Web/Views')

diff --git a/ExamTemplate/Web/Views/Account/Edit.cshtml b/ExamTemplate/Web/Views/Account/Edit.cshtml
new file mode 100644
index 0000000..da08d9a
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Edit.cshtml
@@ -0,0 +1,20 @@
+@model EditUserViewModel
+@{
+	ViewData["Title"] = "Edit Profile";
+}
+
+<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">
+	<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">
+	<span asp-validation-for="LastName" class="form-error"></span>
+	
+	<input type="submit" value="Update Profile">
+</form>
diff --git a/ExamTemplate/Web/Views/Account/Login.cshtml b/ExamTemplate/Web/Views/Account/Login.cshtml
new file mode 100644
index 0000000..688c547
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Login.cshtml
@@ -0,0 +1,14 @@
+@model ExamTemplate.Web.Models.User.LoginUserViewModel
+@{
+	ViewData["Title"] = "Login";
+}
+
+<form asp-controller="Account" asp-action="Login" method="post">
+	<input type="text" asp-for="Username" placeholder="Username">
+	<span asp-validation-for="Username" class="form-error"></span>
+
+	<input type="password" asp-for="Password" placeholder="Password">
+	<span asp-validation-for="Password" class="form-error"></span>
+
+	<input type="submit">
+</form>
diff --git a/ExamTemplate/Web/Views/Account/Profile.cshtml b/ExamTemplate/Web/Views/Account/Profile.cshtml
new file mode 100644
index 0000000..c6f3e5c
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Profile.cshtml
@@ -0,0 +1,27 @@
+@using Microsoft.AspNetCore.Identity
+
+@inject SignInManager<User> SignInManager
+@inject UserManager<User> UserManager
+
+@model UserViewModel
+@{
+	ViewData["Title"] = Model.Username + "'s Profile";
+}
+
+<p>
+	<h2>
+		@Model.FirstName @Model.LastName
+	</h2>
+	<div>
+		@Model.Username
+	</div>
+	@if (SignInManager.IsSignedIn(User))
+	{
+		@if(UserManager.GetUserName(User) == Model.Username)
+		{
+			<form asp-controller="Account" asp-action="Edit" method="get">
+				<input type="submit" value="Edit Profile">
+			</form>
+		}
+	}
+</p>
diff --git a/ExamTemplate/Web/Views/Account/Register.cshtml b/ExamTemplate/Web/Views/Account/Register.cshtml
new file mode 100644
index 0000000..d255287
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Register.cshtml
@@ -0,0 +1,20 @@
+@model ExamTemplate.Web.Models.User.RegisterUserViewModel
+@{
+	ViewData["Title"] = "Register";
+}
+
+<form asp-controller="User" asp-action="Register" method="post">
+	<input type="text" asp-for="FirstName" placeholder="FirstName">
+	<span asp-validation-for="FirstName" class="form-error"></span>
+
+	<input type="text" asp-for="LastName" placeholder="LastName">
+	<span asp-validation-for="LastName" class="form-error"></span>
+
+	<input type="text" asp-for="Username" placeholder="Username">
+	<span asp-validation-for="Username" class="form-error"></span>
+	
+	<input type="password" asp-for="Password" placeholder="Password">
+	<span asp-validation-for="Password" class="form-error"></span>
+
+	<input type="submit">
+</form>
diff --git a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml b/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
index 7ae8f50..0ec5c4d 100644
--- a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
+++ b/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
@@ -13,18 +13,18 @@
 		<section>
 			@if (SignInManager.IsSignedIn(User))
 			{
-				<a asp-controller="User" asp-action="Profile" asp-route-username="@UserManager.GetUserName(User)">
+				<a asp-controller="Account" asp-action="Profile" asp-route-username="@UserManager.GetUserName(User)">
 					@UserManager.GetUserName(User)
 				</a>
 
-				<form asp-controller="User" asp-action="Logout" method="post">
+				<form asp-controller="Account" asp-action="Logout" method="post">
 					<input type="submit" value="Logout">
 				</form>
 			}
 			else
 			{
-				<a asp-controller="User" asp-action="Login">Login</a>
-				<a asp-controller="User" asp-action="Register">Register</a>
+				<a asp-controller="Account" asp-action="Login">Login</a>
+				<a asp-controller="Account" asp-action="Register">Register</a>
 			}
 		</section>
 	</div> 
diff --git a/ExamTemplate/Web/Views/User/EditProfile.cshtml b/ExamTemplate/Web/Views/User/EditProfile.cshtml
deleted file mode 100644
index da08d9a..0000000
--- a/ExamTemplate/Web/Views/User/EditProfile.cshtml
+++ /dev/null
@@ -1,20 +0,0 @@
-@model EditUserViewModel
-@{
-	ViewData["Title"] = "Edit Profile";
-}
-
-<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">
-	<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">
-	<span asp-validation-for="LastName" class="form-error"></span>
-	
-	<input type="submit" value="Update Profile">
-</form>
diff --git a/ExamTemplate/Web/Views/User/Login.cshtml b/ExamTemplate/Web/Views/User/Login.cshtml
deleted file mode 100644
index 7cb5ac5..0000000
--- a/ExamTemplate/Web/Views/User/Login.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-@model ExamTemplate.Web.Models.User.LoginUserViewModel
-@{
-	ViewData["Title"] = "Login";
-}
-
-<form asp-controller="User" asp-action="Login" method="post">
-	<input type="text" asp-for="Username" placeholder="Username">
-	<span asp-validation-for="Username" class="form-error"></span>
-
-	<input type="password" asp-for="Password" placeholder="Password">
-	<span asp-validation-for="Password" class="form-error"></span>
-
-	<input type="submit">
-</form>
diff --git a/ExamTemplate/Web/Views/User/Profile.cshtml b/ExamTemplate/Web/Views/User/Profile.cshtml
deleted file mode 100644
index 4120766..0000000
--- a/ExamTemplate/Web/Views/User/Profile.cshtml
+++ /dev/null
@@ -1,27 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-
-@inject SignInManager<User> SignInManager
-@inject UserManager<User> UserManager
-
-@model UserViewModel
-@{
-	ViewData["Title"] = Model.Username + "'s Profile";
-}
-
-<p>
-	<h2>
-		@Model.FirstName @Model.LastName
-	</h2>
-	<div>
-		@Model.Username
-	</div>
-	@if (SignInManager.IsSignedIn(User))
-	{
-		@if(UserManager.GetUserName(User) == Model.Username)
-		{
-			<form asp-controller="User" asp-action="EditProfile" method="get">
-				<input type="submit" value="Edit Profile">
-			</form>
-		}
-	}
-</p>
diff --git a/ExamTemplate/Web/Views/User/Register.cshtml b/ExamTemplate/Web/Views/User/Register.cshtml
deleted file mode 100644
index 3b7f6d9..0000000
--- a/ExamTemplate/Web/Views/User/Register.cshtml
+++ /dev/null
@@ -1,20 +0,0 @@
-@model ExamTemplate.Web.Models.User.RegisterUserViewModel
-@{
-    ViewData["Title"] = "Register";
-}
-
-<form asp-controller="User" asp-action="Register" method="post">
-	<input type="text" asp-for="FirstName" placeholder="FirstName">
-	<span asp-validation-for="FirstName" class="form-error"></span>
-
-	<input type="text" asp-for="LastName" placeholder="LastName">
-	<span asp-validation-for="LastName" class="form-error"></span>
-
-	<input type="text" asp-for="Username" placeholder="Username">
-	<span asp-validation-for="Username" class="form-error"></span>
-	
-	<input type="password" asp-for="Password" placeholder="Password">
-	<span asp-validation-for="Password" class="form-error"></span>
-
-	<input type="submit">
-</form>
-- 
cgit v1.2.3