Merge pull request #65 from STiBaRC/errorHandling

Clean up login & reg models
STiBaRC · Jan 23, 2025 · 91975f5 · 91975f5
2 parents 32c0a7f + 943d045
commit 91975f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/components/LoginModal.js b/components/LoginModal.js
@@ -107,16 +107,11 @@ class LoginModalComponent extends HTMLElement {
 	}
 
 	show() {
-		window.scrollTo(0, 0);
-		document.querySelector("#overlay").classList.remove("hidden");
-		document.body.classList.add("overflowhidden");
 		this.shadow.querySelector("dialog").showModal();
 		this.shadow.querySelector("#username").focus();
 	}
 
 	hide() {
-		document.querySelector("#overlay").classList.add("hidden");
-		document.body.classList.remove("overflowhidden");
 		this.shadow.querySelector("dialog").close();
 		this.shadow.querySelector("#username").value = "";
 		this.shadow.querySelector("#password").value = "";

diff --git a/components/RegisterModal.js b/components/RegisterModal.js
@@ -3,32 +3,6 @@ class RegisterModalComponent extends HTMLElement {
 	#shadowDomHTML = `
 		<style>
 			@import url("/css/global.css");
-
-			dialog {
-				box-sizing: border-box;
-				border-radius: 15px;
-				background-color: var(--color2);
-				color: var(--text);
-				padding: 12px;
-				user-select: text;
-				box-shadow: 0 1px 8px 0 rgba(22, 22, 22, 0.2), 0 1px 4px 0 rgba(22, 22, 22, 0.2);
-				max-height: 90vh;
-				width: 100%;
-				max-width: 50vw;
-				overflow-y: auto;
-				flex-wrap: nowrap;
-			}
-
-			@media only screen and (max-width: 750px) {
-				dialog {
-					width: calc(100vw - 40px);
-					max-width: calc(100vw - 40px);
-				}
-			}
-
-			dialog input, dialog textarea {
-				margin-bottom: 0.25rem;
-			}
 		</style>
 		<dialog>
 			<div class="flexcontainer flexcolumn">
@@ -164,16 +138,19 @@ class RegisterModalComponent extends HTMLElement {
 		if (username == "") {
 			this.shadow.querySelector("#error").textContent = "Username required";
 			this.shadow.querySelector("#errorcontainer").classList.remove("hidden");
+			this.shadow.querySelector("#username").focus();
 			return;
 		}
 		if (password == "") {
 			this.shadow.querySelector("#error").textContent = "Password required";
 			this.shadow.querySelector("#errorcontainer").classList.remove("hidden");
+			this.shadow.querySelector("#password").focus();
 			return;
 		}
 		if (password != password2) {
 			this.shadow.querySelector("#error").textContent = "Passwords must match";
 			this.shadow.querySelector("#errorcontainer").classList.remove("hidden");
+			this.shadow.querySelector("#password2").focus();
 			return;
 		}
 		this.#clicked = true;
@@ -206,9 +183,6 @@ class RegisterModalComponent extends HTMLElement {
 	}
 
 	show() {
-		window.scrollTo(0, 0);
-		document.querySelector("#overlay").classList.remove("hidden");
-		document.body.classList.add("overflowhidden");
 		this.shadow.querySelector("dialog").showModal();
 		this.shadow.querySelector("#username").focus();
 	}