Merge remote-tracking branch 'origin/new_demo_app_fixes' into demo_app_v2

Dave3130 · Dave3130 · commit 202bfc2ee598 · 2025-12-02T20:36:47.000+05:30
diff --git a/public/404.html b/public/404.html
@@ -3,22 +3,24 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Redirecting...</title>
+    <title>Loading...</title>
     <script>
-      // Single Page Application redirect for GitHub Pages
-      // This redirects all routes to index.html so React Router can handle them
-      const pathSegmentsToKeep = 1;
-      const l = window.location;
-      l.replace(
-        l.protocol + '//' + l.hostname + (l.port ? ':' + l.port : '') +
-        l.pathname.split('/').slice(0, 1 + pathSegmentsToKeep).join('/') +
-        '/?/' + l.pathname.slice(1).split('/').slice(pathSegmentsToKeep).join('/').replace(/&/g, '~and~') +
-        (l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '') +
-        l.hash
-      );
+      // Surge serves 404.html for unknown routes unless a 200 fallback is provided.
+      // Instead of mutating the URL (which produced /?/… redirects), load the main
+      // SPA shell in-place so React Router can hydrate the correct route.
+      fetch('/index.html', { credentials: 'same-origin' })
+        .then((response) => response.text())
+        .then((html) => {
+          document.open();
+          document.write(html);
+          document.close();
+        })
+        .catch(() => {
+          window.location.replace('/');
+        });
     </script>
   </head>
   <body>
-    <p>Redirecting to the app...</p>
+    <p>Loading the application…</p>
   </body>
 </html>
