Merge branch 'Achievement-Bug-Fixer' into 'main'

fix: bug when user spamming button

See merge request if3110-2023-01-j/if-3110-2023-01-j!39

api/achievement/my-achievement.php

@@ -106,12 +106,14 @@ if ($page < $pages){
 }
 
 $paginationButtons .= '</ul>';
+$isAdmin = $_SESSION['isAdmin'];
 
 $response = [
     'achievementList' => $achievementList,
     'paginationButtons' => $paginationButtons,
     'query1' => $sql1,
     'query2' => $sql2,
+    'isAdmin' => $isAdmin,
 
 ];
 

app/views/my-achievement/index.php

@@ -20,7 +20,7 @@ if (!isset($_SESSION['username'])) {
     <div class="achievement-container">
         <h1><b>MY-ACHIEVEMENT</b></h1>
         <br>
-        <button class="btn" onclick="window.location.href='../admin-achievement'"><b>ADMIN</b></button>
+        <button id="btn-admin" class="btn-admin" onclick="window.location.href='../admin-achievement'"><b>ADMIN</b></button>
         <button class="btn" onclick="window.location.href='../achievement'"><b>ACHIEVEMENT</b></button>
         <br><br>
         <div class="search-container">

public/css/achievement.css

@@ -235,6 +235,10 @@ body {
   background-color: rgb(127, 0, 25);
 }
 
+.btn-admin {
+  display: none;
+}
+
 button {
   align-items: center;
   appearance: none;

public/js/achievement.js

@@ -57,8 +57,8 @@ document.addEventListener('DOMContentLoaded', function () {
                 const response = JSON.parse(xhr.responseText);
                 achievementList.innerHTML = response.achievementList;
                 paginationButtons.innerHTML = response.paginationButtons;
-                if (response.isAdmin === "0" || response.isAdmin === 0 || response.isAdmin === false || response.isAdmin === "false" || response.isAdmin === null || response.isAdmin === "null" || response.isAdmin === undefined || response.isAdmin === "undefined") {
-                    document.getElementById("btn-admin").style.display = "none";
+                if (!(response.isAdmin === "0" || response.isAdmin === 0 || response.isAdmin === false || response.isAdmin === "false" || response.isAdmin === null || response.isAdmin === "null" || response.isAdmin === undefined || response.isAdmin === "undefined")) {
+                    document.getElementById("btn-admin").style.display = "inline-flex";
                 }
             }
         };

public/js/my-achievement.js

@@ -55,6 +55,9 @@ document.addEventListener('DOMContentLoaded', function () {
                 const response = JSON.parse(xhr.responseText);
                 achievementList.innerHTML = response.achievementList;
                 paginationButtons.innerHTML = response.paginationButtons;
+                if (!(response.isAdmin === "0" || response.isAdmin === 0 || response.isAdmin === false || response.isAdmin === "false" || response.isAdmin === null || response.isAdmin === "null" || response.isAdmin === undefined || response.isAdmin === "undefined")) {
+                    document.getElementById("btn-admin").style.display = "inline-flex";
+                }
             }
         };
         xhr.send();