a

hu8813 · Apr 2, 2024 · cd5bd32 · cd5bd32
1 parent 9f5497b
commit cd5bd32
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/frontend/router.js b/frontend/router.js
@@ -109,9 +109,12 @@ initialize();
 
 
 
-
 const handleLocation = async () => {
-  const path = window.location.hash || '#'; 
+  let path = window.location.hash || '#'; 
+  const questionMarkIndex = path.indexOf('?');
+  if (questionMarkIndex !== -1) {
+    path = path.slice(0, questionMarkIndex);
+  }
   const route = routes[path] || routes[404];
   const html = await fetch(route).then((data) => data.text());
   document.getElementById("app").innerHTML = html;

diff --git a/frontend/views/return.html b/frontend/views/return.html
@@ -7,6 +7,18 @@
 </head>
 <body>
 <script>
+  const currentURL = window.location.href;
+let backendURL = "";
+const privateIPRegex = /^(10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[0-1])\.)/;
+if (currentURL.includes("localhost") || currentURL.includes("127.0.0.1")) {
+    backendURL = "http://localhost:8000";
+} else if (privateIPRegex.test(currentURL)) {
+    backendURL = "http://localhost:8000"; 
+} else {
+    backendURL = "https://pong42.azurewebsites.net"; 
+}
+
+
 document.addEventListener("DOMContentLoaded", async function() {
   const locationSearch = window.location.search;
   const params = new URLSearchParams(locationSearch);
@@ -28,12 +40,11 @@
       localStorage.setItem("userScore", userData.score);
       localStorage.setItem("userEmail", userData.email);
 
-
+      window.location.href = "/"; 
     } catch (error) {
       console.error("Error fetching user info:", error);
 
     }
-    window.location.href = "/"; 
   }
 });
 </script>