From 97f3a78f9da832664a0ba50d0a982a5512bff172 Mon Sep 17 00:00:00 2001
From: dwebmm <mmaurakis@dweb.net>
Date: Tue, 21 Jan 2025 02:25:46 -0600
Subject: [PATCH] Reverted back to 4cd4110 before changes were made to
 monitoring. Trying new implementation for failed pulls.

Added modal for when content is blocked or fails to load
---
 index.html | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 styles.css | 36 ++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index b078342..7a1a514 100644
--- a/index.html
+++ b/index.html
@@ -191,6 +191,17 @@
       </div>
     </div>
 
+    <div id="blockedModal" class="modal blocked-modal">
+        <div class="modal-content">
+            <h2>⚠️ Content Blocked</h2>
+            <p>This content cannot be displayed due to security restrictions.</p>
+            <div class="blocked-modal-buttons">
+                <button id="blockedRetryBtn" class="blocked-retry-btn">Try Another Site</button>
+                <button id="blockedOpenBtn" class="blocked-open-btn">Open in New Tab</button>
+            </div>
+        </div>
+    </div>
+
     <main>
       <iframe
         id="contentFrame"
@@ -306,6 +317,7 @@
                 title.includes("cannot") ||
                 title.includes("denied")
             ) {
+<<<<<<< HEAD
                 fumble();
                 return;
             }
@@ -335,6 +347,47 @@
                     </div>
                 `;
                 document.body.appendChild(httpModal);
+=======
+              // Show blocked content modal
+              const blockedModal = document.getElementById('blockedModal');
+              const retryBtn = document.getElementById('blockedRetryBtn');
+              const openBtn = document.getElementById('blockedOpenBtn');
+              
+              blockedModal.classList.add('show');
+              
+              retryBtn.onclick = () => {
+                blockedModal.classList.remove('show');
+                fumble();
+              };
+              
+              openBtn.onclick = () => {
+                window.open(frame.src, '_blank');
+                blockedModal.classList.remove('show');
+                fumble();
+              };
+              return;
+            }
+          } catch (e) {
+            // Show blocked content modal for CORS errors too
+            const blockedModal = document.getElementById('blockedModal');
+            const retryBtn = document.getElementById('blockedRetryBtn');
+            const openBtn = document.getElementById('blockedOpenBtn');
+            
+            blockedModal.classList.add('show');
+            
+            retryBtn.onclick = () => {
+              blockedModal.classList.remove('show');
+              fumble();
+            };
+            
+            openBtn.onclick = () => {
+              window.open(frame.src, '_blank');
+              blockedModal.classList.remove('show');
+              fumble();
+            };
+            return;
+          }
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
 
                 // Handle button clicks
                 const openBtn = httpModal.querySelector('.http-open-btn');
@@ -358,7 +411,22 @@
 
         // Handle load errors
         frame.onerror = () => {
-          fumble(); // Try again if loading fails
+          const blockedModal = document.getElementById('blockedModal');
+          const retryBtn = document.getElementById('blockedRetryBtn');
+          const openBtn = document.getElementById('blockedOpenBtn');
+          
+          blockedModal.classList.add('show');
+          
+          retryBtn.onclick = () => {
+            blockedModal.classList.remove('show');
+            fumble();
+          };
+          
+          openBtn.onclick = () => {
+            window.open(frame.src, '_blank');
+            blockedModal.classList.remove('show');
+            fumble();
+          };
         };
       };
 
diff --git a/styles.css b/styles.css
index f7dee24..28e461a 100644
--- a/styles.css
+++ b/styles.css
@@ -911,17 +911,29 @@ main:hover .floating-button {
     text-decoration: underline;
 }
 
+<<<<<<< HEAD
 .http-modal .modal-content {
     max-width: 400px;
 }
 
 .http-modal-buttons {
+=======
+.blocked-modal .modal-content {
+    max-width: 400px;
+}
+
+.blocked-modal-buttons {
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     display: flex;
     gap: 10px;
     margin-top: 20px;
 }
 
+<<<<<<< HEAD
 .http-open-btn, .http-skip-btn {
+=======
+.blocked-retry-btn, .blocked-open-btn {
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     flex: 1;
     padding: 12px;
     border: none;
@@ -932,11 +944,16 @@ main:hover .floating-button {
     transition: background-color 0.3s ease;
 }
 
+<<<<<<< HEAD
 .http-open-btn {
+=======
+.blocked-retry-btn {
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #ff4500;
     color: white;
 }
 
+<<<<<<< HEAD
 .dark-mode .http-open-btn {
     background-color: #ff6b4a;
 }
@@ -946,15 +963,34 @@ main:hover .floating-button {
 }
 
 .http-skip-btn {
+=======
+.dark-mode .blocked-retry-btn {
+    background-color: #ff6b4a;
+}
+
+.blocked-retry-btn:hover {
+    background-color: #ff5722;
+}
+
+.blocked-open-btn {
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #f0f0f0;
     color: #333;
 }
 
+<<<<<<< HEAD
 .dark-mode .http-skip-btn {
+=======
+.dark-mode .blocked-open-btn {
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #2a2a2a;
     color: #fff;
 }
 
+<<<<<<< HEAD
 .http-skip-btn:hover {
+=======
+.blocked-open-btn:hover {
+>>>>>>> 495bda9 (Reverted back to 4cd4110 before changes were made to monitoring. Trying)
     background-color: #e0e0e0;
 } 
\ No newline at end of file