Revert "Merge pull request #29 from fabric-testbed/update/develop"

This reverts commit b19e90d, reversing changes made to c247349.
fabric-testbed · Sep 6, 2024 · 79c55b9 · 79c55b9
1 parent d2b6846
commit 79c55b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml
@@ -2,7 +2,7 @@ name: Build and Deploy
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "main" ]
 
 permissions:
   contents: write

diff --git a/src/404.html b/src/404.html
@@ -7,14 +7,10 @@
   <title>FABRIC KNIT Workshop 404</title>
 
   <script>
-    const path = location.pathname.substr(1);
-    if (path && path !== '') {
-      location.replace('/#/' + path);
-      window.alert("path", path, "pathname", location.pathname)
-    } else {
-      location.replace('/#/');
-    }
+    sessionStorage.redirect = location.href;
   </script>
+
+  <meta http-equiv="refresh" content="0;URL='/'"></meta>
 </head>
 
 <body>

diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,6 @@
 import { App } from './app'
 import { createRoot } from 'react-dom/client'
-import { HashRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router-dom'
 import { CssVarsProvider } from '@mui/joy/styles'
 import { theme } from './theme'
 
@@ -9,9 +9,9 @@ const root = createRoot(container)
 
 const ProvisionedApp = () => (
   <CssVarsProvider theme={ theme }>
-   <HashRouter>
+    <BrowserRouter>
       <App />
-    </HashRouter>
+    </BrowserRouter>
   </CssVarsProvider>
 )