diff --git a/docs/dashboard-drawing.png b/docs/dashboard-drawing.png new file mode 100644 index 0000000..5e66988 Binary files /dev/null and b/docs/dashboard-drawing.png differ diff --git a/docs/er-modell.pdf b/docs/er-modell.pdf new file mode 100644 index 0000000..46a92e6 Binary files /dev/null and b/docs/er-modell.pdf differ diff --git a/docs/er-modell.xml b/docs/er-modell.xml new file mode 100644 index 0000000..b34e22c --- /dev/null +++ b/docs/er-modell.xml @@ -0,0 +1 @@ +5VtLb+M2EP41vhp86nHceDdtDwUKBGi3R61F28LKoivTa6e/vpRFyZKGUd2EeiT1IRCH4kPffDMcDpkFXe0vP+XRYferjEW6ICi+LOjnBSFhQPXfQvBcCrgfloJtnsSlCN8ET8nfwgiRkZ6SWBxbLyopU5Uc2sK1zDKxVi1ZlOfy3H5tI9P2qIdoK4DgaR2lUPpHEqtdKQ04usl/Fsl2V42Mkan5Fq2/b3N5ysx4C0I3119ZvY+qvsz7x10Uy3NDRL8s6CqXUpVP+8tKpAW0FWxlu8cXaut55yJT9zQgZYMfUXoyn64b5onGvpyeeq4guX6UKJqhBX047xIlng7Ruqg9aw5o2U7tU13C+tH0KnIlLi/ODNffq2kk5F6o/Fm/UjUI/CUvGxkS4Qr+800luAJy11CHZ2SRYcG27vyGhH4wYNiBoQCY01Hk08PCEYCFjggLA7AAREQWfypMUJcymYk2AgW7nr8atK6FP4uC/iRdvCTqa/Wefr7VlGOIGBhtBzU9D3nK16LFbRXlW6EaWoXYNpDjFuAqWS7SSCU/2pOwoWlG+E0menq16gjuqo7yjkrK6Zt2TbPtduWBrlCnq/KzQVdXBdeffpfOOdC5irLpLYFBDPCIluABVHQNsIU01UuW+Hc8NjJTT6YdM+WVTGV+7Yc+PlL9c4Qb8CDMgpvNDpgD2HwbmRbES/UYD99y/bRV9Xe+BkkXPjacEqHQtvLEc4OIkgkhqobqrM6/fH6bATYMDqHVCqGhHNWoWMEQb1BHhZAr3HzaxS0cETZ7AJhFezEzU/QJiAhDDnDyh8IJRoSH6Hg8y/wNJBsGFQbZMxgqMGYS+yhJZwaJDkDHgwSu/ELHpnm01aEk+r2QFg9L/ZsUpaC7sNWR9RggBQCkytsUjnZRZDwqX+v9dZKl86Gbjd4E0qao9EtJHTbogcsOKoflzoV1V4QhdGDb43pD6cAagF2DC7egDRRuQPCC8QhMYGSm4/v3ix2xEG8w7LDF+Lsg3ZVcqQswuYKGS66Uzmuq7ApIF3LS0cm9yRUM4k7md7pyl1ypgHy3Sg+nVLo2xiXhgUeQF4Qe59Vmp7JeFi79RnWV1f3PjOD+0kOUsYBcu8PtUTy0xLB2AK7APcm74krjhGMKrtB+rnBHXPF6ueKPxRVnmfo+rmhAG3TBTh2LPylZGNgrddeAuwnh9xIiGIsQcEs6X+eBLYSY9OzGwx3n0VIiDt34Ds56qYLHogo825gxVejcqNKNSdpKRI6o0h+SkLGoArM6M6YKnxtVuiFJx94dUaU/IqFjUcWW25otVdjcqMJ6qUIcUaU/VmFjUQWm4F5JFcOOmixDBK8Wr+JNShXeSxXqiCpBL1X4SFShMOE4BFUGYwqedE/seb1UcZQ+Ke5TzCB9Qp3lV3up4g/GlUlTbZz2KZH2b2PvZgoiS0YbHbUGYWNFtZS4Y4rfogp+0augVzPFh0zhkzKldxdLQzdMwb1MGSuopTAlW2noRhUlLqrNj6PK5XdRHWIZ/mySNO2IojTZZrq41voXWv5QnG4l6yj9ZCr2SRwXw1jPzNo3Ms1E33TrC9xkwpYrOcxCre5ZzKuuZMOUZvZxsabwojen42ENs4UfGGsOTvxsV80Gw9pZuq0Tlwyx2MwthfJOj30pTIZ84HUD3oC1XcYbyr7YW6O5ly6c3BflOcpIWQyPTGp4yJXZtTsa0OjY/ypYgwEEsVw7H8zoYLD2gbFmGNwatVwcc4S1Lt7+QbQ0g9s/4dIv/wA= \ No newline at end of file diff --git a/index.php b/index.php index ea405c7..5e01c87 100644 --- a/index.php +++ b/index.php @@ -1,3 +1,4 @@ + diff --git a/js/contentloader.js b/js/contentloader.js index f6698b7..c84ea4f 100644 --- a/js/contentloader.js +++ b/js/contentloader.js @@ -25,6 +25,9 @@ document.getElementById('btnCreate').addEventListener("click" , async (event) => method: 'post', body: formData }); + const jsonData = await response.json(); + console.log(jsonData); + } catch (e) { console.log("Abschicken der Daten fehlerhaft!"); } @@ -36,7 +39,7 @@ document.getElementById('btnLogin').addEventListener("click" , async (event) => // if (document.getElementById('btnLogin') === "Login") { const formData = new FormData(document.getElementById('login-form')); - try { + // try { const response = await fetch('php/signup.php', { method: 'post', body: formData @@ -47,23 +50,26 @@ document.getElementById('btnLogin').addEventListener("click" , async (event) => document.getElementById('login-status').innerHTML = jsonData.error.fontcolor("red"); } else { console.log(jsonData); - if (jsonData == 'true') { - document.getElementById('toggle-login').innerHTML = "Logout"; - document.getElementById('btnLogin').innerHTML = "Logout"; - document.getElementById('exampleModalLabel').innerHTML = "Logout"; - document.getElementById('login-status').innerHTML = "Erfolgreich eingeloggt"; - } - else { - document.getElementById('toggle-login').innerHTML = "Login"; - document.getElementById('btnLogin').innerHTML = "Login"; - document.getElementById('exampleModalLabel').innerHTML = "Login"; - document.getElementById('login-status').innerHTML = "Erfolgreich ausgeloggt"; - } + document.getElementById('login-status').innerHTML = "Eingeloggt"; + location.replace('index2.htm'); + // if (jsonData == 'true') { + // document.getElementById('toggle-login').innerHTML = "Logout"; + // document.getElementById('btnLogin').innerHTML = "Logout"; + // document.getElementById('exampleModalLabel').innerHTML = "Logout"; + // document.getElementById('login-status').innerHTML = "Erfolgreich eingeloggt"; + // } + // else { + // document.getElementById('toggle-login').innerHTML = "Login"; + // document.getElementById('btnLogin').innerHTML = "Login"; + // document.getElementById('exampleModalLabel').innerHTML = "Login"; + // document.getElementById('login-status').innerHTML = "Erfolgreich ausgeloggt"; + // } // location.reload(); } - } catch (e) { - console.log("Login Fehler"); - } + // } + // catch (e) { + // console.log("Login Fehler"); + // } // } }) diff --git a/php/signin.php b/php/signin.php index 10551e8..3fcc839 100644 --- a/php/signin.php +++ b/php/signin.php @@ -6,11 +6,21 @@ $pswd = ($_POST['registerPassword']); $email = ($_POST['registerMail']); - // if ($abfrage == "") { + $search_user = $database->prepare("SELECT ID FROM user WHERE user='$name '"); + $search_user->execute(); + $search_result = $search_user->get_result(); + + if ($search_result->num_rows == 0) { + $pswd = md5($pswd); $stmt = $database->prepare("INSERT INTO user(user, email, password) VALUES (?,?,?)"); $stmt->bind_param("sss", $name, $email, $pswd); $stmt->execute(); $stmt->close(); - // } + echo json_encode("Dein Account wurde erfolgreich erstellt!"); + } else { + echo json_encode("Der Benutzername ist leider schon vergeben!"); + } + + ?> diff --git a/php/signup.php b/php/signup.php index 546e511..319880d 100644 --- a/php/signup.php +++ b/php/signup.php @@ -1,36 +1,33 @@ + session_start(); require('../dbConnect.php'); + $name = ($_POST['loginName']); $pswd = ($_POST['loginPassword']); + // $pswd = md5($pswd); - try { - $stmt = $database->prepare("SELECT password FROM user WHERE '$name'=user"); - $stmt->execute(); - $result = $stmt->get_result(); - $row = $result->fetch_assoc(); - } catch (PDOException $e) { - $e->getMessage(); - } - if ($pswd == $row['password']) { - $stmt = $database->prepare("SELECT loggedin FROM user WHERE '$name'=user"); - $stmt->execute(); - $result = $stmt->get_result()->fetch_assoc(); - if ($result['loggedin'] == 'false') { - $stmt = $database->prepare("UPDATE `benutzer`.`user` SET `loggedin`='true' WHERE '$name'=user"); - $stmt->execute(); - $a = "true"; + $stmt = $database->prepare("SELECT id FROM user WHERE '$name'=user AND password='$pswd'"); + $stmt->execute(); + $result = $stmt->get_result(); + + if ($result->num_rows == 1) { + $object = $result->fetch_object(); + $_SESSION['user'] = $object->id; + // header('Location: /index2.htm'); + echo json_encode('Eingeloggt!'); + // $stmt = $database->prepare("SELECT loggedin FROM user WHERE '$name'=user"); + // $stmt->execute(); + // $result = $stmt->get_result()->fetch_assoc(); + // if ($result['loggedin'] == 'false') { + // $stmt = $database->prepare("UPDATE `benutzer`.`user` SET `loggedin`='true' WHERE '$name'=user"); + // $stmt->execute(); + // $a = "true"; } else { - $stmt = $database->prepare("UPDATE `benutzer`.`user` SET `loggedin`='false' WHERE '$name'=user"); - $stmt->execute(); - $a = "false"; + $a = array('error' => 'Einlogen fehlgeschlagen!'); + echo json_encode($a); } - echo json_encode($a); - } else { - $a = array('error' => 'Einlogen fehlgeschlagen!' . $pswd . " " . $row['password']); - echo json_encode($a); - } ?> diff --git a/sql/entiresTable.sql b/sql/entiresTable.sql index 1069354..58a7b61 100644 --- a/sql/entiresTable.sql +++ b/sql/entiresTable.sql @@ -26,7 +26,6 @@ CREATE TABLE `kd42696_ipr-projekt`.`entries` ( `absturz` LONGTEXT NOT NULL , `trinkspiel` LONGTEXT NOT NULL , PRIMARY KEY (`id`), - UNIQUE (`userID`), UNIQUE (`tanID`)) ENGINE = InnoDB; ALTER TABLE `entries` ADD FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE;