Refactoring - split data, logic and model layers; custom network exception

StudentHouseDashboard/Data/AnnouncementRepository.cs

@@ -1,5 +1,4 @@
-using StudentHouseDashboard.Managers;
+using Models;
-using StudentHouseDashboard.Models;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
@@ -7,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StudentHouseDashboard.Repositories
+namespace Data
 {
     public class AnnouncementRepository
     {
@@ -15,7 +14,7 @@ namespace StudentHouseDashboard.Repositories
         public List<Announcement> GetAllAnnouncements()
         {
             List<Announcement> announcements = new List<Announcement>();
-            UserManager userManager = new UserManager();
+            UserRepository userRepository = new UserRepository();
             using (SqlConnection conn = SqlConnectionHelper.CreateConnection())
             {
                 string sql = "SELECT * FROM Announcements;";
@@ -25,7 +24,7 @@ namespace StudentHouseDashboard.Repositories
                 while (reader.Read())
                 {
                     Announcement announcement = new Announcement(Convert.ToInt32(reader["ID"]),
-                        userManager.GetUserById(Convert.ToInt32(reader["Author"])),
+                        userRepository.GetUserById(Convert.ToInt32(reader["Author"])),
                         reader["Description"].ToString(), reader["Title"].ToString(),
                         (DateTime)reader["PublishDate"], (bool)reader["IsImportant"],
                         (bool)reader["IsSticky"]);
@@ -41,7 +40,7 @@ namespace StudentHouseDashboard.Repositories
         public List<Announcement> GetAnnouncementsByPage(int? p, int? c)
         {
             List<Announcement> announcements = new List<Announcement>();
-            UserManager userManager = new UserManager();
+            UserRepository userRepository = new UserRepository();
             if (c == null || c < 0)
             {
                 c = 10;
@@ -60,7 +59,7 @@ namespace StudentHouseDashboard.Repositories
                 while (reader.Read())
                 {
                     announcements.Add(new Announcement(Convert.ToInt32(reader["ID"]),
-                        userManager.GetUserById(Convert.ToInt32(reader["Author"])),
+                        userRepository.GetUserById(Convert.ToInt32(reader["Author"])),
                         reader["Description"].ToString(), reader["Title"].ToString(),
                         (DateTime)reader["PublishDate"], (bool)reader["IsImportant"],
                         (bool)reader["IsSticky"]));

StudentHouseDashboard/Data/CommentRepository.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.Design;
 using System.Data.SqlClient;
-using StudentHouseDashboard.Models;
+using Models;
 
-namespace StudentHouseDashboard.Repositories;
+namespace Data;
 
 public class CommentRepository
 {

StudentHouseDashboard/Data/Data.csproj

@@ -7,8 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Models\Models.csproj" />
+  </ItemGroup>
+
 </Project>

StudentHouseDashboard/Data/Exceptions.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Data
+{
+    public class DatabaseNetworkException : WebException
+    {
+        public DatabaseNetworkException(string? message) : base(message)
+        {
+        }
+
+        public DatabaseNetworkException(string? message, Exception? innerException) : base(message, innerException)
+        {
+        }
+    }
+}

StudentHouseDashboard/Data/SqlConnectionHelper.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StudentHouseDashboard.Repositories
+namespace Data
 {
     public static class SqlConnectionHelper
     {
@@ -17,9 +17,10 @@ namespace StudentHouseDashboard.Repositories
             {
                 connection.Open();
             }
-            catch (Exception)
+            catch (SqlException e)
             {
-                Console.WriteLine("Database connection error. Are you connected to the VDI VPN?");
+                throw new DatabaseNetworkException("Unable to access FHICT VDI database", e);
+                // Console.WriteLine("Database connection error. Are you connected to the VDI VPN?");
             }
 
             return connection;

StudentHouseDashboard/Data/UserRepository.cs

@@ -4,11 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Data.SqlClient;
-using StudentHouseDashboard.Models;
+using Models;
 using System.Data;
 using System.Xml.Linq;
 
-namespace StudentHouseDashboard.Repositories
+namespace Data
 {
     public class UserRepository
     {

StudentHouseDashboard/Logic/AnnouncementManager.cs

@@ -1,5 +1,5 @@
-using StudentHouseDashboard.Models;
+using Models;
-using StudentHouseDashboard.Repositories;
+using Data;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StudentHouseDashboard.Managers
+namespace Logic
 {
     public class AnnouncementManager
     {

StudentHouseDashboard/Logic/CommentManager.cs

@@ -1,12 +1,12 @@
-using StudentHouseDashboard.Models;
+using Models;
-using StudentHouseDashboard.Repositories;
+using Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StudentHouseDashboard.Managers
+namespace Logic
 {
     public class CommentManager
     {

StudentHouseDashboard/Logic/Logic.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Data\Data.csproj" />
+    <ProjectReference Include="..\Models\Models.csproj" />
+  </ItemGroup>
+
+</Project>

StudentHouseDashboard/Logic/UserManager.cs

@@ -1,6 +1,6 @@
 using BCrypt.Net;
-using StudentHouseDashboard.Models;
+using Models;
-using StudentHouseDashboard.Repositories;
+using Data;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace StudentHouseDashboard.Managers
+namespace Logic
 {
     public class UserManager
     {

StudentHouseDashboard/Models/Announcement.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public class Announcement : GenericMessage, IVotable
     {

StudentHouseDashboard/Models/Comment.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public class Comment : GenericMessage, IVotable
     {

StudentHouseDashboard/Models/Complaint.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public class Complaint : GenericMessage
     {

StudentHouseDashboard/Models/ComplaintSeverity.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public enum ComplaintSeverity
     {

StudentHouseDashboard/Models/ComplaintStatus.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public enum ComplaintStatus
     {

StudentHouseDashboard/Models/Event.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public class Event : GenericMessage
     {

StudentHouseDashboard/Models/GenericMessage.cs

@@ -1,10 +1,9 @@
-using StudentHouseDashboard.Models;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard
+namespace Models
 {
     public abstract class GenericMessage
     {

StudentHouseDashboard/Models/IVotable.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public interface IVotable
     {

StudentHouseDashboard/Models/Models.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

StudentHouseDashboard/Models/User.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public class User
     {
@@ -34,7 +35,8 @@ namespace StudentHouseDashboard.Models
             get => name;
             set => name = value;
         }
-        [PasswordPropertyText(true)]
+
+        [DataType(DataType.Password)]
         public string Password
         {
             get => password;

StudentHouseDashboard/Models/UserRole.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 
-namespace StudentHouseDashboard.Models
+namespace Models
 {
     public enum UserRole
     {

StudentHouseDashboard/StudentHouseDashboard.sln

@@ -5,9 +5,15 @@ VisualStudioVersion = 17.4.33403.182
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp", "WebApp\WebApp.csproj", "{5A02E4A7-32C2-4372-BEB1-A5ED407E0B23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StudentHouseDashboard", "HouseData\StudentHouseDashboard.csproj", "{9A1E1400-9B85-416B-B3B2-2282E0060CE3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinForms", "WinForms\WinForms.csproj", "{3967DDCF-BA8E-45CD-895D-626CE346D419}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinForms", "WinForms\WinForms.csproj", "{3967DDCF-BA8E-45CD-895D-626CE346D419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logic", "Logic\Logic.csproj", "{1AA9B921-CE97-4139-995E-95435B3110C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{FDF2FED1-3113-4BA6-8582-BBE97C301D66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{F7DC7AD1-7A0A-403B-A535-24267BD07628}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{5AB881E8-B8FE-43A5-A74B-40CF15B20AE8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +25,26 @@ Global
 		{5A02E4A7-32C2-4372-BEB1-A5ED407E0B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A02E4A7-32C2-4372-BEB1-A5ED407E0B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A02E4A7-32C2-4372-BEB1-A5ED407E0B23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A1E1400-9B85-416B-B3B2-2282E0060CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A1E1400-9B85-416B-B3B2-2282E0060CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A1E1400-9B85-416B-B3B2-2282E0060CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A1E1400-9B85-416B-B3B2-2282E0060CE3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3967DDCF-BA8E-45CD-895D-626CE346D419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3967DDCF-BA8E-45CD-895D-626CE346D419}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3967DDCF-BA8E-45CD-895D-626CE346D419}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3967DDCF-BA8E-45CD-895D-626CE346D419}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AA9B921-CE97-4139-995E-95435B3110C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AA9B921-CE97-4139-995E-95435B3110C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AA9B921-CE97-4139-995E-95435B3110C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AA9B921-CE97-4139-995E-95435B3110C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDF2FED1-3113-4BA6-8582-BBE97C301D66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDF2FED1-3113-4BA6-8582-BBE97C301D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDF2FED1-3113-4BA6-8582-BBE97C301D66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDF2FED1-3113-4BA6-8582-BBE97C301D66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7DC7AD1-7A0A-403B-A535-24267BD07628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7DC7AD1-7A0A-403B-A535-24267BD07628}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7DC7AD1-7A0A-403B-A535-24267BD07628}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7DC7AD1-7A0A-403B-A535-24267BD07628}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AB881E8-B8FE-43A5-A74B-40CF15B20AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AB881E8-B8FE-43A5-A74B-40CF15B20AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AB881E8-B8FE-43A5-A74B-40CF15B20AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AB881E8-B8FE-43A5-A74B-40CF15B20AE8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

StudentHouseDashboard/Tests/Tests.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+  </ItemGroup>
+
+</Project>

StudentHouseDashboard/Tests/UnitTest1.cs

@@ -0,0 +1,11 @@
+namespace Tests
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

StudentHouseDashboard/Tests/Usings.cs

@@ -0,0 +1 @@
+global using Microsoft.VisualStudio.TestTools.UnitTesting;

StudentHouseDashboard/WebApp/Contact.cs

@@ -1,22 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace WebApp
-{
-    public class Contact
-    {
-        public Contact()
-        {
-            
-        }
-        public Contact(string name, string email)
-        {
-            Name = name;
-            Email = email;
-        }
-        [Required]
-        public string Name { get; set; }
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; }
-    }
-}

StudentHouseDashboard/WebApp/Pages/Announcement.cshtml

@@ -1,5 +1,5 @@
 @page
-@using StudentHouseDashboard.Models;
+@using Models;
 @using System.Globalization
 @model WebApp.Pages.AnnouncementModel
 @{

StudentHouseDashboard/WebApp/Pages/Announcement.cshtml.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Announcements.cshtml

@@ -1,5 +1,5 @@
 @page
-@using StudentHouseDashboard.Models;
+@using Models;
 @using System.Security.Claims;
 @model WebApp.Pages.AnnouncementsModel
 @{

StudentHouseDashboard/WebApp/Pages/Announcements.cshtml.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 using System.Security.Claims;
 
 namespace WebApp.Pages

StudentHouseDashboard/WebApp/Pages/Contact.cshtml

@@ -1,25 +0,0 @@
-@page
-@model WebApp.Pages.ContactModel
-@{
-    ViewData["Title"] = "Contact";
-}
-<h1>@ViewData["Title"]</h1>
-
-@if (ViewData["confirm"] != null)
-{
-    <div class="alert alert-primary" role="alert">
-        @ViewData["confirm"]
-    </div>
-}
-
-<form method="post">
-    <div class="mb-3">
-        <label asp-for="Contact.Name" class="form-label">Name: </label>
-        <input asp-for="Contact.Name" class="form-control" />
-    </div>
-    <div class="mb-3">
-        <label asp-for="Contact.Email" class="form-label">Email</label>
-        <input asp-for="Contact.Email" class="form-control" />
-    </div>
-    <input type="submit" value="Submit" class="btn btn-primary" />
-</form>

StudentHouseDashboard/WebApp/Pages/Contact.cshtml.cs

@@ -1,19 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace WebApp.Pages
-{
-    public class ContactModel : PageModel
-    {
-        [BindProperty]
-        public Contact Contact { get; set; }
-        public void OnGet()
-        {
-        }
-
-        public void OnPost()
-        {
-            ViewData["confirm"] = $"Thank you for contacting us, {Contact.Name}! We promise to return a response in a timely manner to the following e-mail address: {Contact.Email}";
-        }
-    }
-}

StudentHouseDashboard/WebApp/Pages/Login.cshtml.cs

@@ -2,8 +2,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
-using StudentHouseDashboard.Models;
+using Models;
-using StudentHouseDashboard.Managers;
+using Logic;
 using System.Security.Claims;
 
 namespace WebApp.Pages

StudentHouseDashboard/WebApp/Pages/Logout.cshtml

@@ -0,0 +1,6 @@
+@page
+@model WebApp.Pages.LogoutModel
+@{
+}
+<h1>Logout</h1>
+<p>You should be redirected to the <a href="/">homepage</a></p>

StudentHouseDashboard/WebApp/Pages/Logout.cshtml.cs

@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace WebApp.Pages
+{
+    public class LogoutModel : PageModel
+    {
+        public IActionResult OnGet()
+        {
+            HttpContext.SignOutAsync();
+            return RedirectToPage("Index");
+        }
+    }
+}

StudentHouseDashboard/WebApp/Pages/Privacy.cshtml

@@ -5,4 +5,8 @@
 }
 <h1>@ViewData["Title"]</h1>
 
-<p>No data is currently collected.</p>
+<h2>Collected personal data</h2>
+<li>
+    <ul>Password (hashed and salted)</ul>
+    <ul>User-generated content (posts)</ul>
+</li>

StudentHouseDashboard/WebApp/Pages/Register.cshtml

@@ -1,5 +1,5 @@
 @page
-@using StudentHouseDashboard.Models;
+@using Models;
 @model WebApp.Pages.RegisterModel
 @{
     ViewData["Title"] = "Register";

StudentHouseDashboard/WebApp/Pages/Register.cshtml.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml

@@ -22,15 +22,30 @@
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
                         </li>
-                        <li class="nav-item">
+                        @if (!User.Identity.IsAuthenticated)
-                            <a class="nav-link text-dark" asp-area="" asp-page="/Announcements">Announcements</a>
+                        {
-                        </li>
+                            <li class="nav-item">
-                        <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-page="/Login">Login</a>
-                            <a class="nav-link text-dark" asp-area="" asp-page="/Login">Login</a>
+                            </li>
-                        </li>
+                            <li class="nav-item">
-                        <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-page="/Register">Register</a>
-                            <a class="nav-link text-dark" asp-area="" asp-page="/Register">Register</a>
+                            </li>
-                        </li>
+                        }
+                        else
+                        {
+                            <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-page="/Announcements">Announcements</a>
+                            </li>
+                            if (User.IsInRole("ADMIN") || User.IsInRole("MANAGER"))
+                            {
+                                <li class="nav-item">
+                                    <a class="nav-link text-dark" asp-area="" asp-page="/Register">Create user</a>
+                                </li>
+                            }
+                            <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-page="/Logout">Logout</a>
+                            </li>
+                        }
                     </ul>
                 </div>
             </div>

StudentHouseDashboard/WebApp/WebApp.csproj

@@ -17,20 +17,13 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <UpToDateCheckInput Remove="Pages\Contact.cshtml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="Pages\Contact.cshtml" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HouseData\StudentHouseDashboard.csproj" />
+    <ProjectReference Include="..\Logic\Logic.csproj" />
+    <ProjectReference Include="..\Models\Models.csproj" />
   </ItemGroup>
 
 </Project>

StudentHouseDashboard/WinForms/AnnouncementForm.cs

@@ -1,5 +1,5 @@
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

StudentHouseDashboard/WinForms/CommentForm.cs

@@ -1,5 +1,5 @@
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

StudentHouseDashboard/WinForms/Dashboard.cs

@@ -1,5 +1,5 @@
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -61,26 +61,47 @@ namespace WinForms
 
         private void btnDeleteUser_Click(object sender, EventArgs e)
         {
-            User currentUser = (User)lbUsers.SelectedItem;
+            if (lbUsers.SelectedIndex == -1)
-            if (MessageBox.Show($"Are you sure you want to delete\n{currentUser.Name}\n{currentUser.Role}", "Delete user", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
-                UserManager userManager = new UserManager();
+                MessageBox.Show("Please select an item from the list");
-                userManager.DisableUser(currentUser.ID);
+            }
+            else
+            {
+                User currentUser = (User)lbUsers.SelectedItem;
+                if (MessageBox.Show($"Are you sure you want to delete\n{currentUser.Name}\n{currentUser.Role}", "Delete user", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                {
+                    UserManager userManager = new UserManager();
+                    userManager.DisableUser(currentUser.ID);
+                }
             }
             RefreshLists();
         }
 
         private void btnUpdateUser_Click(object sender, EventArgs e)
         {
-            UserForm userForm = new UserForm((User)lbUsers.SelectedItem, false);
+            if (lbUsers.SelectedIndex == -1)
-            userForm.ShowDialog();
+            {
+                MessageBox.Show("Please select an item from the list");
+            }
+            else
+            {
+                UserForm userForm = new UserForm((User)lbUsers.SelectedItem, false);
+                userForm.ShowDialog();
+            }
             RefreshLists();
         }
 
         private void btnViewUser_Click(object sender, EventArgs e)
         {
-            UserForm userForm = new UserForm((User)lbUsers.SelectedItem, true);
+            if (lbUsers.SelectedIndex == -1)
-            userForm.ShowDialog();
+            {
+                MessageBox.Show("Please select an item from the list");
+            }
+            else
+            {
+                UserForm userForm = new UserForm((User)lbUsers.SelectedItem, true);
+                userForm.ShowDialog();
+            }
             RefreshLists();
         }
 

StudentHouseDashboard/WinForms/Login.Designer.cs

@@ -74,6 +74,7 @@
             // 
             tbPassword.Location = new Point(81, 90);
             tbPassword.Name = "tbPassword";
+            tbPassword.PasswordChar = '*';
             tbPassword.Size = new Size(161, 23);
             tbPassword.TabIndex = 4;
             // 

StudentHouseDashboard/WinForms/Login.cs

@@ -1,5 +1,5 @@
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 
 namespace WinForms
 {

StudentHouseDashboard/WinForms/UserForm.cs

@@ -1,5 +1,5 @@
-using StudentHouseDashboard.Managers;
+using Logic;
-using StudentHouseDashboard.Models;
+using Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -34,7 +34,6 @@ namespace WinForms
             if (user != null)
             {
                 tbUsername.Text = user.Name;
-                tbPassword.Text = user.Password;
                 cbUserRole.SelectedIndex = (int)user.Role;
             }
 
@@ -55,7 +54,14 @@ namespace WinForms
             }
             else
             {
-                userManager.UpdateUser(this.user.ID, tbUsername.Text, BCrypt.Net.BCrypt.HashPassword(tbPassword.Text), (UserRole)cbUserRole.SelectedItem);
+                if (string.IsNullOrEmpty(tbPassword.Text))
+                {
+                    //userManager.UpdateUser(this.user.ID, tbUsername.Text,)
+                }
+                else
+                {
+                    userManager.UpdateUser(this.user.ID, tbUsername.Text, BCrypt.Net.BCrypt.HashPassword(tbPassword.Text), (UserRole)cbUserRole.SelectedItem);
+                }
             }
             this.DialogResult = DialogResult.OK;
         }

StudentHouseDashboard/WinForms/WinForms.csproj

@@ -10,7 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\HouseData\StudentHouseDashboard.csproj" />
+    <ProjectReference Include="..\Logic\Logic.csproj" />
+    <ProjectReference Include="..\Models\Models.csproj" />
   </ItemGroup>
 
   <ItemGroup>