From 32acd054f4338c0b62f7040e3374b931302482ca Mon Sep 17 00:00:00 2001
From: Slendy <josh@slendy.pw>
Date: Sun, 30 Jan 2022 23:06:05 -0600
Subject: [PATCH] Make suggested changes

---
 ProjectLighthouse/Controllers/ResourcesController.cs |  4 ----
 ProjectLighthouse/Pages/LoginForm.cshtml             | 11 ++++++-----
 ProjectLighthouse/Pages/PhotosPage.cshtml.cs         |  3 ++-
 ProjectLighthouse/Pages/RegisterForm.cshtml          |  8 ++++----
 ProjectLighthouse/Pages/SlotsPage.cshtml.cs          |  3 ++-
 ProjectLighthouse/Pages/UsersPage.cshtml.cs          |  4 +++-
 ProjectLighthouse/Program.cs                         |  1 +
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ProjectLighthouse/Controllers/ResourcesController.cs b/ProjectLighthouse/Controllers/ResourcesController.cs
index 47e7f26d..48e17903 100644
--- a/ProjectLighthouse/Controllers/ResourcesController.cs
+++ b/ProjectLighthouse/Controllers/ResourcesController.cs
@@ -57,10 +57,6 @@ public class ResourcesController : ControllerBase
     {
         string path = $"png/{hash}.png";
 
-        if (!IOFile.Exists("png"))
-        {
-             FileHelper.EnsureDirectoryCreated(Path.Combine(Environment.CurrentDirectory, "png"));
-        }
         if (IOFile.Exists(path))
         {
             return this.File(IOFile.OpenRead(path), "image/png");
diff --git a/ProjectLighthouse/Pages/LoginForm.cshtml b/ProjectLighthouse/Pages/LoginForm.cshtml
index b04b21bc..53e672df 100644
--- a/ProjectLighthouse/Pages/LoginForm.cshtml
+++ b/ProjectLighthouse/Pages/LoginForm.cshtml
@@ -11,9 +11,10 @@
 
 <script>
     function onSubmit(form) {
-        const passwordHashed = document.getElementById("password");
-        const passwordOriginal = document.getElementById("password-original");
-        passwordHashed.value = sha256(passwordOriginal.value);
+        const passwordInput = document.getElementById("password");
+        const passwordSubmit = document.getElementById("password-submit");
+        
+        passwordSubmit.value = sha256(passwordInput);
         
         return true;
     }
@@ -43,8 +44,8 @@
     <div class="field">
         <label>Password</label>
         <div class="ui left icon input">
-            <input type="password" id="password-original" placeholder="Password">
-            <input type="hidden" name="password" id="password">
+            <input type="password" id="password" placeholder="Password">
+            <input type="hidden" id="password-submit" name="password">
             <i class="lock icon"></i>
         </div>
     </div>
diff --git a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
index db32f928..b6c6efca 100644
--- a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,7 +28,7 @@ public class PhotosPage : BaseLayout
     public PhotosPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string? name)
     {
         if (string.IsNullOrWhiteSpace(name)) name = "";
 
diff --git a/ProjectLighthouse/Pages/RegisterForm.cshtml b/ProjectLighthouse/Pages/RegisterForm.cshtml
index ba179e51..67b3a05a 100644
--- a/ProjectLighthouse/Pages/RegisterForm.cshtml
+++ b/ProjectLighthouse/Pages/RegisterForm.cshtml
@@ -12,10 +12,10 @@
     function onSubmit(form) {
         const passwordInput = document.getElementById("password");
         const confirmPasswordInput = document.getElementById("confirmPassword");
-        const password = document.getElementById("password-submit");
-        const confirmPassword = document.getElementById("confirm-submit");
-        password.value = sha256(passwordInput.value);
-        confirmPassword.value = sha256(confirmPasswordInput.value);
+        const passwordSubmit = document.getElementById("password-submit");
+        const confirmPasswordSubmit = document.getElementById("confirm-submit");
+        passwordSubmit.value = sha256(passwordInput.value);
+        confirmPasswordSubmit.value = sha256(confirmPasswordInput.value);
         
         return true;
     }
diff --git a/ProjectLighthouse/Pages/SlotsPage.cshtml.cs b/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
index 33bfb673..3ee865f1 100644
--- a/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,7 +29,7 @@ public class SlotsPage : BaseLayout
     public SlotsPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string? name)
     {
         if (string.IsNullOrWhiteSpace(name)) name = "";
 
diff --git a/ProjectLighthouse/Pages/UsersPage.cshtml.cs b/ProjectLighthouse/Pages/UsersPage.cshtml.cs
index 45f12a17..9290033c 100644
--- a/ProjectLighthouse/Pages/UsersPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/UsersPage.cshtml.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,7 +27,7 @@ public class UsersPage : BaseLayout
     public UsersPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string? name)
     {
         if (string.IsNullOrWhiteSpace(name)) name = "";
 
@@ -35,6 +36,7 @@ public class UsersPage : BaseLayout
         this.SearchValue = name;
         this.PageNumber = pageNumber;
         this.PageAmount = Math.Max(1, (int)Math.Ceiling((double)this.UserCount / ServerStatics.PageSize));
+
         if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/users/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
 
         this.Users = await this.Database.Users.Where
diff --git a/ProjectLighthouse/Program.cs b/ProjectLighthouse/Program.cs
index 9c06c834..687d76db 100644
--- a/ProjectLighthouse/Program.cs
+++ b/ProjectLighthouse/Program.cs
@@ -82,6 +82,7 @@ public static class Program
             return;
         }
 
+        FileHelper.EnsureDirectoryCreated(Path.Combine(Environment.CurrentDirectory, "png"));
         if (Directory.Exists("r"))
         {
             Logger.Log