Username added to JWT; Promotion to Admin fixed

6 files changed, 5 insertions, 57 deletions

diff --git a/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs
deleted file mode 100644
index 85c67bf..0000000
--- a/src/DevHive.Web/Models/Post/Comment/CreateCommentWebModel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-
-namespace DevHive.Web.Models.Post.Comment
-{
-	public class CreateCommentWebModel
-	{
-		[NotNull]
-		[Required]
-		public Guid PostId { get; set; }
-
-		[NotNull]
-		[Required]
-		public string Message { get; set; }
-	}
-}
diff --git a/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs
deleted file mode 100644
index 5320c3c..0000000
--- a/src/DevHive.Web/Models/Post/Comment/ReadCommentWebModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace DevHive.Web.Models.Post.Comment
-{
-	public class ReadCommentWebModel
-	{
-		public Guid CommentId { get; set; }
-
-		public Guid PostId { get; set; }
-
-		public string IssuerFirstName { get; set; }
-
-		public string IssuerLastName { get; set; }
-
-		public string IssuerUsername { get; set; }
-
-		public string Message { get; set; }
-
-		public DateTime TimeCreated { get; set; }
-	}
-}
diff --git a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs b/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
deleted file mode 100644
index cb1c60a..0000000
--- a/src/DevHive.Web/Models/Post/Comment/UpdateCommentWebModel.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace DevHive.Web.Models.Post.Comment
-{
-	public class UpdateCommentWebModel
-	{
-		public Guid CommentId { get; set; }
-
-		public Guid PostId { get; set; }
-
-		public string NewMessage { get; set; }
-	}
-}
diff --git a/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs b/src/DevHive.Web/Models/Post/CreatePostWebModel.cs
index e35a813..256055a 100644
--- a/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/CreatePostWebModel.cs
@@ -1,12 +1,11 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Http;
 
-namespace DevHive.Web.Models.Post.Post
+namespace DevHive.Web.Models.Post
 {
-	public class CreatePostWebModel
+    public class CreatePostWebModel
 	{
 		[NotNull]
 		[Required]
diff --git a/src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs b/src/DevHive.Web/Models/Post/ReadPostWebModel.cs
index 5d4da31..1d2669e 100644
--- a/src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/ReadPostWebModel.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using DevHive.Web.Models.Post.Comment;
+using DevHive.Web.Models.Comment;
 using Microsoft.AspNetCore.Http;
 
-namespace DevHive.Web.Models.Post.Post
+namespace DevHive.Web.Models.Post
 {
 	public class ReadPostWebModel
 	{
diff --git a/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs b/src/DevHive.Web/Models/Post/UpdatePostWebModel.cs
index ac84d2c..a0c9b61 100644
--- a/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/UpdatePostWebModel.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Http;
 
-namespace DevHive.Web.Models.Post.Post
+namespace DevHive.Web.Models.Post
 {
 	public class UpdatePostWebModel
 	{