From c6f33b142b45c04be63aa1d445561473aae83a97 Mon Sep 17 00:00:00 2001 From: vex Date: Tue, 29 Apr 2025 12:50:58 +0200 Subject: [PATCH 1/2] - user registration passwords have to match in order to be able to register --- public/inputHandler/verifyPassword.js | 0 public/registrieren/registrieren.html | 30 ++++++++++++++++++-------- public/session_storage/login-toggle.js | 0 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 public/inputHandler/verifyPassword.js create mode 100644 public/session_storage/login-toggle.js diff --git a/public/inputHandler/verifyPassword.js b/public/inputHandler/verifyPassword.js new file mode 100644 index 0000000..e69de29 diff --git a/public/registrieren/registrieren.html b/public/registrieren/registrieren.html index e2a34b5..d54eb27 100644 --- a/public/registrieren/registrieren.html +++ b/public/registrieren/registrieren.html @@ -1,16 +1,16 @@ - - - - - - - Registrieren + + + + + + + Registrieren -
+
@@ -58,6 +58,18 @@ document.getElementById('register').addEventListener('click', async (event) => { event.preventDefault(); + const passwordEl = document.getElementById('regPassword') + const password = passwordEl.value + const confirmPasswordEl = document.getElementById('confirmPassword') + const confirmPassword = confirmPasswordEl.value + + if (password !== confirmPassword) { + passwordEl.value = '' + confirmPasswordEl.value= '' + alert('Die Passwörter stimmen nicht überein.') + return + } + const formData = { name: document.getElementById('vorname').value, lower_name: document.getElementById('nachname').value, @@ -77,7 +89,7 @@ const data = await response.json(); sessionStorage.setItem("user_id", data.id) alert('Nutzer erfolgreich hinzugefügt! Ihre Kundennummer: ' + data.id) - window.location.href= '/' + window.location.href = '/' } else { alert('Fehler bei der Registrierung.') } diff --git a/public/session_storage/login-toggle.js b/public/session_storage/login-toggle.js new file mode 100644 index 0000000..e69de29 From c4d922b903ec2ca82e766310b204aca737aa295a Mon Sep 17 00:00:00 2001 From: vextv Date: Tue, 29 Apr 2025 21:18:10 +0200 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/develop' into login_function # Conflicts: # public/registrieren/registrieren.html - Cleaned up code - Added a specific error if e-mail that are already registered are tried to register again - fields in the registration form cant be empty - email input in registration form is now html type email - fields in login form cant be empty - email input on login form is now html type email --- public/login/login.html | 4 ++-- public/registrieren/registrieren.html | 4 ++-- public/startseite/startseite.html | 2 +- scripts/einfügenHeaderFooter.js | 4 ++-- scripts/example.js | 23 ----------------------- scripts/login.js | 7 ------- scripts/query/get_products.js | 17 ----------------- scripts/query/get_users.js | 17 ----------------- scripts/routes/other/route-index.js | 4 ---- server.js | 4 ++++ 10 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 scripts/example.js delete mode 100644 scripts/login.js delete mode 100644 scripts/query/get_products.js delete mode 100644 scripts/query/get_users.js diff --git a/public/login/login.html b/public/login/login.html index 92f7e6e..05f2f2c 100644 --- a/public/login/login.html +++ b/public/login/login.html @@ -32,7 +32,7 @@
- +
@@ -54,7 +54,7 @@