Revize d54432e7

#8643 - funguje login i logout, odstraněno testovací tlačítko pro logout

application/index.php

@@ -37 +37 @@
 <?php include "./view/modals/loginModal.html" ?>
 <?php include "./view/modals/invalidLoginModal.html" ?>
 <?php include "./view/modals/settingsModal.html" ?>
-<!--TODO logování upravit, zde pouze příklad -->
-<?php if(isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] == true) {?>
-    <h1>LOGGEDIN!!!!!!!!!</h1>
-    <button type="button" class="btn btn-default" data-dismiss="modal" onclick="logout()">Odhlásit se</button>
-<?php }?>
 </body>
 </html>
-
-<script>
-    function logout () {
-        var data = new FormData();
-        var xhr = new XMLHttpRequest();
-        xhr.open("POST", "controller/LogoutController.php");
-        xhr.onload = function(){
-            let search = JSON.parse(this.response);
-            console.log(search);
-        };
-        xhr.send(data);
-        return false;
-    }
-
-</script>

application/view/menu.php

@@ -8 +8 @@
             if(isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] == true){
                 echo "<a class=\" px-4 py-1 ";
                 echo (strstr($_SERVER['PHP_SELF'],'/login.php') ? 'active\"' : '\"');
-                echo "href=\"users.php\">Logout</a>";
+                echo "href=\"#\" onclick=\"logout()\">Odhlášení</a>";
             }else{
                 echo "<a class=\" px-4 py-1 ";
                 echo (strstr($_SERVER['PHP_SELF'],'/login.php') ? 'active\"' : '\"');
@@ -25 +25 @@
         ?>
         <a class="my-auto px-4 py-1 <?php echo (strstr($_SERVER['PHP_SELF'],'/settings.php') ? 'active' : '');?>" href="#" data-toggle="modal" data-target="#settings-modal" id="modalSettingsHref">Nastavení</a>
     </div>
-</div>
+</div>
+
+<script>
+    function logout(){
+        var data = new FormData();
+        var xhr = new XMLHttpRequest();
+        xhr.open("POST", "controller/LogoutController.php");
+        xhr.onload = function(){ //refresh page after logout
+            location.reload();
+        };
+        xhr.send(data);
+        return false;
+    }
+</script>

application/view/modals/loginModal.html

@@ -44 +44 @@
         xhr.send(data);
     }
 
-    function login () {
+    function login(){
         var data = new FormData();
         data.append("username", document.getElementById('nick').value);
         data.append("password", document.getElementById('password').value);
@@ -54 +54 @@
             if(this.response == 'Incorrect username and/or password!'){ //login was not successful, show modal
                 $("#invalidlogin-modal").modal("show");
             }else{ //login was successful, refresh page to apply changes in visible items
-               window.location.href = window.location.href;
+                location.reload();
             }
         };
         xhr.send(data);