encapsulate banner in function

qbreader · Jan 6, 2024 · 3980aaf · 3980aaf
1 parent ac5ca27
commit 3980aaf
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 30 deletions.
diff --git a/client/database/index.html b/client/database/index.html
@@ -90,7 +90,7 @@
         <div class="toast-container position-fixed top-0 end-0 p-3">
             <div id="funny-toast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
                 <div class="toast-header" style="background-color: yellow;">
-                    <h1 class="me-auto text-danger">DO YOUR GRAD SCHOOL APPS</h1>
+                    <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                     <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
                 </div>
             </div>

diff --git a/client/database/index.js b/client/database/index.js
@@ -783,10 +783,6 @@ function QueryForm() {
       });
       setDifficulties(tempDifficulties);
     });
-    const toast = new bootstrap.Toast(document.getElementById('funny-toast'));
-    if ((await getAccountUsername()) === 'forrestw') {
-      toast.show();
-    }
   }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CategoryModal, null), /*#__PURE__*/React.createElement("form", {
     className: "mt-3",

diff --git a/client/database/index.jsx b/client/database/index.jsx
@@ -858,11 +858,6 @@ function QueryForm() {
             });
             setDifficulties(tempDifficulties);
         });
-
-        const toast = new bootstrap.Toast(document.getElementById('funny-toast'));
-        if (await getAccountUsername() === 'forrestw') {
-            toast.show();
-        }
     }, []);
 
     return (

diff --git a/client/multiplayer/room.html b/client/multiplayer/room.html
@@ -86,7 +86,7 @@
         <div class="toast-container position-fixed top-0 end-0 p-3">
             <div id="funny-toast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
                 <div class="toast-header" style="background-color: yellow;">
-                    <h1 class="me-auto text-danger">DO YOUR GRAD SCHOOL APPS</h1>
+                    <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                     <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
                 </div>
             </div>

diff --git a/client/multiplayer/room.js b/client/multiplayer/room.js
@@ -1088,10 +1088,3 @@ document.addEventListener('keypress', function (event) {
 });
 
 document.getElementById('username').value = username;
-
-window.onload = async () => {
-    const toast = new bootstrap.Toast(document.getElementById('funny-toast'));
-    if (await getAccountUsername() === 'forrestw') {
-        toast.show();
-    }
-};
diff --git a/client/singleplayer/bonuses.html b/client/singleplayer/bonuses.html
@@ -81,7 +81,7 @@
         <div class="toast-container position-fixed top-0 end-0 p-3">
             <div id="funny-toast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
                 <div class="toast-header" style="background-color: yellow;">
-                    <h1 class="me-auto text-danger">DO YOUR GRAD SCHOOL APPS</h1>
+                    <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                     <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
                 </div>
             </div>

diff --git a/client/singleplayer/bonuses.js b/client/singleplayer/bonuses.js
@@ -711,9 +711,4 @@ window.onload = async () => {
     document.getElementById('year-range-b').textContent = query.maxYear;
 
     loadCategoryModal(query.categories, query.subcategories, query.alternateSubcategories);
-
-    const toast = new bootstrap.Toast(document.getElementById('funny-toast'));
-    if (await getAccountUsername() === 'forrestw') {
-        toast.show();
-    }
 };
diff --git a/client/singleplayer/tossups.html b/client/singleplayer/tossups.html
@@ -81,7 +81,7 @@
         <div class="toast-container position-fixed top-0 end-0 p-3">
             <div id="funny-toast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
                 <div class="toast-header" style="background-color: yellow;">
-                    <h1 class="me-auto text-danger">DO YOUR GRAD SCHOOL APPS</h1>
+                    <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                     <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
                 </div>
             </div>

diff --git a/client/singleplayer/tossups.js b/client/singleplayer/tossups.js
@@ -869,9 +869,4 @@ window.onload = async () => {
     document.getElementById('year-range-b').textContent = query.maxYear;
 
     loadCategoryModal(query.categories, query.subcategories, query.alternateSubcategories);
-
-    const toast = new bootstrap.Toast(document.getElementById('funny-toast'));
-    if (await getAccountUsername() === 'forrestw') {
-        toast.show();
-    }
 };
diff --git a/client/utilities.js b/client/utilities.js
@@ -448,3 +448,18 @@ function updateAlternateSubcategory(subcategory, validAlternateSubcategories) {
 document.getElementById('report-question-submit').addEventListener('click', function () {
     reportQuestion();
 });
+
+
+const banners = {
+    'forrestw': 'DO YOUR GRAD SCHOOL APPS',
+};
+
+getAccountUsername().then(username => {
+    const toast = new bootstrap.Toast(document.getElementById('funny-toast'));
+    const toastText = document.getElementById('funny-toast-text');
+
+    if (username in banners) {
+        toastText.textContent = banners[username];
+        toast.show();
+    }
+});