add stream deletion, fix alert display, improve style

HelloAsso · Sep 2, 2024 · ffe98cd · ffe98cd
1 parent d8d109d
commit ffe98cd
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 32 deletions.
diff --git a/admin/index.php b/admin/index.php
@@ -42,6 +42,15 @@
     exit();
 }
 
+if(isset($_POST['delete'])) {
+    $guid = $_POST['guid'];
+
+    $repository->deleteCharityStream($guid);
+
+    header("Location: /admin/index.php");
+    exit();
+}
+
 // Utilisation de la fonction GetCharityStreamsList pour récupérer les données mises à jour
 $charityStreams = $repository->getCharityStreamsListDB();
 
@@ -99,7 +108,9 @@
                 </tr>
             </thead>
             <tbody>
-                <?php foreach ($charityStreams as $stream): ?>
+                <?php foreach ($charityStreams as $stream): 
+                    $token = $repository->getAccessTokensDB($stream['organization_slug']);
+                ?>
                     <tr>
                         <td><?php echo htmlspecialchars($stream['id']); ?></td>
                         <td><?php echo htmlspecialchars(bin2hex($stream['guid'])); ?></td>
@@ -124,8 +135,14 @@
                         <td>
                             <a href="/admin/widget_edit.php?charityStreamId=<?php echo bin2hex($stream['guid']); ?>"
                                 class="btn btn-primary mb-3" data-bs-toggle="tooltip" data-bs-title="Édition">📝</a>
-                            <a href="/redirect_auth_page.php?organizationSlug=<?php echo $stream['organization_slug']; ?>"
-                                class="btn btn-success" data-bs-toggle="tooltip" data-bs-title="Mire d'authorisation" target="_blank">🔑</a>
+                            <?php if(!isset($token)) { ?>
+                                <a href="/redirect_auth_page.php?organizationSlug=<?php echo $stream['organization_slug']; ?>"
+                                class="btn btn-success mb-3" data-bs-toggle="tooltip" data-bs-title="Mire d'authorisation" target="_blank">🔑</a>
+                            <?php } ?>
+                            <form method="POST">
+                                <input type="hidden" name="guid" value="<?php echo bin2hex($stream['guid']) ?>"/>
+                                <button type="submit" class="btn btn-danger" name="delete" data-bs-toggle="tooltip" data-bs-title="Suppression">🗑️</button>
+                            </form>
                         </td>
                     </tr>
                 <?php endforeach; ?>

diff --git a/admin/widget_edit.php b/admin/widget_edit.php
@@ -174,7 +174,7 @@
                 <label for="sound" class="form-label">Fichier de son</label>
                 <?php if(isset($alertBoxWidget['sound'])) { ?>
                     <div class="form-text">
-                        Déjà chargé: <a href="<?php echo $fileManager->getPictureUrl($alertBoxWidget['sound']); ?>" target="_blank"><?php echo htmlspecialchars($alertBoxWidget['sound']); ?></a>
+                        Déjà chargé: <a href="<?php echo $fileManager->getSoundUrl($alertBoxWidget['sound']); ?>" target="_blank"><?php echo htmlspecialchars($alertBoxWidget['sound']); ?></a>
                     </div>
                 <?php } ?>
                 <input type="file" class="form-control" id="sound" name="sound" />

diff --git a/app/FileManager.php b/app/FileManager.php
@@ -44,13 +44,14 @@ private function checkType($formdata, $ext, $mimes)
 
     private function isPicture($formdata)
     {
-        $ext = ["jpg", "jpeg", "png", "gif", "heic", "heif"];
+        $ext = ["gif", "heic", "heif", "jpg", "jpeg", "png", "webp"];
         $mimes = [
-            "image/jpeg",
-            "image/png",
             "image/gif",
             "image/heic",
-            "image/heif"
+            "image/heif",
+            "image/jpeg",
+            "image/png",
+            "image/webp"
         ];
         $this->checkType($formdata, $ext, $mimes);
     }

diff --git a/app/Repository.php b/app/Repository.php
@@ -126,7 +126,7 @@ function createCharityStreamDB($guid, $owner_email, $form_slug, $organization_sl
         ]);
 
         $query = 'INSERT INTO ' . $this->prefix . 'widget_donation_goal_bar (charity_stream_guid, goal, text_color, text_content, bar_color, background_color)
-                VALUES (:guid, 1000, "#FFFFFF", "", "#FF0000", "#000000")';
+                VALUES (:guid, 1000, "#2f2f5e", "", "#49d38a", "#4c3ccf")';
         $stmt = $this->db->prepare($query);
         $stmt->execute([
             ':guid' => hex2bin($guid)
@@ -145,6 +145,31 @@ function createCharityStreamDB($guid, $owner_email, $form_slug, $organization_sl
         return $password;
     }
 
+    public function deleteCharityStream($guid)
+    {
+        $stream = $this->getCharityStreamByGuidDB(hex2bin($guid));
+
+        $query = 'DELETE FROM ' . $this->prefix . 'users
+                WHERE email = ?';
+        $stmt = $this->db->prepare($query);
+        $stmt->execute([$stream['owner_email']]);
+
+        $query = 'DELETE FROM ' . $this->prefix . 'widget_donation_goal_bar
+                WHERE charity_stream_guid = ?';
+        $stmt = $this->db->prepare($query);
+        $stmt->execute([$stream['guid']]);
+
+        $query = 'DELETE FROM ' . $this->prefix . 'widget_alert_box
+                WHERE charity_stream_guid = ?';
+        $stmt = $this->db->prepare($query);
+        $stmt->execute([$stream['guid']]);
+
+        $query = 'DELETE FROM ' . $this->prefix . 'charity_stream
+                WHERE guid = ?';
+        $stmt = $this->db->prepare($query);
+        $stmt->execute([$stream['guid']]);
+    }
+
     function getUser($email)
     {
         $stmt = $this->db->prepare('SELECT * FROM ' . $this->prefix . 'users WHERE email = ?');
@@ -255,7 +280,11 @@ function getAccessTokensDB($organization_slug)
             ]);
         }
 
-        return $stmt->fetch();
+        if ($stmt->rowCount() > 0) {
+            return $stmt->fetch();
+        }
+
+        return null;
     }
 
 

diff --git a/css/main.css b/css/main.css
@@ -2,9 +2,6 @@
 .widget-donation-goal {
   margin: 10px;
   color: white;
-  -webkit-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
-  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
 }
 
 #title {
@@ -13,7 +10,6 @@
   font-weight: bold;
   font-family: Roboto, sans-serif;
   text-align: center;
-  text-shadow: 0px 0px 10px #000;
   margin: 0;
   width: 70%;
   z-index: 1;
@@ -25,6 +21,7 @@
   display: flex;
   position: relative;
   overflow: hidden;
+  border-radius: 20px;
 }
 
 #goal-current,
@@ -33,7 +30,6 @@
   font-family: Roboto, sans-serif;
   font-weight: bold;
   font-size: 28px;
-  text-shadow: 0px 0px 10px #000;
   width: 15%;
   z-index: 1;
 }
@@ -50,6 +46,7 @@
   top: 4px;
   left: 4px;
   overflow: hidden;
+  border-radius: 13px;
 }
 
 .fade {

diff --git a/css/main.min.css b/css/main.min.css
diff --git a/js/main.js b/js/main.js
@@ -1,4 +1,23 @@
+var alertQueue = [];
+var isAlertActive = false;
+
 function displayAlertBox(pseudo, message, amount) {
+    alertQueue.push({ pseudo, message, amount });
+
+    if (!isAlertActive) {
+        processAlertQueue();
+    }
+}
+
+function processAlertQueue() {
+    if (alertQueue.length === 0) {
+        isAlertActive = false;
+        return;
+    }
+
+    isAlertActive = true;
+    const alert = alertQueue.shift();
+    const { pseudo, message, amount } = alert;
     var container = document.querySelector('.widget-alert-box');
     var oldContent = container.innerHTML;
     container.innerHTML = '';
@@ -21,42 +40,44 @@ function displayAlertBox(pseudo, message, amount) {
     messageTemplate.classList.add('fade');
     container.appendChild(messageTemplate);
 
-    // Appliquer l'effet de fondu
-    setTimeout(function () {
-        img.classList.add('show');
-        messageTemplate.classList.add('show');
-    }, 100); // Délai pour déclencher la transition
+    img.classList.add('show');
+    messageTemplate.classList.add('show');
 
-    // Jouer le son
     var audio = new Audio(window.sound);
     audio.volume = window.sound_volume;
     audio.play();
 
-    // Retirer l'image et le message après 3 secondes avec un effet de fondu
     setTimeout(function () {
         img.classList.remove('show');
         messageTemplate.classList.remove('show');
         audio.pause();
         audio.currentTime = 0;
 
-        setTimeout(function () {
-            container.innerHTML = oldContent;
-        }, 1000); // Attendre que le fondu soit terminé avant de vider le conteneur
+        container.innerHTML = oldContent;
+        processAlertQueue();
     }, window.alert_duration);
 }
 
+const options = {
+    separator: ' ',
+    separator: ' ',
+    decimal: ',',
+    suffix: ' €',
+};
+var counter = new countUp.CountUp('goal-current', window.currentAmount, options);
+
 function updateDonationBar() {
     const currentAmountUnit = window.currentAmount / 100;
     const percentage = Math.min(100, (currentAmountUnit / window.goalAmount) * 100);
-    document.getElementById('goal-current').textContent = currentAmountUnit + ' €';
-    document.getElementById('total-bar').style.width = percentage + '%';
+    counter.update(currentAmountUnit);
+    document.getElementById('total-bar').style.width = 'calc(' + percentage + '% - 8px)';
 }
 
 function fetchDonation() {
     const request = new XMLHttpRequest()
-    request.open("GET", 'fetch_donations.php?charityStreamId=' + window.charityStreamId + 
-        (window.continuationToken ? ('&continuationToken=' + window.continuationToken) : '') + 
-        (window.currentAmount ? ('&currentAmount=' + window.currentAmount) : '') + 
+    request.open("GET", 'fetch_donations.php?charityStreamId=' + window.charityStreamId +
+        (window.continuationToken ? ('&continuationToken=' + window.continuationToken) : '') +
+        (window.currentAmount ? ('&currentAmount=' + window.currentAmount) : '') +
         (window.from ? ('&from=' + window.from) : ''), true)
     request.onload = () => {
         if (request.status === 200) {

diff --git a/js/main.min.js b/js/main.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "bootstrap": "^5.3.3",
+    "countup.js": "^2.8.0",
     "moment": "^2.30.1"
   }
 }
diff --git a/widget_donation_goal.php b/widget_donation_goal.php
@@ -75,6 +75,7 @@
         var continuationToken = '<?php echo $continuationToken; ?>';
     </script>
 
+    <script src="/node_modules/countup.js/dist/countUp.umd.js"></script>
     <script src="/js/main.min.js"></script>
 
     <script>