diff --git a/public/js/register.js b/public/js/register.js index c0cf69255fe4ac5e3b9249bdab096f40fff7582c..0af090e0d9f6496e0f1e698281511216e20556b2 100644 --- a/public/js/register.js +++ b/public/js/register.js @@ -7,43 +7,7 @@ const register = async function (e) { const email = document.getElementById("email").value; const password = document.getElementById("password").value; const confPW = document.getElementById("confirm-password").value; - const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; - let isError = false; - - if (username===""){ - document.getElementById("usernameError").textContent= "Invalid username"; - isError=true; - } else { - document.getElementById("usernameError").textContent= ""; - } - if (name===""){ - document.getElementById("nameError").textContent= "Invalid name"; - isError=true; - } else { - document.getElementById("usernameError").textContent= ""; - } - if (!emailRegex.test(email)){ - document.getElementById("emailError").textContent= "Invalid email"; - isError=true; - } else { - document.getElementById("usernameError").textContent= ""; - } - if (password===""){ - document.getElementById("passwordError").textContent= "Invalid password"; - isError=true; - } else { - document.getElementById("usernameError").textContent= ""; - } - if (password!==confPW){ - document.getElementById("confPassError").textContent= "confirm your password"; - isError=true; - } else { - document.getElementById("usernameError").textContent= ""; - } - if (isError){ - return; - } const formData = new FormData(); formData.append("username", username); diff --git a/public/js/users.js b/public/js/users.js index cf179e5da1aad4b8976e6431c0a9b1462922cc6e..d04cb7fc10ead789f04fbe3e7cb7463bc562e8f3 100644 --- a/public/js/users.js +++ b/public/js/users.js @@ -47,8 +47,10 @@ function editForm(event) { document.addEventListener("DOMContentLoaded", function () { const deleteButtons = document.querySelectorAll(".delete-button"); + deleteButtons.forEach(function (button) { button.addEventListener("click", function (event) { + event.preventDefault(); let conf = confirm('Are you sure you want to delete this user?'); if (!conf) { event.preventDefault(); diff --git a/public/view/register.php b/public/view/register.php index 75c0678c170d5be0792af23aebb5b05fcd14eeb4..2b159b7dc3382905785f1e6191a4bb228391cac9 100644 --- a/public/view/register.php +++ b/public/view/register.php @@ -20,30 +20,24 @@ <img src="public/images/logo.jpeg" alt="Your Logo"> </div> <h1 id="registerTitle" class="register-title">Register</h1> - <form id="registerForm" class="register-form"> + <form id="registerForm" class="register-form" onsubmit="register(event)"> <label for="username" id="usernameLabel" class="register-label">Username:</label> <input type="text" id="username" name="username" class="register-input" required /><br /><br /> - <span id="usernameError" class="error-message"></span><br><br> <label for="name" id="nameLabel" class="register-label">Name:</label> <input type="text" id="name" name="name" class="register-input" required /><br /><br /> - <span id="nameError" class="error-message"></span><br><br> <label for="email" id="emailLabel" class="register-label">Email:</label> <input type="email" id="email" name="email" class="register-input" required /><br /><br /> - <span id="emailError" class="error-message"></span><br><br> <label for="password" id="passwordLabel" class="register-label">Password:</label> <input type="password" id="password" name="password" class="register-input" required /><br /><br /> - <span id="passwordError" class="error-message"></span><br><br> <label for="confirm-password" id="confirm-passwordLabel" class="register-label">Confirm Password:</label> <input type="password" id="confirm-password" name="confirm-password" class="register-input" required /><br /><br /> - <span id="confPassError" class="error-message"></span><br><br> - <button type="submit" id="registerButton" class="register-button" - onclick="register(event)">Register</button> + <button type="submit" id="registerButton" class="register-button">Register</button> </form> <p>Already have an account?</p> <a href="/login" class="link">Log in</a> diff --git a/public/view/users.php b/public/view/users.php index f93471e5606c42f6c67b21cc28c2cb0e77982da8..37adacc387e092500167acd6954907f28829a1c8 100644 --- a/public/view/users.php +++ b/public/view/users.php @@ -73,8 +73,8 @@ </div> </div> </div> - <?php require_once(PROJECT_ROOT_PATH . '/public/components/footer.php'); ?> <script src="public/js/users.js"></script> + <?php require_once(PROJECT_ROOT_PATH . '/public/components/Footer.php'); ?> </body> </html> \ No newline at end of file diff --git a/src/controllers/auth/LoginController.php b/src/controllers/auth/LoginController.php index 0736edcb9d9e74c49f6889aa79e1b1fc3c442bc1..40203cb41e53fb1f6569b766def8cf036c93267e 100644 --- a/src/controllers/auth/LoginController.php +++ b/src/controllers/auth/LoginController.php @@ -27,6 +27,9 @@ class LoginController extends BaseController { public function get($urlParams) { + if (isset($_SESSION['user_id'])){ + header("Location: /"); + } $phpFile = PROJECT_ROOT_PATH . "/public/view/login.php"; if (file_exists($phpFile)) { diff --git a/src/controllers/auth/RegisterController.php b/src/controllers/auth/RegisterController.php index c05211749292644cf07c99c6dbd690eca7d86c58..455ef0a9f70277865a97a22eac298de64ecdee9e 100644 --- a/src/controllers/auth/RegisterController.php +++ b/src/controllers/auth/RegisterController.php @@ -23,6 +23,9 @@ class RegisterController extends BaseController } public function get($urParams){ + if (isset($_SESSION['user_id'])){ + header("Location: /"); + } $phpFile = PROJECT_ROOT_PATH . "/public/view/register.php"; if (file_exists($phpFile)){ diff --git a/src/controllers/user/UserController.php b/src/controllers/user/UserController.php index 164ab07257c476460a05906c4b75a45190e9f7ed..899dfada98e0290a06d2edbcacac9fada4f075e4 100644 --- a/src/controllers/user/UserController.php +++ b/src/controllers/user/UserController.php @@ -25,7 +25,7 @@ class UserController extends BaseController public function get($urlParams) { if (!$urlParams) { - if (!$_GET["pageNo"] || !$_GET["pageSize"]) { + if (!isset($_GET["pageNo"]) || !isset($_GET["pageSize"])) { header("Location: /user?pageNo=1&pageSize=10"); } $users = $this->srv->getAll([