VyperGroup · dave9123 · Dec 15, 2023 · Dec 15, 2023 · Dec 16, 2023 · Dec 20, 2023
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Astroid is a proxy that supports now.gg. It uses Ultraviolet, a highly sophistic
 [![Deploy to Render](https://binbashbanana.github.io/deploy-buttons/buttons/remade/render.svg)](https://render.com/deploy?repo=https://github.com/VyperGroup/astroidv3)
 [![Deploy to Cyclic](https://binbashbanana.github.io/deploy-buttons/buttons/remade/cyclic.svg)](https://app.cyclic.sh/api/app/deploy/VyperGroup/astroidv3)
 [![Deploy to Amplify Console](https://binbashbanana.github.io/deploy-buttons/buttons/remade/amplifyconsole.svg)](https://console.aws.amazon.com/amplify/home#/deploy?repo=https://github.com/VyperGroup/astroidv3)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FVyperGroup%2Fastroidv3)
 
 
 You can also make an A name record pointing to the IPv4 address of 5.161.68.227 or a CNAME record pointing to astroid.wtf. For a free DNS service, use [Freedns](https://freedns.afraid.org/).
@@ -36,4 +37,4 @@ You can close it at any time by pressing <kbd>ctrl</kbd> + <kbd>c</kbd>
 
 Join the discord server!
 
-[![Join us on Discord](https://invidget.switchblade.xyz/nowgg?theme=dark)](https://discord.gg/nowgg)
+[![Join us on Discord](https://invidget.switchblade.xyz/nowgg?theme=dark)](https://discord.gg/nowgg)
diff --git a/static/.DS_Store b/static/.DS_Store
diff --git a/static/images/.DS_Store b/static/images/.DS_Store
diff --git a/static/index.html b/static/index.html
@@ -8,6 +8,7 @@
         <meta name="description" content="Math explained in easy language, plus puzzles, games, worksheets and an illustrated dictionary. For K-12 kids, teachers and parents.">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="fractions.css">
+        <script async src="https://arc.io/widget.min.js#i2pjQQrd"></script>
     </head>
         <iframe src="main.html"></iframe>
     </body>

diff --git a/static/links/.DS_Store b/static/links/.DS_Store
diff --git a/static/links/login/.DS_Store b/static/links/login/.DS_Store
diff --git a/static/links/login/dist/.DS_Store b/static/links/login/dist/.DS_Store
diff --git a/static/links/login/dist/css/.DS_Store b/static/links/login/dist/css/.DS_Store
diff --git a/static/links/login/dist/img/.DS_Store b/static/links/login/dist/img/.DS_Store
diff --git a/static/links/login/dist/js/.DS_Store b/static/links/login/dist/js/.DS_Store
diff --git a/static/service/data/v.json b/static/service/data/v.json
diff --git a/static/sw.js b/static/sw.js
@@ -1,4 +1,3 @@
-importScripts('https://arc.io/arc-sw-core.js')
 importScripts('/worksheets/uv/uv.bundle.js');
 importScripts('/worksheets/uv/uv.config.js');
 importScripts('/worksheets/uv/uv.sw.js');

diff --git a/static/worksheets/.DS_Store b/static/worksheets/.DS_Store
diff --git a/static/worksheets/404.html b/static/worksheets/404.html
@@ -1,4 +1,4 @@
-<<!DOCTYPE html>
+<!DOCTYPE html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
 <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
@@ -15,6 +15,5 @@
     <body>
         404 fr
         <script src="" async defer></script>
-        <script src="https://cdn.counter.dev/script.js" data-id="6b17de00-dd04-4596-bf57-162019cc4096" data-utcoffset="7"></script>
     </body>
 </html>
diff --git a/static/worksheets/64.html b/static/worksheets/64.html
@@ -5,28 +5,27 @@
   <script src="uv/uv.config.js"></script>
   <script>
     function work(value) {
-      window.navigator.serviceWorker.register("/sw.js", {
-        scope: __uv$config.prefix
-      }).then(() => {
-        console.log("Service worker registration successful");
-        let url = value.trim();
-        if (!(url.startsWith("https://") || url.startsWith("http://"))) {
-          url = "https://" + url;
-        }
-        if (url.endsWith(".swf")) {
-          sessionStorage.setItem("uvURL", __uv$config.encodeUrl(url));
-          location.href = "go.html";
-          console.log("Redirection to English Test successful");
-        } else {
-          sessionStorage.setItem("uvURL", __uv$config.encodeUrl(url));
+      let url = value.trim();
+
+      if (url.startsWith("https://")) {
+        window.navigator.serviceWorker.register("/sw.js", {
+          scope: __uv$config.prefix
+        }).then(() => {
+          console.log("Service worker registration successful");
+          sessionStorage.setItem("assignmentURL", __uv$config.encodeUrl(url));
           location.href = "loader.html";
-          console.log("Redirection to Worksheet successful");
-        }
-      }).catch((error) => {
-        console.error("Service worker registration failed:", error);
-      });
+          console.log("Redirection to Loader successful");
+        }).catch((error) => {
+          console.error("Service worker registration failed:", error);
+        });
+      } else if (url.startsWith("/")) {
+        sessionStorage.setItem("assignmentURL", url);
+        console.log(url);
+        location.href = "loader.html";
+        console.log("Redirection to Assessment successful");
+      }
     }
-  </script>
+    </script>
   <script src="main.js"></script>
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE edge">
@@ -64,6 +63,7 @@
         <input type="checkbox" id="input-navbar" style="display: none;">
         <div class="navbar__items">
           <a href="index.html" class="navbar__item">Home</a>
+          <a href="nowgg.html" class="navbar__item">Now.gg</a>
           <a href="html.html" class="navbar__item">HTML / Flash</a>
           <a href="emuindex.html" class="navbar__item">Emulators</a>
           <a href="apps.html" class="navbar__item">Apps</a>
@@ -96,7 +96,7 @@ <h2 class="heading">Practice Tests - N64</h2>
                     button.onclick = () => {
                       if (worksheet.type === 'html') {
                         const source = worksheet.source.replace('https://', '');
-                        work(`https://${source}`);
+                        work(`${source}`);
                       } else {
                         console.error(`Unsupported worksheet type "${worksheet.type}" for worksheet "${worksheet.title}"`);
                       }
@@ -129,6 +129,5 @@ <h2 class="heading">Practice Tests - N64</h2>
       </div>
     </div>
   </footer>
-  <script src="https://cdn.counter.dev/script.js" data-id="6b17de00-dd04-4596-bf57-162019cc4096" data-utcoffset="7"></script>
 </body>
 </html>
diff --git a/static/worksheets/abc.html b/static/worksheets/abc.html
@@ -29,6 +29,5 @@
         win.document.body.appendChild(iframe);
       };
     </script>
-    <script src="https://cdn.counter.dev/script.js" data-id="6b17de00-dd04-4596-bf57-162019cc4096" data-utcoffset="7"></script>
   </body>
 </html>
diff --git a/static/worksheets/api/abcc.js b/static/worksheets/api/abcc.js
@@ -2,25 +2,23 @@ window.addEventListener('load', function () {
     const startScriptOnLoad = localStorage.getItem('startScriptOnLoad');
 
     if (startScriptOnLoad === 'true') {
-        startScript();
-    }
-});
+        var directPreviousPage = localStorage.getItem('directPreviousPage') || 'https://www.google.com/';
+        var currentURL = window.location.href;
+        var baseURL = currentURL.substring(0, currentURL.lastIndexOf("/") + 1);
+        var indexURL = baseURL + "main.html";
 
-function startScript() {
-    var currentURL = window.location.href;
-    var baseURL = currentURL.substring(0, currentURL.lastIndexOf("/") + 1);
-    var indexURL = baseURL + "main.html";
-
-    win = window.open();
-    win.document.body.style.margin = "0";
-    win.document.body.style.height = "100vh";
-    var iframe = win.document.createElement("iframe");
-    iframe.style.border = "none";
-    iframe.style.width = "100%";
-    iframe.style.height = "100%";
-    iframe.style.margin = "0";
-    iframe.referrerpolicy = "no-referrer";
-    iframe.allow = "fullscreen";
-    iframe.src = indexURL; 
-    win.document.body.appendChild(iframe);
-}
+        win = window.open();
+        win.document.body.style.margin = "0";
+        win.document.body.style.height = "100vh";
+        var iframe = win.document.createElement("iframe");
+        iframe.style.border = "none";
+        iframe.style.width = "100%";
+        iframe.style.height = "100%";
+        iframe.style.margin = "0";
+        iframe.referrerpolicy = "no-referrer";
+        iframe.allow = "fullscreen";
+        iframe.src = indexURL;
+        win.document.body.appendChild(iframe);
+        this.window.location.replace(directPreviousPage);
+    }
+});
diff --git a/static/worksheets/api/abct.js b/static/worksheets/api/abct.js
@@ -1,4 +1,5 @@
 const ABCCheckbox = document.getElementById('ABC');
+const ABCDirect = document.getElementById('ABCDirect');
 
 function handleCheckboxChange() {
     const startScriptOnLoad = ABCCheckbox.checked;
@@ -12,14 +13,26 @@ function handleCheckboxChange() {
     }
 }
 
+function handleTextChange() {
+    localStorage.setItem('directPreviousPage', ABCDirect.value);
+    console.log('ABC will direct to ' + ABCDirect.value + ' on page load.');
+}
+
+ABCDirect.addEventListener('change', handleTextChange);
 ABCCheckbox.addEventListener('change', handleCheckboxChange);
 
 window.addEventListener('load', () => {
     const startScriptOnLoad = localStorage.getItem('startScriptOnLoad');
+    const directPreviousPage = localStorage.getItem('directPreviousPage');
 
     if (startScriptOnLoad === 'true') {
         ABCCheckbox.checked = true;
     } else {
         ABCCheckbox.checked = false;
     }
+    if (directPreviousPage == null) {
+        ABCDirect.value = 'https://google.com/';
+    } else {
+        ABCDirect.value = directPreviousPage;
+    }
 });