Merge branch 'main' into beta

l0drex · Aug 9, 2022 · 879278a · 879278a
2 parents b27fbbe + 9411e3d
commit 879278a
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 109 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
 
   deploy:
     name: Deploy
-    if: (github.event_name == 'workflow_dispatch' && inputs.deploy) || github.event_name == 'release'
+    if: (github.event_name == 'workflow_dispatch' && inputs.Deploy) || github.event_name == 'release'
     runs-on: ubuntu-latest
     needs: build
     concurrency:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,12 +21,12 @@
   "repository": "https://github.com/l0drex/family-tree",
   "private": true,
   "dependencies": {
-    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.3.0",
-    "@testing-library/user-event": "^14.3.0",
+    "@testing-library/user-event": "^14.4.2",
     "@types/jest": "^28.1.6",
-    "@types/node": "^18.6.1",
-    "@types/react": "^18.0.15",
+    "@types/node": "^18.6.5",
+    "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "d3": "7.6.1",
     "gedcomx-js": "^2.8.0",

diff --git a/public/404.html b/public/404.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Redirect to single page website</title>
+  <script type="text/javascript">
+    // Single Page Apps for GitHub Pages
+    // MIT License
+    // https://github.com/rafgraph/spa-github-pages
+    // This script takes the current url and converts the path and query
+    // string into just a query string, and then redirects the browser
+    // to the new url with only a query string and hash fragment,
+    // e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
+    // https://www.foo.tld/?/one/two&a=b~and~c=d#qwe
+    // Note: this 404.html file must be at least 512 bytes for it to work
+    // with Internet Explorer (it is currently > 512 bytes)
+
+    // If you're creating a Project Pages site and NOT using a custom domain,
+    // then set pathSegmentsToKeep to 1 (enterprise users may need to set it to > 1).
+    // This way the code will only replace the route part of the path, and not
+    // the real directory in which the app resides, for example:
+    // https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
+    // https://username.github.io/repo-name/?/one/two&a=b~and~c=d#qwe
+    // Otherwise, leave pathSegmentsToKeep as 0.
+    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
+    );
+
+  </script>
+</head>
+<body>
+</body>
+</html>