From c4d922b903ec2ca82e766310b204aca737aa295a Mon Sep 17 00:00:00 2001
From: vextv <fabidani03@t-online.de>
Date: Tue, 29 Apr 2025 21:18:10 +0200
Subject: [PATCH] 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 @@
 
             <!-- Eingabefeld für Benutzername -->
             <div class="input-group">
-                <input id="email" type="text" placeholder="E-Mail" required/>
+                <input id="email" type="email" placeholder="E-Mail" required/>
                 <i class="icon fas fa-user"></i>
             </div>
 
@@ -54,7 +54,7 @@
 </main>
 
 <script>
-    document.getElementById('submit').addEventListener('click', async (event) => {
+    document.querySelector('form').addEventListener('submit', async (event) => {
         event.preventDefault()
 
         const email = document.getElementById('email').value
diff --git a/public/registrieren/registrieren.html b/public/registrieren/registrieren.html
index 53f69e4..a7a9836 100644
--- a/public/registrieren/registrieren.html
+++ b/public/registrieren/registrieren.html
@@ -68,7 +68,7 @@
     </main>
 
     <script>
-        document.getElementById('register').addEventListener('click', async (event) => {
+        document.querySelector('form').addEventListener('submit', async (event) => {
             event.preventDefault();
 
             const passwordEl = document.getElementById('regPassword')
@@ -78,7 +78,7 @@
 
             if (password !== confirmPassword) {
                 passwordEl.value = ''
-                confirmPasswordEl.value= ''
+                confirmPasswordEl.value = ''
                 alert('Die Passwörter stimmen nicht überein.')
                 return
             }
diff --git a/public/startseite/startseite.html b/public/startseite/startseite.html
index 8118b61..9c1dec8 100644
--- a/public/startseite/startseite.html
+++ b/public/startseite/startseite.html
@@ -31,7 +31,7 @@
         </section>
 
         <!-- Hauptinhalt -->
-        <h1>Unsere Neusten Produkte: </h1>
+        <h1>Unsere neusten Produkte: </h1>
         <section class="card-grid" id="latest-products">
             <!-- Dynamische Produkte (5 neuesten Produkte) -->
         </section>
diff --git a/scripts/einfügenHeaderFooter.js b/scripts/einfügenHeaderFooter.js
index a9fb954..6bf84a1 100644
--- a/scripts/einfügenHeaderFooter.js
+++ b/scripts/einfügenHeaderFooter.js
@@ -21,7 +21,7 @@ document.addEventListener("DOMContentLoaded", () => {
                 // Header-Inhalt in die Seite einfügen
                 headerTarget.innerHTML = data;
 
-                // 🚀 WICHTIG: Jetzt den Warenkorb zählen, nachdem der Header geladen ist!
+                // WICHTIG: Jetzt den Warenkorb zählen, nachdem der Header geladen ist!
                 zeigeWarenkorbAnzahl();
 
                 zeigeLoginStatus();
@@ -83,7 +83,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
         if (userId) {
             loginBtn.textContent = 'Logout'
-            loginBtn.href = '#'
+            loginBtn.href = '/'
             loginBtn.addEventListener('click', (e) => {
                 e.preventDefault()
                 sessionStorage.clear()
diff --git a/scripts/example.js b/scripts/example.js
deleted file mode 100644
index d539db9..0000000
--- a/scripts/example.js
+++ /dev/null
@@ -1,23 +0,0 @@
-let sidebarEl = document.getElementById("mySidebar")
-let mainEl = document.getElementById("main")
-
-/* Set the width of the sidebar to 250px and the left margin of the page content to 250px */
-function openNav() {
-    sidebarEl.style.width = "250px";
-    mainEl.style.marginLeft = "250px";
-}
-
-/* Set the width of the sidebar to 0 and the left margin of the page content to 0 */
-function closeNav() {
-    sidebarEl.style.width = "0";
-    mainEl.style.marginLeft = "0";
-}
-
-/* Toggle the sidebar */
-function toggleNav() {
-    if (sidebarEl.offsetWidth > 0) {
-        closeNav()
-    } else {
-        openNav()
-    }
-}
\ No newline at end of file
diff --git a/scripts/login.js b/scripts/login.js
deleted file mode 100644
index 6d17a2a..0000000
--- a/scripts/login.js
+++ /dev/null
@@ -1,7 +0,0 @@
-let nameEl = document.getElementById("loginMail");
-let passwordEl = document.getElementById("loginPassword");
-
-function login() {
-    console.log(nameEl.value)
-    console.log(passwordEl.value)
-}
\ No newline at end of file
diff --git a/scripts/query/get_products.js b/scripts/query/get_products.js
deleted file mode 100644
index 9f51378..0000000
--- a/scripts/query/get_products.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const mysql = require('mysql');
-
-const connection = mysql.createConnection({
-    host: "localhost",
-    user: "root",
-    password: "",
-    database: "webshop"
-})
-
-connection.connect(function (err) {
-    if (err) throw err
-    console.log("Connected to database")
-    connection.query("SELECT * FROM webshop.product LIMIT 10", function (err, result) {
-        if (err) throw err
-        console.log(result)
-    })
-})
\ No newline at end of file
diff --git a/scripts/query/get_users.js b/scripts/query/get_users.js
deleted file mode 100644
index 72caeef..0000000
--- a/scripts/query/get_users.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const mysql = require('mysql');
-
-const connection = mysql.createConnection({
-    host: "localhost",
-    user: "root",
-    password: "",
-    database: "webshop"
-})
-
-connection.connect(function (err) {
-    if (err) throw err
-    console.log("Connected to database")
-    connection.query("SELECT * FROM webshop.user WHERE ID = 15", function (err, result) {
-        if (err) throw err
-        console.log(result)
-    })
-})
\ No newline at end of file
diff --git a/scripts/routes/other/route-index.js b/scripts/routes/other/route-index.js
index 0418bcc..6ba00d0 100644
--- a/scripts/routes/other/route-index.js
+++ b/scripts/routes/other/route-index.js
@@ -6,10 +6,6 @@ router.get('/', (req, res) => {
     res.sendFile(path.join(__dirname, '../../../public/startseite/startseite.html'));
 })
 
-router.get('/example', (req, res) => {
-    res.sendFile(path.join(__dirname, '../../../public/example/index.html'));
-})
-
 // Route - Login
 router.get('/login', (req, res) => {
     res.sendFile(path.join(__dirname, '../../../public/login/login.html'));
diff --git a/server.js b/server.js
index 6c97d50..5ef778c 100644
--- a/server.js
+++ b/server.js
@@ -135,11 +135,15 @@ app.get('/api/products/sportwagen', async (req, res) => {
 app.post('/api/user/registration', (req, res) => {
     // SQL-Query für Nutzerregistration
     const {name, lower_name, email, passwd} = req.body;
+
     const sql = "INSERT INTO webshop.user (name, lower_name, email, passwd, passwd_hash_algo) VALUES (?, ?, ?, ?, 'none')"
 
     // Query abschicken
     db.query(sql, [name, lower_name, email, passwd], (err, results) => {
         if (err) {
+            if (err.code === 'ER_DUP_ENTRY'){
+                res.status(409).json({message: 'Diese E-Mail Adresse ist bereits registriert.'})
+            }
             console.error('Fehler beim Schreiben in die Datenbank: ', err);
             res.status(500).send('Fehler beim Schreiben in die Datenbank');
             return;