Merge pull request #536 from poppastring/admin-page-updates

Admin page updates
poppastring · Mar 11, 2021 · 4a69ebd · 4a69ebd
2 parents 2784ec7 + 56642ae
commit 4a69ebd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ pool:
 
 variables:
   buildConfiguration: 'Release'
-  version: 2.31
+  version: 2.32
 
 steps:
 - task: UseDotNet@2

diff --git a/source/DasBlog.Web.UI/Mappers/ProfilePost.cs b/source/DasBlog.Web.UI/Mappers/ProfilePost.cs
@@ -78,7 +78,8 @@ public ProfilePost(IDasBlogSettings dasBlogSettings)
 				.ForMember(dest => dest.CommentId, opt => opt.MapFrom(src => src.EntryId))
 				.ForMember(dest => dest.SpamState, opt => opt.MapFrom(src => src.SpamState))
 				.ForMember(dest => dest.IsPublic, opt => opt.MapFrom(src => src.IsPublic))
-				.ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.AuthorEmail));
+				.ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.AuthorEmail))
+				.ForMember(dest => dest.AuthorIPAddress, opt => opt.MapFrom(src => src.AuthorIPAddress));
 
 			CreateMap<AddCommentViewModel, Comment>()
 				.ForMember(dest => dest.Author, opt => opt.MapFrom(src => src.Name))

diff --git a/source/DasBlog.Web.UI/Models/BlogViewModels/CommentAdminViewModel.cs b/source/DasBlog.Web.UI/Models/BlogViewModels/CommentAdminViewModel.cs
@@ -9,5 +9,6 @@ public class CommentAdminViewModel : CommentViewModel
 	{
 		public string Title { get; set; }
 		public string Email { get; set; }
+		public string AuthorIPAddress { get; set; }
 	}
 }
diff --git a/source/DasBlog.Web.UI/Views/Admin/ManageComments.cshtml b/source/DasBlog.Web.UI/Views/Admin/ManageComments.cshtml
@@ -19,23 +19,25 @@
                 <tr>
                     <th scope="col">Blog Title</th>
                     <th scope="col">Name</th>
+                    <th scope="col">IP Address</th>
                     <th scope="col">Status</th>
                     <th scope="col">Comment Text</th>
                     <th scope="col">Approval</th>
                     <th scope="col">Delete</th>
                 </tr>
             </thead>
-            <tbody>
+            <tbody class="dbc-admin-comment-table">
                 @foreach (var comment in Model)
                 {
-                    <tr>
-                        <td width="30%"><a href="@dasBlogSettings.GetPermaLinkUrl(comment.BlogPostId)">@comment.Title</a></td>
-                        <td width="10%"><a href="mailto:@[email protected]">@comment.Name</a></td>
-                        <td width="10%">@comment.SpamState</td>
-                        <td width="30%">@comment.Text</td>
-                        <td width="10%"><comment-approval-link comment="@comment" admin="true" /></td>
-                        <td width="10%"><comment-delete-link comment="@comment" admin="true" /></td>
-                    </tr>
+                <tr>
+                    <td width="20%"><a href="@dasBlogSettings.GetPermaLinkUrl(comment.BlogPostId)">@comment.Title</a></td>
+                    <td width="15%"><a href="mailto:@[email protected]">@comment.Name</a></td>
+                    <td width="5%">@comment.AuthorIPAddress</td>
+                    <td width="10%">@comment.SpamState</td>
+                    <td width="30%">@comment.Text</td>
+                    <td width="10%"><comment-approval-link comment="@comment" admin="true" /></td>
+                    <td width="10%"><comment-delete-link comment="@comment" admin="true" /></td>
+                </tr>
                 }
             </tbody>
         </table>

diff --git a/source/DasBlog.Web.UI/wwwroot/css/site.css b/source/DasBlog.Web.UI/wwwroot/css/site.css
@@ -150,3 +150,6 @@
     height: 100%;
 }
 
+tbody.dbc-admin-comment-table td {
+    word-break: break-all;
+}
diff --git a/source/DasBlog.Web.UI/wwwroot/css/site.min.css b/source/DasBlog.Web.UI/wwwroot/css/site.min.css