Updated error for now.gg apps (#588 #577 #552 #582) + Formatted

UseInterstellar · Apr 10, 2024 · 4195dae · 4195dae · crointer · Apr 18, 2024
1 parent e38a358
commit 4195dae
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 40 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -32,6 +32,5 @@ If applicable, add screenshots to help explain your problem.
 **Additional context**
 Add any other context about the problem here.
 
-
 > [!IMPORTANT]
->  Do not post your personal information here this includes but is not limited to email addresses, names, and age.
+> Do not post your personal information here this includes but is not limited to email addresses, names, and age.
diff --git a/README.md b/README.md
@@ -27,16 +27,19 @@
 
 > [!IMPORTANT]
 > You **cannot** deploy to static web hosts, including Netlify, Cloudflare Pages, and GitHub Pages.
+
 ### Server Deployment
 
 You must run these commands on your server:  
 `git clone https://github.com/InterstellarNetwork/interstellar`  
 `cd interstellar`  
 `npm install`  
-`npm start`  
+`npm start`
+
 ### Updating
+
 `cd interstellar`  
-``git pull --force --allow-unrelated-histories``
+`git pull --force --allow-unrelated-histories`
 
 <a target="_blank" href="https://heroku.com/deploy/?template=https://github.com/interstellarnetwork/interstellar"><img alt="Deploy to Heroku" src="https://binbashbanana.github.io/deploy-buttons/buttons/remade/heroku.svg"></a>
 <a target="_blank" href="https://app.koyeb.com/deploy?type=git&repository=github.com/interstellarnetwork/interstellar"><img alt="Deploy to Koyeb" src="https://binbashbanana.github.io/deploy-buttons/buttons/remade/koyeb.svg"></a>

diff --git a/static/apps.html b/static/apps.html
@@ -15,7 +15,7 @@
     <script src="/assets/scripts/main.js?v=22"></script>
     <script src="/assets/scripts/index.js?v=12"></script>
     <script src="https://kit.fontawesome.com/1237c86ba0.js" crossorigin="anonymous"></script>
-    <script src="assets/scripts/a.js?v=28"></script>
+    <script src="assets/scripts/a.js?v=30"></script>
   </head>
   <body>
     <div class="fixed-nav-bar">
@@ -26,7 +26,9 @@
         <a class="navbar-link" href="/./g"><i class="fa-solid fa-gamepad navbar-icon"></i><xn>Ga</xn><xn>mes</xn></a>
         <a class="navbar-link" href="/./ap"><i class="fa-solid fa-phone navbar-icon"></i><xn>Ap</xn><xn>ps</xn></a>
         <a class="navbar-link" href="/./t"><i class="fa-solid fa-laptop navbar-icon"></i><xn>Ta</xn><xn>bs</xn></a>
-        <a class="navbar-link" href="/./s"><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a>
+        <a class="navbar-link" href="/./s"
+          ><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a
+        >
       </div>
     </div>
     <div class="input-container">

diff --git a/static/assets/json/a.json b/static/assets/json/a.json
@@ -222,8 +222,8 @@
     "link": "https://youtube.com",
     "image": "/assets/media/icons/youtube.webp",
     "categories": ["all", "social", "stream", "media"],
-    "error": true, 
-    "say": "YouTube is currently not working."    
+    "error": true,
+    "say": "YouTube is currently not working."
   },
   {
     "name": "Invidous (YouTube)",

diff --git a/static/assets/scripts/a.js b/static/assets/scripts/a.js
@@ -164,14 +164,18 @@ document.addEventListener('DOMContentLoaded', () => {
 
       appsList.forEach((app) => {
         if (app.categories && app.categories.includes('local')) {
-            app.local = true;
-        } else if (app.link && app.link.includes("now.gg")) {
-            if (app.error === null || app.error === undefined) {
-                app.error = true; 
-                app.say = "Now.gg is currently not working";
-            }
+          app.local = true
+        } else if (app.link && (app.link.includes('now.gg') || app.link.includes('nowgg.me'))) {
+          if (app.partial === null || app.partial === undefined) {
+            app.partial = true
+            app.say = 'Now.gg is currently not working for some users.'
+          }
+        } else if (app.link && app.link.includes('nowgg.nl')) {
+          if (app.error === null || app.error === undefined) {
+            app.error = true
+            app.say = 'NowGG.nl is currently down.'
+          }
         }
-
 
         let pinNum = appInd
 
@@ -214,6 +218,8 @@ document.addEventListener('DOMContentLoaded', () => {
 
         if (app.error) {
           paragraph.style.color = 'red'
+        } else if (app.partial) {
+          paragraph.style.color = 'yellow'
         }
 
         link.appendChild(image)

diff --git a/static/assets/scripts/frame.js b/static/assets/scripts/frame.js
@@ -1,9 +1,9 @@
 const iframe = document.getElementById('ifra')
 
-if (navigator.userAgent.includes("Chrome")) {
-  window.addEventListener('resize', function() {
-      navigator.keyboard.lock(['Escape']);
-  });
+if (navigator.userAgent.includes('Chrome')) {
+  window.addEventListener('resize', function () {
+    navigator.keyboard.lock(['Escape'])
+  })
 }
 
 // Iframe

diff --git a/static/assets/scripts/g.js b/static/assets/scripts/g.js
@@ -163,14 +163,19 @@ document.addEventListener('DOMContentLoaded', () => {
       appInd = 0
       appsList.forEach((app) => {
         if (app.categories && app.categories.includes('local')) {
-            app.local = true;
-        } else if (app.link && app.link.includes("now.gg")) {
-            if (app.error === null || app.error === undefined) {
-                app.error = true; 
-                app.say = "Now.gg is currently not working";
-            }
+          app.local = true
+        } else if (app.link && (app.link.includes('now.gg') || app.link.includes('nowgg.me'))) {
+          if (app.partial === null || app.partial === undefined) {
+            app.partial = true
+            app.say = 'Now.gg is currently not working for some users.'
+          }
+        } else if (app.link && app.link.includes('nowgg.nl')) {
+          if (app.error === null || app.error === undefined) {
+            app.error = true
+            app.say = 'NowGG.nl is currently down.'
+          }
         }
-        
+
         let pinNum = appInd
 
         const columnDiv = document.createElement('div')
@@ -212,6 +217,8 @@ document.addEventListener('DOMContentLoaded', () => {
 
         if (app.error) {
           paragraph.style.color = 'red'
+        } else if (app.partial) {
+          paragraph.style.color = 'yellow'
         }
 
         link.appendChild(image)

diff --git a/static/assets/scripts/main.js b/static/assets/scripts/main.js
@@ -1,19 +1,19 @@
 document.addEventListener('DOMContentLoaded', function () {
   // Ads
   if (localStorage.getItem('ad') === null || localStorage.getItem('ad') === 'default') {
-    localStorage.setItem('ad', 'on');
+    localStorage.setItem('ad', 'on')
   }
-  
-  var advDiv = document.getElementById('adv');
+
+  var advDiv = document.getElementById('adv')
   if (advDiv && localStorage.getItem('ad') === 'default') {
-    var script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.src = '//oysterscoldtiny.com/1c/c3/8a/1cc38a6899fdf8ba4dfe779bcc54627b.js';
-    advDiv.appendChild(script);
-    console.log('Script inserted inside the adv div.');
+    var script = document.createElement('script')
+    script.type = 'text/javascript'
+    script.src = '//oysterscoldtiny.com/1c/c3/8a/1cc38a6899fdf8ba4dfe779bcc54627b.js'
+    advDiv.appendChild(script)
+    console.log('Script inserted inside the adv div.')
   } else if (advDiv && localStorage.getItem('ad') === 'off') {
-    advDiv.remove();
-    console.log('The adv div has been removed.');
+    advDiv.remove()
+    console.log('The adv div has been removed.')
   }
 })
 

diff --git a/static/games.html b/static/games.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="/assets/styles/main.css?v=8" />
     <link rel="stylesheet" href="/assets/styles/themes/default.css?v=5" />
     <script src="/assets/scripts/index.js?v=12"></script>
-    <script src="/assets/scripts/g.js?v=60"></script>
+    <script src="/assets/scripts/g.js?v=62"></script>
   </head>
   <body>
     <div class="fixed-nav-bar">
@@ -22,7 +22,9 @@
         <a class="navbar-link" href="/./g"><i class="fa-solid fa-gamepad navbar-icon"></i><xn>Ga</xn><xn>mes</xn></a>
         <a class="navbar-link" href="/./ap"><i class="fa-solid fa-phone navbar-icon"></i><xn>Ap</xn><xn>ps</xn></a>
         <a class="navbar-link" href="/./t"><i class="fa-solid fa-laptop navbar-icon"></i><xn>Ta</xn><xn>bs</xn></a>
-        <a class="navbar-link" href="/./s"><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a>
+        <a class="navbar-link" href="/./s"
+          ><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a
+        >
       </div>
     </div>
     <div class="input-container">

diff --git a/static/index.html b/static/index.html
@@ -19,7 +19,9 @@
         <a class="navbar-link" href="/./g"><i class="fa-solid fa-gamepad navbar-icon"></i><xn>Ga</xn><xn>mes</xn></a>
         <a class="navbar-link" href="/./ap"><i class="fa-solid fa-phone navbar-icon"></i><xn>Ap</xn><xn>ps</xn></a>
         <a class="navbar-link" href="/./t"><i class="fa-solid fa-laptop navbar-icon"></i><xn>Ta</xn><xn>bs</xn></a>
-        <a class="navbar-link" href="/./s"><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a>
+        <a class="navbar-link" href="/./s"
+          ><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a
+        >
       </div>
     </div>
     <div id="particles-js">

diff --git a/static/settings.html b/static/settings.html
@@ -22,7 +22,9 @@
         <a class="navbar-link" href="/./g"><i class="fa-solid fa-gamepad navbar-icon"></i><xn>Ga</xn><xn>mes</xn></a>
         <a class="navbar-link" href="/./ap"><i class="fa-solid fa-phone navbar-icon"></i><xn>Ap</xn><xn>ps</xn></a>
         <a class="navbar-link" href="/./t"><i class="fa-solid fa-laptop navbar-icon"></i><xn>Ta</xn><xn>bs</xn></a>
-        <a class="navbar-link" href="/./s"><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a>
+        <a class="navbar-link" href="/./s"
+          ><i class="fa-solid fa-gear navbar-icon settings-icon"></i><xn>Set</xn><xn>tings</xn></a
+        >
       </div>
     </div>
     <div class="main">