From 6ff19832982e8404e13cd3f5272d6e81d2b92540 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Thu, 30 May 2024 01:07:52 -0500
Subject: [PATCH 001/151] Basic passing test

---
 .yarnrc.yml      |   9 +
 package.json     |   7 +-
 src/base.test.ts |   6 +
 yarn.lock        | 418 ++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 415 insertions(+), 25 deletions(-)
 create mode 100644 src/base.test.ts

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 9660dd12..182b17c3 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -7,3 +7,12 @@ pnpFallbackMode: all
 pnpMode: loose
 
 yarnPath: .yarn/releases/yarn-4.2.2.cjs
+
+packageExtensions:
+  debug@*:
+    dependencies:
+      supports-color: "*"
+
+  vite@*:
+    dependencies:
+      supports-color: "*"
diff --git a/package.json b/package.json
index c841443c..8e97bec0 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "format": "prettier --write src packages",
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
     "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
-    "start": "yarn run build && yarn run server"
+    "start": "yarn run build && yarn run server",
+    "test": "vitest"
   },
   "workspaces": [
     "deps/web-components/packages/*",
@@ -35,6 +36,7 @@
     "@macrostrat/revision-info-webpack": "^1.0.0",
     "@macrostrat/storybook": "workspace:*",
     "@mdx-js/rollup": "^2.3.0",
+    "@types/esprima": "^4",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
     "@yarnpkg/sdks": "^3.1.0",
@@ -42,7 +44,7 @@
     "sass": "^1.49.0",
     "stylus": "^0.55.0",
     "typescript": "^5.1.6",
-    "vite-plugin-rewrite-all": "^1.0.1"
+    "vitest": "^1.6.0"
   },
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
@@ -107,6 +109,7 @@
     "d3-selection": "^1.0.0",
     "d3-shape": "^3.2.0",
     "esbuild": "^0.20.0",
+    "esprima": "^4.0.1",
     "express": "^4.18.2",
     "hex-to-css-filter": "^5.4.0",
     "history": "^5.3.0",
diff --git a/src/base.test.ts b/src/base.test.ts
new file mode 100644
index 00000000..6c3d0cf1
--- /dev/null
+++ b/src/base.test.ts
@@ -0,0 +1,6 @@
+/** Basic tests with Vitest */
+import { test, expect } from "vitest";
+
+test("should pass", () => {
+  expect(true).toBe(true);
+});
diff --git a/yarn.lock b/yarn.lock
index 4caafcec..5a14795d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5465,6 +5465,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
+  dependencies:
+    "@sinclair/typebox": "npm:^0.27.8"
+  checksum: 10/910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
+  languageName: node
+  linkType: hard
+
 "@jest/source-map@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/source-map@npm:27.5.1"
@@ -6528,6 +6537,7 @@ __metadata:
     "@turf/buffer": "npm:^6.5.0"
     "@turf/centroid": "npm:^6.5.0"
     "@types/compression": "npm:^1.7.2"
+    "@types/esprima": "npm:^4"
     "@types/express": "npm:^4.17.17"
     "@types/geojson": "npm:^7946.0.10"
     "@types/node": "npm:^20.4.10"
@@ -6554,6 +6564,7 @@ __metadata:
     d3-selection: "npm:^1.0.0"
     d3-shape: "npm:^3.2.0"
     esbuild: "npm:^0.20.0"
+    esprima: "npm:^4.0.1"
     express: "npm:^4.18.2"
     hex-to-css-filter: "npm:^5.4.0"
     history: "npm:^5.3.0"
@@ -6587,7 +6598,7 @@ __metadata:
     vike-react: "npm:^0.4.2"
     vite: "npm:^5.0.12"
     vite-plugin-cesium: "npm:^1.2.22"
-    vite-plugin-rewrite-all: "npm:^1.0.1"
+    vitest: "npm:^1.6.0"
     zustand: "npm:^4.5.1"
   languageName: unknown
   linkType: soft
@@ -8912,6 +8923,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 10/297f95ff77c82c54de8c9907f186076e715ff2621c5222ba50b8d40a170661c0c5242c763cba2a4791f0f91cb1d8ffa53ea1d7294570cf8cd4694c0e383e484d
+  languageName: node
+  linkType: hard
+
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -10932,6 +10950,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/esprima@npm:^4":
+  version: 4.0.6
+  resolution: "@types/esprima@npm:4.0.6"
+  dependencies:
+    "@types/estree": "npm:*"
+  checksum: 10/36c5ca24a6506eb5742e8c66c0372918a859535022a5605f1e898b66e4941b91384f43c6aeb5c8ca1ed984af469dfabd22e784e833175bb1ab25af40787466ba
+  languageName: node
+  linkType: hard
+
 "@types/estree-jsx@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/estree-jsx@npm:1.0.0"
@@ -12028,6 +12055,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/expect@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/expect@npm:1.6.0"
+  dependencies:
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
+    chai: "npm:^4.3.10"
+  checksum: 10/e82304a12e22b98c1ccea81e8f33c838561deb878588eac463164cc4f8fc0c401ace3a9e6758d9e3a6bcc01313e845e8478aaefb7548eaded04b8de12c1928f6
+  languageName: node
+  linkType: hard
+
+"@vitest/runner@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/runner@npm:1.6.0"
+  dependencies:
+    "@vitest/utils": "npm:1.6.0"
+    p-limit: "npm:^5.0.0"
+    pathe: "npm:^1.1.1"
+  checksum: 10/d83a608be36dace77f91a9d15ab7753f9c5923281188a8d9cb5ccec770df9cc9ba80e5e1e3465328c7605977be0f0708610855abf5f4af037a4ede5f51a83e47
+  languageName: node
+  linkType: hard
+
+"@vitest/snapshot@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/snapshot@npm:1.6.0"
+  dependencies:
+    magic-string: "npm:^0.30.5"
+    pathe: "npm:^1.1.1"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/0bfc26a48b45814604ff0f7276d73a047b79f3618e0b620ff54ea2de548e9603a9770963ba6ebb19f7ea1ed51001cbca58d74aa0271651d4f8e88c6233885eba
+  languageName: node
+  linkType: hard
+
+"@vitest/spy@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/spy@npm:1.6.0"
+  dependencies:
+    tinyspy: "npm:^2.2.0"
+  checksum: 10/1c9698272a58aa47708bb8a1672d655fcec3285b02067cc3f70bfe76f4eda7a756eb379f8c945ccbe61677f5189aeb5ba93c2737a9d7db2de8c4e7bbdffcd372
+  languageName: node
+  linkType: hard
+
+"@vitest/utils@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/utils@npm:1.6.0"
+  dependencies:
+    diff-sequences: "npm:^29.6.3"
+    estree-walker: "npm:^3.0.3"
+    loupe: "npm:^2.3.7"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/5c5d7295ac13fcea1da039232bcc7c3fc6f070070fe12ba2ad152456af6e216e48a3ae169016cfcd5055706a00dc567b8f62e4a9b1914f069f52b8f0a3c25e60
+  languageName: node
+  linkType: hard
+
 "@vx/axis@npm:0.0.198":
   version: 0.0.198
   resolution: "@vx/axis@npm:0.0.198"
@@ -12594,6 +12675,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-walk@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "acorn-walk@npm:8.3.2"
+  checksum: 10/57dbe2fd8cf744f562431775741c5c087196cd7a65ce4ccb3f3981cdfad25cd24ad2bad404997b88464ac01e789a0a61e5e355b2a84876f13deef39fb39686ca
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^7.1.1, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
@@ -12612,7 +12700,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.11.2":
+"acorn@npm:^8.11.2, acorn@npm:^8.11.3":
   version: 8.11.3
   resolution: "acorn@npm:8.11.3"
   bin:
@@ -13122,6 +13210,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"assertion-error@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "assertion-error@npm:1.1.0"
+  checksum: 10/fd9429d3a3d4fd61782eb3962ae76b6d08aa7383123fca0596020013b3ebd6647891a85b05ce821c47d1471ed1271f00b0545cf6a4326cf2fc91efcc3b0fbecf
+  languageName: node
+  linkType: hard
+
 "ast-types@npm:^0.16.1":
   version: 0.16.1
   resolution: "ast-types@npm:0.16.1"
@@ -14055,7 +14150,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.0.0":
+"cac@npm:^6.0.0, cac@npm:^6.7.14":
   version: 6.7.14
   resolution: "cac@npm:6.7.14"
   checksum: 10/002769a0fbfc51c062acd2a59df465a2a947916b02ac50b56c69ec6c018ee99ac3e7f4dd7366334ea847f1ecacf4defaa61bcd2ac283db50156ce1f1d8c8ad42
@@ -14336,6 +14431,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chai@npm:^4.3.10":
+  version: 4.4.1
+  resolution: "chai@npm:4.4.1"
+  dependencies:
+    assertion-error: "npm:^1.1.0"
+    check-error: "npm:^1.0.3"
+    deep-eql: "npm:^4.1.3"
+    get-func-name: "npm:^2.0.2"
+    loupe: "npm:^2.3.6"
+    pathval: "npm:^1.1.1"
+    type-detect: "npm:^4.0.8"
+  checksum: 10/c6d7aba913a67529c68dbec3673f94eb9c586c5474cc5142bd0b587c9c9ec9e5fbaa937e038ecaa6475aea31433752d5fabdd033b9248bde6ae53befcde774ae
+  languageName: node
+  linkType: hard
+
 "chalk@npm:2.3.1":
   version: 2.3.1
   resolution: "chalk@npm:2.3.1"
@@ -14485,6 +14595,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"check-error@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "check-error@npm:1.0.3"
+  dependencies:
+    get-func-name: "npm:^2.0.2"
+  checksum: 10/e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399
+  languageName: node
+  linkType: hard
+
 "chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.5.3":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
@@ -15074,6 +15193,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"confbox@npm:^0.1.7":
+  version: 0.1.7
+  resolution: "confbox@npm:0.1.7"
+  checksum: 10/3086687b9a2a70d44d4b40a2d376536fe7e1baec4a2a34261b21b8a836026b419cbf89ded6054216631823e7d63c415dad4b4d53591d6edbb202bb9820dfa6fa
+  languageName: node
+  linkType: hard
+
 "config-chain@npm:^1.1.13":
   version: 1.1.13
   resolution: "config-chain@npm:1.1.13"
@@ -15098,13 +15224,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"connect-history-api-fallback@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "connect-history-api-fallback@npm:1.6.0"
-  checksum: 10/59f013870e987f2e921218b88ad99e6b469a058ee7dd35561a360968fd4260f236b5523b7387ddec8991f9f9fbddda098f830ddc701f12c1bfb1f49d5f4b13c1
-  languageName: node
-  linkType: hard
-
 "connect-history-api-fallback@npm:^2.0.0":
   version: 2.0.0
   resolution: "connect-history-api-fallback@npm:2.0.0"
@@ -16679,6 +16798,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-eql@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "deep-eql@npm:4.1.3"
+  dependencies:
+    type-detect: "npm:^4.0.0"
+  checksum: 10/12ce93ae63de187e77b076d3d51bfc28b11f98910a22c18714cce112791195e86a94f97788180994614b14562a86c9763f67c69f785e4586f806b5df39bf9301
+  languageName: node
+  linkType: hard
+
 "deep-equal@npm:^2.0.5":
   version: 2.2.2
   resolution: "deep-equal@npm:2.2.2"
@@ -16986,6 +17114,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: 10/179daf9d2f9af5c57ad66d97cb902a538bcf8ed64963fa7aa0c329b3de3665ce2eb6ffdc2f69f29d445fa4af2517e5e55e5b6e00c00a9ae4f43645f97f7078cb
+  languageName: node
+  linkType: hard
+
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -18265,7 +18400,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^3.0.0":
+"estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3":
   version: 3.0.3
   resolution: "estree-walker@npm:3.0.3"
   dependencies:
@@ -19390,6 +19525,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "get-func-name@npm:2.0.2"
+  checksum: 10/3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
+  languageName: node
+  linkType: hard
+
 "get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
   version: 1.2.1
   resolution: "get-intrinsic@npm:1.2.1"
@@ -22485,6 +22627,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-tokens@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "js-tokens@npm:9.0.0"
+  checksum: 10/65e7a55a1a18d61f1cf94bfd7704da870b74337fa08d4c58118e69a8b10225b5ad887ff3ae595d720301b0924811a9b0594c679621a85ecbac6e3aac8533c53b
+  languageName: node
+  linkType: hard
+
 "js-yaml@npm:=4.1.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -23304,6 +23453,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"local-pkg@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "local-pkg@npm:0.5.0"
+  dependencies:
+    mlly: "npm:^1.4.2"
+    pkg-types: "npm:^1.0.3"
+  checksum: 10/20f4caba50dc6fb00ffcc1a78bc94b5acb33995e0aadf4d4edcdeab257e891aa08f50afddf02f3240b2c3d02432bc2078f2a916a280ed716b64753a3d250db70
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^2.0.0":
   version: 2.0.0
   resolution: "locate-path@npm:2.0.0"
@@ -23664,6 +23823,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"loupe@npm:^2.3.6, loupe@npm:^2.3.7":
+  version: 2.3.7
+  resolution: "loupe@npm:2.3.7"
+  dependencies:
+    get-func-name: "npm:^2.0.1"
+  checksum: 10/635c8f0914c2ce7ecfe4e239fbaf0ce1d2c00e4246fafcc4ed000bfdb1b8f89d05db1a220054175cca631ebf3894872a26fffba0124477fcb562f78762848fb1
+  languageName: node
+  linkType: hard
+
 "lower-case@npm:^2.0.2":
   version: 2.0.2
   resolution: "lower-case@npm:2.0.2"
@@ -23800,6 +23968,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.30.5":
+  version: 0.30.10
+  resolution: "magic-string@npm:0.30.10"
+  dependencies:
+    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
+  checksum: 10/9f8bf6363a14c98a9d9f32ef833b194702a5c98fb931b05ac511b76f0b06fd30ed92beda6ca3261d2d52d21e39e891ef1136fbd032023f6cbb02d0b7d5767201
+  languageName: node
+  linkType: hard
+
 "make-dir@npm:^1.0.0":
   version: 1.3.0
   resolution: "make-dir@npm:1.3.0"
@@ -25108,6 +25285,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mlly@npm:^1.4.2, mlly@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "mlly@npm:1.7.0"
+  dependencies:
+    acorn: "npm:^8.11.3"
+    pathe: "npm:^1.1.2"
+    pkg-types: "npm:^1.1.0"
+    ufo: "npm:^1.5.3"
+  checksum: 10/a52f17767f1aa8133ad4354065e579c3d1cc72e866102bde7e466123772f5e571327b95ce777d1d655724f0c479a82acaafc6e81e25781851779d865682c8823
+  languageName: node
+  linkType: hard
+
 "modify-values@npm:^1.0.0":
   version: 1.0.1
   resolution: "modify-values@npm:1.0.1"
@@ -26408,6 +26597,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-limit@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "p-limit@npm:5.0.0"
+  dependencies:
+    yocto-queue: "npm:^1.0.0"
+  checksum: 10/87bf5837dee6942f0dbeff318436179931d9a97848d1b07dbd86140a477a5d2e6b90d9701b210b4e21fe7beaea2979dfde366e4f576fa644a59bd4d6a6371da7
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^2.0.0":
   version: 2.0.0
   resolution: "p-locate@npm:2.0.0"
@@ -26876,6 +27074,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pathval@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "pathval@npm:1.1.1"
+  checksum: 10/b50a4751068aa3a5428f5a0b480deecedc6f537666a3630a0c2ae2d5e7c0f4bf0ee77b48404441ec1220bef0c91625e6030b3d3cf5a32ab0d9764018d1d9dbb6
+  languageName: node
+  linkType: hard
+
 "pbf@npm:^3.2.1":
   version: 3.2.1
   resolution: "pbf@npm:3.2.1"
@@ -27019,6 +27224,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-types@npm:^1.0.3, pkg-types@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "pkg-types@npm:1.1.1"
+  dependencies:
+    confbox: "npm:^0.1.7"
+    mlly: "npm:^1.7.0"
+    pathe: "npm:^1.1.2"
+  checksum: 10/225eaf7c0339027e176dd0d34a6d9a1384c21e0aab295e57dfbef1f1b7fc132f008671da7e67553e352b80b17ba38c531c720c914061d277410eef1bdd9d9608
+  languageName: node
+  linkType: hard
+
 "pngjs@npm:^3.3.3":
   version: 3.4.0
   resolution: "pngjs@npm:3.4.0"
@@ -28029,6 +28245,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-format@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "pretty-format@npm:29.7.0"
+  dependencies:
+    "@jest/schemas": "npm:^29.6.3"
+    ansi-styles: "npm:^5.0.0"
+    react-is: "npm:^18.0.0"
+  checksum: 10/dea96bc83c83cd91b2bfc55757b6b2747edcaac45b568e46de29deee80742f17bc76fe8898135a70d904f4928eafd8bb693cd1da4896e8bdd3c5e82cadf1d2bb
+  languageName: node
+  linkType: hard
+
 "pretty-hrtime@npm:^1.0.3":
   version: 1.0.3
   resolution: "pretty-hrtime@npm:1.0.3"
@@ -29029,6 +29256,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^18.0.0":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
+  languageName: node
+  linkType: hard
+
 "react-json-tree@npm:^0.15.0":
   version: 0.15.2
   resolution: "react-json-tree@npm:0.15.2"
@@ -31353,6 +31587,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"siginfo@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "siginfo@npm:2.0.0"
+  checksum: 10/e93ff66c6531a079af8fb217240df01f980155b5dc408d2d7bebc398dd284e383eb318153bf8acd4db3c4fe799aa5b9a641e38b0ba3b1975700b1c89547ea4e7
+  languageName: node
+  linkType: hard
+
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
@@ -31828,6 +32069,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stackback@npm:0.0.2":
+  version: 0.0.2
+  resolution: "stackback@npm:0.0.2"
+  checksum: 10/2d4dc4e64e2db796de4a3c856d5943daccdfa3dd092e452a1ce059c81e9a9c29e0b9badba91b43ef0d5ff5c04ee62feb3bcc559a804e16faf447bac2d883aa99
+  languageName: node
+  linkType: hard
+
 "stampit@npm:^4.3.2":
   version: 4.3.2
   resolution: "stampit@npm:4.3.2"
@@ -31880,6 +32128,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"std-env@npm:^3.5.0":
+  version: 3.7.0
+  resolution: "std-env@npm:3.7.0"
+  checksum: 10/6ee0cca1add3fd84656b0002cfbc5bfa20340389d9ba4720569840f1caa34bce74322aef4c93f046391583e50649d0cf81a5f8fe1d411e50b659571690a45f12
+  languageName: node
+  linkType: hard
+
 "stop-iteration-iterator@npm:^1.0.0":
   version: 1.0.0
   resolution: "stop-iteration-iterator@npm:1.0.0"
@@ -32270,6 +32525,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-literal@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "strip-literal@npm:2.1.0"
+  dependencies:
+    js-tokens: "npm:^9.0.0"
+  checksum: 10/21c813aa1e669944e7e2318c8c927939fb90b0c52f53f57282bfc3dd6e19d53f70004f1f1693e33e5e790ad5ef102b0fce2b243808229d1ce07ae71f326c0e82
+  languageName: node
+  linkType: hard
+
 "style-inject@npm:^0.3.0":
   version: 0.3.0
   resolution: "style-inject@npm:0.3.0"
@@ -32383,6 +32647,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"supports-color@npm:*":
+  version: 9.4.0
+  resolution: "supports-color@npm:9.4.0"
+  checksum: 10/cb8ff8daeaf1db642156f69a9aa545b6c01dd9c4def4f90a49f46cbf24be0c245d392fcf37acd119cd1819b99dad2cc9b7e3260813f64bcfd7f5b18b5a1eefb8
+  languageName: node
+  linkType: hard
+
 "supports-color@npm:^2.0.0":
   version: 2.0.0
   resolution: "supports-color@npm:2.0.0"
@@ -32885,6 +33156,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinybench@npm:^2.5.1":
+  version: 2.8.0
+  resolution: "tinybench@npm:2.8.0"
+  checksum: 10/9731d070bedee6d44f3bb565862c284776e6adfd70d81a051a5c79b77479408509b448ad8d467d538d18bc0ae857b3ead8168d7e98d7f1355f8a0b01aa2f163b
+  languageName: node
+  linkType: hard
+
 "tinycolor2@npm:^1.4.1":
   version: 1.6.0
   resolution: "tinycolor2@npm:1.6.0"
@@ -32899,6 +33177,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinypool@npm:^0.8.3":
+  version: 0.8.4
+  resolution: "tinypool@npm:0.8.4"
+  checksum: 10/7365944c2532f240111443e7012be31a634faf1a02db08a91db3aa07361c26a374d0be00a0f2ea052c4bee39c107ba67f1f814c108d9d51dfc725c559c1a9c03
+  languageName: node
+  linkType: hard
+
 "tinyqueue@npm:^2.0.3":
   version: 2.0.3
   resolution: "tinyqueue@npm:2.0.3"
@@ -32906,6 +33191,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyspy@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "tinyspy@npm:2.2.1"
+  checksum: 10/170d6232e87f9044f537b50b406a38fbfd6f79a261cd12b92879947bd340939a833a678632ce4f5c4a6feab4477e9c21cd43faac3b90b68b77dd0536c4149736
+  languageName: node
+  linkType: hard
+
 "tmp@npm:^0.0.33":
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
@@ -33352,7 +33644,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-detect@npm:4.0.8":
+"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
   checksum: 10/5179e3b8ebc51fce1b13efb75fdea4595484433f9683bbc2dca6d99789dba4e602ab7922d2656f2ce8383987467f7770131d4a7f06a26287db0615d2f4c4ce7d
@@ -33585,6 +33877,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ufo@npm:^1.5.3":
+  version: 1.5.3
+  resolution: "ufo@npm:1.5.3"
+  checksum: 10/2b30dddd873c643efecdb58cfe457183cd4d95937ccdacca6942c697b87a2c578232c25a5149fda85436696bf0fdbc213bf2b220874712bc3e58c0fb00a2c950
+  languageName: node
+  linkType: hard
+
 "uglify-js@npm:^3.1.4":
   version: 3.17.4
   resolution: "uglify-js@npm:3.17.4"
@@ -34466,6 +34765,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-node@npm:1.6.0":
+  version: 1.6.0
+  resolution: "vite-node@npm:1.6.0"
+  dependencies:
+    cac: "npm:^6.7.14"
+    debug: "npm:^4.3.4"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    vite: "npm:^5.0.0"
+  bin:
+    vite-node: vite-node.mjs
+  checksum: 10/40230598c3c285cf65f407ac50b1c7753ab2dfa960de76ec1a95a0ce0ff963919d065c29ba538d9fb2fba3e0703a051d49d1ad6486001ba2f90616cc706ddc3d
+  languageName: node
+  linkType: hard
+
 "vite-plugin-cesium@npm:^1.2.22":
   version: 1.2.22
   resolution: "vite-plugin-cesium@npm:1.2.22"
@@ -34480,17 +34794,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-rewrite-all@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "vite-plugin-rewrite-all@npm:1.0.1"
-  dependencies:
-    connect-history-api-fallback: "npm:^1.6.0"
-  peerDependencies:
-    vite: ^2.0.0 || ^3.0.0 || ^4.0.0
-  checksum: 10/480997fa98b9b6a856c9c1fd915a0d830c20fa8017e53de135e03203e89bc1d33561d0a39013a8f4d27d31691d3f71d44ed9901012424ba92fc7bab27829a8b0
-  languageName: node
-  linkType: hard
-
 "vite@npm:^4.4.9":
   version: 4.4.9
   resolution: "vite@npm:4.4.9"
@@ -34611,6 +34914,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vitest@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "vitest@npm:1.6.0"
+  dependencies:
+    "@vitest/expect": "npm:1.6.0"
+    "@vitest/runner": "npm:1.6.0"
+    "@vitest/snapshot": "npm:1.6.0"
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
+    acorn-walk: "npm:^8.3.2"
+    chai: "npm:^4.3.10"
+    debug: "npm:^4.3.4"
+    execa: "npm:^8.0.1"
+    local-pkg: "npm:^0.5.0"
+    magic-string: "npm:^0.30.5"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    std-env: "npm:^3.5.0"
+    strip-literal: "npm:^2.0.0"
+    tinybench: "npm:^2.5.1"
+    tinypool: "npm:^0.8.3"
+    vite: "npm:^5.0.0"
+    vite-node: "npm:1.6.0"
+    why-is-node-running: "npm:^2.2.2"
+  peerDependencies:
+    "@edge-runtime/vm": "*"
+    "@types/node": ^18.0.0 || >=20.0.0
+    "@vitest/browser": 1.6.0
+    "@vitest/ui": 1.6.0
+    happy-dom: "*"
+    jsdom: "*"
+  peerDependenciesMeta:
+    "@edge-runtime/vm":
+      optional: true
+    "@types/node":
+      optional: true
+    "@vitest/browser":
+      optional: true
+    "@vitest/ui":
+      optional: true
+    happy-dom:
+      optional: true
+    jsdom:
+      optional: true
+  bin:
+    vitest: vitest.mjs
+  checksum: 10/ad921a723ac9438636d37111f0b2ea5afd0ba4a7813fb75382b9f75574e10d533cf950573ebb9332a595ce197cb83593737a6b55a3b6e6eb00bddbcd0920a03e
+  languageName: node
+  linkType: hard
+
 "vlq@npm:^0.2.2":
   version: 0.2.3
   resolution: "vlq@npm:0.2.3"
@@ -35071,6 +35424,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"why-is-node-running@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "why-is-node-running@npm:2.2.2"
+  dependencies:
+    siginfo: "npm:^2.0.0"
+    stackback: "npm:0.0.2"
+  bin:
+    why-is-node-running: cli.js
+  checksum: 10/f3582e0337f4b25537d492b1d40f00b978ce04b1d1eeea8f310bfa8aae8a7d11d118d672e2f0760c164ce3753a620a70aa29ff3620e340197624940cf9c08615
+  languageName: node
+  linkType: hard
+
 "wide-align@npm:^1.1.0, wide-align@npm:^1.1.5":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
@@ -35513,6 +35878,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yocto-queue@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "yocto-queue@npm:1.0.0"
+  checksum: 10/2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
+  languageName: node
+  linkType: hard
+
 "zenscroll@npm:^4.0.2":
   version: 4.0.2
   resolution: "zenscroll@npm:4.0.2"

From 60ecc45f633a3faf58e6e61b214a921d3538c825 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Thu, 30 May 2024 01:20:28 -0500
Subject: [PATCH 002/151] Added basic test

---
 src/base.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/base.test.ts b/src/base.test.ts
index 6c3d0cf1..96b0724d 100644
--- a/src/base.test.ts
+++ b/src/base.test.ts
@@ -4,3 +4,5 @@ import { test, expect } from "vitest";
 test("should pass", () => {
   expect(true).toBe(true);
 });
+
+// Load the URL of the main testing page

From 438fa3f57ecdc33369a364bb203d016d2a35dfc9 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 30 May 2024 12:03:17 -0400
Subject: [PATCH 003/151] test removing images

---
 .gitignore                |   4 +
 src/pages/+Page.mdx       |   5 +
 src/pages/styles.sass     | 560 +++++++++++++++++++++++
 src/pages/test/+Page.mdx  | 551 +++++++++++++++++++++++
 src/pages/test/main.styl  | 168 +++++++
 src/pages/test/styles.css | 908 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 2196 insertions(+)
 create mode 100644 src/pages/styles.sass
 create mode 100644 src/pages/test/+Page.mdx
 create mode 100644 src/pages/test/main.styl
 create mode 100644 src/pages/test/styles.css

diff --git a/.gitignore b/.gitignore
index 6ea0477a..5fad7bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,8 @@ docker-compose.yaml
 !.yarn/sdks
 !.yarn/versions
 
+# For ignoring static files
+*.png
+*.jpg 
+
 .vite
\ No newline at end of file
diff --git a/src/pages/+Page.mdx b/src/pages/+Page.mdx
index c3a96be4..fabd5791 100644
--- a/src/pages/+Page.mdx
+++ b/src/pages/+Page.mdx
@@ -2,6 +2,7 @@ export { ContentPage as default } from "~/layouts";
 import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
 
+
 <PageHeader title="Macrostrat">
   <span className="subtitle">
     <span className="secondary">v2</span>{" "}
@@ -43,3 +44,7 @@ These products come from a variety of sources throughout the geosciences.
 <LinkCard href="/docs/" title="Documentation">
   Macrostrat documentation
 </LinkCard>
+
+<LinkCard href="/test" title="Test Site">
+  New test site @David
+</LinkCard>
diff --git a/src/pages/styles.sass b/src/pages/styles.sass
new file mode 100644
index 00000000..2616991a
--- /dev/null
+++ b/src/pages/styles.sass
@@ -0,0 +1,560 @@
+/* Snap styles
+
+html, body
+  font-family: sans-serif
+  margin: 0
+  padding: 0
+  width: 100%
+  height: 100%
+  overflow: hidden
+
+.row-eq-height
+  display: -webkit-box
+  display: -webkit-flex
+  display: -ms-flexbox
+  display: flex
+
+#donate-title-container
+  display: flex
+  align-items: center
+  justify-content: center
+  height: 100%
+  width: 100%
+  position: absolute
+  text-align: center
+
+.snap-content
+  position: absolute
+  top: 0
+  right: 0
+  bottom: 0
+  left: 0
+  width: auto
+  height: auto
+  z-index: 2
+  overflow: auto
+  -webkit-overflow-scrolling: touch
+  -webkit-transform: translate3d(0, 0, 0)
+  -moz-transform: translate3d(0, 0, 0)
+  -ms-transform: translate3d(0, 0, 0)
+  -o-transform: translate3d(0, 0, 0)
+  transform: translate3d(0, 0, 0)
+
+.snap-drawers
+  position: absolute
+  top: 0
+  right: 0
+  bottom: 0
+  left: 0
+  width: auto
+  height: auto
+
+.snap-drawer
+  position: absolute
+  top: 0
+  right: auto
+  bottom: 0
+  left: auto
+  width: 265px
+  height: auto
+  overflow: auto
+  -webkit-overflow-scrolling: touch
+  -webkit-transition: width 0.3s ease
+  -moz-transition: width 0.3s ease
+  -ms-transition: width 0.3s ease
+  -o-transition: width 0.3s ease
+  transition: width 0.3s ease
+
+.snap-drawer-left
+  left: 0
+  z-index: 1
+
+.snap-drawer-right
+  right: 0
+  z-index: 1
+
+.snapjs-left .snap-drawer-right, .snapjs-right .snap-drawer-left
+  display: none
+
+.snapjs-expand-left .snap-drawer-left, .snapjs-expand-right .snap-drawer-right
+  width: 100%
+
+/* End snap styles
+
+a:hover
+  text-decoration: none
+
+.container-fluid
+  margin: 0
+  padding: 0
+  height: 100%
+
+.scrollable
+  overflow: auto
+  -webkit-transition-property: top, bottom
+  transition-property: top, bottom
+  -webkit-transition-duration: .2s, .2s
+  transition-duration: .2s, .2s
+  -webkit-transition-timing-function: linear, linear
+  transition-timing-function: linear, linear
+  -webkit-overflow-scrolling: touch
+
+.footer
+  display: block
+  bottom: 0
+  width: 100%
+  padding: 1em
+  background-color: #015EAB
+
+#who-made-it
+  color: #E0E1E6
+  font-weight: 200
+  text-align: center
+
+  > a
+    color: #E0E1E6
+    font-weight: 200
+
+    >
+      img
+        height: 75px
+
+      i
+        margin-top: 10px
+
+        &:first-child
+          margin-right: 10px
+
+#bottom-nav
+  text-align: center
+
+.footer-nav > li > a
+  color: #E0E1E6
+  padding: 5px
+
+.funding
+  color: #E0E1E6
+  display: table
+  text-align: center
+
+.funding-line
+  display: table-cell
+  vertical-align: middle
+  font-weight: 200
+
+.funding-logo
+  width: 75px
+
+.snap-content
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif
+
+.navbar-default
+  background-color: rgba(0, 0, 0, 0)
+  border: none
+
+.snap-drawers
+  top: 50px
+
+.close-to-top
+  background-color: #015EAB
+  opacity: 1
+
+#second-nav
+  background-color: #193441
+
+.navbar-default
+  .navbar-nav > li > a
+    color: #E0E1E6
+    font-size: 1.1em
+    font-weight: 400
+    letter-spacing: 1px
+
+  .navbar-toggle .icon-bar
+    background-color: #E0E1E6
+
+  .navbar-nav > li > a
+    &:hover, &:focus
+      color: #fff
+
+  .navbar-toggle
+    border-color: rgba(0, 0, 0, 0)
+
+    &:hover, &:focus
+      background-color: rgba(0, 0, 0, 0)
+
+.logo
+  height: 50px
+  padding: 2px
+
+.main
+  margin: auto
+  color: #888
+  background-size: cover
+  background-repeat: no-repeat
+
+  > h1
+    font-family: "Maven Pro", sans-serif
+    font-size: 50px
+    font-weight: 100
+    line-height: 1.1
+
+.explore-sift
+  background-color: #990000
+  border-color: #990000
+  margin-top: 10px
+
+  &.btn-info
+    background-color: #015EAB
+    border-color: #015EAB
+
+.rockd-button-container
+  display: flex
+  align-items: center
+
+.explore-sift.rockd
+  background-color: #363434
+  border-color: #363434
+
+.rockd-logo-small
+  height: 21px
+  margin-right: 5px
+
+.stats
+  color: white
+
+.snap-drawer-right
+  background-color: #015EAB
+  opacity: 0.92
+
+.drawer-menu
+  background-color: #015EAB
+  line-height: 20px
+  margin: 0
+
+  > a
+    display: block
+    color: #E0E1E6
+    padding: 12px 35px !important
+    border-bottom: 2px solid #0167bc
+    font-size: 13px
+    font-weight: 100
+    letter-spacing: 1px
+
+    &:hover
+      color: #fff
+
+.nav
+  > li > a
+    &:hover, &:focus
+      background-color: rgba(0, 0, 0, 0)
+
+  &.drawer
+    margin-top: 60px
+
+#view
+  height: 100%
+  width: 100%
+  position: relative
+  background-color: #fff
+  margin-top: 50px
+
+  > .container-fluid
+    height: 100%
+    padding: 0
+
+.row
+  margin: 0
+
+.slide
+  height: 100%
+  background-color: #fff
+
+.stat-row
+  height: 50%
+
+.slide-container
+  width: 100%
+  height: 100%
+
+  /* text-align: center;
+  display: table
+  padding: 0
+
+.slide-content
+  display: table-cell
+  vertical-align: middle
+
+.slide-container > .stat-container
+  display: table-cell
+
+.slide-content-padded
+  padding-left: 10%
+  padding-right: 10%
+
+.welcome
+  background-color: rgba(0, 0, 0, 0.3)
+  text-align: center
+
+.title
+  margin-left: 1em
+  margin-top: -6em
+  padding: 40px
+  border-radius: 20px
+
+  > p
+    color: #f7f7f7
+    font-size: 20px
+    font-weight: 300
+
+.top-stat, .top-stat-label
+  display: block
+  color: #f7f7f7
+  font-size: 20px
+
+.top-stat
+  font-weight: 600
+
+.top-stat-label
+  font-size: 16px
+  font-weight: 300
+
+.big
+  font-size: 75px
+  color: #E0E1E6
+  font-family: "Maven Pro", sans-serif
+
+.nohighlight a
+  color: white
+
+.stats > .slide-container
+  text-align: center
+
+#app-title
+  background-color: #4BABBf
+  color: white
+
+.about-title
+  border-bottom: 1px solid #eee
+  margin-bottom: 18px
+
+#about
+  padding: 100px 0
+
+  > .slide-container
+    padding-bottom: 100px
+
+.about
+  padding: 0 15px
+
+.about-row
+  padding: 15px 0
+
+.about-body
+  padding: 0 30px
+  color: #000 !important
+
+.about-body-subtitle
+  font-size: 22px
+  text-align: center
+  font-weight: 200
+  color: #777
+
+#apps
+  max-width: 900px
+  margin: 0 auto
+  height: auto
+
+.app
+  padding: 0
+  height: 160px
+
+.app-background
+  position: absolute
+  font-size: 70px
+  width: 100%
+  height: 100%
+  color: #777
+  font-weight: 100
+  letter-spacing: 15px
+  display: flex
+  align-items: center
+  justify-content: flex-end
+
+.blurb
+  font-weight: 200
+  font-size: 14px
+  letter-spacing: 1px
+
+.app-background-text
+  padding-right: 20px
+  text-align: right
+  max-width: 55%
+
+.app-background-text-small
+  font-size: 50px
+
+.app-content
+  z-index: 2
+
+.app-grid
+  border: 1px solid #E5E5E5
+  margin-top: -1px
+  margin-bottom: 0
+  margin-left: -1px
+  min-height: 200px
+  text-align: center
+  display: table
+
+.app-grid-content
+  display: table-cell
+  vertical-align: middle
+  color: #4BABBf
+  font-weight: 500
+  font-size: 16px
+
+.app-img
+  height: 120px
+  position: absolute
+  border-radius: 4px
+  left: 15px
+  top: 15px
+
+#api
+  /* background-color: #D33A29;
+
+.api-title
+  background-color: #fff
+  height: 200px
+  width: 200px
+  border-radius: 50%
+  text-align: center
+  display: table
+  border: 11px solid #6bbe98
+  color: #4BABBf
+
+.big.apps
+  color: #F5F5F5
+
+#apps
+  padding-top: 150px
+
+#contact
+  height: 1000px
+  padding: 140px 0
+
+#contact-holder
+  text-align: right
+  color: #777
+  border-bottom: 1px solid #eee
+  margin-bottom: 18px
+
+.api-title > .big
+  display: table-cell
+  vertical-align: middle
+  color: #6bbe98
+
+.stat-caption
+  z-index: 10
+  color: #fff
+  text-align: center
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6)
+  position: absolute
+  left: 20%
+  right: 20%
+  bottom: 20px
+
+  >
+    p
+      font-size: 18px
+
+    h1
+      font-size: 45px
+
+.attribution
+  height: 25px
+  width: 25px
+  position: absolute
+  text-align: center
+  right: 0
+  bottom: 0
+  margin-right: 10px
+  margin-bottom: 10px
+  padding: 5px
+  border: 1px solid #eee
+  border-radius: 50%
+  color: #eee
+  z-index: 500
+
+.stat
+  background-repeat: no-repeat
+  background-size: cover
+
+.stat-container
+  height: 100%
+
+.page-info
+  color: #4bab7f
+  font-size: 18px
+  line-height: 28px
+  font-weight: 200
+
+  &.donate
+    color: #333
+
+  > a
+    color: #4bab7f
+    font-weight: bold
+
+.person
+  background-repeat: no-repeat
+  background-size: cover
+  height: 200px
+  border-bottom: 10px solid #fff
+
+.row > .person
+  &:first-child
+    border-right: 5px solid #fff
+
+  &:last-child
+    border-left: 5px solid #fff
+
+.person-info
+  float: right
+  color: white
+  font-size: 19px
+  bottom: 0
+  font-weight: 200
+  position: absolute
+  right: 0
+  text-align: right
+  background-color: rgba(0, 0, 0, 0.2)
+  letter-spacing: 1px
+  padding-top: 10px
+  padding-left: 10px
+  border-radius: 3px
+
+n
+  font-size: 25px
+  font-weight: 200
+  color: inherit
+
+  > a
+    font-size: 25px
+    font-weight: 200
+    color: inherit
+
+    &:hover
+      color: inherit
+      font-weight: bolder
+
+    color: white
+
+t
+  font-weight: 400
+
+e
+  font-size: 14px
+  font-weight: 200
+
+#people
+  height: auto
diff --git a/src/pages/test/+Page.mdx b/src/pages/test/+Page.mdx
new file mode 100644
index 00000000..846cf8ea
--- /dev/null
+++ b/src/pages/test/+Page.mdx
@@ -0,0 +1,551 @@
+import { PageHeader } from "~/components";
+import { LinkCard } from "~/components/cards";
+import "./main.styl";
+
+<div id="snapContent" class="snap-content scrollable">
+  <div class="container-fluid">
+    [//]: # "Nav Bar"
+    <div class="nav">
+      <ul>
+        <li><a href="#about">About</a></li>
+        <li><a href="#apps">Apps</a></li>
+        <li><a href="#api">API</a></li>
+        <li><a href="#people">People</a></li>
+        <li><a href="#donate">Donate</a></li>
+        <li><a href="#publications">Publications</a></li>
+        <li><img id="logo-jpg"></img></li>
+      </ul>
+    </div>
+
+    [//]: # "Start Page"
+    <div class="parent">
+      <div class="left">
+        <h1 class="big">Macrostrat</h1>
+        <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
+        <ul class="buttons1">
+          <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
+          <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
+          <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
+            <div class="rockd-button-container">
+              <img id="rockd-png"></img>
+              <a href="https://rockd.org" target="_blank">Go mobile</a>
+            </div>
+          </div></li>
+        </ul>
+      </div>
+      
+      <div class="right">
+        <ul class="stats-row">
+          <li>
+            <span class="top-stat" id="n_columns">1,400</span>
+            <span class="top-stat-label">Regional Rock Columns</span>
+          </li>
+          <li>
+            <span class="top-stat" id="n_units">33,903</span>
+            <span class="top-stat-label">Rock Units</span>
+          </li>
+          <li>
+            <span class="top-stat" id="n_polys">2,500,000</span>
+            <span class="top-stat-label">Geologic Map Polygons</span>
+          </li>
+          <li>
+            <span class="top-stat" id="n_names">51,212</span>
+            <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    [//]: # "Locations"
+    <div class="country_container north-america">
+      <div class="country">
+        <h1>North America</h1>\
+        <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+      </div>
+      <div class="country caribbean">
+        <h1>Caribbean</h1>\
+        <div class="caption">243 packages. 798 units. 897 collections.</div>
+      </div>
+      <div class="country new-zealand">
+        <h1>New Zealand</h1>\
+        <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+      </div>
+      <div class="country deep-sea">
+        <h1>Deep Sea</h1>\
+        <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+      </div>
+    </div>
+
+    [//]: # "Geological Maps"
+    <h1 class="big">Geologic Maps</h1>
+    <div class="map-info">
+      With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
+      \
+      \
+      Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
+      \
+      \
+      Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
+    </div>
+         
+    [//]: # "About"
+    <div class="row slide" id="about">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder about-title">
+                <h1 class="big">About</h1>
+              </div>
+            </div>
+          </div>
+          <div class="row about-row">
+            <div class="col-sm-3 about-body-subtitle">
+              Summary
+            </div>
+            <div class="col-sm-9 about-body page-info">
+              Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
+            </div>
+          </div>
+
+          <div class="row about-row">
+            <div class="col-sm-3 about-body-subtitle">
+              License
+            </div>
+            <div class="col-sm-9 about-body page-info">
+              All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
+            </div>
+          </div>
+
+          <div class="row about-row">
+            <div class="col-sm-3 about-body-subtitle">
+              Citation
+            </div>
+            <div class="col-sm-9 about-body page-info">
+              <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
+              \
+              \
+              <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
+            </div>
+          </div>
+
+          <div class="row about-row">
+            <div class="col-sm-3 about-body-subtitle">
+              Collaboration
+            </div>
+            <div class="col-sm-9 about-body page-info">
+              Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
+            </div>
+          </div>
+
+          <div class="row about-row">
+            <div class="col-sm-3 about-body-subtitle">
+              Funding
+            </div>
+            <div class="col-sm-9 about-body page-info">
+              Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
+
+<div class="row slide" id="apps">
+  <div class="col-xs-12 slide-container">
+    <div class="row">
+      <div class="col-xs-12" id="app-title">
+        <h1 class="big apps">Built with Macrostrat</h1>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="/sift">
+          <div class="app-background">
+            <div class="app-background-text">
+              Sift
+              <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://rockd.org">
+          <div class="app-background">
+            <div class="app-background-text">
+              Rockd
+              <p class="blurb">A mobile field book, Macrostrat style.</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="/map">
+          <div class="app-background">
+            <div class="app-background-text">
+              Map
+              <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
+          <div class="app-background">
+            <div class="app-background-text">
+              Mancos
+              <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="http://fc.umn.edu/" target="_blank">
+          <div class="app-background">
+            <div class="app-background-text">
+              FOC
+              <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://github.com/UW-Macrostrat/node-api-template">
+          <div class="app-background">
+            <div class="app-background-text app-background-text-small">
+              API Template
+              <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    [//]: # "API"
+    <div class="row slide" id="api">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-sm-6">
+              <div class="page-title-holder api-title">
+                <h1 class="big">API</h1>
+              </div>
+            </div>
+            <div class="col-sm-6">
+              <div class="page-info">
+                All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    [//]: # "About"
+    <div class="row slide" id="people">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder" id="contact-holder">
+                <h1 class="big">People</h1>
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 person" id="shanan">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
+                <t>Professor, Database Developer</t>\
+                <e>peters -at geology.wisc.edu</e>
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="daven">
+              <div class="person-info">
+                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
+                <t>Research Scientist, Developer</t> \
+                <e>daven.quinn -at wisc.edu</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="evgeny">
+              <div class="person-info">
+                <n>Evgeny Mazko</n> \
+                <t>Graduate Student</t> \
+                <e>mazko -at wisc.edu</e> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="michael">
+              <div class="person-info">
+                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
+                <t>Senior Programmer Analyst</t> \
+                <e>mmcclenn -at- geology.wisc.edu</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="casey">
+              <div class="person-info">
+                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
+                <t>Research Specialist, Developer (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="daniel">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
+                <t>Graduate Student (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="shan">
+              <div class="person-info">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
+                <t>Graduate Student (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="ben">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
+                <t>Postdoctoral Scholar (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="afiqah">
+              <div class="person-info">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
+                <t>Undergrad Student (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="sharon">
+              <div class="person-info">
+                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
+                <t>Researcher (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="andrew">
+              <div class="person-info">
+                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
+                <t>Data Mobilization and Research Scientist</t> \
+                <e>azaffos -at- email.arizona.edu</e> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="jon">
+              <div class="person-info">
+                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
+                <t>Postdoctoral Researcher (former)</t> \
+                <e>jhusson - at - uvic.ca</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="erika">
+              <div class="person-info">
+                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
+                <t>Research Intern (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="noel">
+              <div class="person-info">
+                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
+                <t>Researcher (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="john">
+              <div class="person-info">
+                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
+                <t>Next-level Developer (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="puneet">
+              <div class="person-info">
+                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
+                <t>Generally Ignored</t> \
+                <e>punkish at eidesis.org</e> 
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+    [//]: # "Donate"
+    <div class="row slide" id="donate-row">
+      <div class="col-xs-12 slide-container" id="donate">
+        <div class="slide-content slide-content-padded">
+          <div class="row row-eq-height">
+            <div class="col-sm-6">
+              <div class="page-title-holder" id="donate-title-container">
+                <div class="donate-container">
+                <h1 class="big">Donate</h1>
+                <a class="btn btn-danger btn-lg" href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate now</a>
+              </div>
+              </div>
+            </div>
+            <div class="col-sm-6">
+              <div class="page-info donate">
+                  Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    [//]: # "Publications"
+    <div class="row slide" id="publications">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder">
+                <h1 class="big">Publications</h1>
+                <p class="blurb">literature utilizing Macrostrat</p>
+              </div>
+            </div>
+          </div>
+          [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
+          <div class="row">
+            <div class="col-xs-12">
+              <ol class="pub-list" reversed>
+                <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
+                <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
+                <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
+                <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
+                <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
+                <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
+                <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
+                <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
+                <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
+                <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
+                <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
+                <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
+                <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
+                <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
+                <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
+                <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
+                <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
+                <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
+                <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
+                <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
+                <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
+                <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
+                <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
+                <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
+                <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
+                <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
+                <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
+                <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
+                Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
+                <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
+                <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
+                <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
+                <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
+                <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
+                <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
+                <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
+                <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
+                <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
+                <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
+                <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
+                <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
+                <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
+                <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
+                <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
+                <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
+                <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
+                <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
+                <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
+                <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
+                <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
+                <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
+                <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
+                <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
+                <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
+                <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
+                <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
+                  <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
+                <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
+                <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
+                <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
+                <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
+                <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
+                <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
+                <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
+                <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
+              </ol>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    [//]: # "Footer"
+    <div class="row footer">
+      <div class="container">
+        <div class="col-sm-4" id="who-made-it">
+          Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><i class="fa fa-github"></i></a>
+        </div>
+        <div class="col-sm-4" id="bottom-nav">
+          <ul class="nav footer-nav">
+            <li><a href="#about">About</a></li>
+            <li><a href="#apps">Apps</a></li>
+            <li><a href="#api">API</a></li>
+            <li><a href="#people">People</a></li>
+            <li><a href="#donate">Donate</a></li>
+            <li><a href="#publications">Publications</a></li>
+          </ul>
+        </div>
+        <div class="col-sm-4 funding">
+          <div class="funding-line">
+            Current support: \
+            EAR-1948843 \
+            ICER-1928323 \
+            UW-Madison Dept. Geoscience
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/test/main.styl b/src/pages/test/main.styl
new file mode 100644
index 00000000..c666254e
--- /dev/null
+++ b/src/pages/test/main.styl
@@ -0,0 +1,168 @@
+html, body
+  color: #E0E1E6
+  height: 100%
+
+.nav
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #333;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none;
+
+  li a:hover 
+    background-color: #111;
+
+#logo-jpg 
+  content: url("./img/logo_white.png")
+  width: 35px
+  padding-top: 6px
+
+.parent
+  height: 100%
+
+.left
+  width: 70%
+  text-align: center
+  height: 750px
+  background-image url("./img/cover_medium.jpg")
+  color: white
+
+  li
+    float: left
+    list-style-type: none
+  
+  ul
+    display: inline-block;
+
+
+
+.right
+  background-color: blue
+  height: 750px
+  width: 30%
+  background-image url("./img/deep_sea_new_medium.jpg")
+
+  ul 
+    list-style-type: none
+
+  li 
+    width: 25%
+    padding-left: 10px
+
+  .buttons1
+    padding-left: 27%      
+
+.parent
+  display: inline-flex
+  width: 100%
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  margin-top: 10%
+  margin-bottom: 5%
+  width: 40%
+  margin-left: 30%
+  text-align: center
+
+.big-text
+  font-family: Helvetica, sans-serif
+  font-weight: 900
+  font-size: 20px
+  margin-bottom: 5%
+  padding: 0 100px
+
+.top-stat, .top-stat-label
+  display: block
+  color: white
+
+.top-stat
+  font-size: 35px
+  font-family: Helvetica, sans-serif
+
+.stats-row
+  margin-top: 20%
+
+  li
+    padding-top: 10px
+    padding-bottom: 20px
+    color: black
+    width: 100%
+    
+.btn
+  background-color: #363434;
+  border: none;
+  color: white;
+  padding: 13px 10px;
+  margin: 10px
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  float: left
+  border-radius: 12px;
+
+.btn:hover 
+  background-color: #545151 
+
+.small-rockd
+  background-image url("../img/north_america_small.jpg")
+  float: left
+
+#placeholder
+    background-image url("../img/north_america_small.jpg")
+
+.buttons1 
+  font-size: 20px
+  padding: 0px
+
+  a 
+    color: white
+    text-decoration: none
+
+  a:hover
+    color: white
+
+#rockd-png
+  content: url("./img/rockd.jpg")
+  width: 22px
+  padding-right: 4px
+  float: left
+  padding-top: 5px
+
+.country_container 
+  height: 1000px
+  display: grid;
+  grid-template-columns: repeat(2, minmax(150px, 2fr));
+  grid-template-rows: repeat(2, minmax(150px, 2fr));
+
+.country
+  height: 100%
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  color: white
+
+.deep-sea
+  background-image url("./img/deep_sea_new.jpg")
+
+.north-america
+  background-image url("./img/north_america_med.jpg")
+
+.caribbean
+  background-image url("./img/caribbean_new.jpg")
+
+.new-zealand
+  background-image url("./img/new_zealand_new.jpg")
\ No newline at end of file
diff --git a/src/pages/test/styles.css b/src/pages/test/styles.css
new file mode 100644
index 00000000..9ec89de9
--- /dev/null
+++ b/src/pages/test/styles.css
@@ -0,0 +1,908 @@
+/* Snap styles */
+html, body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+.row-eq-height {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display:         flex;
+}
+
+#donate-title-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+  position: absolute;
+  text-align: center;
+}
+.snap-content {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto;
+  z-index: 2;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  -webkit-transform: translate3d(0, 0, 0);
+     -moz-transform: translate3d(0, 0, 0);
+      -ms-transform: translate3d(0, 0, 0);
+       -o-transform: translate3d(0, 0, 0);
+          transform: translate3d(0, 0, 0);
+}
+
+.snap-drawers {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto;
+}
+
+.snap-drawer {
+  position: absolute;
+  top: 0;
+  right: auto;
+  bottom: 0;
+  left: auto;
+  width: 265px;
+  height: auto;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  -webkit-transition: width 0.3s ease;
+     -moz-transition: width 0.3s ease;
+      -ms-transition: width 0.3s ease;
+       -o-transition: width 0.3s ease;
+          transition: width 0.3s ease;
+}
+
+.snap-drawer-left {
+  left: 0;
+  z-index: 1;
+}
+
+.snap-drawer-right {
+  right: 0;
+  z-index: 1;
+}
+
+.snapjs-left .snap-drawer-right,
+.snapjs-right .snap-drawer-left {
+  display: none;
+}
+
+.snapjs-expand-left .snap-drawer-left,
+.snapjs-expand-right .snap-drawer-right {
+  width: 100%;
+}
+
+/* End snap styles */
+
+a:hover {
+  text-decoration: none;
+}
+.container-fluid {
+  margin: 0;
+  padding: 0;
+  height: 100%;
+}
+.scrollable{
+  overflow: auto;
+  -webkit-transition-property: top, bottom;
+  transition-property: top, bottom;
+  -webkit-transition-duration: .2s, .2s;
+  transition-duration: .2s, .2s;
+  -webkit-transition-timing-function: linear, linear;
+  transition-timing-function: linear, linear;
+  -webkit-overflow-scrolling: touch;
+}
+.footer {
+  display: block;
+  bottom: 0;
+  width: 100%;
+  padding: 1em;
+  background-color: #015EAB;
+}
+#who-made-it {
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+}
+#who-made-it > a {
+  color: #E0E1E6;
+  font-weight: 200;
+}
+#who-made-it > a > img {
+  height: 75px;
+}
+#who-made-it > a > i {
+  margin-top: 10px;
+}
+#who-made-it > a > i:first-child {
+  margin-right: 10px;
+}
+#bottom-nav {
+  text-align: center;
+}
+.footer-nav > li > a {
+  color: #E0E1E6;
+  padding: 5px;
+}
+.funding {
+  color: #E0E1E6;
+  display: table;
+  text-align: center;
+}
+.funding-line {
+  display: table-cell;
+  vertical-align: middle;
+  font-weight: 200;
+}
+.funding-logo {
+  width: 75px;
+}
+.snap-content {
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+.navbar-default {
+  background-color: rgba(0,0,0,0);
+  border: none;
+}
+.snap-drawers {
+  top: 50px;
+}
+.close-to-top {
+  background-color: #015EAB;
+  opacity: 1;
+}
+#second-nav {
+  background-color: #193441;
+}
+.navbar-default .navbar-nav>li>a {
+  color: #E0E1E6;
+  font-size: 1.1em;
+  font-weight: 400;
+  letter-spacing: 1px;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #E0E1E6;
+}
+.navbar-default .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus {
+  color: #fff;
+}
+.navbar-default .navbar-toggle {
+  border-color: rgba(0,0,0,0);
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: rgba(0,0,0,0);
+}
+.logo {
+  height: 50px;
+  padding: 2px;
+}
+.main {
+  margin: auto;
+  color:#888;
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+.main > h1 {
+  font-family: "Maven Pro", sans-serif;
+  font-size: 50px;
+  font-weight: 100;
+  line-height: 1.1;
+}
+.explore-sift {
+  background-color: #990000;
+  border-color: #990000;
+  margin-top: 10px;
+}
+.explore-sift.btn-info {
+  background-color: #015EAB;
+  border-color: #015EAB;
+}
+.rockd-button-container {
+  display: flex;
+  align-items: center;
+}
+.explore-sift.rockd {
+  background-color: #363434;
+  border-color: #363434;
+}
+.rockd-logo-small {
+  height: 21px;
+  margin-right: 5px;
+}
+.stats {
+  color: white;
+}
+.snap-drawer-right {
+  background-color: #015EAB;
+  opacity: 0.92;
+}
+.drawer-menu {
+  background-color: #015EAB;
+  line-height: 20px;
+  margin: 0;
+}
+.drawer-menu > a {
+  display: block;
+  color: #E0E1E6;
+  padding: 12px 35px !important;
+  border-bottom: 2px solid #0167bc;
+  font-size: 13px;
+  font-weight: 100;
+  letter-spacing: 1px;
+}
+.drawer-menu > a:hover {
+  color: #fff;
+}
+.nav>li>a:hover, .nav>li>a:focus {
+  background-color: rgba(0,0,0,0);
+}
+.nav.drawer {
+  margin-top: 60px;
+}
+#view {
+  height: 100%;
+  width: 100%;
+  position: relative;
+  background-color: #fff;
+  margin-top: 50px;
+}
+#view > .container-fluid {
+  height: 100%;
+  padding: 0;
+}
+.row {
+  margin: 0;
+}
+.slide {
+  height: 100%;
+  background-color: #fff;
+}
+.stat-row {
+  height: 50%;
+}
+.slide-container {
+  width: 100%;
+  height: 100%;
+ /* text-align: center; */
+  display: table;
+  padding: 0;
+}
+.slide-content {
+  display: table-cell;
+  vertical-align: middle;
+}
+.slide-container > .stat-container {
+  display: table-cell;
+}
+
+.slide-content-padded {
+  padding-left: 10%;
+  padding-right: 10%;
+}
+
+.welcome {
+  background-color: rgba(0,0,0,0.3);
+  text-align: center;
+}
+.title {
+  margin-left: 1em;
+  margin-top: -6em;
+  padding: 40px;
+  border-radius: 20px;
+}
+
+.title > p {
+  color: #f7f7f7;
+  font-size: 20px;
+  font-weight: 300;
+}
+.top-stat, .top-stat-label {
+  display: block;
+  color: #f7f7f7;
+  font-size: 20px;
+}
+.top-stat {
+  font-weight: 600;
+}
+.top-stat-label {
+  font-size: 16px;
+  font-weight: 300;
+}
+.big {
+  font-size: 75px;
+  color: #E0E1E6;
+  font-family: "Maven Pro", sans-serif;
+}
+.nohighlight a{
+  color: white;
+}
+
+.stats > .slide-container {
+  text-align: center;
+}
+
+
+#app-title {
+  background-color: #4BABBf;
+  color: white;
+}
+
+.about-title {
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+
+}
+#about {
+  padding: 100px 0;
+}
+#about > .slide-container {
+  padding-bottom: 100px;
+
+}
+.about {
+  padding: 0 15px;
+}
+.about-row {
+  padding: 15px 0;
+}
+.about-body {
+  padding: 0 30px;
+  color: #000 !important;
+}
+.about-body-subtitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: 200;
+  color: #777;
+}
+
+#apps {
+  max-width: 900px;
+  margin: 0 auto;
+  height: auto;
+}
+.app {
+  padding: 0;
+  height: 160px;
+}
+.app-background {
+  position: absolute;
+  font-size: 70px;
+  width: 100%;
+  height: 100%;
+  color: #777;
+  font-weight: 100;
+  letter-spacing: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.blurb {
+  font-weight: 200;
+  font-size: 14px;
+  letter-spacing: 1px;
+}
+.app-background-text {
+  padding-right: 20px;
+  text-align: right;
+  max-width: 55%;
+}
+.app-background-text-small {
+  font-size: 50px;
+}
+.app-content {
+  z-index: 2;
+}
+
+.app-grid {
+  border: 1px solid #E5E5E5;
+  margin-top: -1px;
+  margin-bottom: 0;
+  margin-left: -1px;
+  min-height: 200px;
+  text-align: center;
+  display: table;
+}
+
+.app-grid-content {
+  display: table-cell;
+  vertical-align: middle;
+  color: #4BABBf;
+  font-weight: 500;
+  font-size: 16px;
+}
+
+.app-img {
+  height: 120px;
+  position: absolute;
+  border-radius: 4px;
+  left: 15px;
+  top: 15px;
+}
+
+#api {
+ /* background-color: #D33A29;*/
+}
+.api-title {
+  background-color: #fff;
+  height:200px;
+  width: 200px;
+  border-radius: 50%;
+  text-align: center;
+  display: table;
+  border: 11px solid #6bbe98;
+  color: #4BABBf;
+}
+
+.big.apps {
+  color: #F5F5F5;
+}
+#apps {
+  padding-top: 150px;
+}
+#contact {
+  height: 1000px;
+  padding: 140px 0;
+}
+#contact-holder {
+  text-align: right;
+  color: #777;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+}
+.api-title > .big {
+  display: table-cell;
+  vertical-align: middle;
+  color: #6bbe98;
+}
+
+.stat-caption {
+  z-index: 10;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
+  position: absolute;
+  left: 20%;
+  right: 20%;
+  bottom: 20px;
+}
+.stat-caption > p {
+  font-size: 18px;
+}
+.stat-caption > h1 {
+  font-size: 45px;
+}
+
+.attribution {
+  height: 25px;
+  width: 25px;
+  position: absolute;
+  text-align: center;
+  right: 0;
+  bottom: 0;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  padding: 5px;
+  border: 1px solid #eee;
+  border-radius: 50%;
+  color: #eee;
+  z-index: 500;
+}
+
+.stat {
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.stat-container {
+  height: 100%;
+}
+
+.page-info {
+  color: #4bab7f;
+  font-size: 18px;
+  line-height: 28px;
+  font-weight: 200;
+}
+.page-info.donate {
+  color: #333;
+}
+.page-info > a {
+  color: #4bab7f;
+  font-weight: bold;
+}
+.person {
+  background-repeat: no-repeat;
+  background-size: cover;
+  height: 200px;
+  border-bottom: 10px solid #fff;
+}
+.row > .person:first-child {
+  border-right: 5px solid #fff;
+}
+.row > .person:last-child {
+  border-left: 5px solid #fff;
+}
+.person-info {
+  float: right;
+  color: white;
+  font-size: 19px;
+  bottom: 0;
+  font-weight: 200;
+  position: absolute;
+  right: 0;
+  text-align: right;
+  background-color: rgba(0,0,0,0.2);
+  letter-spacing: 1px;
+  padding-top: 10px;
+  padding-left: 10px;
+  border-radius: 3px;
+}
+n, n > a {
+  font-size: 25px;
+  font-weight: 200;
+  color: inherit;
+}
+n > a:hover {
+  color: inherit;
+  font-weight: bolder;
+}
+n > a {
+  color: white;
+}
+t {
+  font-weight: 400;
+}
+e {
+  font-size: 14px;
+  font-weight: 200;
+}
+#people {
+  height: auto;
+}
+#shanan {
+  background-image: url("../img/shanan.jpg");
+}
+#shanan_wide {
+  background-image: url("../img/shanan_wide.jpg");
+}
+#daven {
+  background-image: url("../img/daven.jpg");
+}
+#evgeny {
+  background-image: url("../img/evgeny.jpg");
+}
+#casey {
+  background-image: url("../img/casey.jpg");
+}
+#afiqah {
+  background-image: url("../img/afiqah.jpg");
+}
+#daniel {
+  background-image: url("../img/daniel.jpg");
+}
+#shan {
+  background-image: url("../img/shan.jpg");
+}
+#michael {
+  background-image: url("../img/michael.jpg");
+}
+#ben {
+  background-image: url("../img/ben.jpg");
+}
+#jon {
+  background-image: url("../img/jon.jpg");
+  background-position-y: -45px;
+}
+#sharon {
+  background-image: url("../img/sharon.jpg");
+  background-position-y: -45px;
+}
+#victoria {
+  background-image: url("../img/victoria.jpg");
+}
+#john {
+  background-position: center;
+}
+#publications {
+  height: auto;
+  padding-top: 15%;
+  padding-bottom: 100px;
+}
+.pub-list {
+  counter-reset: pub-counter 70;
+  list-style: none;
+}
+.pub-list li {
+  counter-increment: pub-counter -1;
+  position: relative;
+  padding: 4px 0 20px 70px;
+}
+.pub-list li:before {
+  content: counter(pub-counter);
+  position: absolute;
+  left: 0;
+  top: -2px;
+  font-size: 35px;
+  color: #babdc8;
+}
+
+#donate {
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-image: url("../img/donate.jpg");
+}
+#donate-row {
+  padding: 100px 0;
+  background-color: #fff;
+}
+.donate-container > h1 {
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
+  font-size: 90px;
+  font-weight: 700;
+}
+
+.page-info.donate {
+  background-color: rgba(255,255,255,0.7);
+  padding: 25px;
+  border-radius: 5px;
+}
+.burwell-title {
+  text-align: center;
+  color: #000000;
+}
+@media(max-width: 1200px), (min-width: 1200px) {
+  .snap-drawers {
+    display: none;
+  }
+  .main {
+    background-image: url("../img/cover_large.jpg");
+  }
+  .north-america {
+    background-image: url("../img/north_america.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new.jpg");
+  }
+  #john {
+    background-image: url("../img/john.jpg");
+  }
+  #puneet {
+    background-image: url("../img/puneet.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel.jpg");
+    background-position: 0 -35px, center;
+  }
+  #andrew {
+    background-image: url("../img/andrew.jpg");
+    background-position: 0 -35px, center;
+  }
+  #erika {
+    background-image: url("../img/erika.jpg");
+  }
+}
+@media(max-width: 992px) {
+  .snap-drawers {
+    display: none;
+  }
+  .main {
+    background-image: url("../img/cover_medium.jpg");
+  }
+  .north-america {
+    background-image: url("../img/north_america_med.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new_medium.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new_medium.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new_medium.jpg");
+  }
+  #john {
+    background-image: url("../img/john_med.jpg");
+  }
+  #puneet {
+    background-image: url("../img/puneet_med.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel_med.jpg");
+    background-position: 0 0;
+  }
+  #andrew {
+    background-image: url("../img/andrew_med.jpg");
+    background-position: 0 0;
+  }
+  #erika {
+    background-image: url("../img/erika_med.jpg");
+  }
+  #jon {
+    background-position: 0 0;
+  }
+  #donate {
+    background-image: url("../img/donate_medium.jpg");
+  }
+  .donate-container > h1 {
+    font-size: 60px;
+  }
+}
+@media(max-width: 768px) {
+  .top-stat-col {
+    margin-top: 15px;
+  }
+  .logo {
+    margin-left: 10px;
+  }
+  .snap-drawers {
+    display: block;
+  }
+  .main {
+  /*  background-image: url("../img/cover_small.jpg");*/
+  }
+  .north-america {
+    background-image: url("../img/north_america_small.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new_small.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new_small.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new_small.jpg");
+  }
+  .big {
+    font-size: 50px;
+  }
+  .title {
+    margin-top: 0;
+    margin-right: 1em;
+  }
+  .app-grid {
+    width: 100%;
+  }
+  #api {
+    height: 150%;
+  }
+  .api-title {
+    margin-left: 7%;
+    margin-bottom: 50px;
+    margin-top: 50px;
+  }
+  .stat-caption > h1 {
+    font-size: 42px;
+  }
+  .stat-caption > p {
+    font-size: 16px;
+  }
+  .person-info {
+    line-height: 17px;
+  }
+  n {
+    font-size: 14px;
+  }
+  t {
+    font-size: 15px;
+  }
+  e {
+    font-size: 10px;
+  }
+  #john {
+    background-image: url("../img/john_low.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel_low.jpg");
+  }
+  #andrew {
+    background-image: url("../img/andrew_low.jpg");
+  }
+  #donate {
+    background-image: url("../img/donate_small.jpg");
+  }
+  #erika {
+    background-image: url("../img/erika_low.jpg");
+  }
+  .funding {
+    display: block;
+  }
+  .funding-line {
+    display: block;
+  }
+  .stat-row {
+    height: 100%;
+  }
+  .stat {
+    height: 50%;
+  }
+  .donate-container > h1 {
+    font-size: 45px;
+  }
+  .page-info.donate {
+    font-size: 15px;
+    margin-bottom: 25px;
+    font-weight: 400;
+  }
+}
+@media(max-width: 450px) {
+  .row-eq-height {
+    display: block;
+  }
+  #donate-title-container {
+    position: relative;
+    margin-bottom: 15px;
+  }
+  .logo {
+    height: 40px;
+    padding-left: 10px;
+    padding-top: 7px;
+  }
+  .big {
+    font-size: 37px;
+  }
+  .col-xs-6 {
+    width: 100%;
+  }
+  .api-title {
+    margin-left: 21%;
+  }
+  .pub-list {
+    margin-left: -35px;
+  }
+  .slide-content-padded {
+    padding: 0;
+  }
+  .pub-list li:before {
+    font-size: 25px;
+  }
+  .app-img {
+    height: 80px;
+  }
+  .app-background-text {
+    font-size: 25px;
+    letter-spacing: 10px;
+  }
+
+  .person {
+    border: 5px solid #fff;
+  }
+  .footer .col-sm-4 {
+    padding: 25px 0;
+  }
+  .about-body-subtitle {
+    font-size: 25px;
+    font-weight: 400;
+  }
+  #app-title {
+    height: 250px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+}

From b00b659492284ab73b3135633c9dd4839752b2f7 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 30 May 2024 12:12:04 -0400
Subject: [PATCH 004/151] added borders

---
 src/pages/test/+Page.mdx | 308 +++++++++++++++++++--------------------
 src/pages/test/main.styl |  66 +++++++--
 2 files changed, 205 insertions(+), 169 deletions(-)

diff --git a/src/pages/test/+Page.mdx b/src/pages/test/+Page.mdx
index 846cf8ea..7fb9d6bf 100644
--- a/src/pages/test/+Page.mdx
+++ b/src/pages/test/+Page.mdx
@@ -2,162 +2,164 @@ import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
 import "./main.styl";
 
-<div id="snapContent" class="snap-content scrollable">
-  <div class="container-fluid">
-    [//]: # "Nav Bar"
-    <div class="nav">
-      <ul>
-        <li><a href="#about">About</a></li>
-        <li><a href="#apps">Apps</a></li>
-        <li><a href="#api">API</a></li>
-        <li><a href="#people">People</a></li>
-        <li><a href="#donate">Donate</a></li>
-        <li><a href="#publications">Publications</a></li>
-        <li><img id="logo-jpg"></img></li>
-      </ul>
-    </div>
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="#about">About</a></li>
+    <li><a href="#apps">Apps</a></li>
+    <li><a href="#api">API</a></li>
+    <li><a href="#people">People</a></li>
+    <li><a href="#donate">Donate</a></li>
+    <li><a href="#publications">Publications</a></li>
+    <li><img id="logo-jpg"></img></li>
+  </ul>
+</div>
 
-    [//]: # "Start Page"
-    <div class="parent">
-      <div class="left">
-        <h1 class="big">Macrostrat</h1>
-        <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
-        <ul class="buttons1">
-          <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
-          <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
-          <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
-            <div class="rockd-button-container">
-              <img id="rockd-png"></img>
-              <a href="https://rockd.org" target="_blank">Go mobile</a>
-            </div>
-          </div></li>
-        </ul>
-      </div>
-      
-      <div class="right">
-        <ul class="stats-row">
-          <li>
-            <span class="top-stat" id="n_columns">1,400</span>
-            <span class="top-stat-label">Regional Rock Columns</span>
-          </li>
-          <li>
-            <span class="top-stat" id="n_units">33,903</span>
-            <span class="top-stat-label">Rock Units</span>
-          </li>
-          <li>
-            <span class="top-stat" id="n_polys">2,500,000</span>
-            <span class="top-stat-label">Geologic Map Polygons</span>
-          </li>
-          <li>
-            <span class="top-stat" id="n_names">51,212</span>
-            <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
-          </li>
-        </ul>
-      </div>
-    </div>
+[//]: # "Start Page"
+<div class="parent">
+  <div class="left">
+    <h1 class="big">Macrostrat</h1>
+    <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
+    <ul class="buttons1">
+      <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
+      <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
+      <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
+        <div class="rockd-button-container">
+          <img id="rockd-png"></img>
+          <a href="https://rockd.org" target="_blank">Go mobile</a>
+        </div>
+      </div></li>
+    </ul>
+  </div>
+  
+  <div class="right">
+    <ul class="stats-row">
+      <li>
+        <span class="top-stat" id="n_columns">1,400</span>
+        <span class="top-stat-label">Regional Rock Columns</span>
+      </li>
+      <li>
+        <span class="top-stat" id="n_units">33,903</span>
+        <span class="top-stat-label">Rock Units</span>
+      </li>
+      <li>
+        <span class="top-stat" id="n_polys">2,500,000</span>
+        <span class="top-stat-label">Geologic Map Polygons</span>
+      </li>
+      <li>
+        <span class="top-stat" id="n_names">51,212</span>
+        <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
+      </li>
+    </ul>
+  </div>
+</div>
 
-    [//]: # "Locations"
-    <div class="country_container north-america">
-      <div class="country">
-        <h1>North America</h1>\
-        <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
-      </div>
-      <div class="country caribbean">
-        <h1>Caribbean</h1>\
-        <div class="caption">243 packages. 798 units. 897 collections.</div>
-      </div>
-      <div class="country new-zealand">
-        <h1>New Zealand</h1>\
-        <div class="caption">828 packages. 2,168 units. 328 collections.</div>
-      </div>
-      <div class="country deep-sea">
-        <h1>Deep Sea</h1>\
-        <div class="caption">388 packages. 7,124 units. 0 collections.</div>
-      </div>
-    </div>
+[//]: # "Locations"
+<div class="country_container">
+  <div class="country north-america">
+    <h1>North America</h1>\
+    <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+  </div>
+  <div class="country caribbean">
+    <h1>Caribbean</h1>\
+    <div class="caption">243 packages. 798 units. 897 collections.</div>
+  </div>
+  <div class="country new-zealand">
+    <h1>New Zealand</h1>\
+    <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+  </div>
+  <div class="country deep-sea">
+    <h1>Deep Sea</h1>\
+    <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+  </div>
+</div>
 
-    [//]: # "Geological Maps"
-    <h1 class="big">Geologic Maps</h1>
-    <div class="map-info">
-      With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
-      \
-      \
-      Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
-      \
-      \
-      Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
-    </div>
-         
-    [//]: # "About"
-    <div class="row slide" id="about">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder about-title">
-                <h1 class="big">About</h1>
-              </div>
-            </div>
-          </div>
-          <div class="row about-row">
-            <div class="col-sm-3 about-body-subtitle">
-              Summary
-            </div>
-            <div class="col-sm-9 about-body page-info">
-              Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
-            </div>
-          </div>
+[//]: # "Geological Maps"
+<div class="geologic-maps">
+  <h1 class="title map-title">Geologic Maps</h1>
+  <div class="map-info">
+    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
+    \
+    \
+    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
+    \
+    \
+    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
+  </div>
+</div>
 
-          <div class="row about-row">
-            <div class="col-sm-3 about-body-subtitle">
-              License
-            </div>
-            <div class="col-sm-9 about-body page-info">
-              All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
-            </div>
+<div class="rock-border"></div>
+      
+[//]: # "About"
+<div class="row slide" id="about">
+  <div class="col-xs-12 slide-container">
+    <div class="slide-content slide-content-padded">
+      <div class="row">
+        <div class="col-xs-12">
+          <div class="page-title-holder about-title">
+            <h1 class="title about-title">About</h1>
           </div>
+        </div>
+      </div>
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Summary
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
+        </div>
+      </div>
 
-          <div class="row about-row">
-            <div class="col-sm-3 about-body-subtitle">
-              Citation
-            </div>
-            <div class="col-sm-9 about-body page-info">
-              <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
-              \
-              \
-              <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
-            </div>
-          </div>
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          License
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
+        </div>
+      </div>
 
-          <div class="row about-row">
-            <div class="col-sm-3 about-body-subtitle">
-              Collaboration
-            </div>
-            <div class="col-sm-9 about-body page-info">
-              Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
-            </div>
-          </div>
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Citation
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
+          \
+          \
+          <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
+        </div>
+      </div>
 
-          <div class="row about-row">
-            <div class="col-sm-3 about-body-subtitle">
-              Funding
-            </div>
-            <div class="col-sm-9 about-body page-info">
-              Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
-            </div>
-          </div>
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Collaboration
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
         </div>
       </div>
-    </div>
 
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Funding
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
+        </div>
+      </div>
+    </div>
   </div>
 </div>
 
+<div class="rock-border"></div>
+
+[//]: # "Built With Macrostrat"
 <div class="row slide" id="apps">
   <div class="col-xs-12 slide-container">
     <div class="row">
       <div class="col-xs-12" id="app-title">
-        <h1 class="big apps">Built with Macrostrat</h1>
+        <h1 class="title">Built with Macrostrat</h1>
       </div>
     </div>
 
@@ -239,6 +241,9 @@ import "./main.styl";
       </div>
     </div>
 
+    <div class="rock-border"></div>
+
+
     [//]: # "API"
     <div class="row slide" id="api">
       <div class="col-xs-12 slide-container">
@@ -258,8 +263,9 @@ import "./main.styl";
         </div>
       </div>
     </div>
+    <div class="rock-border"></div>
 
-    [//]: # "About"
+    [//]: # "People"
     <div class="row slide" id="people">
       <div class="col-xs-12 slide-container">
         <div class="slide-content slide-content-padded">
@@ -402,25 +408,11 @@ import "./main.styl";
     </div>
 
     [//]: # "Donate"
-    <div class="row slide" id="donate-row">
-      <div class="col-xs-12 slide-container" id="donate">
-        <div class="slide-content slide-content-padded">
-          <div class="row row-eq-height">
-            <div class="col-sm-6">
-              <div class="page-title-holder" id="donate-title-container">
-                <div class="donate-container">
-                <h1 class="big">Donate</h1>
-                <a class="btn btn-danger btn-lg" href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate now</a>
-              </div>
-              </div>
-            </div>
-            <div class="col-sm-6">
-              <div class="page-info donate">
-                  Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
-              </div>
-            </div>
-          </div>
-        </div>
+    <div class="donate-container">
+      <h1 class="title donate-title">Donate</h1>
+      <a class="btn btn-danger btn-lg" href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate now</a>
+      <div class="page-info donate">
+          Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
       </div>
     </div>
     
diff --git a/src/pages/test/main.styl b/src/pages/test/main.styl
index c666254e..29253d17 100644
--- a/src/pages/test/main.styl
+++ b/src/pages/test/main.styl
@@ -1,6 +1,6 @@
 html, body
   color: #E0E1E6
-  height: 100%
+  background-color: white
 
 .nav
   ul 
@@ -30,13 +30,13 @@ html, body
   padding-top: 6px
 
 .parent
-  height: 100%
+  height: 100vh
 
 .left
   width: 70%
   text-align: center
-  height: 750px
-  background-image url("./img/cover_medium.jpg")
+  height: 100vh
+  background-image url("./img/cover_large.jpg")
   color: white
 
   li
@@ -46,16 +46,15 @@ html, body
   ul
     display: inline-block;
 
-
-
 .right
   background-color: blue
-  height: 750px
+  height: 100vh
   width: 30%
   background-image url("./img/deep_sea_new_medium.jpg")
 
   ul 
     list-style-type: none
+    margin-top: 32vh
 
   li 
     width: 25%
@@ -71,8 +70,7 @@ html, body
 .big
   font-size: 72px
   font-family: "Maven Pro", sans-serif;
-  margin-top: 10%
-  margin-bottom: 5%
+  margin-top: 32vh
   width: 40%
   margin-left: 30%
   text-align: center
@@ -142,10 +140,11 @@ html, body
   padding-top: 5px
 
 .country_container 
-  height: 1000px
+  height: 100vh
   display: grid;
   grid-template-columns: repeat(2, minmax(150px, 2fr));
   grid-template-rows: repeat(2, minmax(150px, 2fr));
+  background-color: green
 
 .country
   height: 100%
@@ -165,4 +164,49 @@ html, body
   background-image url("./img/caribbean_new.jpg")
 
 .new-zealand
-  background-image url("./img/new_zealand_new.jpg")
\ No newline at end of file
+  background-image url("./img/new_zealand_new.jpg")
+
+.rock-border
+  content: url("./img/rocks-border.jpg")
+  width: 100%
+  margin: 0
+
+.geologic-maps
+  height: 100vh
+  background-color: white
+  color: black
+  margin: 0
+
+.map-info
+  padding: 0 10vh
+  margin: 0
+
+.title
+  margin: 0
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  padding: 20vh 0
+  text-align: center
+
+#about
+  height: 100vh
+  background-color: white
+  color: black
+  margin: 0
+
+#apps
+  height: 100vh
+  color: black
+  background-color: white
+
+#api
+  height: 100vh
+
+.donate-container
+  height: 80vh
+  background-image url("./img/donate_medium.jpg")
+
+.donate-title
+  color:white
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  font-family: "Maven Pro", sans-serif;
\ No newline at end of file

From 4439de135f9d50e1519a709eaabd3763e11fdf96 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 30 May 2024 18:13:52 -0400
Subject: [PATCH 005/151] change site name

---
 src/pages/+Page.mdx       |   2 +-
 src/pages/test/+Page.mdx  | 543 -----------------------
 src/pages/test/main.styl  | 212 ---------
 src/pages/test/styles.css | 908 --------------------------------------
 4 files changed, 1 insertion(+), 1664 deletions(-)
 delete mode 100644 src/pages/test/+Page.mdx
 delete mode 100644 src/pages/test/main.styl
 delete mode 100644 src/pages/test/styles.css

diff --git a/src/pages/+Page.mdx b/src/pages/+Page.mdx
index fabd5791..c09bf97a 100644
--- a/src/pages/+Page.mdx
+++ b/src/pages/+Page.mdx
@@ -45,6 +45,6 @@ These products come from a variety of sources throughout the geosciences.
   Macrostrat documentation
 </LinkCard>
 
-<LinkCard href="/test" title="Test Site">
+<LinkCard href="/mainpageTest" title="Test Site">
   New test site @David
 </LinkCard>
diff --git a/src/pages/test/+Page.mdx b/src/pages/test/+Page.mdx
deleted file mode 100644
index 7fb9d6bf..00000000
--- a/src/pages/test/+Page.mdx
+++ /dev/null
@@ -1,543 +0,0 @@
-import { PageHeader } from "~/components";
-import { LinkCard } from "~/components/cards";
-import "./main.styl";
-
-[//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="#about">About</a></li>
-    <li><a href="#apps">Apps</a></li>
-    <li><a href="#api">API</a></li>
-    <li><a href="#people">People</a></li>
-    <li><a href="#donate">Donate</a></li>
-    <li><a href="#publications">Publications</a></li>
-    <li><img id="logo-jpg"></img></li>
-  </ul>
-</div>
-
-[//]: # "Start Page"
-<div class="parent">
-  <div class="left">
-    <h1 class="big">Macrostrat</h1>
-    <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
-    <ul class="buttons1">
-      <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
-      <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
-      <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
-        <div class="rockd-button-container">
-          <img id="rockd-png"></img>
-          <a href="https://rockd.org" target="_blank">Go mobile</a>
-        </div>
-      </div></li>
-    </ul>
-  </div>
-  
-  <div class="right">
-    <ul class="stats-row">
-      <li>
-        <span class="top-stat" id="n_columns">1,400</span>
-        <span class="top-stat-label">Regional Rock Columns</span>
-      </li>
-      <li>
-        <span class="top-stat" id="n_units">33,903</span>
-        <span class="top-stat-label">Rock Units</span>
-      </li>
-      <li>
-        <span class="top-stat" id="n_polys">2,500,000</span>
-        <span class="top-stat-label">Geologic Map Polygons</span>
-      </li>
-      <li>
-        <span class="top-stat" id="n_names">51,212</span>
-        <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
-      </li>
-    </ul>
-  </div>
-</div>
-
-[//]: # "Locations"
-<div class="country_container">
-  <div class="country north-america">
-    <h1>North America</h1>\
-    <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
-  </div>
-  <div class="country caribbean">
-    <h1>Caribbean</h1>\
-    <div class="caption">243 packages. 798 units. 897 collections.</div>
-  </div>
-  <div class="country new-zealand">
-    <h1>New Zealand</h1>\
-    <div class="caption">828 packages. 2,168 units. 328 collections.</div>
-  </div>
-  <div class="country deep-sea">
-    <h1>Deep Sea</h1>\
-    <div class="caption">388 packages. 7,124 units. 0 collections.</div>
-  </div>
-</div>
-
-[//]: # "Geological Maps"
-<div class="geologic-maps">
-  <h1 class="title map-title">Geologic Maps</h1>
-  <div class="map-info">
-    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
-    \
-    \
-    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
-    \
-    \
-    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
-  </div>
-</div>
-
-<div class="rock-border"></div>
-      
-[//]: # "About"
-<div class="row slide" id="about">
-  <div class="col-xs-12 slide-container">
-    <div class="slide-content slide-content-padded">
-      <div class="row">
-        <div class="col-xs-12">
-          <div class="page-title-holder about-title">
-            <h1 class="title about-title">About</h1>
-          </div>
-        </div>
-      </div>
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Summary
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          License
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Citation
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
-          \
-          \
-          <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Collaboration
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Funding
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="rock-border"></div>
-
-[//]: # "Built With Macrostrat"
-<div class="row slide" id="apps">
-  <div class="col-xs-12 slide-container">
-    <div class="row">
-      <div class="col-xs-12" id="app-title">
-        <h1 class="title">Built with Macrostrat</h1>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="/sift">
-          <div class="app-background">
-            <div class="app-background-text">
-              Sift
-              <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://rockd.org">
-          <div class="app-background">
-            <div class="app-background-text">
-              Rockd
-              <p class="blurb">A mobile field book, Macrostrat style.</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="/map">
-          <div class="app-background">
-            <div class="app-background-text">
-              Map
-              <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
-          <div class="app-background">
-            <div class="app-background-text">
-              Mancos
-              <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="http://fc.umn.edu/" target="_blank">
-          <div class="app-background">
-            <div class="app-background-text">
-              FOC
-              <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://github.com/UW-Macrostrat/node-api-template">
-          <div class="app-background">
-            <div class="app-background-text app-background-text-small">
-              API Template
-              <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="rock-border"></div>
-
-
-    [//]: # "API"
-    <div class="row slide" id="api">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-sm-6">
-              <div class="page-title-holder api-title">
-                <h1 class="big">API</h1>
-              </div>
-            </div>
-            <div class="col-sm-6">
-              <div class="page-info">
-                All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="rock-border"></div>
-
-    [//]: # "People"
-    <div class="row slide" id="people">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder" id="contact-holder">
-                <h1 class="big">People</h1>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-xs-6 person" id="shanan">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
-                <t>Professor, Database Developer</t>\
-                <e>peters -at geology.wisc.edu</e>
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daven">
-              <div class="person-info">
-                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
-                <t>Research Scientist, Developer</t> \
-                <e>daven.quinn -at wisc.edu</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="evgeny">
-              <div class="person-info">
-                <n>Evgeny Mazko</n> \
-                <t>Graduate Student</t> \
-                <e>mazko -at wisc.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="michael">
-              <div class="person-info">
-                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
-                <t>Senior Programmer Analyst</t> \
-                <e>mmcclenn -at- geology.wisc.edu</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="casey">
-              <div class="person-info">
-                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
-                <t>Research Specialist, Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daniel">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="shan">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="ben">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
-                <t>Postdoctoral Scholar (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="afiqah">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
-                <t>Undergrad Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="sharon">
-              <div class="person-info">
-                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="andrew">
-              <div class="person-info">
-                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
-                <t>Data Mobilization and Research Scientist</t> \
-                <e>azaffos -at- email.arizona.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="jon">
-              <div class="person-info">
-                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
-                <t>Postdoctoral Researcher (former)</t> \
-                <e>jhusson - at - uvic.ca</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="erika">
-              <div class="person-info">
-                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
-                <t>Research Intern (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="noel">
-              <div class="person-info">
-                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="john">
-              <div class="person-info">
-                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
-                <t>Next-level Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="puneet">
-              <div class="person-info">
-                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
-                <t>Generally Ignored</t> \
-                <e>punkish at eidesis.org</e> 
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </div>
-
-    [//]: # "Donate"
-    <div class="donate-container">
-      <h1 class="title donate-title">Donate</h1>
-      <a class="btn btn-danger btn-lg" href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate now</a>
-      <div class="page-info donate">
-          Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
-      </div>
-    </div>
-    
-    [//]: # "Publications"
-    <div class="row slide" id="publications">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder">
-                <h1 class="big">Publications</h1>
-                <p class="blurb">literature utilizing Macrostrat</p>
-              </div>
-            </div>
-          </div>
-          [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
-          <div class="row">
-            <div class="col-xs-12">
-              <ol class="pub-list" reversed>
-                <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
-                <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
-                <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
-                <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
-                <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
-                <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
-                <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
-                <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
-                <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
-                <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
-                <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
-                <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
-                <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
-                <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
-                <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
-                <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
-                <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
-                <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
-                <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
-                <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
-                <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
-                <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
-                <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
-                <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
-                <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
-                <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
-                <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
-                <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
-                Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
-                <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
-                <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
-                <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
-                <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
-                <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
-                <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
-                <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
-                <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
-                <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
-                <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
-                <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
-                <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
-                <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
-                <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
-                <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
-                <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
-                <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
-                <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
-                <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
-                <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
-                <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
-                <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
-                <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
-                <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
-                <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
-                <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
-                <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
-                  <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
-                <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
-                <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
-                <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
-                <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
-                <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
-                <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
-                <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
-                <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
-              </ol>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    [//]: # "Footer"
-    <div class="row footer">
-      <div class="container">
-        <div class="col-sm-4" id="who-made-it">
-          Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><i class="fa fa-github"></i></a>
-        </div>
-        <div class="col-sm-4" id="bottom-nav">
-          <ul class="nav footer-nav">
-            <li><a href="#about">About</a></li>
-            <li><a href="#apps">Apps</a></li>
-            <li><a href="#api">API</a></li>
-            <li><a href="#people">People</a></li>
-            <li><a href="#donate">Donate</a></li>
-            <li><a href="#publications">Publications</a></li>
-          </ul>
-        </div>
-        <div class="col-sm-4 funding">
-          <div class="funding-line">
-            Current support: \
-            EAR-1948843 \
-            ICER-1928323 \
-            UW-Madison Dept. Geoscience
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/pages/test/main.styl b/src/pages/test/main.styl
deleted file mode 100644
index 29253d17..00000000
--- a/src/pages/test/main.styl
+++ /dev/null
@@ -1,212 +0,0 @@
-html, body
-  color: #E0E1E6
-  background-color: white
-
-.nav
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #333;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none;
-
-  li a:hover 
-    background-color: #111;
-
-#logo-jpg 
-  content: url("./img/logo_white.png")
-  width: 35px
-  padding-top: 6px
-
-.parent
-  height: 100vh
-
-.left
-  width: 70%
-  text-align: center
-  height: 100vh
-  background-image url("./img/cover_large.jpg")
-  color: white
-
-  li
-    float: left
-    list-style-type: none
-  
-  ul
-    display: inline-block;
-
-.right
-  background-color: blue
-  height: 100vh
-  width: 30%
-  background-image url("./img/deep_sea_new_medium.jpg")
-
-  ul 
-    list-style-type: none
-    margin-top: 32vh
-
-  li 
-    width: 25%
-    padding-left: 10px
-
-  .buttons1
-    padding-left: 27%      
-
-.parent
-  display: inline-flex
-  width: 100%
-
-.big
-  font-size: 72px
-  font-family: "Maven Pro", sans-serif;
-  margin-top: 32vh
-  width: 40%
-  margin-left: 30%
-  text-align: center
-
-.big-text
-  font-family: Helvetica, sans-serif
-  font-weight: 900
-  font-size: 20px
-  margin-bottom: 5%
-  padding: 0 100px
-
-.top-stat, .top-stat-label
-  display: block
-  color: white
-
-.top-stat
-  font-size: 35px
-  font-family: Helvetica, sans-serif
-
-.stats-row
-  margin-top: 20%
-
-  li
-    padding-top: 10px
-    padding-bottom: 20px
-    color: black
-    width: 100%
-    
-.btn
-  background-color: #363434;
-  border: none;
-  color: white;
-  padding: 13px 10px;
-  margin: 10px
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  float: left
-  border-radius: 12px;
-
-.btn:hover 
-  background-color: #545151 
-
-.small-rockd
-  background-image url("../img/north_america_small.jpg")
-  float: left
-
-#placeholder
-    background-image url("../img/north_america_small.jpg")
-
-.buttons1 
-  font-size: 20px
-  padding: 0px
-
-  a 
-    color: white
-    text-decoration: none
-
-  a:hover
-    color: white
-
-#rockd-png
-  content: url("./img/rockd.jpg")
-  width: 22px
-  padding-right: 4px
-  float: left
-  padding-top: 5px
-
-.country_container 
-  height: 100vh
-  display: grid;
-  grid-template-columns: repeat(2, minmax(150px, 2fr));
-  grid-template-rows: repeat(2, minmax(150px, 2fr));
-  background-color: green
-
-.country
-  height: 100%
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  color: white
-
-.deep-sea
-  background-image url("./img/deep_sea_new.jpg")
-
-.north-america
-  background-image url("./img/north_america_med.jpg")
-
-.caribbean
-  background-image url("./img/caribbean_new.jpg")
-
-.new-zealand
-  background-image url("./img/new_zealand_new.jpg")
-
-.rock-border
-  content: url("./img/rocks-border.jpg")
-  width: 100%
-  margin: 0
-
-.geologic-maps
-  height: 100vh
-  background-color: white
-  color: black
-  margin: 0
-
-.map-info
-  padding: 0 10vh
-  margin: 0
-
-.title
-  margin: 0
-  font-size: 72px
-  font-family: "Maven Pro", sans-serif;
-  padding: 20vh 0
-  text-align: center
-
-#about
-  height: 100vh
-  background-color: white
-  color: black
-  margin: 0
-
-#apps
-  height: 100vh
-  color: black
-  background-color: white
-
-#api
-  height: 100vh
-
-.donate-container
-  height: 80vh
-  background-image url("./img/donate_medium.jpg")
-
-.donate-title
-  color:white
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
-  font-family: "Maven Pro", sans-serif;
\ No newline at end of file
diff --git a/src/pages/test/styles.css b/src/pages/test/styles.css
deleted file mode 100644
index 9ec89de9..00000000
--- a/src/pages/test/styles.css
+++ /dev/null
@@ -1,908 +0,0 @@
-/* Snap styles */
-html, body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-.row-eq-height {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display:         flex;
-}
-
-#donate-title-container {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  width: 100%;
-  position: absolute;
-  text-align: center;
-}
-.snap-content {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: auto;
-  height: auto;
-  z-index: 2;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-transform: translate3d(0, 0, 0);
-     -moz-transform: translate3d(0, 0, 0);
-      -ms-transform: translate3d(0, 0, 0);
-       -o-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-
-.snap-drawers {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: auto;
-  height: auto;
-}
-
-.snap-drawer {
-  position: absolute;
-  top: 0;
-  right: auto;
-  bottom: 0;
-  left: auto;
-  width: 265px;
-  height: auto;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-transition: width 0.3s ease;
-     -moz-transition: width 0.3s ease;
-      -ms-transition: width 0.3s ease;
-       -o-transition: width 0.3s ease;
-          transition: width 0.3s ease;
-}
-
-.snap-drawer-left {
-  left: 0;
-  z-index: 1;
-}
-
-.snap-drawer-right {
-  right: 0;
-  z-index: 1;
-}
-
-.snapjs-left .snap-drawer-right,
-.snapjs-right .snap-drawer-left {
-  display: none;
-}
-
-.snapjs-expand-left .snap-drawer-left,
-.snapjs-expand-right .snap-drawer-right {
-  width: 100%;
-}
-
-/* End snap styles */
-
-a:hover {
-  text-decoration: none;
-}
-.container-fluid {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-}
-.scrollable{
-  overflow: auto;
-  -webkit-transition-property: top, bottom;
-  transition-property: top, bottom;
-  -webkit-transition-duration: .2s, .2s;
-  transition-duration: .2s, .2s;
-  -webkit-transition-timing-function: linear, linear;
-  transition-timing-function: linear, linear;
-  -webkit-overflow-scrolling: touch;
-}
-.footer {
-  display: block;
-  bottom: 0;
-  width: 100%;
-  padding: 1em;
-  background-color: #015EAB;
-}
-#who-made-it {
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-}
-#who-made-it > a {
-  color: #E0E1E6;
-  font-weight: 200;
-}
-#who-made-it > a > img {
-  height: 75px;
-}
-#who-made-it > a > i {
-  margin-top: 10px;
-}
-#who-made-it > a > i:first-child {
-  margin-right: 10px;
-}
-#bottom-nav {
-  text-align: center;
-}
-.footer-nav > li > a {
-  color: #E0E1E6;
-  padding: 5px;
-}
-.funding {
-  color: #E0E1E6;
-  display: table;
-  text-align: center;
-}
-.funding-line {
-  display: table-cell;
-  vertical-align: middle;
-  font-weight: 200;
-}
-.funding-logo {
-  width: 75px;
-}
-.snap-content {
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-}
-.navbar-default {
-  background-color: rgba(0,0,0,0);
-  border: none;
-}
-.snap-drawers {
-  top: 50px;
-}
-.close-to-top {
-  background-color: #015EAB;
-  opacity: 1;
-}
-#second-nav {
-  background-color: #193441;
-}
-.navbar-default .navbar-nav>li>a {
-  color: #E0E1E6;
-  font-size: 1.1em;
-  font-weight: 400;
-  letter-spacing: 1px;
-}
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #E0E1E6;
-}
-.navbar-default .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus {
-  color: #fff;
-}
-.navbar-default .navbar-toggle {
-  border-color: rgba(0,0,0,0);
-}
-.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
-  background-color: rgba(0,0,0,0);
-}
-.logo {
-  height: 50px;
-  padding: 2px;
-}
-.main {
-  margin: auto;
-  color:#888;
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-.main > h1 {
-  font-family: "Maven Pro", sans-serif;
-  font-size: 50px;
-  font-weight: 100;
-  line-height: 1.1;
-}
-.explore-sift {
-  background-color: #990000;
-  border-color: #990000;
-  margin-top: 10px;
-}
-.explore-sift.btn-info {
-  background-color: #015EAB;
-  border-color: #015EAB;
-}
-.rockd-button-container {
-  display: flex;
-  align-items: center;
-}
-.explore-sift.rockd {
-  background-color: #363434;
-  border-color: #363434;
-}
-.rockd-logo-small {
-  height: 21px;
-  margin-right: 5px;
-}
-.stats {
-  color: white;
-}
-.snap-drawer-right {
-  background-color: #015EAB;
-  opacity: 0.92;
-}
-.drawer-menu {
-  background-color: #015EAB;
-  line-height: 20px;
-  margin: 0;
-}
-.drawer-menu > a {
-  display: block;
-  color: #E0E1E6;
-  padding: 12px 35px !important;
-  border-bottom: 2px solid #0167bc;
-  font-size: 13px;
-  font-weight: 100;
-  letter-spacing: 1px;
-}
-.drawer-menu > a:hover {
-  color: #fff;
-}
-.nav>li>a:hover, .nav>li>a:focus {
-  background-color: rgba(0,0,0,0);
-}
-.nav.drawer {
-  margin-top: 60px;
-}
-#view {
-  height: 100%;
-  width: 100%;
-  position: relative;
-  background-color: #fff;
-  margin-top: 50px;
-}
-#view > .container-fluid {
-  height: 100%;
-  padding: 0;
-}
-.row {
-  margin: 0;
-}
-.slide {
-  height: 100%;
-  background-color: #fff;
-}
-.stat-row {
-  height: 50%;
-}
-.slide-container {
-  width: 100%;
-  height: 100%;
- /* text-align: center; */
-  display: table;
-  padding: 0;
-}
-.slide-content {
-  display: table-cell;
-  vertical-align: middle;
-}
-.slide-container > .stat-container {
-  display: table-cell;
-}
-
-.slide-content-padded {
-  padding-left: 10%;
-  padding-right: 10%;
-}
-
-.welcome {
-  background-color: rgba(0,0,0,0.3);
-  text-align: center;
-}
-.title {
-  margin-left: 1em;
-  margin-top: -6em;
-  padding: 40px;
-  border-radius: 20px;
-}
-
-.title > p {
-  color: #f7f7f7;
-  font-size: 20px;
-  font-weight: 300;
-}
-.top-stat, .top-stat-label {
-  display: block;
-  color: #f7f7f7;
-  font-size: 20px;
-}
-.top-stat {
-  font-weight: 600;
-}
-.top-stat-label {
-  font-size: 16px;
-  font-weight: 300;
-}
-.big {
-  font-size: 75px;
-  color: #E0E1E6;
-  font-family: "Maven Pro", sans-serif;
-}
-.nohighlight a{
-  color: white;
-}
-
-.stats > .slide-container {
-  text-align: center;
-}
-
-
-#app-title {
-  background-color: #4BABBf;
-  color: white;
-}
-
-.about-title {
-  border-bottom: 1px solid #eee;
-  margin-bottom: 18px;
-
-}
-#about {
-  padding: 100px 0;
-}
-#about > .slide-container {
-  padding-bottom: 100px;
-
-}
-.about {
-  padding: 0 15px;
-}
-.about-row {
-  padding: 15px 0;
-}
-.about-body {
-  padding: 0 30px;
-  color: #000 !important;
-}
-.about-body-subtitle {
-  font-size: 22px;
-  text-align: center;
-  font-weight: 200;
-  color: #777;
-}
-
-#apps {
-  max-width: 900px;
-  margin: 0 auto;
-  height: auto;
-}
-.app {
-  padding: 0;
-  height: 160px;
-}
-.app-background {
-  position: absolute;
-  font-size: 70px;
-  width: 100%;
-  height: 100%;
-  color: #777;
-  font-weight: 100;
-  letter-spacing: 15px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.blurb {
-  font-weight: 200;
-  font-size: 14px;
-  letter-spacing: 1px;
-}
-.app-background-text {
-  padding-right: 20px;
-  text-align: right;
-  max-width: 55%;
-}
-.app-background-text-small {
-  font-size: 50px;
-}
-.app-content {
-  z-index: 2;
-}
-
-.app-grid {
-  border: 1px solid #E5E5E5;
-  margin-top: -1px;
-  margin-bottom: 0;
-  margin-left: -1px;
-  min-height: 200px;
-  text-align: center;
-  display: table;
-}
-
-.app-grid-content {
-  display: table-cell;
-  vertical-align: middle;
-  color: #4BABBf;
-  font-weight: 500;
-  font-size: 16px;
-}
-
-.app-img {
-  height: 120px;
-  position: absolute;
-  border-radius: 4px;
-  left: 15px;
-  top: 15px;
-}
-
-#api {
- /* background-color: #D33A29;*/
-}
-.api-title {
-  background-color: #fff;
-  height:200px;
-  width: 200px;
-  border-radius: 50%;
-  text-align: center;
-  display: table;
-  border: 11px solid #6bbe98;
-  color: #4BABBf;
-}
-
-.big.apps {
-  color: #F5F5F5;
-}
-#apps {
-  padding-top: 150px;
-}
-#contact {
-  height: 1000px;
-  padding: 140px 0;
-}
-#contact-holder {
-  text-align: right;
-  color: #777;
-  border-bottom: 1px solid #eee;
-  margin-bottom: 18px;
-}
-.api-title > .big {
-  display: table-cell;
-  vertical-align: middle;
-  color: #6bbe98;
-}
-
-.stat-caption {
-  z-index: 10;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
-  position: absolute;
-  left: 20%;
-  right: 20%;
-  bottom: 20px;
-}
-.stat-caption > p {
-  font-size: 18px;
-}
-.stat-caption > h1 {
-  font-size: 45px;
-}
-
-.attribution {
-  height: 25px;
-  width: 25px;
-  position: absolute;
-  text-align: center;
-  right: 0;
-  bottom: 0;
-  margin-right: 10px;
-  margin-bottom: 10px;
-  padding: 5px;
-  border: 1px solid #eee;
-  border-radius: 50%;
-  color: #eee;
-  z-index: 500;
-}
-
-.stat {
-  background-repeat: no-repeat;
-  background-size: cover;
-}
-.stat-container {
-  height: 100%;
-}
-
-.page-info {
-  color: #4bab7f;
-  font-size: 18px;
-  line-height: 28px;
-  font-weight: 200;
-}
-.page-info.donate {
-  color: #333;
-}
-.page-info > a {
-  color: #4bab7f;
-  font-weight: bold;
-}
-.person {
-  background-repeat: no-repeat;
-  background-size: cover;
-  height: 200px;
-  border-bottom: 10px solid #fff;
-}
-.row > .person:first-child {
-  border-right: 5px solid #fff;
-}
-.row > .person:last-child {
-  border-left: 5px solid #fff;
-}
-.person-info {
-  float: right;
-  color: white;
-  font-size: 19px;
-  bottom: 0;
-  font-weight: 200;
-  position: absolute;
-  right: 0;
-  text-align: right;
-  background-color: rgba(0,0,0,0.2);
-  letter-spacing: 1px;
-  padding-top: 10px;
-  padding-left: 10px;
-  border-radius: 3px;
-}
-n, n > a {
-  font-size: 25px;
-  font-weight: 200;
-  color: inherit;
-}
-n > a:hover {
-  color: inherit;
-  font-weight: bolder;
-}
-n > a {
-  color: white;
-}
-t {
-  font-weight: 400;
-}
-e {
-  font-size: 14px;
-  font-weight: 200;
-}
-#people {
-  height: auto;
-}
-#shanan {
-  background-image: url("../img/shanan.jpg");
-}
-#shanan_wide {
-  background-image: url("../img/shanan_wide.jpg");
-}
-#daven {
-  background-image: url("../img/daven.jpg");
-}
-#evgeny {
-  background-image: url("../img/evgeny.jpg");
-}
-#casey {
-  background-image: url("../img/casey.jpg");
-}
-#afiqah {
-  background-image: url("../img/afiqah.jpg");
-}
-#daniel {
-  background-image: url("../img/daniel.jpg");
-}
-#shan {
-  background-image: url("../img/shan.jpg");
-}
-#michael {
-  background-image: url("../img/michael.jpg");
-}
-#ben {
-  background-image: url("../img/ben.jpg");
-}
-#jon {
-  background-image: url("../img/jon.jpg");
-  background-position-y: -45px;
-}
-#sharon {
-  background-image: url("../img/sharon.jpg");
-  background-position-y: -45px;
-}
-#victoria {
-  background-image: url("../img/victoria.jpg");
-}
-#john {
-  background-position: center;
-}
-#publications {
-  height: auto;
-  padding-top: 15%;
-  padding-bottom: 100px;
-}
-.pub-list {
-  counter-reset: pub-counter 70;
-  list-style: none;
-}
-.pub-list li {
-  counter-increment: pub-counter -1;
-  position: relative;
-  padding: 4px 0 20px 70px;
-}
-.pub-list li:before {
-  content: counter(pub-counter);
-  position: absolute;
-  left: 0;
-  top: -2px;
-  font-size: 35px;
-  color: #babdc8;
-}
-
-#donate {
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-image: url("../img/donate.jpg");
-}
-#donate-row {
-  padding: 100px 0;
-  background-color: #fff;
-}
-.donate-container > h1 {
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
-  font-size: 90px;
-  font-weight: 700;
-}
-
-.page-info.donate {
-  background-color: rgba(255,255,255,0.7);
-  padding: 25px;
-  border-radius: 5px;
-}
-.burwell-title {
-  text-align: center;
-  color: #000000;
-}
-@media(max-width: 1200px), (min-width: 1200px) {
-  .snap-drawers {
-    display: none;
-  }
-  .main {
-    background-image: url("../img/cover_large.jpg");
-  }
-  .north-america {
-    background-image: url("../img/north_america.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new.jpg");
-  }
-  #john {
-    background-image: url("../img/john.jpg");
-  }
-  #puneet {
-    background-image: url("../img/puneet.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel.jpg");
-    background-position: 0 -35px, center;
-  }
-  #andrew {
-    background-image: url("../img/andrew.jpg");
-    background-position: 0 -35px, center;
-  }
-  #erika {
-    background-image: url("../img/erika.jpg");
-  }
-}
-@media(max-width: 992px) {
-  .snap-drawers {
-    display: none;
-  }
-  .main {
-    background-image: url("../img/cover_medium.jpg");
-  }
-  .north-america {
-    background-image: url("../img/north_america_med.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new_medium.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new_medium.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new_medium.jpg");
-  }
-  #john {
-    background-image: url("../img/john_med.jpg");
-  }
-  #puneet {
-    background-image: url("../img/puneet_med.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel_med.jpg");
-    background-position: 0 0;
-  }
-  #andrew {
-    background-image: url("../img/andrew_med.jpg");
-    background-position: 0 0;
-  }
-  #erika {
-    background-image: url("../img/erika_med.jpg");
-  }
-  #jon {
-    background-position: 0 0;
-  }
-  #donate {
-    background-image: url("../img/donate_medium.jpg");
-  }
-  .donate-container > h1 {
-    font-size: 60px;
-  }
-}
-@media(max-width: 768px) {
-  .top-stat-col {
-    margin-top: 15px;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-  .snap-drawers {
-    display: block;
-  }
-  .main {
-  /*  background-image: url("../img/cover_small.jpg");*/
-  }
-  .north-america {
-    background-image: url("../img/north_america_small.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new_small.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new_small.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new_small.jpg");
-  }
-  .big {
-    font-size: 50px;
-  }
-  .title {
-    margin-top: 0;
-    margin-right: 1em;
-  }
-  .app-grid {
-    width: 100%;
-  }
-  #api {
-    height: 150%;
-  }
-  .api-title {
-    margin-left: 7%;
-    margin-bottom: 50px;
-    margin-top: 50px;
-  }
-  .stat-caption > h1 {
-    font-size: 42px;
-  }
-  .stat-caption > p {
-    font-size: 16px;
-  }
-  .person-info {
-    line-height: 17px;
-  }
-  n {
-    font-size: 14px;
-  }
-  t {
-    font-size: 15px;
-  }
-  e {
-    font-size: 10px;
-  }
-  #john {
-    background-image: url("../img/john_low.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel_low.jpg");
-  }
-  #andrew {
-    background-image: url("../img/andrew_low.jpg");
-  }
-  #donate {
-    background-image: url("../img/donate_small.jpg");
-  }
-  #erika {
-    background-image: url("../img/erika_low.jpg");
-  }
-  .funding {
-    display: block;
-  }
-  .funding-line {
-    display: block;
-  }
-  .stat-row {
-    height: 100%;
-  }
-  .stat {
-    height: 50%;
-  }
-  .donate-container > h1 {
-    font-size: 45px;
-  }
-  .page-info.donate {
-    font-size: 15px;
-    margin-bottom: 25px;
-    font-weight: 400;
-  }
-}
-@media(max-width: 450px) {
-  .row-eq-height {
-    display: block;
-  }
-  #donate-title-container {
-    position: relative;
-    margin-bottom: 15px;
-  }
-  .logo {
-    height: 40px;
-    padding-left: 10px;
-    padding-top: 7px;
-  }
-  .big {
-    font-size: 37px;
-  }
-  .col-xs-6 {
-    width: 100%;
-  }
-  .api-title {
-    margin-left: 21%;
-  }
-  .pub-list {
-    margin-left: -35px;
-  }
-  .slide-content-padded {
-    padding: 0;
-  }
-  .pub-list li:before {
-    font-size: 25px;
-  }
-  .app-img {
-    height: 80px;
-  }
-  .app-background-text {
-    font-size: 25px;
-    letter-spacing: 10px;
-  }
-
-  .person {
-    border: 5px solid #fff;
-  }
-  .footer .col-sm-4 {
-    padding: 25px 0;
-  }
-  .about-body-subtitle {
-    font-size: 25px;
-    font-weight: 400;
-  }
-  #app-title {
-    height: 250px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
-
-}

From 24c6bbbbbb8ecc6612f363906671c1c1cf6377f4 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 30 May 2024 19:57:10 -0400
Subject: [PATCH 006/151] added images correctly

---
 src/pages/mainpageTest/+Page.mdx  | 549 ++++++++++++++++++
 src/pages/mainpageTest/index.ts   |   6 +
 src/pages/mainpageTest/main.styl  | 300 ++++++++++
 src/pages/mainpageTest/styles.css | 908 ++++++++++++++++++++++++++++++
 4 files changed, 1763 insertions(+)
 create mode 100644 src/pages/mainpageTest/+Page.mdx
 create mode 100644 src/pages/mainpageTest/index.ts
 create mode 100644 src/pages/mainpageTest/main.styl
 create mode 100644 src/pages/mainpageTest/styles.css

diff --git a/src/pages/mainpageTest/+Page.mdx b/src/pages/mainpageTest/+Page.mdx
new file mode 100644
index 00000000..c451aea7
--- /dev/null
+++ b/src/pages/mainpageTest/+Page.mdx
@@ -0,0 +1,549 @@
+import { PageHeader } from "~/components";
+import { LinkCard } from "~/components/cards";
+import { Image } from "./index";
+import "./main.styl";
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="#about">About</a></li>
+    <li><a href="#apps">Apps</a></li>
+    <li><a href="#api">API</a></li>
+    <li><a href="#people">People</a></li>
+    <li><a href="#donate">Donate</a></li>
+    <li><a href="#publications">Publications</a></li>
+    <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+
+[//]: # "Start Page"
+<div class="parent">
+  <div class="left">
+    <h1 class="big">Macrostrat</h1>
+    <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
+    <ul class="buttons1">
+      <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
+      <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
+      <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
+        <div class="rockd-button-container">
+          <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
+          <a href="https://rockd.org" target="_blank">Go mobile</a>
+        </div>
+      </div></li>
+    </ul>
+  </div>
+  
+  <div class="right">
+    <ul class="stats-row">
+      <li>
+        <span class="top-stat" id="n_columns">1,400</span>
+        <span class="top-stat-label">Regional Rock Columns</span>
+      </li>
+      <li>
+        <span class="top-stat" id="n_units">33,903</span>
+        <span class="top-stat-label">Rock Units</span>
+      </li>
+      <li>
+        <span class="top-stat" id="n_polys">2,500,000</span>
+        <span class="top-stat-label">Geologic Map Polygons</span>
+      </li>
+      <li>
+        <span class="top-stat" id="n_names">51,212</span>
+        <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
+      </li>
+    </ul>
+  </div>
+</div>
+
+[//]: # "Locations"
+<div class="country_container">
+  <div class="country north-america">
+    <h1>North America</h1>\
+    <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+  </div>
+  <div class="country caribbean">
+    <h1>Caribbean</h1>\
+    <div class="caption">243 packages. 798 units. 897 collections.</div>
+  </div>
+  <div class="country new-zealand">
+    <h1>New Zealand</h1>\
+    <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+  </div>
+  <div class="country deep-sea">
+    <h1>Deep Sea</h1>\
+    <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+  </div>
+</div>
+
+[//]: # "Geological Maps"
+<div class="geologic-maps">
+  <h1 class="title map-title">Geologic Maps</h1>
+  <div class="map-info">
+    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
+    \
+    \
+    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
+    \
+    \
+    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
+  </div>
+</div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+      
+[//]: # "About"
+<div class="row slide" id="about">
+  <div class="col-xs-12 slide-container">
+    <div class="slide-content slide-content-padded">
+      <div class="row">
+        <div class="col-xs-12">
+          <div class="page-title-holder about-title">
+            <h1 class="title about-title">About</h1>
+          </div>
+        </div>
+      </div>
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Summary
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          License
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Citation
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
+          \
+          \
+          <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Collaboration
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Funding
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+
+[//]: # "Built With Macrostrat"
+<div class="row slide" id="apps">
+  <div class="col-xs-12 slide-container">
+    <div class="row">
+      <div class="col-xs-12" id="app-title">
+        <h1 class="title">Built with Macrostrat</h1>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="/sift">
+          <div class="app-background">
+            <div class="app-background-text">
+              Sift
+              <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://rockd.org">
+          <div class="app-background">
+            <div class="app-background-text">
+              Rockd
+              <p class="blurb">A mobile field book, Macrostrat style.</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="/map">
+          <div class="app-background">
+            <div class="app-background-text">
+              Map
+              <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
+          <div class="app-background">
+            <div class="app-background-text">
+              Mancos
+              <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="http://fc.umn.edu/" target="_blank">
+          <div class="app-background">
+            <div class="app-background-text">
+              FOC
+              <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://github.com/UW-Macrostrat/node-api-template">
+          <div class="app-background">
+            <div class="app-background-text app-background-text-small">
+              API Template
+              <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+
+
+    [//]: # "API"
+    <div class="row slide" id="api">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-sm-6">
+              <div class="page-title-holder api-title">
+                <h1 class="big">API</h1>
+              </div>
+            </div>
+            <div class="col-sm-6">
+              <div class="page-info">
+                All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <Image className="rock-border" src="rocks-border.jpg"></Image>
+
+    [//]: # "People"
+    <div class="row slide" id="people">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder" id="contact-holder">
+                <h1 class="big">People</h1>
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 person" id="shanan">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
+                <t>Professor, Database Developer</t>\
+                <e>peters -at geology.wisc.edu</e>
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="daven">
+              <div class="person-info">
+                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
+                <t>Research Scientist, Developer</t> \
+                <e>daven.quinn -at wisc.edu</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="evgeny">
+              <div class="person-info">
+                <n>Evgeny Mazko</n> \
+                <t>Graduate Student</t> \
+                <e>mazko -at wisc.edu</e> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="michael">
+              <div class="person-info">
+                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
+                <t>Senior Programmer Analyst</t> \
+                <e>mmcclenn -at- geology.wisc.edu</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="casey">
+              <div class="person-info">
+                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
+                <t>Research Specialist, Developer (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="daniel">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
+                <t>Graduate Student (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="shan">
+              <div class="person-info">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
+                <t>Graduate Student (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="ben">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
+                <t>Postdoctoral Scholar (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="afiqah">
+              <div class="person-info">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
+                <t>Undergrad Student (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="sharon">
+              <div class="person-info">
+                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
+                <t>Researcher (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="andrew">
+              <div class="person-info">
+                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
+                <t>Data Mobilization and Research Scientist</t> \
+                <e>azaffos -at- email.arizona.edu</e> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="jon">
+              <div class="person-info">
+                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
+                <t>Postdoctoral Researcher (former)</t> \
+                <e>jhusson - at - uvic.ca</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="erika">
+              <div class="person-info">
+                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
+                <t>Research Intern (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="noel">
+              <div class="person-info">
+                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
+                <t>Researcher (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="john">
+              <div class="person-info">
+                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
+                <t>Next-level Developer (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="puneet">
+              <div class="person-info">
+                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
+                <t>Generally Ignored</t> \
+                <e>punkish at eidesis.org</e> 
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+    [//]: # "Donate"
+    <div class="donate-container" id="donate">
+      <div class="donate-left">
+        <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
+      </div>
+      <div class="donate-right">
+        <div class="donate-info">
+            Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+        </div>
+      </div>
+    </div>
+    
+    [//]: # "Publications"
+    <div class="row slide" id="publications">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder">
+                <h1 class="big">Publications</h1>
+                <p class="blurb">literature utilizing Macrostrat</p>
+              </div>
+            </div>
+          </div>
+          [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
+          <div class="row">
+            <div class="col-xs-12">
+              <ol class="pub-list" reversed>
+                <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
+                <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
+                <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
+                <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
+                <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
+                <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
+                <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
+                <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
+                <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
+                <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
+                <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
+                <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
+                <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
+                <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
+                <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
+                <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
+                <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
+                <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
+                <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
+                <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
+                <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
+                <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
+                <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
+                <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
+                <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
+                <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
+                <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
+                <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
+                Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
+                <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
+                <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
+                <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
+                <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
+                <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
+                <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
+                <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
+                <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
+                <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
+                <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
+                <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
+                <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
+                <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
+                <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
+                <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
+                <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
+                <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
+                <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
+                <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
+                <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
+                <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
+                <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
+                <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
+                <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
+                <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
+                <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
+                <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
+                  <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
+                <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
+                <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
+                <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
+                <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
+                <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
+                <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
+                <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
+                <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
+              </ol>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    [//]: # "Footer"
+    <div class="footer">
+      <div class="footer-container">
+        <div class="col-sm-4" id="who-made-it">
+          <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+          <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+        </div>
+        <div class="col-sm-4" id="bottom-nav">
+          <ul class="footer-nav">
+            <li><a href="#about">About</a></li>
+            <li><a href="#apps">Apps</a></li>
+            <li><a href="#api">API</a></li>
+            <li><a href="#people">People</a></li>
+            <li><a href="#donate">Donate</a></li>
+            <li><a href="#publications">Publications</a></li>
+          </ul>
+        </div>
+        <div class="col-sm-4 funding">
+          <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+          <div class="funding-line">
+            Current support: \
+            EAR-1948843 \
+            ICER-1928323 \
+            UW-Madison Dept. Geoscience
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/mainpageTest/index.ts b/src/pages/mainpageTest/index.ts
new file mode 100644
index 00000000..7e04b44b
--- /dev/null
+++ b/src/pages/mainpageTest/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "/img/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/mainpageTest/main.styl b/src/pages/mainpageTest/main.styl
new file mode 100644
index 00000000..e7fbc0c7
--- /dev/null
+++ b/src/pages/mainpageTest/main.styl
@@ -0,0 +1,300 @@
+html, body
+  color: #E0E1E6
+  background-color: white
+  margin: 0
+
+a:hover
+  text-decoration: none
+
+.nav
+  position: fixed
+  width: 100%
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
+.parent
+  height: 100vh
+
+.left
+  width: 70%
+  text-align: center
+  height: 100vh
+  background-image url("./img/cover_large.jpg")
+  background-repeat: no-repeat;
+  background-size: cover;
+  color: white
+
+  li
+    float: left
+    list-style-type: none
+  
+  ul
+    display: inline-block;
+
+.right
+  background-color: blue
+  height: 100vh
+  width: 30%
+  background-image url("./img/deep_sea_new_medium.jpg")
+  background-repeat: no-repeat;
+  background-size: cover;
+
+  ul 
+    list-style-type: none
+    margin-top: 32vh
+
+  li 
+    width: 25%
+    padding-left: 10px
+
+  .buttons1
+    padding-left: 27%      
+
+.parent
+  display: inline-flex
+  width: 100%
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  margin-top: 32vh
+  width: 40%
+  margin-left: 30%
+  text-align: center
+
+.big-text
+  font-family: Helvetica, sans-serif
+  font-weight: 900
+  font-size: 20px
+  margin-bottom: 5%
+  padding: 0 100px
+
+.top-stat, .top-stat-label
+  display: block
+  color: white
+
+.top-stat
+  font-size: 35px
+  font-family: Helvetica, sans-serif
+
+.stats-row
+  margin-top: 20%
+
+  li
+    padding-top: 10px
+    padding-bottom: 20px
+    color: black
+    width: 100%
+    
+.btn
+  background-color: #363434;
+  border: none;
+  color: white;
+  padding: 13px 10px;
+  margin: 10px
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  float: left
+  border-radius: 12px;
+
+.btn:hover 
+  background-color: #545151 
+
+.small-rockd
+  background-image url("../img/north_america_small.jpg")
+  float: left
+
+#placeholder
+    background-image url("../img/north_america_small.jpg")
+
+.buttons1 
+  font-size: 20px
+  padding: 0px
+
+  a 
+    color: white
+    text-decoration: none
+
+  a:hover
+    color: white
+
+.rockd-png
+  width: 22px
+  padding-right: 4px
+  float: left
+  padding-top: 5px
+
+.country_container 
+  height: 100vh
+  display: grid;
+  grid-template-columns: repeat(2, minmax(150px, 2fr));
+  grid-template-rows: repeat(2, minmax(150px, 2fr));
+  background-color: green
+
+.country
+  height: 100%
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  color: white
+
+.deep-sea
+  background-image url("./img/deep_sea_new.jpg")
+
+.north-america
+  background-image url("./img/north_america_med.jpg")
+
+.caribbean
+  background-image url("./img/caribbean_new.jpg")
+
+.new-zealand
+  background-image url("./img/new_zealand_new.jpg")
+
+.rock-border
+  width: 100%
+  margin: 0
+  padding: 0
+
+.geologic-maps
+  height: 100vh
+  background-color: white
+  color: black
+  margin: 0
+
+.map-info
+  padding: 0 10vh
+  margin: 0
+
+.title
+  margin: 0
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  padding: 20vh 0
+  text-align: center
+
+#about
+  height: 100vh
+  background-color: white
+  color: black
+  margin: 0
+
+#apps
+  height: 100vh
+  color: black
+  background-color: white
+
+#api
+  height: 100vh
+
+.donate-container
+  height: 80vh
+  background-image url("./img/donate_medium.jpg")
+  background-repeat: no-repeat;
+  background-size: cover;
+
+.donate-title
+  a 
+    color:white
+  a:hover
+    text-decoration: none
+
+  color: white
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  font-family: "Maven Pro", sans-serif;
+  padding: 0
+
+.donate-left
+  float: left
+  width: 50%
+  height: 80vh
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+.donate-right
+  float: right
+  width: 50%
+  height: 80vh
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+.donate-info
+  background: rgba(255,255,255,0.5);
+  padding: 25px
+  color: black
+  width: 80%
+  font-size: 18px
+
+  a
+    color: black
+    font-weight: bold
+    text-decoration: none
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px
\ No newline at end of file
diff --git a/src/pages/mainpageTest/styles.css b/src/pages/mainpageTest/styles.css
new file mode 100644
index 00000000..9ec89de9
--- /dev/null
+++ b/src/pages/mainpageTest/styles.css
@@ -0,0 +1,908 @@
+/* Snap styles */
+html, body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+.row-eq-height {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display:         flex;
+}
+
+#donate-title-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+  position: absolute;
+  text-align: center;
+}
+.snap-content {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto;
+  z-index: 2;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  -webkit-transform: translate3d(0, 0, 0);
+     -moz-transform: translate3d(0, 0, 0);
+      -ms-transform: translate3d(0, 0, 0);
+       -o-transform: translate3d(0, 0, 0);
+          transform: translate3d(0, 0, 0);
+}
+
+.snap-drawers {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto;
+}
+
+.snap-drawer {
+  position: absolute;
+  top: 0;
+  right: auto;
+  bottom: 0;
+  left: auto;
+  width: 265px;
+  height: auto;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  -webkit-transition: width 0.3s ease;
+     -moz-transition: width 0.3s ease;
+      -ms-transition: width 0.3s ease;
+       -o-transition: width 0.3s ease;
+          transition: width 0.3s ease;
+}
+
+.snap-drawer-left {
+  left: 0;
+  z-index: 1;
+}
+
+.snap-drawer-right {
+  right: 0;
+  z-index: 1;
+}
+
+.snapjs-left .snap-drawer-right,
+.snapjs-right .snap-drawer-left {
+  display: none;
+}
+
+.snapjs-expand-left .snap-drawer-left,
+.snapjs-expand-right .snap-drawer-right {
+  width: 100%;
+}
+
+/* End snap styles */
+
+a:hover {
+  text-decoration: none;
+}
+.container-fluid {
+  margin: 0;
+  padding: 0;
+  height: 100%;
+}
+.scrollable{
+  overflow: auto;
+  -webkit-transition-property: top, bottom;
+  transition-property: top, bottom;
+  -webkit-transition-duration: .2s, .2s;
+  transition-duration: .2s, .2s;
+  -webkit-transition-timing-function: linear, linear;
+  transition-timing-function: linear, linear;
+  -webkit-overflow-scrolling: touch;
+}
+.footer {
+  display: block;
+  bottom: 0;
+  width: 100%;
+  padding: 1em;
+  background-color: #015EAB;
+}
+#who-made-it {
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+}
+#who-made-it > a {
+  color: #E0E1E6;
+  font-weight: 200;
+}
+#who-made-it > a > img {
+  height: 75px;
+}
+#who-made-it > a > i {
+  margin-top: 10px;
+}
+#who-made-it > a > i:first-child {
+  margin-right: 10px;
+}
+#bottom-nav {
+  text-align: center;
+}
+.footer-nav > li > a {
+  color: #E0E1E6;
+  padding: 5px;
+}
+.funding {
+  color: #E0E1E6;
+  display: table;
+  text-align: center;
+}
+.funding-line {
+  display: table-cell;
+  vertical-align: middle;
+  font-weight: 200;
+}
+.funding-logo {
+  width: 75px;
+}
+.snap-content {
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+.navbar-default {
+  background-color: rgba(0,0,0,0);
+  border: none;
+}
+.snap-drawers {
+  top: 50px;
+}
+.close-to-top {
+  background-color: #015EAB;
+  opacity: 1;
+}
+#second-nav {
+  background-color: #193441;
+}
+.navbar-default .navbar-nav>li>a {
+  color: #E0E1E6;
+  font-size: 1.1em;
+  font-weight: 400;
+  letter-spacing: 1px;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #E0E1E6;
+}
+.navbar-default .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus {
+  color: #fff;
+}
+.navbar-default .navbar-toggle {
+  border-color: rgba(0,0,0,0);
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: rgba(0,0,0,0);
+}
+.logo {
+  height: 50px;
+  padding: 2px;
+}
+.main {
+  margin: auto;
+  color:#888;
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+.main > h1 {
+  font-family: "Maven Pro", sans-serif;
+  font-size: 50px;
+  font-weight: 100;
+  line-height: 1.1;
+}
+.explore-sift {
+  background-color: #990000;
+  border-color: #990000;
+  margin-top: 10px;
+}
+.explore-sift.btn-info {
+  background-color: #015EAB;
+  border-color: #015EAB;
+}
+.rockd-button-container {
+  display: flex;
+  align-items: center;
+}
+.explore-sift.rockd {
+  background-color: #363434;
+  border-color: #363434;
+}
+.rockd-logo-small {
+  height: 21px;
+  margin-right: 5px;
+}
+.stats {
+  color: white;
+}
+.snap-drawer-right {
+  background-color: #015EAB;
+  opacity: 0.92;
+}
+.drawer-menu {
+  background-color: #015EAB;
+  line-height: 20px;
+  margin: 0;
+}
+.drawer-menu > a {
+  display: block;
+  color: #E0E1E6;
+  padding: 12px 35px !important;
+  border-bottom: 2px solid #0167bc;
+  font-size: 13px;
+  font-weight: 100;
+  letter-spacing: 1px;
+}
+.drawer-menu > a:hover {
+  color: #fff;
+}
+.nav>li>a:hover, .nav>li>a:focus {
+  background-color: rgba(0,0,0,0);
+}
+.nav.drawer {
+  margin-top: 60px;
+}
+#view {
+  height: 100%;
+  width: 100%;
+  position: relative;
+  background-color: #fff;
+  margin-top: 50px;
+}
+#view > .container-fluid {
+  height: 100%;
+  padding: 0;
+}
+.row {
+  margin: 0;
+}
+.slide {
+  height: 100%;
+  background-color: #fff;
+}
+.stat-row {
+  height: 50%;
+}
+.slide-container {
+  width: 100%;
+  height: 100%;
+ /* text-align: center; */
+  display: table;
+  padding: 0;
+}
+.slide-content {
+  display: table-cell;
+  vertical-align: middle;
+}
+.slide-container > .stat-container {
+  display: table-cell;
+}
+
+.slide-content-padded {
+  padding-left: 10%;
+  padding-right: 10%;
+}
+
+.welcome {
+  background-color: rgba(0,0,0,0.3);
+  text-align: center;
+}
+.title {
+  margin-left: 1em;
+  margin-top: -6em;
+  padding: 40px;
+  border-radius: 20px;
+}
+
+.title > p {
+  color: #f7f7f7;
+  font-size: 20px;
+  font-weight: 300;
+}
+.top-stat, .top-stat-label {
+  display: block;
+  color: #f7f7f7;
+  font-size: 20px;
+}
+.top-stat {
+  font-weight: 600;
+}
+.top-stat-label {
+  font-size: 16px;
+  font-weight: 300;
+}
+.big {
+  font-size: 75px;
+  color: #E0E1E6;
+  font-family: "Maven Pro", sans-serif;
+}
+.nohighlight a{
+  color: white;
+}
+
+.stats > .slide-container {
+  text-align: center;
+}
+
+
+#app-title {
+  background-color: #4BABBf;
+  color: white;
+}
+
+.about-title {
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+
+}
+#about {
+  padding: 100px 0;
+}
+#about > .slide-container {
+  padding-bottom: 100px;
+
+}
+.about {
+  padding: 0 15px;
+}
+.about-row {
+  padding: 15px 0;
+}
+.about-body {
+  padding: 0 30px;
+  color: #000 !important;
+}
+.about-body-subtitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: 200;
+  color: #777;
+}
+
+#apps {
+  max-width: 900px;
+  margin: 0 auto;
+  height: auto;
+}
+.app {
+  padding: 0;
+  height: 160px;
+}
+.app-background {
+  position: absolute;
+  font-size: 70px;
+  width: 100%;
+  height: 100%;
+  color: #777;
+  font-weight: 100;
+  letter-spacing: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.blurb {
+  font-weight: 200;
+  font-size: 14px;
+  letter-spacing: 1px;
+}
+.app-background-text {
+  padding-right: 20px;
+  text-align: right;
+  max-width: 55%;
+}
+.app-background-text-small {
+  font-size: 50px;
+}
+.app-content {
+  z-index: 2;
+}
+
+.app-grid {
+  border: 1px solid #E5E5E5;
+  margin-top: -1px;
+  margin-bottom: 0;
+  margin-left: -1px;
+  min-height: 200px;
+  text-align: center;
+  display: table;
+}
+
+.app-grid-content {
+  display: table-cell;
+  vertical-align: middle;
+  color: #4BABBf;
+  font-weight: 500;
+  font-size: 16px;
+}
+
+.app-img {
+  height: 120px;
+  position: absolute;
+  border-radius: 4px;
+  left: 15px;
+  top: 15px;
+}
+
+#api {
+ /* background-color: #D33A29;*/
+}
+.api-title {
+  background-color: #fff;
+  height:200px;
+  width: 200px;
+  border-radius: 50%;
+  text-align: center;
+  display: table;
+  border: 11px solid #6bbe98;
+  color: #4BABBf;
+}
+
+.big.apps {
+  color: #F5F5F5;
+}
+#apps {
+  padding-top: 150px;
+}
+#contact {
+  height: 1000px;
+  padding: 140px 0;
+}
+#contact-holder {
+  text-align: right;
+  color: #777;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+}
+.api-title > .big {
+  display: table-cell;
+  vertical-align: middle;
+  color: #6bbe98;
+}
+
+.stat-caption {
+  z-index: 10;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
+  position: absolute;
+  left: 20%;
+  right: 20%;
+  bottom: 20px;
+}
+.stat-caption > p {
+  font-size: 18px;
+}
+.stat-caption > h1 {
+  font-size: 45px;
+}
+
+.attribution {
+  height: 25px;
+  width: 25px;
+  position: absolute;
+  text-align: center;
+  right: 0;
+  bottom: 0;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  padding: 5px;
+  border: 1px solid #eee;
+  border-radius: 50%;
+  color: #eee;
+  z-index: 500;
+}
+
+.stat {
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.stat-container {
+  height: 100%;
+}
+
+.page-info {
+  color: #4bab7f;
+  font-size: 18px;
+  line-height: 28px;
+  font-weight: 200;
+}
+.page-info.donate {
+  color: #333;
+}
+.page-info > a {
+  color: #4bab7f;
+  font-weight: bold;
+}
+.person {
+  background-repeat: no-repeat;
+  background-size: cover;
+  height: 200px;
+  border-bottom: 10px solid #fff;
+}
+.row > .person:first-child {
+  border-right: 5px solid #fff;
+}
+.row > .person:last-child {
+  border-left: 5px solid #fff;
+}
+.person-info {
+  float: right;
+  color: white;
+  font-size: 19px;
+  bottom: 0;
+  font-weight: 200;
+  position: absolute;
+  right: 0;
+  text-align: right;
+  background-color: rgba(0,0,0,0.2);
+  letter-spacing: 1px;
+  padding-top: 10px;
+  padding-left: 10px;
+  border-radius: 3px;
+}
+n, n > a {
+  font-size: 25px;
+  font-weight: 200;
+  color: inherit;
+}
+n > a:hover {
+  color: inherit;
+  font-weight: bolder;
+}
+n > a {
+  color: white;
+}
+t {
+  font-weight: 400;
+}
+e {
+  font-size: 14px;
+  font-weight: 200;
+}
+#people {
+  height: auto;
+}
+#shanan {
+  background-image: url("../img/shanan.jpg");
+}
+#shanan_wide {
+  background-image: url("../img/shanan_wide.jpg");
+}
+#daven {
+  background-image: url("../img/daven.jpg");
+}
+#evgeny {
+  background-image: url("../img/evgeny.jpg");
+}
+#casey {
+  background-image: url("../img/casey.jpg");
+}
+#afiqah {
+  background-image: url("../img/afiqah.jpg");
+}
+#daniel {
+  background-image: url("../img/daniel.jpg");
+}
+#shan {
+  background-image: url("../img/shan.jpg");
+}
+#michael {
+  background-image: url("../img/michael.jpg");
+}
+#ben {
+  background-image: url("../img/ben.jpg");
+}
+#jon {
+  background-image: url("../img/jon.jpg");
+  background-position-y: -45px;
+}
+#sharon {
+  background-image: url("../img/sharon.jpg");
+  background-position-y: -45px;
+}
+#victoria {
+  background-image: url("../img/victoria.jpg");
+}
+#john {
+  background-position: center;
+}
+#publications {
+  height: auto;
+  padding-top: 15%;
+  padding-bottom: 100px;
+}
+.pub-list {
+  counter-reset: pub-counter 70;
+  list-style: none;
+}
+.pub-list li {
+  counter-increment: pub-counter -1;
+  position: relative;
+  padding: 4px 0 20px 70px;
+}
+.pub-list li:before {
+  content: counter(pub-counter);
+  position: absolute;
+  left: 0;
+  top: -2px;
+  font-size: 35px;
+  color: #babdc8;
+}
+
+#donate {
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-image: url("../img/donate.jpg");
+}
+#donate-row {
+  padding: 100px 0;
+  background-color: #fff;
+}
+.donate-container > h1 {
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
+  font-size: 90px;
+  font-weight: 700;
+}
+
+.page-info.donate {
+  background-color: rgba(255,255,255,0.7);
+  padding: 25px;
+  border-radius: 5px;
+}
+.burwell-title {
+  text-align: center;
+  color: #000000;
+}
+@media(max-width: 1200px), (min-width: 1200px) {
+  .snap-drawers {
+    display: none;
+  }
+  .main {
+    background-image: url("../img/cover_large.jpg");
+  }
+  .north-america {
+    background-image: url("../img/north_america.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new.jpg");
+  }
+  #john {
+    background-image: url("../img/john.jpg");
+  }
+  #puneet {
+    background-image: url("../img/puneet.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel.jpg");
+    background-position: 0 -35px, center;
+  }
+  #andrew {
+    background-image: url("../img/andrew.jpg");
+    background-position: 0 -35px, center;
+  }
+  #erika {
+    background-image: url("../img/erika.jpg");
+  }
+}
+@media(max-width: 992px) {
+  .snap-drawers {
+    display: none;
+  }
+  .main {
+    background-image: url("../img/cover_medium.jpg");
+  }
+  .north-america {
+    background-image: url("../img/north_america_med.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new_medium.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new_medium.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new_medium.jpg");
+  }
+  #john {
+    background-image: url("../img/john_med.jpg");
+  }
+  #puneet {
+    background-image: url("../img/puneet_med.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel_med.jpg");
+    background-position: 0 0;
+  }
+  #andrew {
+    background-image: url("../img/andrew_med.jpg");
+    background-position: 0 0;
+  }
+  #erika {
+    background-image: url("../img/erika_med.jpg");
+  }
+  #jon {
+    background-position: 0 0;
+  }
+  #donate {
+    background-image: url("../img/donate_medium.jpg");
+  }
+  .donate-container > h1 {
+    font-size: 60px;
+  }
+}
+@media(max-width: 768px) {
+  .top-stat-col {
+    margin-top: 15px;
+  }
+  .logo {
+    margin-left: 10px;
+  }
+  .snap-drawers {
+    display: block;
+  }
+  .main {
+  /*  background-image: url("../img/cover_small.jpg");*/
+  }
+  .north-america {
+    background-image: url("../img/north_america_small.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new_small.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new_small.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new_small.jpg");
+  }
+  .big {
+    font-size: 50px;
+  }
+  .title {
+    margin-top: 0;
+    margin-right: 1em;
+  }
+  .app-grid {
+    width: 100%;
+  }
+  #api {
+    height: 150%;
+  }
+  .api-title {
+    margin-left: 7%;
+    margin-bottom: 50px;
+    margin-top: 50px;
+  }
+  .stat-caption > h1 {
+    font-size: 42px;
+  }
+  .stat-caption > p {
+    font-size: 16px;
+  }
+  .person-info {
+    line-height: 17px;
+  }
+  n {
+    font-size: 14px;
+  }
+  t {
+    font-size: 15px;
+  }
+  e {
+    font-size: 10px;
+  }
+  #john {
+    background-image: url("../img/john_low.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel_low.jpg");
+  }
+  #andrew {
+    background-image: url("../img/andrew_low.jpg");
+  }
+  #donate {
+    background-image: url("../img/donate_small.jpg");
+  }
+  #erika {
+    background-image: url("../img/erika_low.jpg");
+  }
+  .funding {
+    display: block;
+  }
+  .funding-line {
+    display: block;
+  }
+  .stat-row {
+    height: 100%;
+  }
+  .stat {
+    height: 50%;
+  }
+  .donate-container > h1 {
+    font-size: 45px;
+  }
+  .page-info.donate {
+    font-size: 15px;
+    margin-bottom: 25px;
+    font-weight: 400;
+  }
+}
+@media(max-width: 450px) {
+  .row-eq-height {
+    display: block;
+  }
+  #donate-title-container {
+    position: relative;
+    margin-bottom: 15px;
+  }
+  .logo {
+    height: 40px;
+    padding-left: 10px;
+    padding-top: 7px;
+  }
+  .big {
+    font-size: 37px;
+  }
+  .col-xs-6 {
+    width: 100%;
+  }
+  .api-title {
+    margin-left: 21%;
+  }
+  .pub-list {
+    margin-left: -35px;
+  }
+  .slide-content-padded {
+    padding: 0;
+  }
+  .pub-list li:before {
+    font-size: 25px;
+  }
+  .app-img {
+    height: 80px;
+  }
+  .app-background-text {
+    font-size: 25px;
+    letter-spacing: 10px;
+  }
+
+  .person {
+    border: 5px solid #fff;
+  }
+  .footer .col-sm-4 {
+    padding: 25px 0;
+  }
+  .about-body-subtitle {
+    font-size: 25px;
+    font-weight: 400;
+  }
+  #app-title {
+    height: 250px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+}

From d2a3efb319a5a33f004537c8c8a902be6571136d Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 31 May 2024 11:27:14 -0400
Subject: [PATCH 007/151] fixed all images

---
 src/pages/mainpageTest/+Page.mdx | 111 +++++++++++++++++++------------
 src/pages/mainpageTest/main.styl |  66 ++++++++++--------
 2 files changed, 106 insertions(+), 71 deletions(-)

diff --git a/src/pages/mainpageTest/+Page.mdx b/src/pages/mainpageTest/+Page.mdx
index c451aea7..0a9383b3 100644
--- a/src/pages/mainpageTest/+Page.mdx
+++ b/src/pages/mainpageTest/+Page.mdx
@@ -19,59 +19,79 @@ import "./main.styl";
 [//]: # "Start Page"
 <div class="parent">
   <div class="left">
-    <h1 class="big">Macrostrat</h1>
-    <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
-    <ul class="buttons1">
-      <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
-      <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
-      <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
-        <div class="rockd-button-container">
-          <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
-          <a href="https://rockd.org" target="_blank">Go mobile</a>
-        </div>
-      </div></li>
-    </ul>
+    <Image className="back-img cover-image" src="cover_large.jpg"></Image>
+    <div class="text">
+      <h1 class="big">Macrostrat</h1>
+      <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
+      <ul class="buttons1">
+        <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
+        <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
+        <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
+          <div class="rockd-button-container">
+            <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
+            <a href="https://rockd.org" target="_blank">Go mobile</a>
+          </div>
+        </div></li>
+      </ul>
+    </div>
   </div>
   
+
   <div class="right">
-    <ul class="stats-row">
-      <li>
-        <span class="top-stat" id="n_columns">1,400</span>
-        <span class="top-stat-label">Regional Rock Columns</span>
-      </li>
-      <li>
-        <span class="top-stat" id="n_units">33,903</span>
-        <span class="top-stat-label">Rock Units</span>
-      </li>
-      <li>
-        <span class="top-stat" id="n_polys">2,500,000</span>
-        <span class="top-stat-label">Geologic Map Polygons</span>
-      </li>
-      <li>
-        <span class="top-stat" id="n_names">51,212</span>
-        <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
-      </li>
-    </ul>
+    <Image className="back-img sea-image" src="deep_sea_new_medium.jpg"></Image>
+    <div class="text">
+      <ul class="stats-row">
+        <li>
+          <span class="top-stat" id="n_columns">1,400</span>
+          <span class="top-stat-label">Regional Rock Columns</span>
+        </li>
+        <li>
+          <span class="top-stat" id="n_units">33,903</span>
+          <span class="top-stat-label">Rock Units</span>
+        </li>
+        <li>
+          <span class="top-stat" id="n_polys">2,500,000</span>
+          <span class="top-stat-label">Geologic Map Polygons</span>
+        </li>
+        <li>
+          <span class="top-stat" id="n_names">51,212</span>
+          <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
+        </li>
+      </ul>
+    </div>
   </div>
+
 </div>
 
 [//]: # "Locations"
 <div class="country_container">
   <div class="country north-america">
-    <h1>North America</h1>\
-    <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+    <Image className="img country-image" src="north_america_med.jpg"></Image>
+    <div class="text">
+      <h1>North America</h1>\
+      <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+    </div>
   </div>
   <div class="country caribbean">
-    <h1>Caribbean</h1>\
-    <div class="caption">243 packages. 798 units. 897 collections.</div>
+    <Image className="img country-image" src="caribbean_new_medium.jpg"></Image>
+    <div class="text">
+      <h1>Caribbean</h1>\
+      <div class="caption">243 packages. 798 units. 897 collections.</div>
+    </div>
   </div>
   <div class="country new-zealand">
-    <h1>New Zealand</h1>\
-    <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+    <Image className="img country-image" src="new_zealand_new_medium.jpg"></Image>
+    <div class="text">
+      <h1>New Zealand</h1>\
+      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+    </div>
   </div>
   <div class="country deep-sea">
-    <h1>Deep Sea</h1>\
-    <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+    <Image className="img country-image" src="deep_sea_new_medium.jpg"></Image>
+    <div class="text">
+      <h1>Deep Sea</h1>\
+      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+    </div>
   </div>
 </div>
 
@@ -410,12 +430,15 @@ import "./main.styl";
 
     [//]: # "Donate"
     <div class="donate-container" id="donate">
-      <div class="donate-left">
-        <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
-      </div>
-      <div class="donate-right">
-        <div class="donate-info">
-            Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+      <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
+      <div class="text">
+        <div class="donate-left">
+          <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
+        </div>
+        <div class="donate-right">
+          <div class="donate-info">
+              Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/pages/mainpageTest/main.styl b/src/pages/mainpageTest/main.styl
index e7fbc0c7..87a9aa47 100644
--- a/src/pages/mainpageTest/main.styl
+++ b/src/pages/mainpageTest/main.styl
@@ -9,6 +9,7 @@ a:hover
 .nav
   position: fixed
   width: 100%
+  z-index: 10000
 
   ul 
     list-style-type: none;
@@ -27,6 +28,7 @@ a:hover
     text-align: center;
     padding: 14px 16px;
     text-decoration: none
+
 .parent
   height: 100vh
 
@@ -34,9 +36,6 @@ a:hover
   width: 70%
   text-align: center
   height: 100vh
-  background-image url("./img/cover_large.jpg")
-  background-repeat: no-repeat;
-  background-size: cover;
   color: white
 
   li
@@ -44,15 +43,32 @@ a:hover
     list-style-type: none
   
   ul
-    display: inline-block;
+    display: inline-block
+
+.text
+  position:absolute
+  z-index: 100
+
+.cover-image
+  position:absolute
+  z-index:5
+  left:0px
+  top:0px
+  height: 100vh
+  width: 70%
+  object-fit: cover
+
+.sea-image
+  position:absolute
+  z-index: 6
+  height: 100vh
+  width: 30%
+  object-fit: cover
 
 .right
   background-color: blue
   height: 100vh
   width: 30%
-  background-image url("./img/deep_sea_new_medium.jpg")
-  background-repeat: no-repeat;
-  background-size: cover;
 
   ul 
     list-style-type: none
@@ -116,13 +132,6 @@ a:hover
 .btn:hover 
   background-color: #545151 
 
-.small-rockd
-  background-image url("../img/north_america_small.jpg")
-  float: left
-
-#placeholder
-    background-image url("../img/north_america_small.jpg")
-
 .buttons1 
   font-size: 20px
   padding: 0px
@@ -155,17 +164,16 @@ a:hover
   text-align: center;
   color: white
 
-.deep-sea
-  background-image url("./img/deep_sea_new.jpg")
-
-.north-america
-  background-image url("./img/north_america_med.jpg")
-
-.caribbean
-  background-image url("./img/caribbean_new.jpg")
+.img
+  position:absolute
+  z-index:5
+  height: 100vh
+  width: 100%
+  object-fit: cover
 
-.new-zealand
-  background-image url("./img/new_zealand_new.jpg")
+.country-image
+  height: 50vh
+  width: 50%
 
 .rock-border
   width: 100%
@@ -205,9 +213,6 @@ a:hover
 
 .donate-container
   height: 80vh
-  background-image url("./img/donate_medium.jpg")
-  background-repeat: no-repeat;
-  background-size: cover;
 
 .donate-title
   a 
@@ -248,6 +253,13 @@ a:hover
     font-weight: bold
     text-decoration: none
 
+.donate-img
+  position:absolute
+  z-index:5
+  height: 80vh
+  width: 100%
+  object-fit: cover
+
 .footer 
   width: 100%
   background-color: #015EAB

From 4b859d080780734cdc1d4519eb0f8d11af19fdd7 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 31 May 2024 12:02:44 -0400
Subject: [PATCH 008/151] fixed button formatting on first page

---
 src/pages/mainpageTest/+Page.mdx |  6 +++---
 src/pages/mainpageTest/main.styl | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages/mainpageTest/+Page.mdx b/src/pages/mainpageTest/+Page.mdx
index 0a9383b3..5ef0c6a8 100644
--- a/src/pages/mainpageTest/+Page.mdx
+++ b/src/pages/mainpageTest/+Page.mdx
@@ -24,9 +24,9 @@ import "./main.styl";
       <h1 class="big">Macrostrat</h1>
       <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
       <ul class="buttons1">
-        <li><a type="button" class="btn btn12" href="/sift/#/">Search</a></li>
-        <li><a type="button" class="btn btn12" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
-        <li><div type="button" class="btn btn12 rockd" onclick="window.location='https://rockd.org'">
+        <li><a type="button" class="btn" href="/sift/#/">Search</a></li>
+        <li><a type="button" class="btn" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
+        <li><div type="button" class="btn rockd" onclick="window.location='https://rockd.org'">
           <div class="rockd-button-container">
             <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
             <a href="https://rockd.org" target="_blank">Go mobile</a>
diff --git a/src/pages/mainpageTest/main.styl b/src/pages/mainpageTest/main.styl
index 87a9aa47..e2bd2e8b 100644
--- a/src/pages/mainpageTest/main.styl
+++ b/src/pages/mainpageTest/main.styl
@@ -34,20 +34,24 @@ a:hover
 
 .left
   width: 70%
-  text-align: center
-  height: 100vh
+  display: flex;
+  justify-content: center;
+  align-items: center;  height: 100vh
   color: white
 
   li
     float: left
     list-style-type: none
-  
+    width: 33%
+
   ul
     display: inline-block
+    width: 100%
 
 .text
   position:absolute
   z-index: 100
+  padding: 0 20px
 
 .cover-image
   position:absolute
@@ -88,17 +92,12 @@ a:hover
 .big
   font-size: 72px
   font-family: "Maven Pro", sans-serif;
-  margin-top: 32vh
-  width: 40%
-  margin-left: 30%
   text-align: center
 
 .big-text
   font-family: Helvetica, sans-serif
   font-weight: 900
   font-size: 20px
-  margin-bottom: 5%
-  padding: 0 100px
 
 .top-stat, .top-stat-label
   display: block
@@ -117,6 +116,9 @@ a:hover
     color: black
     width: 100%
     
+.rockd
+  background-color: green
+
 .btn
   background-color: #363434;
   border: none;

From c924492afd0c1ef82cfc5fc3060adcc268203115 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 31 May 2024 15:34:57 -0400
Subject: [PATCH 009/151] moved to dev

---
 src/pages/dev/+Page.mdx           |   1 +
 src/pages/mainpageTest/+Page.mdx  | 572 -------------------
 src/pages/mainpageTest/index.ts   |   6 -
 src/pages/mainpageTest/main.styl  | 314 -----------
 src/pages/mainpageTest/styles.css | 908 ------------------------------
 5 files changed, 1 insertion(+), 1800 deletions(-)
 delete mode 100644 src/pages/mainpageTest/+Page.mdx
 delete mode 100644 src/pages/mainpageTest/index.ts
 delete mode 100644 src/pages/mainpageTest/main.styl
 delete mode 100644 src/pages/mainpageTest/styles.css

diff --git a/src/pages/dev/+Page.mdx b/src/pages/dev/+Page.mdx
index 55eb7bee..5db9b2d9 100644
--- a/src/pages/dev/+Page.mdx
+++ b/src/pages/dev/+Page.mdx
@@ -10,3 +10,4 @@ import { PageBreadcrumbs } from "~/renderer";
 - [User interface tests](/dev/ui-tests)
 - [Feedback](/dev/feedback)
 - [Map filter](/dev/filtering)
+- [Main Page](/dev/main-page)
diff --git a/src/pages/mainpageTest/+Page.mdx b/src/pages/mainpageTest/+Page.mdx
deleted file mode 100644
index 5ef0c6a8..00000000
--- a/src/pages/mainpageTest/+Page.mdx
+++ /dev/null
@@ -1,572 +0,0 @@
-import { PageHeader } from "~/components";
-import { LinkCard } from "~/components/cards";
-import { Image } from "./index";
-import "./main.styl";
-
-[//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="#about">About</a></li>
-    <li><a href="#apps">Apps</a></li>
-    <li><a href="#api">API</a></li>
-    <li><a href="#people">People</a></li>
-    <li><a href="#donate">Donate</a></li>
-    <li><a href="#publications">Publications</a></li>
-    <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
-  </ul>
-</div>
-
-[//]: # "Start Page"
-<div class="parent">
-  <div class="left">
-    <Image className="back-img cover-image" src="cover_large.jpg"></Image>
-    <div class="text">
-      <h1 class="big">Macrostrat</h1>
-      <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
-      <ul class="buttons1">
-        <li><a type="button" class="btn" href="/sift/#/">Search</a></li>
-        <li><a type="button" class="btn" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
-        <li><div type="button" class="btn rockd" onclick="window.location='https://rockd.org'">
-          <div class="rockd-button-container">
-            <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
-            <a href="https://rockd.org" target="_blank">Go mobile</a>
-          </div>
-        </div></li>
-      </ul>
-    </div>
-  </div>
-  
-
-  <div class="right">
-    <Image className="back-img sea-image" src="deep_sea_new_medium.jpg"></Image>
-    <div class="text">
-      <ul class="stats-row">
-        <li>
-          <span class="top-stat" id="n_columns">1,400</span>
-          <span class="top-stat-label">Regional Rock Columns</span>
-        </li>
-        <li>
-          <span class="top-stat" id="n_units">33,903</span>
-          <span class="top-stat-label">Rock Units</span>
-        </li>
-        <li>
-          <span class="top-stat" id="n_polys">2,500,000</span>
-          <span class="top-stat-label">Geologic Map Polygons</span>
-        </li>
-        <li>
-          <span class="top-stat" id="n_names">51,212</span>
-          <span class="top-stat-label nohighlight"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
-        </li>
-      </ul>
-    </div>
-  </div>
-
-</div>
-
-[//]: # "Locations"
-<div class="country_container">
-  <div class="country north-america">
-    <Image className="img country-image" src="north_america_med.jpg"></Image>
-    <div class="text">
-      <h1>North America</h1>\
-      <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
-    </div>
-  </div>
-  <div class="country caribbean">
-    <Image className="img country-image" src="caribbean_new_medium.jpg"></Image>
-    <div class="text">
-      <h1>Caribbean</h1>\
-      <div class="caption">243 packages. 798 units. 897 collections.</div>
-    </div>
-  </div>
-  <div class="country new-zealand">
-    <Image className="img country-image" src="new_zealand_new_medium.jpg"></Image>
-    <div class="text">
-      <h1>New Zealand</h1>\
-      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
-    </div>
-  </div>
-  <div class="country deep-sea">
-    <Image className="img country-image" src="deep_sea_new_medium.jpg"></Image>
-    <div class="text">
-      <h1>Deep Sea</h1>\
-      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
-    </div>
-  </div>
-</div>
-
-[//]: # "Geological Maps"
-<div class="geologic-maps">
-  <h1 class="title map-title">Geologic Maps</h1>
-  <div class="map-info">
-    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
-    \
-    \
-    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
-    \
-    \
-    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
-  </div>
-</div>
-
-<Image className="rock-border" src="rocks-border.jpg"></Image>
-      
-[//]: # "About"
-<div class="row slide" id="about">
-  <div class="col-xs-12 slide-container">
-    <div class="slide-content slide-content-padded">
-      <div class="row">
-        <div class="col-xs-12">
-          <div class="page-title-holder about-title">
-            <h1 class="title about-title">About</h1>
-          </div>
-        </div>
-      </div>
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Summary
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          License
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Citation
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
-          \
-          \
-          <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Collaboration
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
-        </div>
-      </div>
-
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Funding
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<Image className="rock-border" src="rocks-border.jpg"></Image>
-
-[//]: # "Built With Macrostrat"
-<div class="row slide" id="apps">
-  <div class="col-xs-12 slide-container">
-    <div class="row">
-      <div class="col-xs-12" id="app-title">
-        <h1 class="title">Built with Macrostrat</h1>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="/sift">
-          <div class="app-background">
-            <div class="app-background-text">
-              Sift
-              <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://rockd.org">
-          <div class="app-background">
-            <div class="app-background-text">
-              Rockd
-              <p class="blurb">A mobile field book, Macrostrat style.</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="/map">
-          <div class="app-background">
-            <div class="app-background-text">
-              Map
-              <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
-          <div class="app-background">
-            <div class="app-background-text">
-              Mancos
-              <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="http://fc.umn.edu/" target="_blank">
-          <div class="app-background">
-            <div class="app-background-text">
-              FOC
-              <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://github.com/UW-Macrostrat/node-api-template">
-          <div class="app-background">
-            <div class="app-background-text app-background-text-small">
-              API Template
-              <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-
-<Image className="rock-border" src="rocks-border.jpg"></Image>
-
-
-    [//]: # "API"
-    <div class="row slide" id="api">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-sm-6">
-              <div class="page-title-holder api-title">
-                <h1 class="big">API</h1>
-              </div>
-            </div>
-            <div class="col-sm-6">
-              <div class="page-info">
-                All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <Image className="rock-border" src="rocks-border.jpg"></Image>
-
-    [//]: # "People"
-    <div class="row slide" id="people">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder" id="contact-holder">
-                <h1 class="big">People</h1>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-xs-6 person" id="shanan">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
-                <t>Professor, Database Developer</t>\
-                <e>peters -at geology.wisc.edu</e>
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daven">
-              <div class="person-info">
-                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
-                <t>Research Scientist, Developer</t> \
-                <e>daven.quinn -at wisc.edu</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="evgeny">
-              <div class="person-info">
-                <n>Evgeny Mazko</n> \
-                <t>Graduate Student</t> \
-                <e>mazko -at wisc.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="michael">
-              <div class="person-info">
-                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
-                <t>Senior Programmer Analyst</t> \
-                <e>mmcclenn -at- geology.wisc.edu</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="casey">
-              <div class="person-info">
-                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
-                <t>Research Specialist, Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daniel">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="shan">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="ben">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
-                <t>Postdoctoral Scholar (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="afiqah">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
-                <t>Undergrad Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="sharon">
-              <div class="person-info">
-                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="andrew">
-              <div class="person-info">
-                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
-                <t>Data Mobilization and Research Scientist</t> \
-                <e>azaffos -at- email.arizona.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="jon">
-              <div class="person-info">
-                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
-                <t>Postdoctoral Researcher (former)</t> \
-                <e>jhusson - at - uvic.ca</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="erika">
-              <div class="person-info">
-                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
-                <t>Research Intern (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="noel">
-              <div class="person-info">
-                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="john">
-              <div class="person-info">
-                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
-                <t>Next-level Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="puneet">
-              <div class="person-info">
-                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
-                <t>Generally Ignored</t> \
-                <e>punkish at eidesis.org</e> 
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </div>
-
-    [//]: # "Donate"
-    <div class="donate-container" id="donate">
-      <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
-      <div class="text">
-        <div class="donate-left">
-          <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
-        </div>
-        <div class="donate-right">
-          <div class="donate-info">
-              Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
-          </div>
-        </div>
-      </div>
-    </div>
-    
-    [//]: # "Publications"
-    <div class="row slide" id="publications">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder">
-                <h1 class="big">Publications</h1>
-                <p class="blurb">literature utilizing Macrostrat</p>
-              </div>
-            </div>
-          </div>
-          [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
-          <div class="row">
-            <div class="col-xs-12">
-              <ol class="pub-list" reversed>
-                <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
-                <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
-                <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
-                <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
-                <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
-                <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
-                <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
-                <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
-                <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
-                <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
-                <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
-                <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
-                <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
-                <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
-                <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
-                <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
-                <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
-                <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
-                <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
-                <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
-                <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
-                <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
-                <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
-                <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
-                <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
-                <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
-                <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
-                <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
-                Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
-                <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
-                <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
-                <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
-                <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
-                <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
-                <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
-                <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
-                <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
-                <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
-                <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
-                <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
-                <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
-                <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
-                <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
-                <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
-                <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
-                <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
-                <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
-                <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
-                <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
-                <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
-                <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
-                <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
-                <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
-                <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
-                <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
-                <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
-                  <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
-                <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
-                <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
-                <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
-                <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
-                <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
-                <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
-                <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
-                <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
-              </ol>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    [//]: # "Footer"
-    <div class="footer">
-      <div class="footer-container">
-        <div class="col-sm-4" id="who-made-it">
-          <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-          <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-        </div>
-        <div class="col-sm-4" id="bottom-nav">
-          <ul class="footer-nav">
-            <li><a href="#about">About</a></li>
-            <li><a href="#apps">Apps</a></li>
-            <li><a href="#api">API</a></li>
-            <li><a href="#people">People</a></li>
-            <li><a href="#donate">Donate</a></li>
-            <li><a href="#publications">Publications</a></li>
-          </ul>
-        </div>
-        <div class="col-sm-4 funding">
-          <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-          <div class="funding-line">
-            Current support: \
-            EAR-1948843 \
-            ICER-1928323 \
-            UW-Madison Dept. Geoscience
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/pages/mainpageTest/index.ts b/src/pages/mainpageTest/index.ts
deleted file mode 100644
index 7e04b44b..00000000
--- a/src/pages/mainpageTest/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import h from "@macrostrat/hyper";
-
-export function Image({ src, className, width, height }) {
-    const srcWithAddedPrefix = "/img/" + src;
-    return h("img", {src: srcWithAddedPrefix, className, width, height})
-}
\ No newline at end of file
diff --git a/src/pages/mainpageTest/main.styl b/src/pages/mainpageTest/main.styl
deleted file mode 100644
index e2bd2e8b..00000000
--- a/src/pages/mainpageTest/main.styl
+++ /dev/null
@@ -1,314 +0,0 @@
-html, body
-  color: #E0E1E6
-  background-color: white
-  margin: 0
-
-a:hover
-  text-decoration: none
-
-.nav
-  position: fixed
-  width: 100%
-  z-index: 10000
-
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #015eab;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none
-
-.parent
-  height: 100vh
-
-.left
-  width: 70%
-  display: flex;
-  justify-content: center;
-  align-items: center;  height: 100vh
-  color: white
-
-  li
-    float: left
-    list-style-type: none
-    width: 33%
-
-  ul
-    display: inline-block
-    width: 100%
-
-.text
-  position:absolute
-  z-index: 100
-  padding: 0 20px
-
-.cover-image
-  position:absolute
-  z-index:5
-  left:0px
-  top:0px
-  height: 100vh
-  width: 70%
-  object-fit: cover
-
-.sea-image
-  position:absolute
-  z-index: 6
-  height: 100vh
-  width: 30%
-  object-fit: cover
-
-.right
-  background-color: blue
-  height: 100vh
-  width: 30%
-
-  ul 
-    list-style-type: none
-    margin-top: 32vh
-
-  li 
-    width: 25%
-    padding-left: 10px
-
-  .buttons1
-    padding-left: 27%      
-
-.parent
-  display: inline-flex
-  width: 100%
-
-.big
-  font-size: 72px
-  font-family: "Maven Pro", sans-serif;
-  text-align: center
-
-.big-text
-  font-family: Helvetica, sans-serif
-  font-weight: 900
-  font-size: 20px
-
-.top-stat, .top-stat-label
-  display: block
-  color: white
-
-.top-stat
-  font-size: 35px
-  font-family: Helvetica, sans-serif
-
-.stats-row
-  margin-top: 20%
-
-  li
-    padding-top: 10px
-    padding-bottom: 20px
-    color: black
-    width: 100%
-    
-.rockd
-  background-color: green
-
-.btn
-  background-color: #363434;
-  border: none;
-  color: white;
-  padding: 13px 10px;
-  margin: 10px
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  float: left
-  border-radius: 12px;
-
-.btn:hover 
-  background-color: #545151 
-
-.buttons1 
-  font-size: 20px
-  padding: 0px
-
-  a 
-    color: white
-    text-decoration: none
-
-  a:hover
-    color: white
-
-.rockd-png
-  width: 22px
-  padding-right: 4px
-  float: left
-  padding-top: 5px
-
-.country_container 
-  height: 100vh
-  display: grid;
-  grid-template-columns: repeat(2, minmax(150px, 2fr));
-  grid-template-rows: repeat(2, minmax(150px, 2fr));
-  background-color: green
-
-.country
-  height: 100%
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  color: white
-
-.img
-  position:absolute
-  z-index:5
-  height: 100vh
-  width: 100%
-  object-fit: cover
-
-.country-image
-  height: 50vh
-  width: 50%
-
-.rock-border
-  width: 100%
-  margin: 0
-  padding: 0
-
-.geologic-maps
-  height: 100vh
-  background-color: white
-  color: black
-  margin: 0
-
-.map-info
-  padding: 0 10vh
-  margin: 0
-
-.title
-  margin: 0
-  font-size: 72px
-  font-family: "Maven Pro", sans-serif;
-  padding: 20vh 0
-  text-align: center
-
-#about
-  height: 100vh
-  background-color: white
-  color: black
-  margin: 0
-
-#apps
-  height: 100vh
-  color: black
-  background-color: white
-
-#api
-  height: 100vh
-
-.donate-container
-  height: 80vh
-
-.donate-title
-  a 
-    color:white
-  a:hover
-    text-decoration: none
-
-  color: white
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
-  font-family: "Maven Pro", sans-serif;
-  padding: 0
-
-.donate-left
-  float: left
-  width: 50%
-  height: 80vh
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-.donate-right
-  float: right
-  width: 50%
-  height: 80vh
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-.donate-info
-  background: rgba(255,255,255,0.5);
-  padding: 25px
-  color: black
-  width: 80%
-  font-size: 18px
-
-  a
-    color: black
-    font-weight: bold
-    text-decoration: none
-
-.donate-img
-  position:absolute
-  z-index:5
-  height: 80vh
-  width: 100%
-  object-fit: cover
-
-.footer 
-  width: 100%
-  background-color: #015EAB
-
-.footer-container
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 0 auto;
-  width: 60%
-
-.col-sm-4
-  color: white
-  width: 33.333%
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-weight: bold
-
-.nav-logo
-  padding-top: 5px
-
-.funding-logo
-  padding: 10px
-
-.footer-nav
-  list-style-type: none
-  padding-right: 40px
-
-  li
-    padding: 5px 0
-
-  a
-    color: white
-
-  a:hover
-    text-decoration: none
-
-.git_logo
-  vertical-align: sub
-
-.f1-text
-  a
-    color: white
-
-#who-made-it
-  padding-top: 25px
\ No newline at end of file
diff --git a/src/pages/mainpageTest/styles.css b/src/pages/mainpageTest/styles.css
deleted file mode 100644
index 9ec89de9..00000000
--- a/src/pages/mainpageTest/styles.css
+++ /dev/null
@@ -1,908 +0,0 @@
-/* Snap styles */
-html, body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-.row-eq-height {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display:         flex;
-}
-
-#donate-title-container {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  width: 100%;
-  position: absolute;
-  text-align: center;
-}
-.snap-content {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: auto;
-  height: auto;
-  z-index: 2;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-transform: translate3d(0, 0, 0);
-     -moz-transform: translate3d(0, 0, 0);
-      -ms-transform: translate3d(0, 0, 0);
-       -o-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-
-.snap-drawers {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: auto;
-  height: auto;
-}
-
-.snap-drawer {
-  position: absolute;
-  top: 0;
-  right: auto;
-  bottom: 0;
-  left: auto;
-  width: 265px;
-  height: auto;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-transition: width 0.3s ease;
-     -moz-transition: width 0.3s ease;
-      -ms-transition: width 0.3s ease;
-       -o-transition: width 0.3s ease;
-          transition: width 0.3s ease;
-}
-
-.snap-drawer-left {
-  left: 0;
-  z-index: 1;
-}
-
-.snap-drawer-right {
-  right: 0;
-  z-index: 1;
-}
-
-.snapjs-left .snap-drawer-right,
-.snapjs-right .snap-drawer-left {
-  display: none;
-}
-
-.snapjs-expand-left .snap-drawer-left,
-.snapjs-expand-right .snap-drawer-right {
-  width: 100%;
-}
-
-/* End snap styles */
-
-a:hover {
-  text-decoration: none;
-}
-.container-fluid {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-}
-.scrollable{
-  overflow: auto;
-  -webkit-transition-property: top, bottom;
-  transition-property: top, bottom;
-  -webkit-transition-duration: .2s, .2s;
-  transition-duration: .2s, .2s;
-  -webkit-transition-timing-function: linear, linear;
-  transition-timing-function: linear, linear;
-  -webkit-overflow-scrolling: touch;
-}
-.footer {
-  display: block;
-  bottom: 0;
-  width: 100%;
-  padding: 1em;
-  background-color: #015EAB;
-}
-#who-made-it {
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-}
-#who-made-it > a {
-  color: #E0E1E6;
-  font-weight: 200;
-}
-#who-made-it > a > img {
-  height: 75px;
-}
-#who-made-it > a > i {
-  margin-top: 10px;
-}
-#who-made-it > a > i:first-child {
-  margin-right: 10px;
-}
-#bottom-nav {
-  text-align: center;
-}
-.footer-nav > li > a {
-  color: #E0E1E6;
-  padding: 5px;
-}
-.funding {
-  color: #E0E1E6;
-  display: table;
-  text-align: center;
-}
-.funding-line {
-  display: table-cell;
-  vertical-align: middle;
-  font-weight: 200;
-}
-.funding-logo {
-  width: 75px;
-}
-.snap-content {
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-}
-.navbar-default {
-  background-color: rgba(0,0,0,0);
-  border: none;
-}
-.snap-drawers {
-  top: 50px;
-}
-.close-to-top {
-  background-color: #015EAB;
-  opacity: 1;
-}
-#second-nav {
-  background-color: #193441;
-}
-.navbar-default .navbar-nav>li>a {
-  color: #E0E1E6;
-  font-size: 1.1em;
-  font-weight: 400;
-  letter-spacing: 1px;
-}
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #E0E1E6;
-}
-.navbar-default .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus {
-  color: #fff;
-}
-.navbar-default .navbar-toggle {
-  border-color: rgba(0,0,0,0);
-}
-.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
-  background-color: rgba(0,0,0,0);
-}
-.logo {
-  height: 50px;
-  padding: 2px;
-}
-.main {
-  margin: auto;
-  color:#888;
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-.main > h1 {
-  font-family: "Maven Pro", sans-serif;
-  font-size: 50px;
-  font-weight: 100;
-  line-height: 1.1;
-}
-.explore-sift {
-  background-color: #990000;
-  border-color: #990000;
-  margin-top: 10px;
-}
-.explore-sift.btn-info {
-  background-color: #015EAB;
-  border-color: #015EAB;
-}
-.rockd-button-container {
-  display: flex;
-  align-items: center;
-}
-.explore-sift.rockd {
-  background-color: #363434;
-  border-color: #363434;
-}
-.rockd-logo-small {
-  height: 21px;
-  margin-right: 5px;
-}
-.stats {
-  color: white;
-}
-.snap-drawer-right {
-  background-color: #015EAB;
-  opacity: 0.92;
-}
-.drawer-menu {
-  background-color: #015EAB;
-  line-height: 20px;
-  margin: 0;
-}
-.drawer-menu > a {
-  display: block;
-  color: #E0E1E6;
-  padding: 12px 35px !important;
-  border-bottom: 2px solid #0167bc;
-  font-size: 13px;
-  font-weight: 100;
-  letter-spacing: 1px;
-}
-.drawer-menu > a:hover {
-  color: #fff;
-}
-.nav>li>a:hover, .nav>li>a:focus {
-  background-color: rgba(0,0,0,0);
-}
-.nav.drawer {
-  margin-top: 60px;
-}
-#view {
-  height: 100%;
-  width: 100%;
-  position: relative;
-  background-color: #fff;
-  margin-top: 50px;
-}
-#view > .container-fluid {
-  height: 100%;
-  padding: 0;
-}
-.row {
-  margin: 0;
-}
-.slide {
-  height: 100%;
-  background-color: #fff;
-}
-.stat-row {
-  height: 50%;
-}
-.slide-container {
-  width: 100%;
-  height: 100%;
- /* text-align: center; */
-  display: table;
-  padding: 0;
-}
-.slide-content {
-  display: table-cell;
-  vertical-align: middle;
-}
-.slide-container > .stat-container {
-  display: table-cell;
-}
-
-.slide-content-padded {
-  padding-left: 10%;
-  padding-right: 10%;
-}
-
-.welcome {
-  background-color: rgba(0,0,0,0.3);
-  text-align: center;
-}
-.title {
-  margin-left: 1em;
-  margin-top: -6em;
-  padding: 40px;
-  border-radius: 20px;
-}
-
-.title > p {
-  color: #f7f7f7;
-  font-size: 20px;
-  font-weight: 300;
-}
-.top-stat, .top-stat-label {
-  display: block;
-  color: #f7f7f7;
-  font-size: 20px;
-}
-.top-stat {
-  font-weight: 600;
-}
-.top-stat-label {
-  font-size: 16px;
-  font-weight: 300;
-}
-.big {
-  font-size: 75px;
-  color: #E0E1E6;
-  font-family: "Maven Pro", sans-serif;
-}
-.nohighlight a{
-  color: white;
-}
-
-.stats > .slide-container {
-  text-align: center;
-}
-
-
-#app-title {
-  background-color: #4BABBf;
-  color: white;
-}
-
-.about-title {
-  border-bottom: 1px solid #eee;
-  margin-bottom: 18px;
-
-}
-#about {
-  padding: 100px 0;
-}
-#about > .slide-container {
-  padding-bottom: 100px;
-
-}
-.about {
-  padding: 0 15px;
-}
-.about-row {
-  padding: 15px 0;
-}
-.about-body {
-  padding: 0 30px;
-  color: #000 !important;
-}
-.about-body-subtitle {
-  font-size: 22px;
-  text-align: center;
-  font-weight: 200;
-  color: #777;
-}
-
-#apps {
-  max-width: 900px;
-  margin: 0 auto;
-  height: auto;
-}
-.app {
-  padding: 0;
-  height: 160px;
-}
-.app-background {
-  position: absolute;
-  font-size: 70px;
-  width: 100%;
-  height: 100%;
-  color: #777;
-  font-weight: 100;
-  letter-spacing: 15px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.blurb {
-  font-weight: 200;
-  font-size: 14px;
-  letter-spacing: 1px;
-}
-.app-background-text {
-  padding-right: 20px;
-  text-align: right;
-  max-width: 55%;
-}
-.app-background-text-small {
-  font-size: 50px;
-}
-.app-content {
-  z-index: 2;
-}
-
-.app-grid {
-  border: 1px solid #E5E5E5;
-  margin-top: -1px;
-  margin-bottom: 0;
-  margin-left: -1px;
-  min-height: 200px;
-  text-align: center;
-  display: table;
-}
-
-.app-grid-content {
-  display: table-cell;
-  vertical-align: middle;
-  color: #4BABBf;
-  font-weight: 500;
-  font-size: 16px;
-}
-
-.app-img {
-  height: 120px;
-  position: absolute;
-  border-radius: 4px;
-  left: 15px;
-  top: 15px;
-}
-
-#api {
- /* background-color: #D33A29;*/
-}
-.api-title {
-  background-color: #fff;
-  height:200px;
-  width: 200px;
-  border-radius: 50%;
-  text-align: center;
-  display: table;
-  border: 11px solid #6bbe98;
-  color: #4BABBf;
-}
-
-.big.apps {
-  color: #F5F5F5;
-}
-#apps {
-  padding-top: 150px;
-}
-#contact {
-  height: 1000px;
-  padding: 140px 0;
-}
-#contact-holder {
-  text-align: right;
-  color: #777;
-  border-bottom: 1px solid #eee;
-  margin-bottom: 18px;
-}
-.api-title > .big {
-  display: table-cell;
-  vertical-align: middle;
-  color: #6bbe98;
-}
-
-.stat-caption {
-  z-index: 10;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
-  position: absolute;
-  left: 20%;
-  right: 20%;
-  bottom: 20px;
-}
-.stat-caption > p {
-  font-size: 18px;
-}
-.stat-caption > h1 {
-  font-size: 45px;
-}
-
-.attribution {
-  height: 25px;
-  width: 25px;
-  position: absolute;
-  text-align: center;
-  right: 0;
-  bottom: 0;
-  margin-right: 10px;
-  margin-bottom: 10px;
-  padding: 5px;
-  border: 1px solid #eee;
-  border-radius: 50%;
-  color: #eee;
-  z-index: 500;
-}
-
-.stat {
-  background-repeat: no-repeat;
-  background-size: cover;
-}
-.stat-container {
-  height: 100%;
-}
-
-.page-info {
-  color: #4bab7f;
-  font-size: 18px;
-  line-height: 28px;
-  font-weight: 200;
-}
-.page-info.donate {
-  color: #333;
-}
-.page-info > a {
-  color: #4bab7f;
-  font-weight: bold;
-}
-.person {
-  background-repeat: no-repeat;
-  background-size: cover;
-  height: 200px;
-  border-bottom: 10px solid #fff;
-}
-.row > .person:first-child {
-  border-right: 5px solid #fff;
-}
-.row > .person:last-child {
-  border-left: 5px solid #fff;
-}
-.person-info {
-  float: right;
-  color: white;
-  font-size: 19px;
-  bottom: 0;
-  font-weight: 200;
-  position: absolute;
-  right: 0;
-  text-align: right;
-  background-color: rgba(0,0,0,0.2);
-  letter-spacing: 1px;
-  padding-top: 10px;
-  padding-left: 10px;
-  border-radius: 3px;
-}
-n, n > a {
-  font-size: 25px;
-  font-weight: 200;
-  color: inherit;
-}
-n > a:hover {
-  color: inherit;
-  font-weight: bolder;
-}
-n > a {
-  color: white;
-}
-t {
-  font-weight: 400;
-}
-e {
-  font-size: 14px;
-  font-weight: 200;
-}
-#people {
-  height: auto;
-}
-#shanan {
-  background-image: url("../img/shanan.jpg");
-}
-#shanan_wide {
-  background-image: url("../img/shanan_wide.jpg");
-}
-#daven {
-  background-image: url("../img/daven.jpg");
-}
-#evgeny {
-  background-image: url("../img/evgeny.jpg");
-}
-#casey {
-  background-image: url("../img/casey.jpg");
-}
-#afiqah {
-  background-image: url("../img/afiqah.jpg");
-}
-#daniel {
-  background-image: url("../img/daniel.jpg");
-}
-#shan {
-  background-image: url("../img/shan.jpg");
-}
-#michael {
-  background-image: url("../img/michael.jpg");
-}
-#ben {
-  background-image: url("../img/ben.jpg");
-}
-#jon {
-  background-image: url("../img/jon.jpg");
-  background-position-y: -45px;
-}
-#sharon {
-  background-image: url("../img/sharon.jpg");
-  background-position-y: -45px;
-}
-#victoria {
-  background-image: url("../img/victoria.jpg");
-}
-#john {
-  background-position: center;
-}
-#publications {
-  height: auto;
-  padding-top: 15%;
-  padding-bottom: 100px;
-}
-.pub-list {
-  counter-reset: pub-counter 70;
-  list-style: none;
-}
-.pub-list li {
-  counter-increment: pub-counter -1;
-  position: relative;
-  padding: 4px 0 20px 70px;
-}
-.pub-list li:before {
-  content: counter(pub-counter);
-  position: absolute;
-  left: 0;
-  top: -2px;
-  font-size: 35px;
-  color: #babdc8;
-}
-
-#donate {
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-image: url("../img/donate.jpg");
-}
-#donate-row {
-  padding: 100px 0;
-  background-color: #fff;
-}
-.donate-container > h1 {
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
-  font-size: 90px;
-  font-weight: 700;
-}
-
-.page-info.donate {
-  background-color: rgba(255,255,255,0.7);
-  padding: 25px;
-  border-radius: 5px;
-}
-.burwell-title {
-  text-align: center;
-  color: #000000;
-}
-@media(max-width: 1200px), (min-width: 1200px) {
-  .snap-drawers {
-    display: none;
-  }
-  .main {
-    background-image: url("../img/cover_large.jpg");
-  }
-  .north-america {
-    background-image: url("../img/north_america.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new.jpg");
-  }
-  #john {
-    background-image: url("../img/john.jpg");
-  }
-  #puneet {
-    background-image: url("../img/puneet.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel.jpg");
-    background-position: 0 -35px, center;
-  }
-  #andrew {
-    background-image: url("../img/andrew.jpg");
-    background-position: 0 -35px, center;
-  }
-  #erika {
-    background-image: url("../img/erika.jpg");
-  }
-}
-@media(max-width: 992px) {
-  .snap-drawers {
-    display: none;
-  }
-  .main {
-    background-image: url("../img/cover_medium.jpg");
-  }
-  .north-america {
-    background-image: url("../img/north_america_med.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new_medium.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new_medium.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new_medium.jpg");
-  }
-  #john {
-    background-image: url("../img/john_med.jpg");
-  }
-  #puneet {
-    background-image: url("../img/puneet_med.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel_med.jpg");
-    background-position: 0 0;
-  }
-  #andrew {
-    background-image: url("../img/andrew_med.jpg");
-    background-position: 0 0;
-  }
-  #erika {
-    background-image: url("../img/erika_med.jpg");
-  }
-  #jon {
-    background-position: 0 0;
-  }
-  #donate {
-    background-image: url("../img/donate_medium.jpg");
-  }
-  .donate-container > h1 {
-    font-size: 60px;
-  }
-}
-@media(max-width: 768px) {
-  .top-stat-col {
-    margin-top: 15px;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-  .snap-drawers {
-    display: block;
-  }
-  .main {
-  /*  background-image: url("../img/cover_small.jpg");*/
-  }
-  .north-america {
-    background-image: url("../img/north_america_small.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new_small.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new_small.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new_small.jpg");
-  }
-  .big {
-    font-size: 50px;
-  }
-  .title {
-    margin-top: 0;
-    margin-right: 1em;
-  }
-  .app-grid {
-    width: 100%;
-  }
-  #api {
-    height: 150%;
-  }
-  .api-title {
-    margin-left: 7%;
-    margin-bottom: 50px;
-    margin-top: 50px;
-  }
-  .stat-caption > h1 {
-    font-size: 42px;
-  }
-  .stat-caption > p {
-    font-size: 16px;
-  }
-  .person-info {
-    line-height: 17px;
-  }
-  n {
-    font-size: 14px;
-  }
-  t {
-    font-size: 15px;
-  }
-  e {
-    font-size: 10px;
-  }
-  #john {
-    background-image: url("../img/john_low.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel_low.jpg");
-  }
-  #andrew {
-    background-image: url("../img/andrew_low.jpg");
-  }
-  #donate {
-    background-image: url("../img/donate_small.jpg");
-  }
-  #erika {
-    background-image: url("../img/erika_low.jpg");
-  }
-  .funding {
-    display: block;
-  }
-  .funding-line {
-    display: block;
-  }
-  .stat-row {
-    height: 100%;
-  }
-  .stat {
-    height: 50%;
-  }
-  .donate-container > h1 {
-    font-size: 45px;
-  }
-  .page-info.donate {
-    font-size: 15px;
-    margin-bottom: 25px;
-    font-weight: 400;
-  }
-}
-@media(max-width: 450px) {
-  .row-eq-height {
-    display: block;
-  }
-  #donate-title-container {
-    position: relative;
-    margin-bottom: 15px;
-  }
-  .logo {
-    height: 40px;
-    padding-left: 10px;
-    padding-top: 7px;
-  }
-  .big {
-    font-size: 37px;
-  }
-  .col-xs-6 {
-    width: 100%;
-  }
-  .api-title {
-    margin-left: 21%;
-  }
-  .pub-list {
-    margin-left: -35px;
-  }
-  .slide-content-padded {
-    padding: 0;
-  }
-  .pub-list li:before {
-    font-size: 25px;
-  }
-  .app-img {
-    height: 80px;
-  }
-  .app-background-text {
-    font-size: 25px;
-    letter-spacing: 10px;
-  }
-
-  .person {
-    border: 5px solid #fff;
-  }
-  .footer .col-sm-4 {
-    padding: 25px 0;
-  }
-  .about-body-subtitle {
-    font-size: 25px;
-    font-weight: 400;
-  }
-  #app-title {
-    height: 250px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
-
-}

From 5ca6de3b61040c9e29e58398e454f1c89ccaa72d Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 31 May 2024 22:34:25 -0500
Subject: [PATCH 010/151] Moved legend hook to utility function

---
 src/pages/maps/@id/correlation/+Page.ts       | 66 +++++++++++++++++++
 src/pages/maps/@id/correlation/+config.ts     | 10 +++
 .../maps/@id/correlation/+onBeforeRender.ts   | 27 ++++++++
 .../maps/@id/correlation/main.module.sass     | 61 +++++++++++++++++
 src/pages/maps/@id/legend/+Page.ts            | 20 +-----
 src/pages/maps/@id/utils.ts                   | 24 +++++++
 6 files changed, 190 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/maps/@id/correlation/+Page.ts
 create mode 100644 src/pages/maps/@id/correlation/+config.ts
 create mode 100644 src/pages/maps/@id/correlation/+onBeforeRender.ts
 create mode 100644 src/pages/maps/@id/correlation/main.module.sass
 create mode 100644 src/pages/maps/@id/utils.ts

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
new file mode 100644
index 00000000..a23d2efc
--- /dev/null
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -0,0 +1,66 @@
+import { HotkeysProvider, Spinner } from "@blueprintjs/core";
+import DataSheet from "@macrostrat/data-sheet2";
+import { FullscreenPage } from "~/layouts";
+import hyper from "@macrostrat/hyper";
+import styles from "./main.module.sass";
+import { ColorCell } from "@macrostrat/data-sheet2";
+import { PageBreadcrumbs } from "~/renderer";
+import {
+  LongTextViewer,
+  IntervalCell,
+  lithologyRenderer,
+  ExpandedLithologies,
+} from "~/components/legend-table";
+import { useLegendData } from "../utils";
+
+const h = hyper.styled(styles);
+
+export function Page({ map }) {
+  const slug = map.slug;
+
+  const data = useLegendData(map);
+
+  if (data == null) {
+    return h(Spinner);
+  }
+
+  return h(
+    HotkeysProvider,
+    h(FullscreenPage, { className: "main" }, [
+      h(PageBreadcrumbs),
+      h("h1", map.name + " map units"),
+      h(DataSheet, {
+        data,
+        columnSpecOptions: {
+          overrides: {
+            liths: {
+              name: "Lithologies",
+              valueRenderer: lithologyRenderer,
+              dataEditor: ExpandedLithologies,
+            },
+            name: "Unit name",
+            comments: "Comments",
+            legend_id: "Legend ID",
+            strat_name: "Stratigraphic names",
+            b_interval: {
+              name: "Lower",
+              cellComponent: IntervalCell,
+            },
+            t_interval: {
+              name: "Upper",
+              cellComponent: IntervalCell,
+            },
+            color: {
+              name: "Color",
+              cellComponent: ColorCell,
+            },
+            descrip: {
+              name: "Description",
+              dataEditor: LongTextViewer,
+            },
+          },
+        },
+      }),
+    ])
+  );
+}
diff --git a/src/pages/maps/@id/correlation/+config.ts b/src/pages/maps/@id/correlation/+config.ts
new file mode 100644
index 00000000..ac56ce59
--- /dev/null
+++ b/src/pages/maps/@id/correlation/+config.ts
@@ -0,0 +1,10 @@
+export default {
+  meta: {
+    Page: {
+      env: {
+        client: true,
+        server: false,
+      },
+    },
+  },
+};
diff --git a/src/pages/maps/@id/correlation/+onBeforeRender.ts b/src/pages/maps/@id/correlation/+onBeforeRender.ts
new file mode 100644
index 00000000..1d1295f7
--- /dev/null
+++ b/src/pages/maps/@id/correlation/+onBeforeRender.ts
@@ -0,0 +1,27 @@
+import { postgrestPrefix } from "@macrostrat-web/settings";
+import { PageContextServer } from "vike/types";
+import { PostgrestClient } from "@supabase/postgrest-js";
+
+const client = new PostgrestClient(postgrestPrefix);
+
+export async function onBeforeRender(pageContext: PageContextServer) {
+  const { id } = pageContext.routeParams;
+  const res: any = await client
+    .from("sources")
+    .select("source_id,slug,name")
+    .eq("source_id", id);
+
+  const map = res?.data?.[0];
+
+  return {
+    pageContext: {
+      pageProps: {
+        map,
+      },
+      documentProps: {
+        // The page's <title>
+        title: map.name + "– Legend",
+      },
+    },
+  };
+}
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
new file mode 100644
index 00000000..1765dd4f
--- /dev/null
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -0,0 +1,61 @@
+.main
+  padding: 2em 8em
+  display: flex
+  flex-direction: column
+  position: fixed
+  width: 100vw
+  height: 100vh
+  top: 0
+  left: 0
+
+.data-sheet-container
+  display: flex
+  flex-direction: column
+  flex: 1
+  position: relative
+  min-height: 0
+
+.lithology
+  font-weight: bold
+  display: inline-block
+  padding: 0 0.5em
+  border-radius: 0.5em
+
+.inline-lithology .lithology
+  line-height: 1.2em
+
+.basis-panel
+  :global(.bp5-tag)
+    margin: 0 0.5em 0.5em 0
+  td
+    vertical-align: top
+  th
+    text-align: left
+    font-weight: 400
+    font-size: 0.9em
+    font-style: italic
+    color: var(--secondary-color)
+
+.basis-panel, .long-text
+  max-width: 20em
+  padding: 8px
+  max-height: 30em
+  overflow-y: scroll
+  pointer-events: all
+
+.description
+  font-style: italic
+
+
+.tag-header
+  font-weight: bold
+  text-transform: small-caps
+  font-size: 0.8em
+  color: var(--secondary-color)
+
+.basis-col
+  max-width: 15em
+
+.liths :global(.bp5-tag)
+  padding: 0px 4px
+  min-height: 16px
\ No newline at end of file
diff --git a/src/pages/maps/@id/legend/+Page.ts b/src/pages/maps/@id/legend/+Page.ts
index 78554dd2..d5eb366b 100644
--- a/src/pages/maps/@id/legend/+Page.ts
+++ b/src/pages/maps/@id/legend/+Page.ts
@@ -1,10 +1,8 @@
 import { HotkeysProvider, Spinner, Tag } from "@blueprintjs/core";
 import DataSheet from "@macrostrat/data-sheet2";
-import { useState } from "react";
 import { FullscreenPage } from "~/layouts";
 import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
-import { useAsyncEffect } from "@macrostrat/ui-components";
 import { ColorCell } from "@macrostrat/data-sheet2";
 import { PageBreadcrumbs } from "~/renderer";
 import {
@@ -13,26 +11,12 @@ import {
   lithologyRenderer,
   ExpandedLithologies,
 } from "~/components/legend-table";
-
-import { postgrest } from "~/providers";
+import { useLegendData } from "../utils";
 
 const h = hyper.styled(styles);
 
 export function Page({ map }) {
-  const slug = map.slug;
-
-  const [data, setData] = useState(null);
-
-  useAsyncEffect(async () => {
-    const res = await postgrest
-      .from("legend")
-      .select(
-        "legend_id, name, strat_name, age, lith, descrip, comments, liths, b_interval, t_interval, best_age_bottom, best_age_top, unit_ids, concept_ids"
-      )
-      .eq("source_id", map.source_id)
-      .order("legend_id", { ascending: true });
-    setData(res.data);
-  }, [map.source_id]);
+  const data = useLegendData(map);
 
   if (data == null) {
     return h(Spinner);
diff --git a/src/pages/maps/@id/utils.ts b/src/pages/maps/@id/utils.ts
new file mode 100644
index 00000000..3e671ab8
--- /dev/null
+++ b/src/pages/maps/@id/utils.ts
@@ -0,0 +1,24 @@
+import { useState } from "react";
+import { useAsyncEffect } from "@macrostrat/ui-components";
+import { postgrest } from "~/providers";
+
+type MapInfo = {
+  source_id: number;
+  slug?: string;
+};
+
+export function useLegendData(map: MapInfo): any[] | null {
+  /** Hook to return legend data from PostgREST */
+  const [data, setData] = useState(null);
+  useAsyncEffect(async () => {
+    const res = await postgrest
+      .from("legend")
+      .select(
+        "legend_id, name, strat_name, age, lith, descrip, comments, liths, b_interval, t_interval, best_age_bottom, best_age_top, unit_ids, concept_ids"
+      )
+      .eq("source_id", map.source_id)
+      .order("legend_id", { ascending: true });
+    setData(res.data);
+  }, [map.source_id]);
+  return data;
+}

From f73c9706400d1eedb6e294bf0df4a8384661f940 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 01:06:52 -0500
Subject: [PATCH 011/151] A really basic graph as a starting point to
 correlation diagram

---
 src/layouts/main.module.sass                  |   3 +-
 src/pages/maps/@id/correlation/+Page.ts       | 226 ++++++++++++++----
 .../maps/@id/correlation/main.module.sass     |  68 +-----
 src/pages/maps/@id/utils.ts                   |   2 +-
 4 files changed, 193 insertions(+), 106 deletions(-)

diff --git a/src/layouts/main.module.sass b/src/layouts/main.module.sass
index 0de9d808..ab72dec9 100644
--- a/src/layouts/main.module.sass
+++ b/src/layouts/main.module.sass
@@ -21,5 +21,4 @@
 
 
 .fullscreen-page
-  margin: 1em auto 3em
-  padding: 0 4em
+  padding: 1em 4em 3em
diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index a23d2efc..cbfac727 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -3,64 +3,194 @@ import DataSheet from "@macrostrat/data-sheet2";
 import { FullscreenPage } from "~/layouts";
 import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
-import { ColorCell } from "@macrostrat/data-sheet2";
 import { PageBreadcrumbs } from "~/renderer";
-import {
-  LongTextViewer,
-  IntervalCell,
-  lithologyRenderer,
-  ExpandedLithologies,
-} from "~/components/legend-table";
-import { useLegendData } from "../utils";
+import { useLegendData, MapInfo } from "../utils";
+import { useElementSize, useAPIResult } from "@macrostrat/ui-components";
+import { useMemo, useRef } from "react";
+import { Bar } from "@visx/shape";
+import { Group } from "@visx/group";
+import { scaleBand, scaleLinear } from "@visx/scale";
+import { apiV2Prefix } from "@macrostrat-web/settings";
+import fetch from "cross-fetch";
 
 const h = hyper.styled(styles);
 
+const apiRoute = apiV2Prefix + "/defs/intervals";
+const resultUnwrapper = (res) => res.success.data;
+
 export function Page({ map }) {
-  const slug = map.slug;
+  const ref = useRef(null);
+  const size = useElementSize(ref);
+  const legendData = useLegendData(map);
+  const intervals = useAPIResult(apiRoute, resultUnwrapper);
+
+  const correlationChartData = useMemo(() => {
+    return buildCorrelationChartData(legendData, intervals);
+  }, [legendData, intervals]);
+
+  return h(FullscreenPage, [
+    h("div.page-inner", [
+      h(PageBreadcrumbs),
+      h("div.vis-container", { ref }, [
+        h.if(legendData != null)(Example, {
+          map,
+          ...size,
+          data: correlationChartData,
+        }),
+      ]),
+    ]),
+  ]);
+}
+
+type CorrelationItem = {
+  legend_id: number;
+  name: string;
+  strat_name: string;
+  age: string;
+  lith: string;
+  descrip: string;
+  comments: string;
+  liths: string;
+  b_interval: number;
+  t_interval: number;
+  best_age_bottom: string;
+  best_age_top: string;
+  unit_ids: string;
+  concept_ids: string;
+};
+
+function buildCorrelationChartData(legendData, intervals): LetterFrequency[] {
+  if (legendData == null) {
+    return [];
+  }
+  return legendData.map((d, i) => {
+    return {
+      letter: d.legend_id.toString(),
+      frequency: i,
+    };
+  });
+}
+
+type LetterFrequency = {
+  letter: string;
+  frequency: number;
+};
+
+const letterFrequency: LetterFrequency[] = [
+  { letter: "A", frequency: 0.08167 },
+  { letter: "B", frequency: 0.01492 },
+  { letter: "C", frequency: 0.02782 },
+  { letter: "D", frequency: 0.04253 },
+  { letter: "E", frequency: 0.12702 },
+  { letter: "F", frequency: 0.02288 },
+  { letter: "G", frequency: 0.02015 },
+  { letter: "H", frequency: 0.06094 },
+  { letter: "I", frequency: 0.06966 },
+  { letter: "J", frequency: 0.00153 },
+  { letter: "K", frequency: 0.00772 },
+  { letter: "L", frequency: 0.04025 },
+  { letter: "M", frequency: 0.02406 },
+  { letter: "N", frequency: 0.06749 },
+  { letter: "O", frequency: 0.07507 },
+  { letter: "P", frequency: 0.01929 },
+  { letter: "Q", frequency: 0.00095 },
+  { letter: "R", frequency: 0.05987 },
+  { letter: "S", frequency: 0.06327 },
+  { letter: "T", frequency: 0.09056 },
+  { letter: "U", frequency: 0.02758 },
+  { letter: "V", frequency: 0.00978 },
+  { letter: "W", frequency: 0.0236 },
+  { letter: "X", frequency: 0.0015 },
+  { letter: "Y", frequency: 0.01974 },
+  { letter: "Z", frequency: 0.00074 },
+];
+
+const data = letterFrequency.slice(5);
+const verticalMargin = 120;
+
+// accessors
+const getLetter = (d: LetterFrequency) => d.letter;
+const getLetterFrequency = (d: LetterFrequency) => Number(d.frequency) * 100;
 
-  const data = useLegendData(map);
+export type BarsProps = {
+  width: number;
+  height: number;
+  events?: boolean;
+  map: MapInfo;
+  data: LetterFrequency[];
+};
+
+interface LegendItem {
+  legend_id: number;
+  name: string;
+  strat_name: string;
+  age: string;
+  lith: string;
+  descrip: string;
+  comments: string;
+  liths: string;
+  b_interval: number;
+  t_interval: number;
+  best_age_bottom: string;
+  best_age_top: string;
+  unit_ids: string;
+  concept_ids: string;
+}
+
+function Example({ width, height, events = false, data }: BarsProps) {
+  // bounds
+  const xMax = width;
+  const yMax = height - verticalMargin;
+
+  // scales, memoize for performance
+  const xScale = useMemo(
+    () =>
+      scaleBand<string>({
+        range: [0, xMax],
+        round: true,
+        domain: data.map(getLetter),
+        padding: 0.4,
+      }),
+    [xMax]
+  );
+  const yScale = useMemo(
+    () =>
+      scaleLinear<number>({
+        range: [yMax, 0],
+        round: true,
+        domain: [0, Math.max(...data.map(getLetterFrequency))],
+      }),
+    [yMax]
+  );
 
   if (data == null) {
     return h(Spinner);
   }
 
-  return h(
-    HotkeysProvider,
-    h(FullscreenPage, { className: "main" }, [
-      h(PageBreadcrumbs),
-      h("h1", map.name + " map units"),
-      h(DataSheet, {
-        data,
-        columnSpecOptions: {
-          overrides: {
-            liths: {
-              name: "Lithologies",
-              valueRenderer: lithologyRenderer,
-              dataEditor: ExpandedLithologies,
-            },
-            name: "Unit name",
-            comments: "Comments",
-            legend_id: "Legend ID",
-            strat_name: "Stratigraphic names",
-            b_interval: {
-              name: "Lower",
-              cellComponent: IntervalCell,
-            },
-            t_interval: {
-              name: "Upper",
-              cellComponent: IntervalCell,
-            },
-            color: {
-              name: "Color",
-              cellComponent: ColorCell,
-            },
-            descrip: {
-              name: "Description",
-              dataEditor: LongTextViewer,
-            },
+  if (width < 10) return null;
+
+  return h("svg", { width, height }, [
+    h(
+      Group,
+      { top: verticalMargin / 2 },
+      data.map((d) => {
+        const letter = getLetter(d);
+        const barWidth = xScale.bandwidth();
+        const barHeight = yMax - (yScale(getLetterFrequency(d)) ?? 0);
+        const barX = xScale(letter);
+        const barY = yMax - barHeight;
+        return h(Bar, {
+          key: `bar-${letter}`,
+          x: barX,
+          y: barY,
+          width: barWidth,
+          height: barHeight,
+          fill: "rgba(23, 233, 217, .5)",
+          onClick() {
+            if (events) alert(`clicked: ${JSON.stringify(Object.values(d))}`);
           },
-        },
-      }),
-    ])
-  );
+        });
+      })
+    ),
+  ]);
 }
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 1765dd4f..0e683d69 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -1,61 +1,19 @@
-.main
-  padding: 2em 8em
-  display: flex
-  flex-direction: column
-  position: fixed
-  width: 100vw
-  height: 100vh
+div.correlation-chart
+  position: relative
+
+.bar
+  position: absolute
+
+.page-inner
+  position: absolute
   top: 0
   left: 0
-
-.data-sheet-container
+  right: 0
+  bottom: 0
+  padding: 2em
   display: flex
   flex-direction: column
-  flex: 1
-  position: relative
-  min-height: 0
-
-.lithology
-  font-weight: bold
-  display: inline-block
-  padding: 0 0.5em
-  border-radius: 0.5em
-
-.inline-lithology .lithology
-  line-height: 1.2em
-
-.basis-panel
-  :global(.bp5-tag)
-    margin: 0 0.5em 0.5em 0
-  td
-    vertical-align: top
-  th
-    text-align: left
-    font-weight: 400
-    font-size: 0.9em
-    font-style: italic
-    color: var(--secondary-color)
-
-.basis-panel, .long-text
-  max-width: 20em
-  padding: 8px
-  max-height: 30em
-  overflow-y: scroll
-  pointer-events: all
-
-.description
-  font-style: italic
-
-
-.tag-header
-  font-weight: bold
-  text-transform: small-caps
-  font-size: 0.8em
-  color: var(--secondary-color)
 
-.basis-col
-  max-width: 15em
 
-.liths :global(.bp5-tag)
-  padding: 0px 4px
-  min-height: 16px
\ No newline at end of file
+.vis-container
+  flex-grow: 1
diff --git a/src/pages/maps/@id/utils.ts b/src/pages/maps/@id/utils.ts
index 3e671ab8..776a12ba 100644
--- a/src/pages/maps/@id/utils.ts
+++ b/src/pages/maps/@id/utils.ts
@@ -2,7 +2,7 @@ import { useState } from "react";
 import { useAsyncEffect } from "@macrostrat/ui-components";
 import { postgrest } from "~/providers";
 
-type MapInfo = {
+export type MapInfo = {
   source_id: number;
   slug?: string;
 };

From 86f68bcc3ebea6fef62df8687212be63bf221558 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 02:41:44 -0500
Subject: [PATCH 012/151] Fixed age scaling

---
 src/pages/maps/@id/correlation/+Page.ts | 197 +++++++++++++-----------
 src/pages/maps/@id/utils.ts             |   2 +-
 2 files changed, 107 insertions(+), 92 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index cbfac727..737da43e 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -11,7 +11,7 @@ import { Bar } from "@visx/shape";
 import { Group } from "@visx/group";
 import { scaleBand, scaleLinear } from "@visx/scale";
 import { apiV2Prefix } from "@macrostrat-web/settings";
-import fetch from "cross-fetch";
+import { AxisLeft } from "@visx/axis";
 
 const h = hyper.styled(styles);
 
@@ -22,7 +22,7 @@ export function Page({ map }) {
   const ref = useRef(null);
   const size = useElementSize(ref);
   const legendData = useLegendData(map);
-  const intervals = useAPIResult(apiRoute, resultUnwrapper);
+  const intervals = useAPIResult(apiRoute, { all: true }, resultUnwrapper);
 
   const correlationChartData = useMemo(() => {
     return buildCorrelationChartData(legendData, intervals);
@@ -42,82 +42,50 @@ export function Page({ map }) {
   ]);
 }
 
-type CorrelationItem = {
-  legend_id: number;
-  name: string;
-  strat_name: string;
-  age: string;
-  lith: string;
-  descrip: string;
-  comments: string;
-  liths: string;
-  b_interval: number;
-  t_interval: number;
-  best_age_bottom: string;
-  best_age_top: string;
-  unit_ids: string;
-  concept_ids: string;
+type IntervalShort = {
+  id: number;
+  b_age: number;
+  t_age: number;
 };
 
-function buildCorrelationChartData(legendData, intervals): LetterFrequency[] {
+function buildCorrelationChartData(
+  legendData: LegendItem[],
+  intervals: IntervalShort[]
+): CorrelationItem[] {
+  /** Build the data for a correlation chart */
   if (legendData == null) {
     return [];
   }
+
+  console.log(legendData, intervals);
+
   return legendData.map((d, i) => {
     return {
       letter: d.legend_id.toString(),
+      ageRange: mergeAgeRanges([
+        getAgeRangeForInterval(d.b_interval),
+        getAgeRangeForInterval(d.t_interval),
+      ]),
       frequency: i,
+      color: d.color,
     };
   });
 }
 
-type LetterFrequency = {
+type CorrelationItem = {
   letter: string;
-  frequency: number;
+  color: string;
+  ageRange: [number, number];
 };
 
-const letterFrequency: LetterFrequency[] = [
-  { letter: "A", frequency: 0.08167 },
-  { letter: "B", frequency: 0.01492 },
-  { letter: "C", frequency: 0.02782 },
-  { letter: "D", frequency: 0.04253 },
-  { letter: "E", frequency: 0.12702 },
-  { letter: "F", frequency: 0.02288 },
-  { letter: "G", frequency: 0.02015 },
-  { letter: "H", frequency: 0.06094 },
-  { letter: "I", frequency: 0.06966 },
-  { letter: "J", frequency: 0.00153 },
-  { letter: "K", frequency: 0.00772 },
-  { letter: "L", frequency: 0.04025 },
-  { letter: "M", frequency: 0.02406 },
-  { letter: "N", frequency: 0.06749 },
-  { letter: "O", frequency: 0.07507 },
-  { letter: "P", frequency: 0.01929 },
-  { letter: "Q", frequency: 0.00095 },
-  { letter: "R", frequency: 0.05987 },
-  { letter: "S", frequency: 0.06327 },
-  { letter: "T", frequency: 0.09056 },
-  { letter: "U", frequency: 0.02758 },
-  { letter: "V", frequency: 0.00978 },
-  { letter: "W", frequency: 0.0236 },
-  { letter: "X", frequency: 0.0015 },
-  { letter: "Y", frequency: 0.01974 },
-  { letter: "Z", frequency: 0.00074 },
-];
-
-const data = letterFrequency.slice(5);
 const verticalMargin = 120;
 
-// accessors
-const getLetter = (d: LetterFrequency) => d.letter;
-const getLetterFrequency = (d: LetterFrequency) => Number(d.frequency) * 100;
-
 export type BarsProps = {
   width: number;
   height: number;
   events?: boolean;
   map: MapInfo;
-  data: LetterFrequency[];
+  data: CorrelationItem[];
 };
 
 interface LegendItem {
@@ -129,12 +97,13 @@ interface LegendItem {
   descrip: string;
   comments: string;
   liths: string;
-  b_interval: number;
-  t_interval: number;
-  best_age_bottom: string;
-  best_age_top: string;
+  b_interval: IntervalShort;
+  t_interval: IntervalShort;
+  best_age_bottom?: number;
+  best_age_top?: number;
   unit_ids: string;
   concept_ids: string;
+  color: string;
 }
 
 function Example({ width, height, events = false, data }: BarsProps) {
@@ -148,20 +117,23 @@ function Example({ width, height, events = false, data }: BarsProps) {
       scaleBand<string>({
         range: [0, xMax],
         round: true,
-        domain: data.map(getLetter),
+        domain: data.map((d, i) => `${i}`),
         padding: 0.4,
       }),
     [xMax]
   );
-  const yScale = useMemo(
-    () =>
-      scaleLinear<number>({
-        range: [yMax, 0],
-        round: true,
-        domain: [0, Math.max(...data.map(getLetterFrequency))],
-      }),
-    [yMax]
-  );
+  const yScale = useMemo(() => {
+    const domain = mergeAgeRanges(
+      data.map((d) => d.ageRange),
+      MergeMode.Outer
+    );
+    console.log("Domain: ", domain);
+    return scaleLinear<number>({
+      range: [0, yMax],
+      round: true,
+      domain,
+    });
+  }, [data, yMax]);
 
   if (data == null) {
     return h(Spinner);
@@ -169,28 +141,71 @@ function Example({ width, height, events = false, data }: BarsProps) {
 
   if (width < 10) return null;
 
+  const data1 = data.sort((a, b) => {
+    return midpointAge(b.ageRange) - midpointAge(a.ageRange);
+  });
+
   return h("svg", { width, height }, [
-    h(
-      Group,
-      { top: verticalMargin / 2 },
-      data.map((d) => {
-        const letter = getLetter(d);
-        const barWidth = xScale.bandwidth();
-        const barHeight = yMax - (yScale(getLetterFrequency(d)) ?? 0);
-        const barX = xScale(letter);
-        const barY = yMax - barHeight;
-        return h(Bar, {
-          key: `bar-${letter}`,
-          x: barX,
-          y: barY,
-          width: barWidth,
-          height: barHeight,
-          fill: "rgba(23, 233, 217, .5)",
-          onClick() {
-            if (events) alert(`clicked: ${JSON.stringify(Object.values(d))}`);
-          },
-        });
-      })
-    ),
+    h(Group, { top: verticalMargin / 2 }, [
+      h(AxisLeft, {
+        scale: yScale,
+        left: 30,
+      }),
+      h(
+        Group,
+        data1.map((d, i) => {
+          const { ageRange } = d;
+          const yMin = yScale(ageRange[0]);
+          const yMax = yScale(ageRange[1]);
+          const barWidth = xScale.bandwidth();
+          const barHeight = yMax - yMin;
+          const barX = xScale(`${i}`);
+          const barY = yMin;
+          return h(Bar, {
+            key: `bar-${i}`,
+            x: barX,
+            y: barY,
+            width: barWidth,
+            height: barHeight,
+            fill: d.color,
+            onClick() {
+              if (events) alert(`clicked: ${JSON.stringify(Object.values(d))}`);
+            },
+          });
+        })
+      ),
+    ]),
   ]);
 }
+
+function getAgeRangeForInterval(
+  interval: IntervalShort
+): [number, number] | null {
+  /** Get the age range for an interval, building up an index as we go */
+  return [interval.b_age, interval.t_age];
+}
+
+enum MergeMode {
+  Inner,
+  Outer,
+}
+
+function mergeAgeRanges(
+  ranges: [number, number][],
+  mergeMode: MergeMode = MergeMode.Outer
+): [number, number] {
+  /** Merge a set of age ranges to get the inner or outer bounds */
+  if (mergeMode === MergeMode.Inner) {
+    const min = Math.min(...ranges.map((d) => d[0]));
+    const max = Math.max(...ranges.map((d) => d[1]));
+    return [min, max];
+  } else {
+    const min = Math.max(...ranges.map((d) => d[0]));
+    const max = Math.min(...ranges.map((d) => d[1]));
+    return [min, max];
+  }
+}
+
+function midpointAge(range: [number, number]) {
+  return (range[0] + range[1]) / 2;
+}
diff --git a/src/pages/maps/@id/utils.ts b/src/pages/maps/@id/utils.ts
index 776a12ba..28f37ed5 100644
--- a/src/pages/maps/@id/utils.ts
+++ b/src/pages/maps/@id/utils.ts
@@ -14,7 +14,7 @@ export function useLegendData(map: MapInfo): any[] | null {
     const res = await postgrest
       .from("legend")
       .select(
-        "legend_id, name, strat_name, age, lith, descrip, comments, liths, b_interval, t_interval, best_age_bottom, best_age_top, unit_ids, concept_ids"
+        "legend_id, name, strat_name, age, lith, descrip, comments, liths, b_interval, t_interval, best_age_bottom, best_age_top, unit_ids, concept_ids, color"
       )
       .eq("source_id", map.source_id)
       .order("legend_id", { ascending: true });

From 7dc35f5f33137b7d0c95a7945966a79cf1384a24 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Sat, 1 Jun 2024 12:57:01 -0400
Subject: [PATCH 013/151] added mainpage to dev folder

---
 src/pages/dev/main-page/+Page.mdx  | 572 ++++++++++++++++++
 src/pages/dev/main-page/index.ts   |   6 +
 src/pages/dev/main-page/main.styl  | 320 ++++++++++
 src/pages/dev/main-page/styles.css | 908 +++++++++++++++++++++++++++++
 4 files changed, 1806 insertions(+)
 create mode 100644 src/pages/dev/main-page/+Page.mdx
 create mode 100644 src/pages/dev/main-page/index.ts
 create mode 100644 src/pages/dev/main-page/main.styl
 create mode 100644 src/pages/dev/main-page/styles.css

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
new file mode 100644
index 00000000..f1fe6d56
--- /dev/null
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -0,0 +1,572 @@
+import { PageHeader } from "~/components";
+import { LinkCard } from "~/components/cards";
+import { Image } from "./index";
+import "./main.styl";
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="#about">About</a></li>
+    <li><a href="#apps">Apps</a></li>
+    <li><a href="#api">API</a></li>
+    <li><a href="#people">People</a></li>
+    <li><a href="#donate">Donate</a></li>
+    <li><a href="#publications">Publications</a></li>
+    <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+
+[//]: # "Start Page"
+<div class="parent">
+  <div class="left">
+    <Image className="back-img cover-image" src="cover_large.jpg"></Image>
+    <div class="text">
+      <h1 class="big">Macrostrat</h1>
+      <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
+      <ul class="buttons1">
+        <li><a type="button" class="btn" href="/sift/#/">Search</a></li>
+        <li><a type="button" class="btn" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
+        <li><div type="button" class="btn rockd" onclick="window.location='https://rockd.org'">
+          <div class="rockd-button-container">
+            <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
+            <a href="https://rockd.org" target="_blank">Go mobile</a>
+          </div>
+        </div></li>
+      </ul>
+    </div>
+  </div>
+  
+
+  <div class="right">
+    <Image className="back-img sea-image" src="deep_sea_new_medium.jpg"></Image>
+    <div class="text">
+      <ul class="stats-row">
+        <li>
+          <span class="top-stat" id="n_columns">1,400</span>
+          <span class="top-stat-label">Regional Rock Columns</span>
+        </li>
+        <li>
+          <span class="top-stat" id="n_units">33,903</span>
+          <span class="top-stat-label">Rock Units</span>
+        </li>
+        <li>
+          <span class="top-stat" id="n_polys">2,500,000</span>
+          <span class="top-stat-label">Geologic Map Polygons</span>
+        </li>
+        <li>
+          <span class="top-stat" id="n_names">51,212</span>
+          <span class="top-stat-label"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
+        </li>
+      </ul>
+    </div>
+  </div>
+
+</div>
+
+[//]: # "Locations"
+<div class="country_container">
+  <div class="country north-america">
+    <Image className="img country-image" src="north_america_med.jpg"></Image>
+    <div class="text">
+      <h1>North America</h1>\
+      <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+    </div>
+  </div>
+  <div class="country caribbean">
+    <Image className="img country-image" src="caribbean_new_medium.jpg"></Image>
+    <div class="text">
+      <h1>Caribbean</h1>\
+      <div class="caption">243 packages. 798 units. 897 collections.</div>
+    </div>
+  </div>
+  <div class="country new-zealand">
+    <Image className="img country-image" src="new_zealand_new_medium.jpg"></Image>
+    <div class="text">
+      <h1>New Zealand</h1>\
+      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+    </div>
+  </div>
+  <div class="country deep-sea">
+    <Image className="img country-image" src="deep_sea_new_medium.jpg"></Image>
+    <div class="text">
+      <h1>Deep Sea</h1>\
+      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+    </div>
+  </div>
+</div>
+
+[//]: # "Geological Maps"
+<div class="geologic-maps">
+  <h1 class="title map-title">Geologic Maps</h1>
+  <div class="map-info">
+    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
+    \
+    \
+    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
+    \
+    \
+    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
+  </div>
+</div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+      
+[//]: # "About"
+<div class="row slide" id="about">
+  <div class="col-xs-12 slide-container">
+    <div class="slide-content slide-content-padded">
+      <div class="row">
+        <div class="col-xs-12">
+          <div class="page-title-holder about-title">
+            <h1 class="title about-title">About</h1>
+          </div>
+        </div>
+      </div>
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Summary
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          License
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Citation
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
+          \
+          \
+          <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Collaboration
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
+        </div>
+      </div>
+
+      <div class="row about-row">
+        <div class="col-sm-3 about-body-subtitle">
+          Funding
+        </div>
+        <div class="col-sm-9 about-body page-info">
+          Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+
+[//]: # "Built With Macrostrat"
+<div class="row slide" id="apps">
+  <div class="col-xs-12 slide-container">
+    <div class="row">
+      <div class="col-xs-12" id="app-title">
+        <h1 class="title">Built with Macrostrat</h1>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="/sift">
+          <div class="app-background">
+            <div class="app-background-text">
+              Sift
+              <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://rockd.org">
+          <div class="app-background">
+            <div class="app-background-text">
+              Rockd
+              <p class="blurb">A mobile field book, Macrostrat style.</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="/map">
+          <div class="app-background">
+            <div class="app-background-text">
+              Map
+              <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
+          <div class="app-background">
+            <div class="app-background-text">
+              Mancos
+              <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="http://fc.umn.edu/" target="_blank">
+          <div class="app-background">
+            <div class="app-background-text">
+              FOC
+              <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 app">
+        <a href="https://github.com/UW-Macrostrat/node-api-template">
+          <div class="app-background">
+            <div class="app-background-text app-background-text-small">
+              API Template
+              <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+
+
+    [//]: # "API"
+    <div class="row slide" id="api">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-sm-6">
+              <div class="page-title-holder api-title">
+                <h1 class="big">API</h1>
+              </div>
+            </div>
+            <div class="col-sm-6">
+              <div class="page-info">
+                All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <Image className="rock-border" src="rocks-border.jpg"></Image>
+
+    [//]: # "People"
+    <div class="row slide" id="people">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder" id="contact-holder">
+                <h1 class="big">People</h1>
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 person" id="shanan">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
+                <t>Professor, Database Developer</t>\
+                <e>peters -at geology.wisc.edu</e>
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="daven">
+              <div class="person-info">
+                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
+                <t>Research Scientist, Developer</t> \
+                <e>daven.quinn -at wisc.edu</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="evgeny">
+              <div class="person-info">
+                <n>Evgeny Mazko</n> \
+                <t>Graduate Student</t> \
+                <e>mazko -at wisc.edu</e> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="michael">
+              <div class="person-info">
+                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
+                <t>Senior Programmer Analyst</t> \
+                <e>mmcclenn -at- geology.wisc.edu</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="casey">
+              <div class="person-info">
+                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
+                <t>Research Specialist, Developer (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="daniel">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
+                <t>Graduate Student (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="shan">
+              <div class="person-info">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
+                <t>Graduate Student (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="ben">
+              <div class="person-info">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
+                <t>Postdoctoral Scholar (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="afiqah">
+              <div class="person-info">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
+                <t>Undergrad Student (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="sharon">
+              <div class="person-info">
+                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
+                <t>Researcher (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="andrew">
+              <div class="person-info">
+                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
+                <t>Data Mobilization and Research Scientist</t> \
+                <e>azaffos -at- email.arizona.edu</e> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="jon">
+              <div class="person-info">
+                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
+                <t>Postdoctoral Researcher (former)</t> \
+                <e>jhusson - at - uvic.ca</e> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="erika">
+              <div class="person-info">
+                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
+                <t>Research Intern (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="noel">
+              <div class="person-info">
+                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
+                <t>Researcher (former)</t> 
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-xs-6 person" id="john">
+              <div class="person-info">
+                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
+                <t>Next-level Developer (former)</t> 
+              </div>
+            </div>
+            <div class="col-xs-6 person" id="puneet">
+              <div class="person-info">
+                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
+                <t>Generally Ignored</t> \
+                <e>punkish at eidesis.org</e> 
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+    [//]: # "Donate"
+    <div class="donate-container" id="donate">
+      <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
+      <div class="text">
+        <div class="donate-left">
+          <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
+        </div>
+        <div class="donate-right">
+          <div class="donate-info">
+              Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    [//]: # "Publications"
+    <div class="row slide" id="publications">
+      <div class="col-xs-12 slide-container">
+        <div class="slide-content slide-content-padded">
+          <div class="row">
+            <div class="col-xs-12">
+              <div class="page-title-holder">
+                <h1 class="big">Publications</h1>
+                <p class="blurb">literature utilizing Macrostrat</p>
+              </div>
+            </div>
+          </div>
+          [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
+          <div class="row">
+            <div class="col-xs-12">
+              <ol class="pub-list" reversed>
+                <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
+                <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
+                <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
+                <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
+                <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
+                <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
+                <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
+                <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
+                <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
+                <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
+                <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
+                <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
+                <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
+                <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
+                <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
+                <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
+                <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
+                <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
+                <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
+                <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
+                <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
+                <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
+                <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
+                <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
+                <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
+                <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
+                <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
+                <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
+                Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
+                <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
+                <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
+                <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
+                <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
+                <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
+                <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
+                <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
+                <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
+                <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
+                <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
+                <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
+                <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
+                <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
+                <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
+                <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
+                <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
+                <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
+                <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
+                <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
+                <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
+                <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
+                <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
+                <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
+                <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
+                <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
+                <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
+                <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
+                <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
+                  <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
+                <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
+                <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
+                <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
+                <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
+                <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
+                <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
+                <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
+                <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
+                <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
+              </ol>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    [//]: # "Footer"
+    <div class="footer">
+      <div class="footer-container">
+        <div class="col-sm-4" id="who-made-it">
+          <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+          <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+        </div>
+        <div class="col-sm-4" id="bottom-nav">
+          <ul class="footer-nav">
+            <li><a href="#about">About</a></li>
+            <li><a href="#apps">Apps</a></li>
+            <li><a href="#api">API</a></li>
+            <li><a href="#people">People</a></li>
+            <li><a href="#donate">Donate</a></li>
+            <li><a href="#publications">Publications</a></li>
+          </ul>
+        </div>
+        <div class="col-sm-4 funding">
+          <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+          <div class="funding-line">
+            Current support: \
+            EAR-1948843 \
+            ICER-1928323 \
+            UW-Madison Dept. Geoscience
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/dev/main-page/index.ts b/src/pages/dev/main-page/index.ts
new file mode 100644
index 00000000..e3670446
--- /dev/null
+++ b/src/pages/dev/main-page/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
new file mode 100644
index 00000000..b3cf2e4a
--- /dev/null
+++ b/src/pages/dev/main-page/main.styl
@@ -0,0 +1,320 @@
+html, body
+  color: #E0E1E6
+  background-color: white
+  margin: 0
+
+a
+  color: white
+
+a:hover
+  text-decoration: none
+
+.nohighlight
+  color: white
+
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
+
+.parent
+  height: 100vh
+
+.left
+  width: 70%
+  display: flex;
+  justify-content: center;
+  align-items: center;  height: 100vh
+  color: white
+
+  li
+    float: left
+    list-style-type: none
+    width: 33%
+
+  ul
+    display: inline-block
+    width: 100%
+
+.text
+  position:absolute
+  z-index: 100
+  padding: 0 20px
+
+.cover-image
+  position:absolute
+  z-index:5
+  left:0px
+  top:0px
+  height: 100vh
+  width: 70%
+  object-fit: cover
+
+.sea-image
+  position:absolute
+  z-index: 6
+  height: 100vh
+  width: 30%
+  object-fit: cover
+
+.right
+  background-color: blue
+  height: 100vh
+  width: 30%
+
+  ul 
+    list-style-type: none
+    margin-top: 32vh
+
+  li 
+    width: 25%
+    padding-left: 10px
+
+  .buttons1
+    padding-left: 27%      
+
+.parent
+  display: inline-flex
+  width: 100%
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  text-align: center
+
+.big-text
+  font-family: Helvetica, sans-serif
+  font-weight: 900
+  font-size: 20px
+
+.top-stat, .top-stat-label
+  display: block
+  color: white
+
+.top-stat
+  font-size: 35px
+  font-family: Helvetica, sans-serif
+
+.stats-row
+  margin-top: 20%
+
+  li
+    padding-top: 10px
+    padding-bottom: 20px
+    color: black
+    width: 100%
+    
+.rockd
+  background-color: green
+
+.btn
+  background-color: #363434;
+  border: none;
+  color: white;
+  padding: 13px 10px;
+  margin: 10px
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  float: left
+  border-radius: 12px;
+
+.btn:hover 
+  background-color: #545151 
+
+.buttons1 
+  font-size: 20px
+  padding: 0px
+
+  a 
+    color: white
+    text-decoration: none
+
+  a:hover
+    color: white
+
+.rockd-png
+  width: 22px
+  padding-right: 4px
+  float: left
+  padding-top: 5px
+
+.country_container 
+  height: 100vh
+  display: grid;
+  grid-template-columns: repeat(2, minmax(150px, 2fr));
+  grid-template-rows: repeat(2, minmax(150px, 2fr));
+  background-color: green
+
+.country
+  height: 100%
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  color: white
+
+.img
+  position:absolute
+  z-index:5
+  height: 100vh
+  width: 100%
+  object-fit: cover
+
+.country-image
+  height: 50vh
+  width: 50%
+
+.rock-border
+  width: 100%
+  margin: 0
+  padding: 0
+
+.geologic-maps
+  height: 100vh
+  background-color: white
+  color: black
+  margin: 0
+
+.map-info
+  padding: 0 10vh
+  margin: 0
+
+.title
+  margin: 0
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  padding: 20vh 0
+  text-align: center
+
+#about
+  height: 100vh
+  background-color: white
+  color: black
+  margin: 0
+
+#apps
+  height: 100vh
+  color: black
+  background-color: white
+
+#api
+  height: 100vh
+
+.donate-container
+  height: 80vh
+
+.donate-title
+  a 
+    color:white
+  a:hover
+    text-decoration: none
+
+  color: white
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  font-family: "Maven Pro", sans-serif;
+  padding: 0
+
+.donate-left
+  float: left
+  width: 50%
+  height: 80vh
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+.donate-right
+  float: right
+  width: 50%
+  height: 80vh
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+.donate-info
+  background: rgba(255,255,255,0.5);
+  padding: 25px
+  color: black
+  width: 80%
+  font-size: 18px
+
+  a
+    color: black
+    font-weight: bold
+    text-decoration: none
+
+.donate-img
+  position:absolute
+  z-index:5
+  height: 80vh
+  width: 100%
+  object-fit: cover
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px
\ No newline at end of file
diff --git a/src/pages/dev/main-page/styles.css b/src/pages/dev/main-page/styles.css
new file mode 100644
index 00000000..9ec89de9
--- /dev/null
+++ b/src/pages/dev/main-page/styles.css
@@ -0,0 +1,908 @@
+/* Snap styles */
+html, body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+.row-eq-height {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display:         flex;
+}
+
+#donate-title-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+  position: absolute;
+  text-align: center;
+}
+.snap-content {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto;
+  z-index: 2;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  -webkit-transform: translate3d(0, 0, 0);
+     -moz-transform: translate3d(0, 0, 0);
+      -ms-transform: translate3d(0, 0, 0);
+       -o-transform: translate3d(0, 0, 0);
+          transform: translate3d(0, 0, 0);
+}
+
+.snap-drawers {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto;
+}
+
+.snap-drawer {
+  position: absolute;
+  top: 0;
+  right: auto;
+  bottom: 0;
+  left: auto;
+  width: 265px;
+  height: auto;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  -webkit-transition: width 0.3s ease;
+     -moz-transition: width 0.3s ease;
+      -ms-transition: width 0.3s ease;
+       -o-transition: width 0.3s ease;
+          transition: width 0.3s ease;
+}
+
+.snap-drawer-left {
+  left: 0;
+  z-index: 1;
+}
+
+.snap-drawer-right {
+  right: 0;
+  z-index: 1;
+}
+
+.snapjs-left .snap-drawer-right,
+.snapjs-right .snap-drawer-left {
+  display: none;
+}
+
+.snapjs-expand-left .snap-drawer-left,
+.snapjs-expand-right .snap-drawer-right {
+  width: 100%;
+}
+
+/* End snap styles */
+
+a:hover {
+  text-decoration: none;
+}
+.container-fluid {
+  margin: 0;
+  padding: 0;
+  height: 100%;
+}
+.scrollable{
+  overflow: auto;
+  -webkit-transition-property: top, bottom;
+  transition-property: top, bottom;
+  -webkit-transition-duration: .2s, .2s;
+  transition-duration: .2s, .2s;
+  -webkit-transition-timing-function: linear, linear;
+  transition-timing-function: linear, linear;
+  -webkit-overflow-scrolling: touch;
+}
+.footer {
+  display: block;
+  bottom: 0;
+  width: 100%;
+  padding: 1em;
+  background-color: #015EAB;
+}
+#who-made-it {
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+}
+#who-made-it > a {
+  color: #E0E1E6;
+  font-weight: 200;
+}
+#who-made-it > a > img {
+  height: 75px;
+}
+#who-made-it > a > i {
+  margin-top: 10px;
+}
+#who-made-it > a > i:first-child {
+  margin-right: 10px;
+}
+#bottom-nav {
+  text-align: center;
+}
+.footer-nav > li > a {
+  color: #E0E1E6;
+  padding: 5px;
+}
+.funding {
+  color: #E0E1E6;
+  display: table;
+  text-align: center;
+}
+.funding-line {
+  display: table-cell;
+  vertical-align: middle;
+  font-weight: 200;
+}
+.funding-logo {
+  width: 75px;
+}
+.snap-content {
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+.navbar-default {
+  background-color: rgba(0,0,0,0);
+  border: none;
+}
+.snap-drawers {
+  top: 50px;
+}
+.close-to-top {
+  background-color: #015EAB;
+  opacity: 1;
+}
+#second-nav {
+  background-color: #193441;
+}
+.navbar-default .navbar-nav>li>a {
+  color: #E0E1E6;
+  font-size: 1.1em;
+  font-weight: 400;
+  letter-spacing: 1px;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #E0E1E6;
+}
+.navbar-default .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus {
+  color: #fff;
+}
+.navbar-default .navbar-toggle {
+  border-color: rgba(0,0,0,0);
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: rgba(0,0,0,0);
+}
+.logo {
+  height: 50px;
+  padding: 2px;
+}
+.main {
+  margin: auto;
+  color:#888;
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+.main > h1 {
+  font-family: "Maven Pro", sans-serif;
+  font-size: 50px;
+  font-weight: 100;
+  line-height: 1.1;
+}
+.explore-sift {
+  background-color: #990000;
+  border-color: #990000;
+  margin-top: 10px;
+}
+.explore-sift.btn-info {
+  background-color: #015EAB;
+  border-color: #015EAB;
+}
+.rockd-button-container {
+  display: flex;
+  align-items: center;
+}
+.explore-sift.rockd {
+  background-color: #363434;
+  border-color: #363434;
+}
+.rockd-logo-small {
+  height: 21px;
+  margin-right: 5px;
+}
+.stats {
+  color: white;
+}
+.snap-drawer-right {
+  background-color: #015EAB;
+  opacity: 0.92;
+}
+.drawer-menu {
+  background-color: #015EAB;
+  line-height: 20px;
+  margin: 0;
+}
+.drawer-menu > a {
+  display: block;
+  color: #E0E1E6;
+  padding: 12px 35px !important;
+  border-bottom: 2px solid #0167bc;
+  font-size: 13px;
+  font-weight: 100;
+  letter-spacing: 1px;
+}
+.drawer-menu > a:hover {
+  color: #fff;
+}
+.nav>li>a:hover, .nav>li>a:focus {
+  background-color: rgba(0,0,0,0);
+}
+.nav.drawer {
+  margin-top: 60px;
+}
+#view {
+  height: 100%;
+  width: 100%;
+  position: relative;
+  background-color: #fff;
+  margin-top: 50px;
+}
+#view > .container-fluid {
+  height: 100%;
+  padding: 0;
+}
+.row {
+  margin: 0;
+}
+.slide {
+  height: 100%;
+  background-color: #fff;
+}
+.stat-row {
+  height: 50%;
+}
+.slide-container {
+  width: 100%;
+  height: 100%;
+ /* text-align: center; */
+  display: table;
+  padding: 0;
+}
+.slide-content {
+  display: table-cell;
+  vertical-align: middle;
+}
+.slide-container > .stat-container {
+  display: table-cell;
+}
+
+.slide-content-padded {
+  padding-left: 10%;
+  padding-right: 10%;
+}
+
+.welcome {
+  background-color: rgba(0,0,0,0.3);
+  text-align: center;
+}
+.title {
+  margin-left: 1em;
+  margin-top: -6em;
+  padding: 40px;
+  border-radius: 20px;
+}
+
+.title > p {
+  color: #f7f7f7;
+  font-size: 20px;
+  font-weight: 300;
+}
+.top-stat, .top-stat-label {
+  display: block;
+  color: #f7f7f7;
+  font-size: 20px;
+}
+.top-stat {
+  font-weight: 600;
+}
+.top-stat-label {
+  font-size: 16px;
+  font-weight: 300;
+}
+.big {
+  font-size: 75px;
+  color: #E0E1E6;
+  font-family: "Maven Pro", sans-serif;
+}
+.nohighlight a{
+  color: white;
+}
+
+.stats > .slide-container {
+  text-align: center;
+}
+
+
+#app-title {
+  background-color: #4BABBf;
+  color: white;
+}
+
+.about-title {
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+
+}
+#about {
+  padding: 100px 0;
+}
+#about > .slide-container {
+  padding-bottom: 100px;
+
+}
+.about {
+  padding: 0 15px;
+}
+.about-row {
+  padding: 15px 0;
+}
+.about-body {
+  padding: 0 30px;
+  color: #000 !important;
+}
+.about-body-subtitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: 200;
+  color: #777;
+}
+
+#apps {
+  max-width: 900px;
+  margin: 0 auto;
+  height: auto;
+}
+.app {
+  padding: 0;
+  height: 160px;
+}
+.app-background {
+  position: absolute;
+  font-size: 70px;
+  width: 100%;
+  height: 100%;
+  color: #777;
+  font-weight: 100;
+  letter-spacing: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.blurb {
+  font-weight: 200;
+  font-size: 14px;
+  letter-spacing: 1px;
+}
+.app-background-text {
+  padding-right: 20px;
+  text-align: right;
+  max-width: 55%;
+}
+.app-background-text-small {
+  font-size: 50px;
+}
+.app-content {
+  z-index: 2;
+}
+
+.app-grid {
+  border: 1px solid #E5E5E5;
+  margin-top: -1px;
+  margin-bottom: 0;
+  margin-left: -1px;
+  min-height: 200px;
+  text-align: center;
+  display: table;
+}
+
+.app-grid-content {
+  display: table-cell;
+  vertical-align: middle;
+  color: #4BABBf;
+  font-weight: 500;
+  font-size: 16px;
+}
+
+.app-img {
+  height: 120px;
+  position: absolute;
+  border-radius: 4px;
+  left: 15px;
+  top: 15px;
+}
+
+#api {
+ /* background-color: #D33A29;*/
+}
+.api-title {
+  background-color: #fff;
+  height:200px;
+  width: 200px;
+  border-radius: 50%;
+  text-align: center;
+  display: table;
+  border: 11px solid #6bbe98;
+  color: #4BABBf;
+}
+
+.big.apps {
+  color: #F5F5F5;
+}
+#apps {
+  padding-top: 150px;
+}
+#contact {
+  height: 1000px;
+  padding: 140px 0;
+}
+#contact-holder {
+  text-align: right;
+  color: #777;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+}
+.api-title > .big {
+  display: table-cell;
+  vertical-align: middle;
+  color: #6bbe98;
+}
+
+.stat-caption {
+  z-index: 10;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
+  position: absolute;
+  left: 20%;
+  right: 20%;
+  bottom: 20px;
+}
+.stat-caption > p {
+  font-size: 18px;
+}
+.stat-caption > h1 {
+  font-size: 45px;
+}
+
+.attribution {
+  height: 25px;
+  width: 25px;
+  position: absolute;
+  text-align: center;
+  right: 0;
+  bottom: 0;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  padding: 5px;
+  border: 1px solid #eee;
+  border-radius: 50%;
+  color: #eee;
+  z-index: 500;
+}
+
+.stat {
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.stat-container {
+  height: 100%;
+}
+
+.page-info {
+  color: #4bab7f;
+  font-size: 18px;
+  line-height: 28px;
+  font-weight: 200;
+}
+.page-info.donate {
+  color: #333;
+}
+.page-info > a {
+  color: #4bab7f;
+  font-weight: bold;
+}
+.person {
+  background-repeat: no-repeat;
+  background-size: cover;
+  height: 200px;
+  border-bottom: 10px solid #fff;
+}
+.row > .person:first-child {
+  border-right: 5px solid #fff;
+}
+.row > .person:last-child {
+  border-left: 5px solid #fff;
+}
+.person-info {
+  float: right;
+  color: white;
+  font-size: 19px;
+  bottom: 0;
+  font-weight: 200;
+  position: absolute;
+  right: 0;
+  text-align: right;
+  background-color: rgba(0,0,0,0.2);
+  letter-spacing: 1px;
+  padding-top: 10px;
+  padding-left: 10px;
+  border-radius: 3px;
+}
+n, n > a {
+  font-size: 25px;
+  font-weight: 200;
+  color: inherit;
+}
+n > a:hover {
+  color: inherit;
+  font-weight: bolder;
+}
+n > a {
+  color: white;
+}
+t {
+  font-weight: 400;
+}
+e {
+  font-size: 14px;
+  font-weight: 200;
+}
+#people {
+  height: auto;
+}
+#shanan {
+  background-image: url("../img/shanan.jpg");
+}
+#shanan_wide {
+  background-image: url("../img/shanan_wide.jpg");
+}
+#daven {
+  background-image: url("../img/daven.jpg");
+}
+#evgeny {
+  background-image: url("../img/evgeny.jpg");
+}
+#casey {
+  background-image: url("../img/casey.jpg");
+}
+#afiqah {
+  background-image: url("../img/afiqah.jpg");
+}
+#daniel {
+  background-image: url("../img/daniel.jpg");
+}
+#shan {
+  background-image: url("../img/shan.jpg");
+}
+#michael {
+  background-image: url("../img/michael.jpg");
+}
+#ben {
+  background-image: url("../img/ben.jpg");
+}
+#jon {
+  background-image: url("../img/jon.jpg");
+  background-position-y: -45px;
+}
+#sharon {
+  background-image: url("../img/sharon.jpg");
+  background-position-y: -45px;
+}
+#victoria {
+  background-image: url("../img/victoria.jpg");
+}
+#john {
+  background-position: center;
+}
+#publications {
+  height: auto;
+  padding-top: 15%;
+  padding-bottom: 100px;
+}
+.pub-list {
+  counter-reset: pub-counter 70;
+  list-style: none;
+}
+.pub-list li {
+  counter-increment: pub-counter -1;
+  position: relative;
+  padding: 4px 0 20px 70px;
+}
+.pub-list li:before {
+  content: counter(pub-counter);
+  position: absolute;
+  left: 0;
+  top: -2px;
+  font-size: 35px;
+  color: #babdc8;
+}
+
+#donate {
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-image: url("../img/donate.jpg");
+}
+#donate-row {
+  padding: 100px 0;
+  background-color: #fff;
+}
+.donate-container > h1 {
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
+  font-size: 90px;
+  font-weight: 700;
+}
+
+.page-info.donate {
+  background-color: rgba(255,255,255,0.7);
+  padding: 25px;
+  border-radius: 5px;
+}
+.burwell-title {
+  text-align: center;
+  color: #000000;
+}
+@media(max-width: 1200px), (min-width: 1200px) {
+  .snap-drawers {
+    display: none;
+  }
+  .main {
+    background-image: url("../img/cover_large.jpg");
+  }
+  .north-america {
+    background-image: url("../img/north_america.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new.jpg");
+  }
+  #john {
+    background-image: url("../img/john.jpg");
+  }
+  #puneet {
+    background-image: url("../img/puneet.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel.jpg");
+    background-position: 0 -35px, center;
+  }
+  #andrew {
+    background-image: url("../img/andrew.jpg");
+    background-position: 0 -35px, center;
+  }
+  #erika {
+    background-image: url("../img/erika.jpg");
+  }
+}
+@media(max-width: 992px) {
+  .snap-drawers {
+    display: none;
+  }
+  .main {
+    background-image: url("../img/cover_medium.jpg");
+  }
+  .north-america {
+    background-image: url("../img/north_america_med.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new_medium.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new_medium.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new_medium.jpg");
+  }
+  #john {
+    background-image: url("../img/john_med.jpg");
+  }
+  #puneet {
+    background-image: url("../img/puneet_med.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel_med.jpg");
+    background-position: 0 0;
+  }
+  #andrew {
+    background-image: url("../img/andrew_med.jpg");
+    background-position: 0 0;
+  }
+  #erika {
+    background-image: url("../img/erika_med.jpg");
+  }
+  #jon {
+    background-position: 0 0;
+  }
+  #donate {
+    background-image: url("../img/donate_medium.jpg");
+  }
+  .donate-container > h1 {
+    font-size: 60px;
+  }
+}
+@media(max-width: 768px) {
+  .top-stat-col {
+    margin-top: 15px;
+  }
+  .logo {
+    margin-left: 10px;
+  }
+  .snap-drawers {
+    display: block;
+  }
+  .main {
+  /*  background-image: url("../img/cover_small.jpg");*/
+  }
+  .north-america {
+    background-image: url("../img/north_america_small.jpg");
+  }
+  .caribbean {
+    background-image: url("../img/caribbean_new_small.jpg");
+  }
+  .new-zealand {
+    background-image: url("../img/new_zealand_new_small.jpg");
+  }
+  .deep-sea {
+    background-image: url("../img/deep_sea_new_small.jpg");
+  }
+  .big {
+    font-size: 50px;
+  }
+  .title {
+    margin-top: 0;
+    margin-right: 1em;
+  }
+  .app-grid {
+    width: 100%;
+  }
+  #api {
+    height: 150%;
+  }
+  .api-title {
+    margin-left: 7%;
+    margin-bottom: 50px;
+    margin-top: 50px;
+  }
+  .stat-caption > h1 {
+    font-size: 42px;
+  }
+  .stat-caption > p {
+    font-size: 16px;
+  }
+  .person-info {
+    line-height: 17px;
+  }
+  n {
+    font-size: 14px;
+  }
+  t {
+    font-size: 15px;
+  }
+  e {
+    font-size: 10px;
+  }
+  #john {
+    background-image: url("../img/john_low.jpg");
+  }
+  #noel {
+    background-image: url("../img/noel_low.jpg");
+  }
+  #andrew {
+    background-image: url("../img/andrew_low.jpg");
+  }
+  #donate {
+    background-image: url("../img/donate_small.jpg");
+  }
+  #erika {
+    background-image: url("../img/erika_low.jpg");
+  }
+  .funding {
+    display: block;
+  }
+  .funding-line {
+    display: block;
+  }
+  .stat-row {
+    height: 100%;
+  }
+  .stat {
+    height: 50%;
+  }
+  .donate-container > h1 {
+    font-size: 45px;
+  }
+  .page-info.donate {
+    font-size: 15px;
+    margin-bottom: 25px;
+    font-weight: 400;
+  }
+}
+@media(max-width: 450px) {
+  .row-eq-height {
+    display: block;
+  }
+  #donate-title-container {
+    position: relative;
+    margin-bottom: 15px;
+  }
+  .logo {
+    height: 40px;
+    padding-left: 10px;
+    padding-top: 7px;
+  }
+  .big {
+    font-size: 37px;
+  }
+  .col-xs-6 {
+    width: 100%;
+  }
+  .api-title {
+    margin-left: 21%;
+  }
+  .pub-list {
+    margin-left: -35px;
+  }
+  .slide-content-padded {
+    padding: 0;
+  }
+  .pub-list li:before {
+    font-size: 25px;
+  }
+  .app-img {
+    height: 80px;
+  }
+  .app-background-text {
+    font-size: 25px;
+    letter-spacing: 10px;
+  }
+
+  .person {
+    border: 5px solid #fff;
+  }
+  .footer .col-sm-4 {
+    padding: 25px 0;
+  }
+  .about-body-subtitle {
+    font-size: 25px;
+    font-weight: 400;
+  }
+  #app-title {
+    height: 250px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+}

From 1fb5d0fcdd88dbce45ff893beb6fac0372c7783a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 14:14:02 -0500
Subject: [PATCH 014/151] Correlation chart is starting to get a bit nicer

---
 src/pages/maps/@id/correlation/+Page.ts       | 180 +++++++++++-------
 .../maps/@id/correlation/main.module.sass     |   5 +-
 2 files changed, 120 insertions(+), 65 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 737da43e..49e23ba7 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -5,34 +5,37 @@ import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
 import { PageBreadcrumbs } from "~/renderer";
 import { useLegendData, MapInfo } from "../utils";
-import { useElementSize, useAPIResult } from "@macrostrat/ui-components";
+import {
+  useElementSize,
+  useAPIResult,
+  useInDarkMode,
+} from "@macrostrat/ui-components";
 import { useMemo, useRef } from "react";
 import { Bar } from "@visx/shape";
 import { Group } from "@visx/group";
 import { scaleBand, scaleLinear } from "@visx/scale";
 import { apiV2Prefix } from "@macrostrat-web/settings";
 import { AxisLeft } from "@visx/axis";
+import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
+import { ForeignObject } from "@macrostrat/column-components";
 
 const h = hyper.styled(styles);
 
-const apiRoute = apiV2Prefix + "/defs/intervals";
-const resultUnwrapper = (res) => res.success.data;
-
 export function Page({ map }) {
   const ref = useRef(null);
   const size = useElementSize(ref);
   const legendData = useLegendData(map);
-  const intervals = useAPIResult(apiRoute, { all: true }, resultUnwrapper);
 
   const correlationChartData = useMemo(() => {
-    return buildCorrelationChartData(legendData, intervals);
-  }, [legendData, intervals]);
+    console.log(legendData);
+    return buildCorrelationChartData(legendData);
+  }, [legendData]);
 
   return h(FullscreenPage, [
     h("div.page-inner", [
       h(PageBreadcrumbs),
       h("div.vis-container", { ref }, [
-        h.if(legendData != null)(Example, {
+        h.if(legendData != null)(CorrelationChart, {
           map,
           ...size,
           data: correlationChartData,
@@ -49,19 +52,16 @@ type IntervalShort = {
 };
 
 function buildCorrelationChartData(
-  legendData: LegendItem[],
-  intervals: IntervalShort[]
+  legendData: LegendItem[]
 ): CorrelationItem[] {
   /** Build the data for a correlation chart */
   if (legendData == null) {
     return [];
   }
 
-  console.log(legendData, intervals);
-
-  return legendData.map((d, i) => {
+  let data1 = legendData.map((d, i) => {
     return {
-      letter: d.legend_id.toString(),
+      legend_id: d.legend_id.toString(),
       ageRange: mergeAgeRanges([
         getAgeRangeForInterval(d.b_interval),
         getAgeRangeForInterval(d.t_interval),
@@ -70,15 +70,19 @@ function buildCorrelationChartData(
       color: d.color,
     };
   });
+
+  return data1.sort((a, b) => {
+    return midpointAge(b.ageRange) - midpointAge(a.ageRange);
+  });
 }
 
 type CorrelationItem = {
-  letter: string;
   color: string;
   ageRange: [number, number];
+  legend_id: number;
 };
 
-const verticalMargin = 120;
+const verticalMargin = 60;
 
 export type BarsProps = {
   width: number;
@@ -106,16 +110,23 @@ interface LegendItem {
   color: string;
 }
 
-function Example({ width, height, events = false, data }: BarsProps) {
+function CorrelationChart({ width, height, events = false, data }: BarsProps) {
   // bounds
   const xMax = width;
   const yMax = height - verticalMargin;
 
+  const domain = useMemo(
+    () => mergeAgeRanges(data.map((d) => d.ageRange)),
+    [data]
+  );
+
+  const xMin = 60;
+
   // scales, memoize for performance
   const xScale = useMemo(
     () =>
       scaleBand<string>({
-        range: [0, xMax],
+        range: [xMin, xMax],
         round: true,
         domain: data.map((d, i) => `${i}`),
         padding: 0.4,
@@ -123,17 +134,12 @@ function Example({ width, height, events = false, data }: BarsProps) {
     [xMax]
   );
   const yScale = useMemo(() => {
-    const domain = mergeAgeRanges(
-      data.map((d) => d.ageRange),
-      MergeMode.Outer
-    );
-    console.log("Domain: ", domain);
     return scaleLinear<number>({
-      range: [0, yMax],
-      round: true,
+      range: [yMax, 0],
+      round: false,
       domain,
     });
-  }, [data, yMax]);
+  }, [domain, yMax]);
 
   if (data == null) {
     return h(Spinner);
@@ -141,43 +147,81 @@ function Example({ width, height, events = false, data }: BarsProps) {
 
   if (width < 10) return null;
 
-  const data1 = data.sort((a, b) => {
-    return midpointAge(b.ageRange) - midpointAge(a.ageRange);
-  });
+  return h("div.vis-frame", [
+    h("svg", { width, height }, [
+      h(Group, { top: verticalMargin / 2, key: "main-plot" }, [
+        h(AgeAxis, {
+          scale: yScale,
+          width: 40,
+        }),
+        h(ForeignObject, { width: 60, height, x: 40 }, [
+          h(Timescale, {
+            orientation: TimescaleOrientation.VERTICAL,
+            length: yMax,
+            // Bug in timescale component, the age range appears to be changed
+            // if we pass it in statically.
+            ageRange: [...domain],
+            absoluteAgeScale: true,
+            levels: [2, 3],
+          }),
+        ]),
+        h(
+          Group,
+          { key: "bars" },
+          data.map((d, i) => {
+            const { ageRange } = d;
 
-  return h("svg", { width, height }, [
-    h(Group, { top: verticalMargin / 2 }, [
-      h(AxisLeft, {
-        scale: yScale,
-        left: 30,
-      }),
-      h(
-        Group,
-        data1.map((d, i) => {
-          const { ageRange } = d;
-          const yMin = yScale(ageRange[0]);
-          const yMax = yScale(ageRange[1]);
-          const barWidth = xScale.bandwidth();
-          const barHeight = yMax - yMin;
-          const barX = xScale(`${i}`);
-          const barY = yMin;
-          return h(Bar, {
-            key: `bar-${i}`,
-            x: barX,
-            y: barY,
-            width: barWidth,
-            height: barHeight,
-            fill: d.color,
-            onClick() {
-              if (events) alert(`clicked: ${JSON.stringify(Object.values(d))}`);
-            },
-          });
-        })
-      ),
+            const yMin = yScale(ageRange[1]);
+            const yMax = yScale(ageRange[0]);
+
+            const barWidth = xScale.bandwidth();
+            const barHeight = yMax - yMin;
+            const barX = xScale(`${i}`);
+            const barY = yMin;
+            return h("rect", {
+              key: d.legend_id,
+              x: barX,
+              y: barY,
+              width: barWidth,
+              height: barHeight,
+              fill: d.color,
+              onClick() {
+                if (events)
+                  alert(`clicked: ${JSON.stringify(Object.values(d))}`);
+              },
+            });
+          })
+        ),
+      ]),
     ]),
   ]);
 }
 
+function AgeAxis({ scale, width }) {
+  const darkMode = useInDarkMode();
+
+  const axisColor = darkMode ? "#ccc" : "#222";
+
+  return h(AxisLeft, {
+    scale,
+    left: width,
+    stroke: axisColor,
+    tickStroke: axisColor,
+    labelProps: {
+      fill: axisColor,
+    },
+    tickLabelProps: () => {
+      return {
+        fill: axisColor,
+        textAnchor: "end",
+        verticalAnchor: "middle",
+        dx: "-0.25em",
+        fontSize: 12,
+      };
+    },
+  });
+}
+
 function getAgeRangeForInterval(
   interval: IntervalShort
 ): [number, number] | null {
@@ -195,15 +239,23 @@ function mergeAgeRanges(
   mergeMode: MergeMode = MergeMode.Outer
 ): [number, number] {
   /** Merge a set of age ranges to get the inner or outer bounds */
+  let min = Infinity;
+  let max = 0;
+  // Negative ages are not handled
+
   if (mergeMode === MergeMode.Inner) {
-    const min = Math.min(...ranges.map((d) => d[0]));
-    const max = Math.max(...ranges.map((d) => d[1]));
-    return [min, max];
+    min = Math.min(...ranges.map((d) => d[0]));
+    max = Math.max(...ranges.map((d) => d[1]));
   } else {
-    const min = Math.max(...ranges.map((d) => d[0]));
-    const max = Math.min(...ranges.map((d) => d[1]));
-    return [min, max];
+    min = Math.max(...ranges.map((d) => d[0]));
+    max = Math.min(...ranges.map((d) => d[1]));
+  }
+
+  // Age ranges should start with the oldest (largest) age
+  if (min < max) {
+    return [max, min];
   }
+  return [min, max];
 }
 
 function midpointAge(range: [number, number]) {
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 0e683d69..5374ed8c 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -4,6 +4,7 @@ div.correlation-chart
 .bar
   position: absolute
 
+// Ideally this wouldn't be necessary
 .page-inner
   position: absolute
   top: 0
@@ -16,4 +17,6 @@ div.correlation-chart
 
 
 .vis-container
-  flex-grow: 1
+  flex: 1
+  overflow: hidden
+  

From 58c3050b7f831032affd28a6dd5c75debd638277 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 14:38:48 -0500
Subject: [PATCH 015/151] Fixed horizontal scaling

---
 src/pages/maps/@id/correlation/+Page.ts | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 49e23ba7..2853f2b7 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -1,20 +1,13 @@
-import { HotkeysProvider, Spinner } from "@blueprintjs/core";
-import DataSheet from "@macrostrat/data-sheet2";
+import { Spinner } from "@blueprintjs/core";
 import { FullscreenPage } from "~/layouts";
 import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
 import { PageBreadcrumbs } from "~/renderer";
 import { useLegendData, MapInfo } from "../utils";
-import {
-  useElementSize,
-  useAPIResult,
-  useInDarkMode,
-} from "@macrostrat/ui-components";
+import { useElementSize, useInDarkMode } from "@macrostrat/ui-components";
 import { useMemo, useRef } from "react";
-import { Bar } from "@visx/shape";
 import { Group } from "@visx/group";
 import { scaleBand, scaleLinear } from "@visx/scale";
-import { apiV2Prefix } from "@macrostrat-web/settings";
 import { AxisLeft } from "@visx/axis";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { ForeignObject } from "@macrostrat/column-components";
@@ -120,16 +113,16 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
     [data]
   );
 
-  const xMin = 60;
+  const xMin = 100;
 
   // scales, memoize for performance
   const xScale = useMemo(
     () =>
       scaleBand<string>({
         range: [xMin, xMax],
-        round: true,
+        round: false,
         domain: data.map((d, i) => `${i}`),
-        padding: 0.4,
+        padding: 0.2,
       }),
     [xMax]
   );
@@ -167,7 +160,6 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
         ]),
         h(
           Group,
-          { key: "bars" },
           data.map((d, i) => {
             const { ageRange } = d;
 

From 350692965a1d06f046074c94608fb3e45fc6aa52 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 15:07:08 -0500
Subject: [PATCH 016/151] Added some non-working options for sorting

---
 src/pages/maps/@id/correlation/+Page.ts | 56 +++++++++++++++++++++----
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 2853f2b7..c1c576d9 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -64,14 +64,14 @@ function buildCorrelationChartData(
     };
   });
 
-  return data1.sort((a, b) => {
-    return midpointAge(b.ageRange) - midpointAge(a.ageRange);
-  });
+  return data1.sort((a, b) => intervalComparison(a.ageRange, b.ageRange));
 }
 
+type AgeRange = [number, number];
+
 type CorrelationItem = {
   color: string;
-  ageRange: [number, number];
+  ageRange: AgeRange;
   legend_id: number;
 };
 
@@ -214,9 +214,7 @@ function AgeAxis({ scale, width }) {
   });
 }
 
-function getAgeRangeForInterval(
-  interval: IntervalShort
-): [number, number] | null {
+function getAgeRangeForInterval(interval: IntervalShort): AgeRange | null {
   /** Get the age range for an interval, building up an index as we go */
   return [interval.b_age, interval.t_age];
 }
@@ -227,9 +225,9 @@ enum MergeMode {
 }
 
 function mergeAgeRanges(
-  ranges: [number, number][],
+  ranges: AgeRange[],
   mergeMode: MergeMode = MergeMode.Outer
-): [number, number] {
+): AgeRange {
   /** Merge a set of age ranges to get the inner or outer bounds */
   let min = Infinity;
   let max = 0;
@@ -253,3 +251,43 @@ function mergeAgeRanges(
 function midpointAge(range: [number, number]) {
   return (range[0] + range[1]) / 2;
 }
+
+enum AgeRangeRelationship {
+  Disjoint,
+  Contains,
+  Contained,
+  Identical,
+}
+
+function convertToForwardOrdinal(a: AgeRange): AgeRange {
+  /** Age ranges are naturally expressed as [b_age, t_age] where
+   * b_age is the older age and t_age is the younger age. This function
+   * converts the age range to [min, max] where min is the oldest age,
+   * expressed as negative numbers. This assists with intuitive ordering
+   * in certain cases.
+   */
+  return [-a[0], -a[1]];
+}
+
+function compareAgeRanges(a: AgeRange, b: AgeRange): AgeRangeRelationship {
+  const a1 = convertToForwardOrdinal(a);
+  const b1 = convertToForwardOrdinal(b);
+  /** Compare two age ranges */
+  if (a1[0] > b1[1] || a1[1] < b1[0]) {
+    return AgeRangeRelationship.Disjoint;
+  }
+  if (a1[0] === b1[0] && a1[1] === b1[1]) {
+    return AgeRangeRelationship.Identical;
+  }
+  if (a1[0] <= b1[0] && a1[1] >= b1[1]) {
+    return AgeRangeRelationship.Contains;
+  }
+  if (a1[0] >= b1[0] && a1[1] <= b1[1]) {
+    return AgeRangeRelationship.Contained;
+  }
+}
+
+function intervalComparison(a: AgeRange, b: AgeRange) {
+  // If age range fully overlaps with another, put the wider one first
+  return midpointAge(b) - midpointAge(a);
+}

From c47ce5e9c19ed3de6a6eb5c46f0fca52e849e50c Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 22:26:10 -0500
Subject: [PATCH 017/151] Added prototype selection box for popover

---
 src/pages/maps/@id/correlation/+Page.ts       | 64 +++++++++++++++++--
 .../maps/@id/correlation/main.module.sass     |  6 ++
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index c1c576d9..fa5157e2 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -1,4 +1,4 @@
-import { Spinner } from "@blueprintjs/core";
+import { Popover, Spinner } from "@blueprintjs/core";
 import { FullscreenPage } from "~/layouts";
 import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
@@ -11,6 +11,8 @@ import { scaleBand, scaleLinear } from "@visx/scale";
 import { AxisLeft } from "@visx/axis";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { ForeignObject } from "@macrostrat/column-components";
+import { useState } from "react";
+import { Bar } from "@visx/shape";
 
 const h = hyper.styled(styles);
 
@@ -108,6 +110,8 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
   const xMax = width;
   const yMax = height - verticalMargin;
 
+  const [selectedLegendID, setSelectedLegendID] = useState<number | null>(null);
+
   const domain = useMemo(
     () => mergeAgeRanges(data.map((d) => d.ageRange)),
     [data]
@@ -115,13 +119,18 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
 
   const xMin = 100;
 
+  const selectedItem = useMemo(
+    () => data.find((d) => d.legend_id === selectedLegendID),
+    [data, selectedLegendID]
+  );
+
   // scales, memoize for performance
   const xScale = useMemo(
     () =>
       scaleBand<string>({
         range: [xMin, xMax],
         round: false,
-        domain: data.map((d, i) => `${i}`),
+        domain: data.map((d, i) => `${d.legend_id}`),
         padding: 0.2,
       }),
     [xMax]
@@ -168,9 +177,9 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
 
             const barWidth = xScale.bandwidth();
             const barHeight = yMax - yMin;
-            const barX = xScale(`${i}`);
+            const barX = xScale(`${d.legend_id}`);
             const barY = yMin;
-            return h("rect", {
+            return h(Bar, {
               key: d.legend_id,
               x: barX,
               y: barY,
@@ -178,17 +187,60 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
               height: barHeight,
               fill: d.color,
               onClick() {
-                if (events)
-                  alert(`clicked: ${JSON.stringify(Object.values(d))}`);
+                console.log("Setting selected legend ID to ", d.legend_id);
+                setSelectedLegendID(d.legend_id);
               },
             });
           })
         ),
+        h(ForeignObject, { width, height, className: "popover-container" }, [
+          h(SelectedLegendItemPopover, { item: selectedItem, xScale, yScale }),
+        ]),
       ]),
     ]),
   ]);
 }
 
+function SelectedLegendItemPopover({
+  item,
+  xScale,
+  yScale,
+}: {
+  item: CorrelationItem | null;
+  xScale: any;
+  yScale: any;
+}) {
+  if (item == null) {
+    return null;
+  }
+
+  const content = h("div", [
+    h("h3", item.legend_id.toString()),
+    h("p", item.color),
+  ]);
+
+  const xv = xScale(`${item.legend_id}`);
+  const top = yScale(item.ageRange[1]);
+  const bottom = yScale(item.ageRange[0]);
+
+  return h(
+    "div.popover-main",
+    {
+      style: {
+        top: top,
+        left: xv,
+        width: xScale.bandwidth(),
+        height: bottom - top,
+      },
+    },
+    h(
+      Popover,
+      { content, isOpen: true, usePortal: true },
+      h("span.popover-target")
+    )
+  );
+}
+
 function AgeAxis({ scale, width }) {
   const darkMode = useInDarkMode();
 
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 5374ed8c..50bb9ad3 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -20,3 +20,9 @@ div.correlation-chart
   flex: 1
   overflow: hidden
   
+.popover-container
+  pointer-events: none
+  position: relative
+
+.popover-main
+  position: absolute
\ No newline at end of file

From 2c1075d38c7e1a5dc16b1f3b598aba5ac8370413 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 1 Jun 2024 22:48:14 -0500
Subject: [PATCH 018/151] Popover mostly displays in the right place

---
 src/pages/maps/@id/correlation/+Page.ts       | 150 ++++++++++++------
 .../maps/@id/correlation/main.module.sass     |   9 +-
 2 files changed, 110 insertions(+), 49 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index fa5157e2..c86e6183 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -11,7 +11,7 @@ import { scaleBand, scaleLinear } from "@visx/scale";
 import { AxisLeft } from "@visx/axis";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { ForeignObject } from "@macrostrat/column-components";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { Bar } from "@visx/shape";
 
 const h = hyper.styled(styles);
@@ -105,12 +105,44 @@ interface LegendItem {
   color: string;
 }
 
+function useSelectedLegendID(
+  legendItems: CorrelationItem[]
+): [number | null, (a: number) => void] {
+  const [selectedLegendID, setSelectedLegendID] = useState<number | null>(null);
+
+  // Add arrow key navigation and escape key to close popover
+  const handleKeyDown = (e) => {
+    if (selectedLegendID == null) {
+      return;
+    }
+    const idx = legendItems.findIndex((d) => d.legend_id === selectedLegendID);
+    if (idx == null) {
+      return;
+    }
+    if (e.key === "ArrowDown" || e.key === "ArrowRight") {
+      setSelectedLegendID(legendItems[idx + 1].legend_id);
+    } else if (e.key === "ArrowUp" || e.key === "ArrowLeft") {
+      setSelectedLegendID(legendItems[idx - 1].legend_id);
+    } else if (e.key === "Escape") {
+      setSelectedLegendID(null);
+    }
+  };
+
+  // Add event listener
+  useEffect(() => {
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [selectedLegendID]);
+
+  return [selectedLegendID, setSelectedLegendID];
+}
+
 function CorrelationChart({ width, height, events = false, data }: BarsProps) {
   // bounds
   const xMax = width;
   const yMax = height - verticalMargin;
 
-  const [selectedLegendID, setSelectedLegendID] = useState<number | null>(null);
+  const [selectedLegendID, setSelectedLegendID] = useSelectedLegendID(data);
 
   const domain = useMemo(
     () => mergeAgeRanges(data.map((d) => d.ageRange)),
@@ -150,54 +182,76 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
   if (width < 10) return null;
 
   return h("div.vis-frame", [
-    h("svg", { width, height }, [
-      h(Group, { top: verticalMargin / 2, key: "main-plot" }, [
-        h(AgeAxis, {
-          scale: yScale,
-          width: 40,
-        }),
-        h(ForeignObject, { width: 60, height, x: 40 }, [
-          h(Timescale, {
-            orientation: TimescaleOrientation.VERTICAL,
-            length: yMax,
-            // Bug in timescale component, the age range appears to be changed
-            // if we pass it in statically.
-            ageRange: [...domain],
-            absoluteAgeScale: true,
-            levels: [2, 3],
+    h(
+      "svg.vis-area",
+      {
+        width,
+        height,
+        onClick() {
+          setSelectedLegendID(null);
+        },
+      },
+      [
+        h(Group, { top: verticalMargin / 2, key: "main-plot" }, [
+          h(AgeAxis, {
+            scale: yScale,
+            width: 40,
           }),
+          h(ForeignObject, { width: 60, height, x: 40 }, [
+            h(Timescale, {
+              orientation: TimescaleOrientation.VERTICAL,
+              length: yMax,
+              // Bug in timescale component, the age range appears to be changed
+              // if we pass it in statically.
+              ageRange: [...domain],
+              absoluteAgeScale: true,
+              levels: [2, 3],
+            }),
+          ]),
+          h(
+            Group,
+            data.map((d, i) => {
+              const { ageRange } = d;
+
+              const yMin = yScale(ageRange[1]);
+              const yMax = yScale(ageRange[0]);
+
+              const barWidth = xScale.bandwidth();
+              const barHeight = yMax - yMin;
+              const barX = xScale(`${d.legend_id}`);
+              const barY = yMin;
+              return h(Bar, {
+                key: d.legend_id,
+                x: barX,
+                y: barY,
+                width: barWidth,
+                height: barHeight,
+                fill: d.color,
+                onClick(event) {
+                  setSelectedLegendID(d.legend_id);
+                  event.stopPropagation();
+                },
+              });
+            })
+          ),
+          h(
+            ForeignObject,
+            {
+              width,
+              height: height - verticalMargin,
+              className: "popover-container",
+            },
+            [
+              h(SelectedLegendItemPopover, {
+                item: selectedItem,
+                xScale,
+                yScale,
+              }),
+            ]
+          ),
         ]),
-        h(
-          Group,
-          data.map((d, i) => {
-            const { ageRange } = d;
-
-            const yMin = yScale(ageRange[1]);
-            const yMax = yScale(ageRange[0]);
-
-            const barWidth = xScale.bandwidth();
-            const barHeight = yMax - yMin;
-            const barX = xScale(`${d.legend_id}`);
-            const barY = yMin;
-            return h(Bar, {
-              key: d.legend_id,
-              x: barX,
-              y: barY,
-              width: barWidth,
-              height: barHeight,
-              fill: d.color,
-              onClick() {
-                console.log("Setting selected legend ID to ", d.legend_id);
-                setSelectedLegendID(d.legend_id);
-              },
-            });
-          })
-        ),
-        h(ForeignObject, { width, height, className: "popover-container" }, [
-          h(SelectedLegendItemPopover, { item: selectedItem, xScale, yScale }),
-        ]),
-      ]),
-    ]),
+      ]
+    ),
   ]);
 }
 
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 50bb9ad3..f8ccdc2a 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -25,4 +25,11 @@ div.correlation-chart
   position: relative
 
 .popover-main
-  position: absolute
\ No newline at end of file
+  position: absolute
+  outline: 2px solid #f22
+
+  :global(.bp5-popover-target)
+    height: 100%
+    width: 100%
+    display: block
+    line-height: 0
\ No newline at end of file

From b60fa3c4309f2a23df5a74c9a8b1784500d21817 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 00:13:07 -0500
Subject: [PATCH 019/151] Started breaking out parts of legend

---
 src/pages/maps/@id/correlation/+Page.ts       | 193 +++---------------
 src/pages/maps/@id/correlation/legend-item.ts |   5 +
 .../maps/@id/correlation/prepare-data.ts      | 102 +++++++++
 src/pages/maps/@id/correlation/types.ts       |  31 +++
 4 files changed, 171 insertions(+), 160 deletions(-)
 create mode 100644 src/pages/maps/@id/correlation/legend-item.ts
 create mode 100644 src/pages/maps/@id/correlation/prepare-data.ts
 create mode 100644 src/pages/maps/@id/correlation/types.ts

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index c86e6183..8e66bd09 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -13,6 +13,8 @@ import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { ForeignObject } from "@macrostrat/column-components";
 import { useState, useEffect } from "react";
 import { Bar } from "@visx/shape";
+import { CorrelationItem, AgeRange } from "./types";
+import { buildCorrelationChartData, mergeAgeRanges } from "./prepare-data";
 
 const h = hyper.styled(styles);
 
@@ -40,43 +42,6 @@ export function Page({ map }) {
   ]);
 }
 
-type IntervalShort = {
-  id: number;
-  b_age: number;
-  t_age: number;
-};
-
-function buildCorrelationChartData(
-  legendData: LegendItem[]
-): CorrelationItem[] {
-  /** Build the data for a correlation chart */
-  if (legendData == null) {
-    return [];
-  }
-
-  let data1 = legendData.map((d, i) => {
-    return {
-      legend_id: d.legend_id.toString(),
-      ageRange: mergeAgeRanges([
-        getAgeRangeForInterval(d.b_interval),
-        getAgeRangeForInterval(d.t_interval),
-      ]),
-      frequency: i,
-      color: d.color,
-    };
-  });
-
-  return data1.sort((a, b) => intervalComparison(a.ageRange, b.ageRange));
-}
-
-type AgeRange = [number, number];
-
-type CorrelationItem = {
-  color: string;
-  ageRange: AgeRange;
-  legend_id: number;
-};
-
 const verticalMargin = 60;
 
 export type BarsProps = {
@@ -87,56 +52,6 @@ export type BarsProps = {
   data: CorrelationItem[];
 };
 
-interface LegendItem {
-  legend_id: number;
-  name: string;
-  strat_name: string;
-  age: string;
-  lith: string;
-  descrip: string;
-  comments: string;
-  liths: string;
-  b_interval: IntervalShort;
-  t_interval: IntervalShort;
-  best_age_bottom?: number;
-  best_age_top?: number;
-  unit_ids: string;
-  concept_ids: string;
-  color: string;
-}
-
-function useSelectedLegendID(
-  legendItems: CorrelationItem[]
-): [number | null, (a: number) => void] {
-  const [selectedLegendID, setSelectedLegendID] = useState<number | null>(null);
-
-  // Add arrow key navigation and escape key to close popover
-  const handleKeyDown = (e) => {
-    if (selectedLegendID == null) {
-      return;
-    }
-    const idx = legendItems.findIndex((d) => d.legend_id === selectedLegendID);
-    if (idx == null) {
-      return;
-    }
-    if (e.key === "ArrowDown" || e.key === "ArrowRight") {
-      setSelectedLegendID(legendItems[idx + 1].legend_id);
-    } else if (e.key === "ArrowUp" || e.key === "ArrowLeft") {
-      setSelectedLegendID(legendItems[idx - 1].legend_id);
-    } else if (e.key === "Escape") {
-      setSelectedLegendID(null);
-    }
-  };
-
-  // Add event listener
-  useEffect(() => {
-    window.addEventListener("keydown", handleKeyDown);
-    return () => window.removeEventListener("keydown", handleKeyDown);
-  }, [selectedLegendID]);
-
-  return [selectedLegendID, setSelectedLegendID];
-}
-
 function CorrelationChart({ width, height, events = false, data }: BarsProps) {
   // bounds
   const xMax = width;
@@ -181,6 +96,8 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
 
   if (width < 10) return null;
 
+  const ageRange = [...domain] as AgeRange;
+
   return h("div.vis-frame", [
     h(
       "svg.vis-area",
@@ -203,7 +120,7 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
               length: yMax,
               // Bug in timescale component, the age range appears to be changed
               // if we pass it in statically.
-              ageRange: [...domain],
+              ageRange,
               absoluteAgeScale: true,
               levels: [2, 3],
             }),
@@ -320,80 +237,36 @@ function AgeAxis({ scale, width }) {
   });
 }
 
-function getAgeRangeForInterval(interval: IntervalShort): AgeRange | null {
-  /** Get the age range for an interval, building up an index as we go */
-  return [interval.b_age, interval.t_age];
-}
-
-enum MergeMode {
-  Inner,
-  Outer,
-}
-
-function mergeAgeRanges(
-  ranges: AgeRange[],
-  mergeMode: MergeMode = MergeMode.Outer
-): AgeRange {
-  /** Merge a set of age ranges to get the inner or outer bounds */
-  let min = Infinity;
-  let max = 0;
-  // Negative ages are not handled
-
-  if (mergeMode === MergeMode.Inner) {
-    min = Math.min(...ranges.map((d) => d[0]));
-    max = Math.max(...ranges.map((d) => d[1]));
-  } else {
-    min = Math.max(...ranges.map((d) => d[0]));
-    max = Math.min(...ranges.map((d) => d[1]));
-  }
-
-  // Age ranges should start with the oldest (largest) age
-  if (min < max) {
-    return [max, min];
-  }
-  return [min, max];
-}
-
-function midpointAge(range: [number, number]) {
-  return (range[0] + range[1]) / 2;
-}
+function useSelectedLegendID(
+  legendItems: CorrelationItem[]
+): [number | null, (a: number) => void] {
+  /** Hook to manage the selected legend item, including handling of arrow-key navigation */
 
-enum AgeRangeRelationship {
-  Disjoint,
-  Contains,
-  Contained,
-  Identical,
-}
+  const [selectedLegendID, setSelectedLegendID] = useState<number | null>(null);
 
-function convertToForwardOrdinal(a: AgeRange): AgeRange {
-  /** Age ranges are naturally expressed as [b_age, t_age] where
-   * b_age is the older age and t_age is the younger age. This function
-   * converts the age range to [min, max] where min is the oldest age,
-   * expressed as negative numbers. This assists with intuitive ordering
-   * in certain cases.
-   */
-  return [-a[0], -a[1]];
-}
+  // Add arrow key navigation and escape key to close popover
+  const handleKeyDown = (e) => {
+    if (selectedLegendID == null) {
+      return;
+    }
+    const idx = legendItems.findIndex((d) => d.legend_id === selectedLegendID);
+    if (idx == null) {
+      return;
+    }
+    if (e.key === "ArrowDown" || e.key === "ArrowRight") {
+      setSelectedLegendID(legendItems[idx + 1].legend_id);
+    } else if (e.key === "ArrowUp" || e.key === "ArrowLeft") {
+      setSelectedLegendID(legendItems[idx - 1].legend_id);
+    } else if (e.key === "Escape") {
+      setSelectedLegendID(null);
+    }
+  };
 
-function compareAgeRanges(a: AgeRange, b: AgeRange): AgeRangeRelationship {
-  const a1 = convertToForwardOrdinal(a);
-  const b1 = convertToForwardOrdinal(b);
-  /** Compare two age ranges */
-  if (a1[0] > b1[1] || a1[1] < b1[0]) {
-    return AgeRangeRelationship.Disjoint;
-  }
-  if (a1[0] === b1[0] && a1[1] === b1[1]) {
-    return AgeRangeRelationship.Identical;
-  }
-  if (a1[0] <= b1[0] && a1[1] >= b1[1]) {
-    return AgeRangeRelationship.Contains;
-  }
-  if (a1[0] >= b1[0] && a1[1] <= b1[1]) {
-    return AgeRangeRelationship.Contained;
-  }
-}
+  // Add event listener
+  useEffect(() => {
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [selectedLegendID]);
 
-function intervalComparison(a: AgeRange, b: AgeRange) {
-  // If age range fully overlaps with another, put the wider one first
-  return midpointAge(b) - midpointAge(a);
+  return [selectedLegendID, setSelectedLegendID];
 }
diff --git a/src/pages/maps/@id/correlation/legend-item.ts b/src/pages/maps/@id/correlation/legend-item.ts
new file mode 100644
index 00000000..abef2a25
--- /dev/null
+++ b/src/pages/maps/@id/correlation/legend-item.ts
@@ -0,0 +1,5 @@
+import h from "@macrostrat/hyper";
+
+export function LegendPopup({ map }) {
+  return h("div", "Hello");
+}
diff --git a/src/pages/maps/@id/correlation/prepare-data.ts b/src/pages/maps/@id/correlation/prepare-data.ts
new file mode 100644
index 00000000..74a86753
--- /dev/null
+++ b/src/pages/maps/@id/correlation/prepare-data.ts
@@ -0,0 +1,102 @@
+import { LegendItem, IntervalShort, CorrelationItem, AgeRange } from "./types";
+
+export function buildCorrelationChartData(
+  legendData: LegendItem[]
+): CorrelationItem[] {
+  /** Build the data for a correlation chart */
+  if (legendData == null) {
+    return [];
+  }
+
+  let data1 = legendData.map((d, i) => {
+    return {
+      legend_id: d.legend_id.toString(),
+      ageRange: mergeAgeRanges([
+        getAgeRangeForInterval(d.b_interval),
+        getAgeRangeForInterval(d.t_interval),
+      ]),
+      frequency: i,
+      color: d.color,
+    };
+  });
+
+  return data1.sort((a, b) => intervalComparison(a.ageRange, b.ageRange));
+}
+
+function getAgeRangeForInterval(interval: IntervalShort): AgeRange | null {
+  /** Get the age range for an interval, building up an index as we go */
+  return [interval.b_age, interval.t_age];
+}
+
+enum MergeMode {
+  Inner,
+  Outer,
+}
+
+export function mergeAgeRanges(
+  ranges: AgeRange[],
+  mergeMode: MergeMode = MergeMode.Outer
+): AgeRange {
+  /** Merge a set of age ranges to get the inner or outer bounds */
+  let min = Infinity;
+  let max = 0;
+  // Negative ages are not handled
+
+  if (mergeMode === MergeMode.Inner) {
+    min = Math.min(...ranges.map((d) => d[0]));
+    max = Math.max(...ranges.map((d) => d[1]));
+  } else {
+    min = Math.max(...ranges.map((d) => d[0]));
+    max = Math.min(...ranges.map((d) => d[1]));
+  }
+
+  // Age ranges should start with the oldest (largest) age
+  if (min < max) {
+    return [max, min];
+  }
+  return [min, max];
+}
+
+function midpointAge(range: [number, number]) {
+  return (range[0] + range[1]) / 2;
+}
+
+enum AgeRangeRelationship {
+  Disjoint,
+  Contains,
+  Contained,
+  Identical,
+}
+
+function convertToForwardOrdinal(a: AgeRange): AgeRange {
+  /** Age ranges are naturally expressed as [b_age, t_age] where
+   * b_age is the older age and t_age is the younger age. This function
+   * converts the age range to [min, max] where min is the oldest age,
+   * expressed as negative numbers. This assists with intuitive ordering
+   * in certain cases.
+   */
+  return [-a[0], -a[1]];
+}
+
+function compareAgeRanges(a: AgeRange, b: AgeRange): AgeRangeRelationship {
+  const a1 = convertToForwardOrdinal(a);
+  const b1 = convertToForwardOrdinal(b);
+  /** Compare two age ranges */
+  if (a1[0] > b1[1] || a1[1] < b1[0]) {
+    return AgeRangeRelationship.Disjoint;
+  }
+  if (a1[0] === b1[0] && a1[1] === b1[1]) {
+    return AgeRangeRelationship.Identical;
+  }
+  if (a1[0] <= b1[0] && a1[1] >= b1[1]) {
+    return AgeRangeRelationship.Contains;
+  }
+  if (a1[0] >= b1[0] && a1[1] <= b1[1]) {
+    return AgeRangeRelationship.Contained;
+  }
+}
+
+function intervalComparison(a: AgeRange, b: AgeRange) {
+  // If age range fully overlaps with another, put the wider one first
+  return midpointAge(b) - midpointAge(a);
+}
diff --git a/src/pages/maps/@id/correlation/types.ts b/src/pages/maps/@id/correlation/types.ts
new file mode 100644
index 00000000..6b3e396f
--- /dev/null
+++ b/src/pages/maps/@id/correlation/types.ts
@@ -0,0 +1,31 @@
+export type AgeRange = [number, number];
+
+export type CorrelationItem = {
+  color: string;
+  ageRange: AgeRange;
+  legend_id: number;
+};
+
+export type IntervalShort = {
+  id: number;
+  b_age: number;
+  t_age: number;
+};
+
+export interface LegendItem {
+  legend_id: number;
+  name: string;
+  strat_name: string;
+  age: string;
+  lith: string;
+  descrip: string;
+  comments: string;
+  liths: string;
+  b_interval: IntervalShort;
+  t_interval: IntervalShort;
+  best_age_bottom?: number;
+  best_age_top?: number;
+  unit_ids: string;
+  concept_ids: string;
+  color: string;
+}

From 9ee997ac103ebd9f824a4d0969a0e4ac213feb40 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 02:07:04 -0500
Subject: [PATCH 020/151] Updated correlation chart data view

---
 src/components/lithology/index.ts             |  2 +-
 src/pages/maps/@id/correlation/+Page.ts       | 72 +++++++++++++------
 src/pages/maps/@id/correlation/legend-item.ts | 60 +++++++++++++++-
 .../maps/@id/correlation/main.module.sass     | 50 +++++++++++--
 .../maps/@id/correlation/prepare-data.ts      |  3 +-
 src/pages/maps/@id/correlation/types.ts       |  3 +-
 6 files changed, 155 insertions(+), 35 deletions(-)

diff --git a/src/components/lithology/index.ts b/src/components/lithology/index.ts
index e60dbf8e..fdc34c5f 100644
--- a/src/components/lithology/index.ts
+++ b/src/components/lithology/index.ts
@@ -9,7 +9,7 @@ const h = hyper.styled(styles);
 
 export function LithologyTag({
   data,
-  className,
+  className = null,
   tooltip = null,
   tooltipProps = {},
   expandOnHover = false,
diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 8e66bd09..3f1f6549 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -15,6 +15,7 @@ import { useState, useEffect } from "react";
 import { Bar } from "@visx/shape";
 import { CorrelationItem, AgeRange } from "./types";
 import { buildCorrelationChartData, mergeAgeRanges } from "./prepare-data";
+import { LegendItemInformation } from "./legend-item";
 
 const h = hyper.styled(styles);
 
@@ -57,7 +58,7 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
   const xMax = width;
   const yMax = height - verticalMargin;
 
-  const [selectedLegendID, setSelectedLegendID] = useSelectedLegendID(data);
+  const [selectedItem, setSelectedLegendID] = useSelectedLegendID(data);
 
   const domain = useMemo(
     () => mergeAgeRanges(data.map((d) => d.ageRange)),
@@ -66,18 +67,13 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
 
   const xMin = 100;
 
-  const selectedItem = useMemo(
-    () => data.find((d) => d.legend_id === selectedLegendID),
-    [data, selectedLegendID]
-  );
-
   // scales, memoize for performance
   const xScale = useMemo(
     () =>
       scaleBand<string>({
         range: [xMin, xMax],
         round: false,
-        domain: data.map((d, i) => `${d.legend_id}`),
+        domain: data.map((d, i) => `${d.id}`),
         padding: 0.2,
       }),
     [xMax]
@@ -135,17 +131,17 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
 
               const barWidth = xScale.bandwidth();
               const barHeight = yMax - yMin;
-              const barX = xScale(`${d.legend_id}`);
+              const barX = xScale(`${d.id}`);
               const barY = yMin;
               return h(Bar, {
-                key: d.legend_id,
+                key: d.id,
                 x: barX,
                 y: barY,
                 width: barWidth,
                 height: barHeight,
                 fill: d.color,
                 onClick(event) {
-                  setSelectedLegendID(d.legend_id);
+                  setSelectedLegendID(d.id);
                   event.stopPropagation();
                 },
               });
@@ -185,14 +181,13 @@ function SelectedLegendItemPopover({
     return null;
   }
 
-  const content = h("div", [
-    h("h3", item.legend_id.toString()),
-    h("p", item.color),
-  ]);
+  const { details, id, ageRange } = item;
+
+  const content = h(LegendItemInformation, { legendItem: details });
 
-  const xv = xScale(`${item.legend_id}`);
-  const top = yScale(item.ageRange[1]);
-  const bottom = yScale(item.ageRange[0]);
+  const xv = xScale(`${id}`);
+  const top = yScale(ageRange[1]);
+  const bottom = yScale(ageRange[0]);
 
   return h(
     "div.popover-main",
@@ -239,7 +234,7 @@ function AgeAxis({ scale, width }) {
 
 function useSelectedLegendID(
   legendItems: CorrelationItem[]
-): [number | null, (a: number) => void] {
+): [CorrelationItem | null, (a: number) => void] {
   /** Hook to manage the selected legend item, including handling of arrow-key navigation */
 
   const [selectedLegendID, setSelectedLegendID] = useState<number | null>(null);
@@ -249,24 +244,57 @@ function useSelectedLegendID(
     if (selectedLegendID == null) {
       return;
     }
-    const idx = legendItems.findIndex((d) => d.legend_id === selectedLegendID);
+    const idx = legendItems.findIndex((d) => d.id === selectedLegendID);
     if (idx == null) {
       return;
     }
     if (e.key === "ArrowDown" || e.key === "ArrowRight") {
-      setSelectedLegendID(legendItems[idx + 1].legend_id);
+      setSelectedLegendID(legendItems[idx + 1].id);
     } else if (e.key === "ArrowUp" || e.key === "ArrowLeft") {
-      setSelectedLegendID(legendItems[idx - 1].legend_id);
+      setSelectedLegendID(legendItems[idx - 1].id);
     } else if (e.key === "Escape") {
       setSelectedLegendID(null);
     }
   };
 
+  useEffect(() => {
+    // Get the focused legend_id from the query string if set
+    const urlParams = new URLSearchParams(window.location.search);
+    const legendID = urlParams.get("legend_id");
+    if (legendID != null) {
+      setSelectedLegendID(parseInt(legendID));
+    }
+  }, []);
+
   // Add event listener
   useEffect(() => {
+    const urlParams = new URLSearchParams(window.location.search);
+    if (selectedLegendID == null) {
+      urlParams.delete("legend_id");
+    } else {
+      urlParams.set("legend_id", `${selectedLegendID}`);
+    }
+    let qString = urlParams.toString();
+    if (qString.length > 0) {
+      qString = "?" + qString;
+    }
+
+    const newUrl = `${window.location.pathname}${qString}`;
+    window.history.replaceState(null, "", newUrl);
+
+    // Set query string to selected legend item
+    if (selectedLegendID == null) {
+      return;
+    }
+
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
   }, [selectedLegendID]);
 
-  return [selectedLegendID, setSelectedLegendID];
+  const selectedItem = useMemo(
+    () => legendItems.find((d) => d.id === selectedLegendID),
+    [legendItems, selectedLegendID]
+  );
+
+  return [selectedItem, setSelectedLegendID];
 }
diff --git a/src/pages/maps/@id/correlation/legend-item.ts b/src/pages/maps/@id/correlation/legend-item.ts
index abef2a25..91070e74 100644
--- a/src/pages/maps/@id/correlation/legend-item.ts
+++ b/src/pages/maps/@id/correlation/legend-item.ts
@@ -1,5 +1,59 @@
-import h from "@macrostrat/hyper";
+import hyper from "@macrostrat/hyper";
+import { LegendItem } from "./types";
+import { LithologyTag } from "~/components";
+import styles from "./main.module.sass";
+import classNames from "classnames";
 
-export function LegendPopup({ map }) {
-  return h("div", "Hello");
+const h = hyper.styled(styles);
+
+export function LegendItemInformation({
+  legendItem,
+}: {
+  legendItem: LegendItem;
+}) {
+  return h("div.legend-panel-outer", [
+    h("div.legend-info-panel", [
+      h("header", [h("h3", legendItem.name), h("code", legendItem.legend_id)]),
+      h("div.data", [
+        h(DataField, {
+          label: "Stratigraphic names",
+          value: legendItem.strat_name,
+        }),
+        h(DataField, { label: "Age", value: legendItem.age }),
+        h(DataField, {
+          label: "Description",
+          value: legendItem.descrip,
+          inline: false,
+        }),
+        h(DataField, { label: "Comments", value: legendItem.comments }),
+        h(DataField, { label: "Lithologies", value: legendItem.lith }),
+        h(DataField, {
+          label: "Linked intervals",
+          value: `${legendItem.b_interval.b_age} - ${legendItem.t_interval.t_age}`,
+        }),
+        h(DataField, {
+          label: "Best age",
+          value: `${legendItem.best_age_bottom} - ${legendItem.best_age_top}`,
+        }),
+        h(DataField, { label: "Unit IDs", value: legendItem.unit_ids }),
+        h(DataField, { label: "Concept IDs", value: legendItem.concept_ids }),
+      ]),
+    ]),
+  ]);
+}
+
+function DataField({ label, value, inline = true }) {
+  return h("div.data-field", { className: classNames({ inline }) }, [
+    h("span.label", label),
+    h("span.value", value),
+  ]);
+}
+
+function LithologyList({ lithologies }) {
+  return h(
+    "div.lithology-list",
+    lithologies.map((lith) => {
+      return h(LithologyTag, { data: lith });
+    })
+  );
 }
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index f8ccdc2a..7627f0dd 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -6,12 +6,10 @@ div.correlation-chart
 
 // Ideally this wouldn't be necessary
 .page-inner
-  position: absolute
-  top: 0
-  left: 0
-  right: 0
-  bottom: 0
-  padding: 2em
+  position: relative
+  width: 100%
+  height: 100%
+  margin: 2em auto 3em
   display: flex
   flex-direction: column
 
@@ -32,4 +30,42 @@ div.correlation-chart
     height: 100%
     width: 100%
     display: block
-    line-height: 0
\ No newline at end of file
+    line-height: 0
+
+.legend-panel-outer
+  width: 25em
+  max-height: 60vh
+  overflow-y: scroll
+
+.legend-info-panel
+  padding: 1em
+  header
+    display: flex
+    justify-content: space-between
+    code
+      font-size: 0.9em
+      color: var(--secondary-color)
+    align-items: baseline
+
+  h3
+    margin: 0 0 0.5em
+    font-size: 1.1em
+
+.data-field
+  margin: 0.2em 0 0.4em
+  &.inline
+    display: flex
+    flex-direction: row
+    align-items: baseline
+    gap: 1em
+    justify-content: space-between
+    .value
+      text-align-last: right
+  .label
+    font-size: 0.8em
+    font-weight: bold
+    display: block
+    color: var(--secondary-color)
+  .value
+    display: block
+
diff --git a/src/pages/maps/@id/correlation/prepare-data.ts b/src/pages/maps/@id/correlation/prepare-data.ts
index 74a86753..7f989639 100644
--- a/src/pages/maps/@id/correlation/prepare-data.ts
+++ b/src/pages/maps/@id/correlation/prepare-data.ts
@@ -10,7 +10,8 @@ export function buildCorrelationChartData(
 
   let data1 = legendData.map((d, i) => {
     return {
-      legend_id: d.legend_id.toString(),
+      details: d,
+      id: d.legend_id,
       ageRange: mergeAgeRanges([
         getAgeRangeForInterval(d.b_interval),
         getAgeRangeForInterval(d.t_interval),
diff --git a/src/pages/maps/@id/correlation/types.ts b/src/pages/maps/@id/correlation/types.ts
index 6b3e396f..c7bed702 100644
--- a/src/pages/maps/@id/correlation/types.ts
+++ b/src/pages/maps/@id/correlation/types.ts
@@ -3,7 +3,8 @@ export type AgeRange = [number, number];
 export type CorrelationItem = {
   color: string;
   ageRange: AgeRange;
-  legend_id: number;
+  details: LegendItem;
+  id: number;
 };
 
 export type IntervalShort = {

From 7a5341294d7414e11fecb6c8ffafae8db165cc27 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 02:20:19 -0500
Subject: [PATCH 021/151] Fixed page styling

---
 src/pages/maps/@id/correlation/main.module.sass | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 7627f0dd..6a4a23bf 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -7,17 +7,16 @@ div.correlation-chart
 // Ideally this wouldn't be necessary
 .page-inner
   position: relative
-  width: 100%
-  height: 100%
   margin: 2em auto 3em
   display: flex
   flex-direction: column
+  height: 100%
 
 
 .vis-container
   flex: 1
   overflow: hidden
-  
+
 .popover-container
   pointer-events: none
   position: relative
@@ -60,7 +59,7 @@ div.correlation-chart
     gap: 1em
     justify-content: space-between
     .value
-      text-align-last: right
+      text-align: right
   .label
     font-size: 0.8em
     font-weight: bold
@@ -68,4 +67,3 @@ div.correlation-chart
     color: var(--secondary-color)
   .value
     display: block
-

From b6f2f7823ab5553b5d3272890669095c9bce91f8 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 02:33:46 -0500
Subject: [PATCH 022/151] Added link to correlation chart

---
 src/pages/maps/@id/+Page.ts                   | 21 +++++++----
 .../maps/@id/correlation/prepare-data.ts      | 36 ++++++++++++-------
 src/pages/maps/@id/main.module.sass           |  9 ++++-
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/pages/maps/@id/+Page.ts b/src/pages/maps/@id/+Page.ts
index 8a64dfe9..d969b594 100644
--- a/src/pages/maps/@id/+Page.ts
+++ b/src/pages/maps/@id/+Page.ts
@@ -349,13 +349,20 @@ function MapLegendPanel(params) {
         h("div.flex.row", [
           h("h3", "Legend"),
           h("div.spacer"),
-          h(
-            DevLink,
-            // Not sure why we have to fully construct the URL here, vs. constructing a relative route.
-            // Probably lack of a trailing slash in the main page?
-            { href: `/maps/${params.source_id}/legend` },
-            "Legend table"
-          ),
+          h("div.dev-links", [
+            h(
+              DevLink,
+              // Not sure why we have to fully construct the URL here, vs. constructing a relative route.
+              // Probably lack of a trailing slash in the main page?
+              { href: `/maps/${params.source_id}/legend` },
+              "Legend table"
+            ),
+            h(
+              DevLink,
+              { href: `/maps/${params.source_id}/correlation` },
+              "Correlation of units"
+            ),
+          ]),
         ]),
         h(MapLegendData, params),
       ])
diff --git a/src/pages/maps/@id/correlation/prepare-data.ts b/src/pages/maps/@id/correlation/prepare-data.ts
index 7f989639..ec817916 100644
--- a/src/pages/maps/@id/correlation/prepare-data.ts
+++ b/src/pages/maps/@id/correlation/prepare-data.ts
@@ -8,18 +8,30 @@ export function buildCorrelationChartData(
     return [];
   }
 
-  let data1 = legendData.map((d, i) => {
-    return {
-      details: d,
-      id: d.legend_id,
-      ageRange: mergeAgeRanges([
-        getAgeRangeForInterval(d.b_interval),
-        getAgeRangeForInterval(d.t_interval),
-      ]),
-      frequency: i,
-      color: d.color,
-    };
-  });
+  let data1 = legendData
+    .map((d, i) => {
+      let ageRanges: AgeRange[] = [];
+
+      if (d.b_interval != null) {
+        ageRanges.push(getAgeRangeForInterval(d.b_interval));
+      }
+      if (d.t_interval != null) {
+        ageRanges.push(getAgeRangeForInterval(d.t_interval));
+      }
+
+      if (ageRanges.length === 0) {
+        return null;
+      }
+
+      return {
+        details: d,
+        id: d.legend_id,
+        ageRange: mergeAgeRanges(ageRanges),
+        frequency: i,
+        color: d.color,
+      };
+    })
+    .filter((d) => d != null) as CorrelationItem[];
 
   return data1.sort((a, b) => intervalComparison(a.ageRange, b.ageRange));
 }
diff --git a/src/pages/maps/@id/main.module.sass b/src/pages/maps/@id/main.module.sass
index 47fb7a50..80c989b0 100644
--- a/src/pages/maps/@id/main.module.sass
+++ b/src/pages/maps/@id/main.module.sass
@@ -31,4 +31,11 @@ body
   width: 1em
   height: 1em
   display: inline-block
-  margin-right: 0.5em
\ No newline at end of file
+  margin-right: 0.5em
+
+.dev-links
+  display: block
+  text-align: right
+  &>*
+    display: block
+    margin: 1em
\ No newline at end of file

From 670e67a7222fd233849523715309c0dd2bd55fb8 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 03:27:12 -0500
Subject: [PATCH 023/151] Updated legend items

---
 src/pages/maps/@id/correlation/legend-item.ts | 35 ++++++++++++++++---
 .../maps/@id/correlation/main.module.sass     |  3 +-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/pages/maps/@id/correlation/legend-item.ts b/src/pages/maps/@id/correlation/legend-item.ts
index 91070e74..bca7a5ba 100644
--- a/src/pages/maps/@id/correlation/legend-item.ts
+++ b/src/pages/maps/@id/correlation/legend-item.ts
@@ -26,7 +26,8 @@ export function LegendItemInformation({
           inline: false,
         }),
         h(DataField, { label: "Comments", value: legendItem.comments }),
-        h(DataField, { label: "Lithologies", value: legendItem.lith }),
+        h(DataField, { label: "Lithology", value: legendItem.lith }),
+        h(LithologyList, { lithologies: legendItem.liths }),
         h(DataField, {
           label: "Linked intervals",
           value: `${legendItem.b_interval.b_age} - ${legendItem.t_interval.t_age}`,
@@ -42,16 +43,40 @@ export function LegendItemInformation({
   ]);
 }
 
-function DataField({ label, value, inline = true }) {
-  return h("div.data-field", { className: classNames({ inline }) }, [
+function DataField({
+  label,
+  value,
+  inline = true,
+  showIfEmpty = false,
+  className,
+  children,
+  unit,
+}: {
+  label: string;
+  value?: any;
+  inline?: boolean;
+  showIfEmpty?: boolean;
+  className?: string;
+  children?: any;
+  unit?: string;
+}) {
+  let val = value ?? children;
+
+  if (!showIfEmpty && (val == null || val === "")) {
+    return null;
+  }
+
+  return h("div.data-field", { className: classNames(className, { inline }) }, [
     h("span.label", label),
-    h("span.value", value),
+    h("span.value", val),
+    h.if(unit != null)("span.unit", unit),
   ]);
 }
 
 function LithologyList({ lithologies }) {
   return h(
-    "div.lithology-list",
+    DataField,
+    { label: "Lithologies" },
     lithologies.map((lith) => {
       return h(LithologyTag, { data: lith });
     })
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 6a4a23bf..35c8ac7b 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -61,9 +61,10 @@ div.correlation-chart
     .value
       text-align: right
   .label
-    font-size: 0.8em
+    font-size: 0.9em
     font-weight: bold
     display: block
     color: var(--secondary-color)
   .value
     display: block
+    font-size: 0.9em

From 7e311c41414a7f467c3c4b20f06e291c5631399d Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 04:01:03 -0500
Subject: [PATCH 024/151] Added values

---
 src/pages/maps/@id/correlation/legend-item.ts | 52 ++++++++++++++++---
 .../maps/@id/correlation/main.module.sass     |  5 +-
 src/pages/maps/@id/correlation/types.ts       |  3 ++
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/pages/maps/@id/correlation/legend-item.ts b/src/pages/maps/@id/correlation/legend-item.ts
index bca7a5ba..56c0f6bd 100644
--- a/src/pages/maps/@id/correlation/legend-item.ts
+++ b/src/pages/maps/@id/correlation/legend-item.ts
@@ -1,5 +1,5 @@
 import hyper from "@macrostrat/hyper";
-import { LegendItem } from "./types";
+import { LegendItem, IntervalShort } from "./types";
 import { LithologyTag } from "~/components";
 import styles from "./main.module.sass";
 import classNames from "classnames";
@@ -28,13 +28,13 @@ export function LegendItemInformation({
         h(DataField, { label: "Comments", value: legendItem.comments }),
         h(DataField, { label: "Lithology", value: legendItem.lith }),
         h(LithologyList, { lithologies: legendItem.liths }),
-        h(DataField, {
-          label: "Linked intervals",
-          value: `${legendItem.b_interval.b_age} - ${legendItem.t_interval.t_age}`,
+        h(IntervalField, {
+          intervals: [legendItem.b_interval, legendItem.t_interval],
         }),
         h(DataField, {
           label: "Best age",
           value: `${legendItem.best_age_bottom} - ${legendItem.best_age_top}`,
+          unit: "Ma",
         }),
         h(DataField, { label: "Unit IDs", value: legendItem.unit_ids }),
         h(DataField, { label: "Concept IDs", value: legendItem.concept_ids }),
@@ -67,12 +67,50 @@ function DataField({
   }
 
   return h("div.data-field", { className: classNames(className, { inline }) }, [
-    h("span.label", label),
-    h("span.value", val),
-    h.if(unit != null)("span.unit", unit),
+    h("div.label", label),
+    h("div.value-container", [
+      h("span.value", val),
+      h.if(unit != null)([" ", h("span.unit", unit)]),
+    ]),
   ]);
 }
 
+function IntervalField({ intervals }: { intervals: IntervalShort[] }) {
+  const unique = uniqueIntervals(...intervals);
+  return h(
+    DataField,
+    {
+      label: "Intervals",
+    },
+    unique.map((interval) => {
+      return h(Interval, { interval, showAgeRange: true });
+    })
+  );
+}
+
+function Interval({
+  interval,
+  showAgeRange = false,
+}: {
+  interval: IntervalShort;
+  showAgeRange?: boolean;
+}) {
+  return h(LithologyTag, {
+    data: interval,
+  });
+}
+
+function uniqueIntervals(
+  ...intervals: (IntervalShort | undefined)[]
+): IntervalShort[] {
+  const unique = new Map<number, IntervalShort>();
+  for (const interval of intervals) {
+    if (interval == null) continue;
+    unique.set(interval.id, interval);
+  }
+  return Array.from(unique.values()).sort((a, b) => b.b_age - a.b_age);
+}
+
 function LithologyList({ lithologies }) {
   return h(
     DataField,
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 35c8ac7b..d07da350 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -65,6 +65,9 @@ div.correlation-chart
     font-weight: bold
     display: block
     color: var(--secondary-color)
-  .value
+  .value-container
     display: block
     font-size: 0.9em
+  .unit
+    color: var(--secondary-color)
+    
diff --git a/src/pages/maps/@id/correlation/types.ts b/src/pages/maps/@id/correlation/types.ts
index c7bed702..85d5021c 100644
--- a/src/pages/maps/@id/correlation/types.ts
+++ b/src/pages/maps/@id/correlation/types.ts
@@ -11,6 +11,9 @@ export type IntervalShort = {
   id: number;
   b_age: number;
   t_age: number;
+  name: string;
+  color: string;
+  rank: number;
 };
 
 export interface LegendItem {

From e760a7faa2b3ed0902dfe74dea935f4cc6ce2a0b Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 15:49:51 -0500
Subject: [PATCH 025/151] Age model selector

---
 src/pages/maps/@id/correlation/+Page.ts       | 73 +++++++++++++++++--
 src/pages/maps/@id/correlation/legend-item.ts | 57 +++++++++++----
 .../maps/@id/correlation/main.module.sass     |  5 +-
 .../maps/@id/correlation/prepare-data.ts      |  6 ++
 src/pages/maps/@id/correlation/types.ts       |  1 +
 5 files changed, 118 insertions(+), 24 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 3f1f6549..fca08b6f 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -1,4 +1,12 @@
-import { Popover, Spinner } from "@blueprintjs/core";
+import {
+  Button,
+  Popover,
+  Spinner,
+  ButtonGroup,
+  SegmentedControl,
+  Label,
+  FormGroup,
+} from "@blueprintjs/core";
 import { FullscreenPage } from "~/layouts";
 import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
@@ -24,19 +32,28 @@ export function Page({ map }) {
   const size = useElementSize(ref);
   const legendData = useLegendData(map);
 
+  const [ageMode, setAgeMode] = useState(AgeDisplayMode.MapLegend);
+
   const correlationChartData = useMemo(() => {
-    console.log(legendData);
     return buildCorrelationChartData(legendData);
   }, [legendData]);
 
   return h(FullscreenPage, [
     h("div.page-inner", [
-      h(PageBreadcrumbs),
+      h("div.flex.row", [
+        h(PageBreadcrumbs),
+        h("div.spacer"),
+        h(AgeDisplayModeSelector, {
+          displayMode: ageMode,
+          setDisplayMode: setAgeMode,
+        }),
+      ]),
       h("div.vis-container", { ref }, [
         h.if(legendData != null)(CorrelationChart, {
           map,
           ...size,
           data: correlationChartData,
+          ageMode,
         }),
       ]),
     ]),
@@ -51,9 +68,16 @@ export type BarsProps = {
   events?: boolean;
   map: MapInfo;
   data: CorrelationItem[];
+  ageMode: AgeDisplayMode;
 };
 
-function CorrelationChart({ width, height, events = false, data }: BarsProps) {
+function CorrelationChart({
+  width,
+  height,
+  events = false,
+  data,
+  ageMode = AgeDisplayMode.MapLegend,
+}: BarsProps) {
   // bounds
   const xMax = width;
   const yMax = height - verticalMargin;
@@ -124,7 +148,10 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
           h(
             Group,
             data.map((d, i) => {
-              const { ageRange } = d;
+              const ageRange =
+                ageMode === AgeDisplayMode.MapLegend
+                  ? d.ageRange
+                  : d.macrostratAgeRange;
 
               const yMin = yScale(ageRange[1]);
               const yMax = yScale(ageRange[0]);
@@ -157,6 +184,7 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
             [
               h(SelectedLegendItemPopover, {
                 item: selectedItem,
+                ageMode,
                 xScale,
                 yScale,
               }),
@@ -171,17 +199,24 @@ function CorrelationChart({ width, height, events = false, data }: BarsProps) {
 function SelectedLegendItemPopover({
   item,
   xScale,
+  ageMode,
   yScale,
 }: {
   item: CorrelationItem | null;
   xScale: any;
   yScale: any;
+  ageMode: AgeDisplayMode;
 }) {
   if (item == null) {
     return null;
   }
 
-  const { details, id, ageRange } = item;
+  const { details, id } = item;
+
+  const ageRange =
+    ageMode === AgeDisplayMode.MapLegend
+      ? item.ageRange
+      : item.macrostratAgeRange;
 
   const content = h(LegendItemInformation, { legendItem: details });
 
@@ -298,3 +333,29 @@ function useSelectedLegendID(
 
   return [selectedItem, setSelectedLegendID];
 }
+
+enum AgeDisplayMode {
+  MapLegend,
+  Macrostrat,
+}
+
+function AgeDisplayModeSelector({
+  displayMode,
+  setDisplayMode,
+}: {
+  displayMode: AgeDisplayMode;
+  setDisplayMode: (a: AgeDisplayMode) => void;
+}) {
+  return h(FormGroup, { label: "Age source", inline: true }, [
+    h(SegmentedControl, {
+      options: [
+        { label: "Map legend", value: AgeDisplayMode.MapLegend },
+        { label: "Macrostrat", value: AgeDisplayMode.Macrostrat },
+      ],
+      small: true,
+      minimal: true,
+      value: displayMode,
+      onValueChange: setDisplayMode,
+    }),
+  ]);
+}
diff --git a/src/pages/maps/@id/correlation/legend-item.ts b/src/pages/maps/@id/correlation/legend-item.ts
index 56c0f6bd..35103f02 100644
--- a/src/pages/maps/@id/correlation/legend-item.ts
+++ b/src/pages/maps/@id/correlation/legend-item.ts
@@ -3,6 +3,7 @@ import { LegendItem, IntervalShort } from "./types";
 import { LithologyTag } from "~/components";
 import styles from "./main.module.sass";
 import classNames from "classnames";
+import { mergeAgeRanges } from "./prepare-data";
 
 const h = hyper.styled(styles);
 
@@ -52,7 +53,7 @@ function DataField({
   children,
   unit,
 }: {
-  label: string;
+  label?: string;
   value?: any;
   inline?: boolean;
   showIfEmpty?: boolean;
@@ -60,32 +61,56 @@ function DataField({
   children?: any;
   unit?: string;
 }) {
-  let val = value ?? children;
-
-  if (!showIfEmpty && (val == null || val === "")) {
+  if (!showIfEmpty && (value == null || value === "") && children == null) {
     return null;
   }
 
   return h("div.data-field", { className: classNames(className, { inline }) }, [
     h("div.label", label),
-    h("div.value-container", [
-      h("span.value", val),
-      h.if(unit != null)([" ", h("span.unit", unit)]),
+    h("div.data-container", [
+      h.if(value != null)(Value, { value, unit }),
+      children,
     ]),
   ]);
 }
 
 function IntervalField({ intervals }: { intervals: IntervalShort[] }) {
   const unique = uniqueIntervals(...intervals);
-  return h(
-    DataField,
-    {
-      label: "Intervals",
-    },
-    unique.map((interval) => {
-      return h(Interval, { interval, showAgeRange: true });
-    })
-  );
+  const ageRange = mergeAgeRanges(unique.map((d) => [d.b_age, d.t_age]));
+  return h([
+    h(
+      DataField,
+      {
+        label: "Intervals",
+      },
+      [
+        unique.map((interval) => {
+          return h(Interval, {
+            key: interval.id,
+            interval,
+            showAgeRange: true,
+          });
+        }),
+        h(Value, { unit: "Ma", value: `${ageRange[0]} - ${ageRange[1]}` }),
+      ]
+    ),
+  ]);
+}
+
+function Value({
+  value,
+  unit,
+  children,
+}: {
+  value?: any;
+  unit?: string;
+  children?: any;
+}) {
+  const val = value ?? children;
+  return h("span.value-container", [
+    h("span.value", val),
+    h.if(unit != null)([" ", h("span.unit", unit)]),
+  ]);
 }
 
 function Interval({
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index d07da350..8c9ea863 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -58,7 +58,7 @@ div.correlation-chart
     align-items: baseline
     gap: 1em
     justify-content: space-between
-    .value
+    .data-container
       text-align: right
   .label
     font-size: 0.9em
@@ -66,8 +66,9 @@ div.correlation-chart
     display: block
     color: var(--secondary-color)
   .value-container
-    display: block
     font-size: 0.9em
+    display: inline-block
+    break-inside: avoid
   .unit
     color: var(--secondary-color)
     
diff --git a/src/pages/maps/@id/correlation/prepare-data.ts b/src/pages/maps/@id/correlation/prepare-data.ts
index ec817916..a6f33408 100644
--- a/src/pages/maps/@id/correlation/prepare-data.ts
+++ b/src/pages/maps/@id/correlation/prepare-data.ts
@@ -23,10 +23,16 @@ export function buildCorrelationChartData(
         return null;
       }
 
+      let macrostratAgeRange: AgeRange | null = null;
+      if (d.best_age_bottom != null && d.best_age_top != null) {
+        macrostratAgeRange = [d.best_age_bottom, d.best_age_top];
+      }
+
       return {
         details: d,
         id: d.legend_id,
         ageRange: mergeAgeRanges(ageRanges),
+        macrostratAgeRange,
         frequency: i,
         color: d.color,
       };
diff --git a/src/pages/maps/@id/correlation/types.ts b/src/pages/maps/@id/correlation/types.ts
index 85d5021c..254214ef 100644
--- a/src/pages/maps/@id/correlation/types.ts
+++ b/src/pages/maps/@id/correlation/types.ts
@@ -3,6 +3,7 @@ export type AgeRange = [number, number];
 export type CorrelationItem = {
   color: string;
   ageRange: AgeRange;
+  macrostratAgeRange: AgeRange | null;
   details: LegendItem;
   id: number;
 };

From 81bc4db495a32b1bcd5f5927eae4c754ebc611c3 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 16:07:21 -0500
Subject: [PATCH 026/151] Best age selector

---
 src/pages/maps/@id/correlation/+Page.ts | 46 +++++++++++++++++++++----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index fca08b6f..65da3976 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -1,10 +1,7 @@
 import {
-  Button,
   Popover,
   Spinner,
-  ButtonGroup,
   SegmentedControl,
-  Label,
   FormGroup,
 } from "@blueprintjs/core";
 import { FullscreenPage } from "~/layouts";
@@ -71,6 +68,20 @@ export type BarsProps = {
   ageMode: AgeDisplayMode;
 };
 
+function getBoundingAgeRange(item: CorrelationItem, ageMode: AgeDisplayMode) {
+  switch (ageMode) {
+    case AgeDisplayMode.MapLegend:
+      return item.ageRange;
+    case AgeDisplayMode.Macrostrat:
+      return item.macrostratAgeRange ?? item.ageRange;
+    case AgeDisplayMode.Both:
+      if (item.macrostratAgeRange == null) {
+        return item.ageRange;
+      }
+      return mergeAgeRanges([item.ageRange, item.macrostratAgeRange]);
+  }
+}
+
 function CorrelationChart({
   width,
   height,
@@ -85,8 +96,8 @@ function CorrelationChart({
   const [selectedItem, setSelectedLegendID] = useSelectedLegendID(data);
 
   const domain = useMemo(
-    () => mergeAgeRanges(data.map((d) => d.ageRange)),
-    [data]
+    () => mergeAgeRanges(data.map((d) => getBoundingAgeRange(d, ageMode))),
+    [data, ageMode]
   );
 
   const xMin = 100;
@@ -160,7 +171,7 @@ function CorrelationChart({
               const barHeight = yMax - yMin;
               const barX = xScale(`${d.id}`);
               const barY = yMin;
-              return h(Bar, {
+              const main = h(Bar, {
                 key: d.id,
                 x: barX,
                 y: barY,
@@ -172,6 +183,27 @@ function CorrelationChart({
                   event.stopPropagation();
                 },
               });
+              if (
+                ageMode !== AgeDisplayMode.Both ||
+                d.macrostratAgeRange == null
+              ) {
+                return main;
+              }
+
+              // We need to render the un-corrected age range as well
+              const yMin1 = yScale(d.ageRange[1]);
+              const yMax1 = yScale(d.ageRange[0]);
+              return h(Group, { key: d.id }, [
+                h(Bar, {
+                  x: barX,
+                  y: yMin1,
+                  width: barWidth,
+                  height: yMax1 - yMin1,
+                  fill: d.color,
+                  opacity: 0.5,
+                }),
+                main,
+              ]);
             })
           ),
           h(
@@ -337,6 +369,7 @@ function useSelectedLegendID(
 enum AgeDisplayMode {
   MapLegend,
   Macrostrat,
+  Both,
 }
 
 function AgeDisplayModeSelector({
@@ -351,6 +384,7 @@ function AgeDisplayModeSelector({
       options: [
         { label: "Map legend", value: AgeDisplayMode.MapLegend },
         { label: "Macrostrat", value: AgeDisplayMode.Macrostrat },
+        { label: "Both", value: AgeDisplayMode.Both },
       ],
       small: true,
       minimal: true,

From 5b87cba81041749b448a9b1da175f7416056c734 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 16:32:10 -0500
Subject: [PATCH 027/151] Updated age display modes

---
 src/pages/maps/@id/correlation/+Page.ts       | 53 ++++++-------------
 .../maps/@id/correlation/prepare-data.ts      | 40 ++++++++++++--
 src/pages/maps/@id/correlation/types.ts       |  6 +++
 3 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 65da3976..854893b1 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -18,8 +18,13 @@ import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { ForeignObject } from "@macrostrat/column-components";
 import { useState, useEffect } from "react";
 import { Bar } from "@visx/shape";
-import { CorrelationItem, AgeRange } from "./types";
-import { buildCorrelationChartData, mergeAgeRanges } from "./prepare-data";
+import { CorrelationItem, AgeRange, AgeDisplayMode } from "./types";
+import {
+  buildCorrelationChartData,
+  mergeAgeRanges,
+  getBoundingAgeRange,
+  getBestAgeRange,
+} from "./prepare-data";
 import { LegendItemInformation } from "./legend-item";
 
 const h = hyper.styled(styles);
@@ -29,11 +34,11 @@ export function Page({ map }) {
   const size = useElementSize(ref);
   const legendData = useLegendData(map);
 
-  const [ageMode, setAgeMode] = useState(AgeDisplayMode.MapLegend);
+  const [ageMode, setAgeMode] = useState(AgeDisplayMode.Macrostrat);
 
   const correlationChartData = useMemo(() => {
-    return buildCorrelationChartData(legendData);
-  }, [legendData]);
+    return buildCorrelationChartData(legendData, ageMode);
+  }, [legendData, ageMode]);
 
   return h(FullscreenPage, [
     h("div.page-inner", [
@@ -68,20 +73,6 @@ export type BarsProps = {
   ageMode: AgeDisplayMode;
 };
 
-function getBoundingAgeRange(item: CorrelationItem, ageMode: AgeDisplayMode) {
-  switch (ageMode) {
-    case AgeDisplayMode.MapLegend:
-      return item.ageRange;
-    case AgeDisplayMode.Macrostrat:
-      return item.macrostratAgeRange ?? item.ageRange;
-    case AgeDisplayMode.Both:
-      if (item.macrostratAgeRange == null) {
-        return item.ageRange;
-      }
-      return mergeAgeRanges([item.ageRange, item.macrostratAgeRange]);
-  }
-}
-
 function CorrelationChart({
   width,
   height,
@@ -159,10 +150,7 @@ function CorrelationChart({
           h(
             Group,
             data.map((d, i) => {
-              const ageRange =
-                ageMode === AgeDisplayMode.MapLegend
-                  ? d.ageRange
-                  : d.macrostratAgeRange;
+              const ageRange = getBestAgeRange(d, ageMode);
 
               const yMin = yScale(ageRange[1]);
               const yMax = yScale(ageRange[0]);
@@ -200,7 +188,7 @@ function CorrelationChart({
                   width: barWidth,
                   height: yMax1 - yMin1,
                   fill: d.color,
-                  opacity: 0.5,
+                  opacity: 0.3,
                 }),
                 main,
               ]);
@@ -243,18 +231,15 @@ function SelectedLegendItemPopover({
     return null;
   }
 
-  const { details, id } = item;
+  const range = getBoundingAgeRange(item, ageMode);
 
-  const ageRange =
-    ageMode === AgeDisplayMode.MapLegend
-      ? item.ageRange
-      : item.macrostratAgeRange;
+  const { details, id } = item;
 
   const content = h(LegendItemInformation, { legendItem: details });
 
   const xv = xScale(`${id}`);
-  const top = yScale(ageRange[1]);
-  const bottom = yScale(ageRange[0]);
+  const top = yScale(range[1]);
+  const bottom = yScale(range[0]);
 
   return h(
     "div.popover-main",
@@ -366,12 +351,6 @@ function useSelectedLegendID(
   return [selectedItem, setSelectedLegendID];
 }
 
-enum AgeDisplayMode {
-  MapLegend,
-  Macrostrat,
-  Both,
-}
-
 function AgeDisplayModeSelector({
   displayMode,
   setDisplayMode,
diff --git a/src/pages/maps/@id/correlation/prepare-data.ts b/src/pages/maps/@id/correlation/prepare-data.ts
index a6f33408..8f04b919 100644
--- a/src/pages/maps/@id/correlation/prepare-data.ts
+++ b/src/pages/maps/@id/correlation/prepare-data.ts
@@ -1,7 +1,14 @@
-import { LegendItem, IntervalShort, CorrelationItem, AgeRange } from "./types";
+import {
+  LegendItem,
+  IntervalShort,
+  CorrelationItem,
+  AgeRange,
+  AgeDisplayMode,
+} from "./types";
 
 export function buildCorrelationChartData(
-  legendData: LegendItem[]
+  legendData: LegendItem[],
+  ageMode: AgeDisplayMode
 ): CorrelationItem[] {
   /** Build the data for a correlation chart */
   if (legendData == null) {
@@ -39,7 +46,9 @@ export function buildCorrelationChartData(
     })
     .filter((d) => d != null) as CorrelationItem[];
 
-  return data1.sort((a, b) => intervalComparison(a.ageRange, b.ageRange));
+  return data1.sort((a, b) =>
+    intervalComparison(getBestAgeRange(a, ageMode), getBestAgeRange(b, ageMode))
+  );
 }
 
 function getAgeRangeForInterval(interval: IntervalShort): AgeRange | null {
@@ -119,3 +128,28 @@ function intervalComparison(a: AgeRange, b: AgeRange) {
   // If age range fully overlaps with another, put the wider one first
   return midpointAge(b) - midpointAge(a);
 }
+
+export function getBoundingAgeRange(
+  item: CorrelationItem,
+  ageMode: AgeDisplayMode
+) {
+  const bestAge = getBestAgeRange(item, ageMode);
+  if (ageMode == AgeDisplayMode.Macrostrat) {
+    return bestAge;
+  }
+  if (bestAge == item.ageRange) {
+    return item.ageRange;
+  } else {
+    return mergeAgeRanges([item.ageRange, bestAge]);
+  }
+}
+
+export function getBestAgeRange(
+  item: CorrelationItem,
+  ageMode: AgeDisplayMode
+) {
+  if (ageMode == AgeDisplayMode.MapLegend || item.macrostratAgeRange == null) {
+    return item.ageRange;
+  }
+  return item.macrostratAgeRange;
+}
diff --git a/src/pages/maps/@id/correlation/types.ts b/src/pages/maps/@id/correlation/types.ts
index 254214ef..71bb25aa 100644
--- a/src/pages/maps/@id/correlation/types.ts
+++ b/src/pages/maps/@id/correlation/types.ts
@@ -34,3 +34,9 @@ export interface LegendItem {
   concept_ids: string;
   color: string;
 }
+
+export enum AgeDisplayMode {
+  MapLegend,
+  Macrostrat,
+  Both,
+}

From 8afe8d3cdc41f4a4d5d58c0e86dbac07381cccb6 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 18:26:12 -0500
Subject: [PATCH 028/151] Updated age reordering'

---
 src/pages/maps/@id/correlation/+Page.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 854893b1..e7d734f5 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -34,7 +34,7 @@ export function Page({ map }) {
   const size = useElementSize(ref);
   const legendData = useLegendData(map);
 
-  const [ageMode, setAgeMode] = useState(AgeDisplayMode.Macrostrat);
+  const [ageMode, setAgeMode] = useState(AgeDisplayMode.MapLegend);
 
   const correlationChartData = useMemo(() => {
     return buildCorrelationChartData(legendData, ageMode);
@@ -76,7 +76,6 @@ export type BarsProps = {
 function CorrelationChart({
   width,
   height,
-  events = false,
   data,
   ageMode = AgeDisplayMode.MapLegend,
 }: BarsProps) {
@@ -99,10 +98,10 @@ function CorrelationChart({
       scaleBand<string>({
         range: [xMin, xMax],
         round: false,
-        domain: data.map((d, i) => `${d.id}`),
+        domain: data.map((d) => `${d.id}`),
         padding: 0.2,
       }),
-    [xMax]
+    [xMax, data]
   );
   const yScale = useMemo(() => {
     return scaleLinear<number>({

From 4145f6759326df962982bb710733e107b66513cf Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 2 Jun 2024 22:00:02 -0500
Subject: [PATCH 029/151] Added settings panel

---
 src/pages/maps/@id/correlation/+Page.ts       | 81 ++++++++++++++++---
 .../maps/@id/correlation/main.module.sass     |  4 +
 2 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index e7d734f5..b6f7112f 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -3,6 +3,7 @@ import {
   Spinner,
   SegmentedControl,
   FormGroup,
+  Button,
 } from "@blueprintjs/core";
 import { FullscreenPage } from "~/layouts";
 import hyper from "@macrostrat/hyper";
@@ -12,7 +13,7 @@ import { useLegendData, MapInfo } from "../utils";
 import { useElementSize, useInDarkMode } from "@macrostrat/ui-components";
 import { useMemo, useRef } from "react";
 import { Group } from "@visx/group";
-import { scaleBand, scaleLinear } from "@visx/scale";
+import { scaleBand, scaleLinear, scaleLog } from "@visx/scale";
 import { AxisLeft } from "@visx/axis";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { ForeignObject } from "@macrostrat/column-components";
@@ -35,27 +36,51 @@ export function Page({ map }) {
   const legendData = useLegendData(map);
 
   const [ageMode, setAgeMode] = useState(AgeDisplayMode.MapLegend);
+  const [ageScale, setAgeScale] = useState<AgeScale>("linear");
 
   const correlationChartData = useMemo(() => {
     return buildCorrelationChartData(legendData, ageMode);
   }, [legendData, ageMode]);
 
+  const [selectedItem, setSelectedLegendID] =
+    useSelectedLegendID(correlationChartData);
+
+  const settings = h("div.settings", [
+    h("h3", "Settings"),
+    h(AgeScaleSelector, { scale: ageScale, setScale: setAgeScale }),
+    h(AgeDisplayModeSelector, {
+      displayMode: ageMode,
+      setDisplayMode: setAgeMode,
+    }),
+  ]);
+
   return h(FullscreenPage, [
     h("div.page-inner", [
       h("div.flex.row", [
         h(PageBreadcrumbs),
         h("div.spacer"),
-        h(AgeDisplayModeSelector, {
-          displayMode: ageMode,
-          setDisplayMode: setAgeMode,
-        }),
+        h(
+          Popover,
+          {
+            content: settings,
+            usePortal: true,
+            rootBoundary: ref.current,
+            onOpening() {
+              setSelectedLegendID(null);
+            },
+          },
+          [h(Button, { icon: "cog", minimal: true })]
+        ),
       ]),
       h("div.vis-container", { ref }, [
         h.if(legendData != null)(CorrelationChart, {
           map,
           ...size,
           data: correlationChartData,
+          selectedItem,
+          setSelectedLegendID,
           ageMode,
+          ageScale,
         }),
       ]),
     ]),
@@ -67,24 +92,29 @@ const verticalMargin = 60;
 export type BarsProps = {
   width: number;
   height: number;
-  events?: boolean;
   map: MapInfo;
   data: CorrelationItem[];
   ageMode: AgeDisplayMode;
+  ageScale: AgeScale;
+  selectedItem: CorrelationItem | null;
+  setSelectedLegendID: (a: number) => void;
 };
 
+type AgeScale = "linear" | "log";
+
 function CorrelationChart({
   width,
   height,
   data,
   ageMode = AgeDisplayMode.MapLegend,
+  ageScale = "linear",
+  selectedItem,
+  setSelectedLegendID,
 }: BarsProps) {
   // bounds
   const xMax = width;
   const yMax = height - verticalMargin;
 
-  const [selectedItem, setSelectedLegendID] = useSelectedLegendID(data);
-
   const domain = useMemo(
     () => mergeAgeRanges(data.map((d) => getBoundingAgeRange(d, ageMode))),
     [data, ageMode]
@@ -104,12 +134,22 @@ function CorrelationChart({
     [xMax, data]
   );
   const yScale = useMemo(() => {
+    if (ageScale === "log") {
+      return scaleLog<number>({
+        range: [yMax, 0],
+        round: true,
+        domain: domain,
+        nice: true,
+        base: 10,
+      });
+    }
+
     return scaleLinear<number>({
       range: [yMax, 0],
       round: false,
       domain,
     });
-  }, [domain, yMax]);
+  }, [domain, yMax, ageScale]);
 
   if (data == null) {
     return h(Spinner);
@@ -357,7 +397,7 @@ function AgeDisplayModeSelector({
   displayMode: AgeDisplayMode;
   setDisplayMode: (a: AgeDisplayMode) => void;
 }) {
-  return h(FormGroup, { label: "Age source", inline: true }, [
+  return h(FormGroup, { label: "Age source" }, [
     h(SegmentedControl, {
       options: [
         { label: "Map legend", value: AgeDisplayMode.MapLegend },
@@ -365,9 +405,28 @@ function AgeDisplayModeSelector({
         { label: "Both", value: AgeDisplayMode.Both },
       ],
       small: true,
-      minimal: true,
       value: displayMode,
       onValueChange: setDisplayMode,
     }),
   ]);
 }
+
+function AgeScaleSelector({
+  scale,
+  setScale,
+}: {
+  scale: AgeScale;
+  setScale: (a: AgeScale) => void;
+}) {
+  return h(FormGroup, { label: "Age scale" }, [
+    h(SegmentedControl, {
+      options: [
+        { label: "Linear", value: "linear" },
+        { label: "Log", value: "log" },
+      ],
+      small: true,
+      value: scale,
+      onValueChange: setScale,
+    }),
+  ]);
+}
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 8c9ea863..1b576064 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -72,3 +72,7 @@ div.correlation-chart
   .unit
     color: var(--secondary-color)
     
+.settings
+  padding: 1em
+  >h3:first-child
+    margin-top: 0
\ No newline at end of file

From 70ecd8795ef201ec7641845bda63a6bbf8ae5996 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 3 Jun 2024 01:56:54 -0500
Subject: [PATCH 030/151] Small fixes to timescale

---
 deps/web-components                     | 2 +-
 src/pages/maps/@id/correlation/+Page.ts | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/deps/web-components b/deps/web-components
index c16da183..53dd60b3 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit c16da18374c50c0417b1e779fcccb898009ef552
+Subproject commit 53dd60b3bcb37486e2a186f4ef5a055748c19276
diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index b6f7112f..6bbe96bc 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -47,7 +47,7 @@ export function Page({ map }) {
 
   const settings = h("div.settings", [
     h("h3", "Settings"),
-    h(AgeScaleSelector, { scale: ageScale, setScale: setAgeScale }),
+    //h(AgeScaleSelector, { scale: ageScale, setScale: setAgeScale }),
     h(AgeDisplayModeSelector, {
       displayMode: ageMode,
       setDisplayMode: setAgeMode,
@@ -69,7 +69,7 @@ export function Page({ map }) {
               setSelectedLegendID(null);
             },
           },
-          [h(Button, { icon: "cog", minimal: true })]
+          h(Button, { icon: "cog", minimal: true })
         ),
       ]),
       h("div.vis-container", { ref }, [
@@ -157,8 +157,6 @@ function CorrelationChart({
 
   if (width < 10) return null;
 
-  const ageRange = [...domain] as AgeRange;
-
   return h("div.vis-frame", [
     h(
       "svg.vis-area",
@@ -181,7 +179,7 @@ function CorrelationChart({
               length: yMax,
               // Bug in timescale component, the age range appears to be changed
               // if we pass it in statically.
-              ageRange,
+              ageRange: domain,
               absoluteAgeScale: true,
               levels: [2, 3],
             }),

From 2ff644ccdb3e886f227a939217a1171f25455d5d Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 3 Jun 2024 02:56:06 -0500
Subject: [PATCH 031/151] Regularize routing for column

---
 .../map-interface/app-state/handlers/index.ts | 14 ++---
 .../map-interface/app-state/reducers/index.ts | 51 +++++++++++++++----
 src/pages/map/map-interface/map-page/index.ts | 38 +++++++-------
 3 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/src/pages/map/map-interface/app-state/handlers/index.ts b/src/pages/map/map-interface/app-state/handlers/index.ts
index 061214e4..72822e2e 100644
--- a/src/pages/map/map-interface/app-state/handlers/index.ts
+++ b/src/pages/map/map-interface/app-state/handlers/index.ts
@@ -51,13 +51,13 @@ async function actionRunner(
       );
 
       // If we are on the column route, the column layer must be enabled
-      const colMatch = matchPath(
-        mapPagePrefix + "/loc/:lng/:lat/column",
-        pathname
-      );
-      if (colMatch != null) {
-        coreState1.mapLayers.add(MapLayer.COLUMNS);
-      }
+      // const colMatch = matchPath(
+      //   mapPagePrefix + "/loc/:lng/:lat/column",
+      //   pathname
+      // );
+      // if (colMatch != null) {
+      //   coreState1.mapLayers.add(MapLayer.COLUMNS);
+      // }
 
       // Fill out the remainder with defaults
 
diff --git a/src/pages/map/map-interface/app-state/reducers/index.ts b/src/pages/map/map-interface/app-state/reducers/index.ts
index f3e6a9f9..061f42d3 100644
--- a/src/pages/map/map-interface/app-state/reducers/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/index.ts
@@ -10,6 +10,8 @@ import { contextPanelIsInitiallyOpen } from "../nav-hooks";
 import { CoreAction, coreReducer } from "./core";
 import { hashStringReducer } from "./hash-string";
 import { AppAction, AppState, MenuAction, MenuState } from "./types";
+import update from "immutability-helper";
+import { MapLayer } from "./map";
 export const browserHistory = createBrowserHistory();
 
 const routerReducer = createRouterReducer(browserHistory);
@@ -45,7 +47,7 @@ function mainReducer(
       const { pathname } = action.payload.location;
       const isOpen = contextPanelIsInitiallyOpen(pathname);
 
-      let s1 = setInfoMarkerPosition(state);
+      const s1 = setInfoMarkerPosition(state, pathname);
 
       const newRoute = action.payload.location;
       let newAction = action;
@@ -56,7 +58,7 @@ function mainReducer(
             ...action.payload,
             location: {
               ...action.payload.location,
-              hash: state.router.location.hash,
+              hash: s1.router.location.hash,
             },
           },
         };
@@ -65,7 +67,7 @@ function mainReducer(
       return {
         ...s1,
         core: { ...s1.core, menuOpen: isOpen, contextPanelOpen: isOpen },
-        router: routerReducer(state.router, newAction),
+        router: routerReducer(s1.router, newAction),
       };
     }
     case "set-menu-page":
@@ -92,18 +94,45 @@ const appReducer = (state: AppState, action: AppAction) => {
   return hashStringReducer(mainReducer(state, action), action);
 };
 
-export function setInfoMarkerPosition(state: AppState): AppState {
+export function setInfoMarkerPosition(
+  state: AppState,
+  pathname: string | null = null
+): AppState {
   // Check if we are viewing a specific location
   const loc = matchPath(
-    mapPagePrefix + "/loc/:lng/:lat",
-    state.router.location.pathname
+    mapPagePrefix + "/loc/:lng/:lat/*",
+    pathname ?? state.router.location.pathname
   );
+
+  let s1 = state;
+
+  // //If we are on the column route, the column layer must be enabled
+  // let s1 = state;
+  // const colMatch = matchPath(
+  //   mapPagePrefix + "/loc/:lng/:lat/column",
+  //   pathname ?? state.router.location.pathname
+  // );
+  // if (colMatch != null) {
+  //   s1 = update(s1, { core: { mapLayers: { $add: [MapLayer.COLUMNS] } } });
+  // }
+
+  // // If we are disabling the column route, we should remove the column layer
+  // const colMatch2 = matchPath(
+  //   mapPagePrefix + "/loc/:lng/:lat/column",
+  //   state.router.location.pathname
+  // );
+
+  // if (colMatch2 != null && colMatch == null) {
+  //   s1 = update(s1, { core: { mapLayers: { $remove: [MapLayer.COLUMNS] } } });
+  // }
+
+  // Set location
   if (loc != null) {
     const { lng, lat } = loc.params;
     return {
-      ...state,
+      ...s1,
       core: {
-        ...state.core,
+        ...s1.core,
         infoMarkerPosition: { lng: Number(lng), lat: Number(lat) },
         infoDrawerOpen: true,
       },
@@ -113,7 +142,7 @@ export function setInfoMarkerPosition(state: AppState): AppState {
   // Check if we're viewing a cross-section
   const crossSection = matchPath(
     mapPagePrefix + "/cross-section/:loc1/:loc2",
-    state.router.location.pathname
+    pathname ?? state.router.location.pathname
   );
   if (crossSection != null) {
     const { loc1, loc2 } = crossSection.params;
@@ -121,9 +150,9 @@ export function setInfoMarkerPosition(state: AppState): AppState {
     const [lng2, lat2] = loc2.split(",").map(Number);
     if (lng1 != null && lat1 != null && lng2 != null && lat2 != null) {
       return {
-        ...state,
+        ...s1,
         core: {
-          ...state.core,
+          ...s1.core,
           crossSectionLine: {
             type: "LineString",
             coordinates: [
diff --git a/src/pages/map/map-interface/map-page/index.ts b/src/pages/map/map-interface/map-page/index.ts
index f7a18c3c..9c9e8bd0 100644
--- a/src/pages/map/map-interface/map-page/index.ts
+++ b/src/pages/map/map-interface/map-page/index.ts
@@ -19,6 +19,7 @@ import Searchbar from "../components/navbar";
 import styles from "./main.module.styl";
 import MapContainer from "./map-view";
 import { MenuPage } from "./menu";
+import { info } from "console";
 
 const ElevationChart = loadable(() => import("../components/elevation-chart"));
 const InfoDrawer = loadable(() => import("../components/info-drawer"));
@@ -118,38 +119,39 @@ function InfoDrawerHolder() {
     h(Routes, [
       h(Route, {
         path: mapPagePrefix + "/loc/:lng/:lat/*",
-        element: h(InfoDrawerLocationGrabber),
+        element: h.if(detailPanelTrans.shouldMount)(InfoDrawer, {
+          className: "detail-panel",
+        }),
       }),
     ]),
-    h.if(detailPanelTrans.shouldMount)(InfoDrawer, {
-      className: "detail-panel",
-    }),
+    h(InfoDrawerLocationGrabber),
   ]);
 }
 
 function InfoDrawerLocationGrabber() {
   // We could probably do this in the reducer...
-  const { lat, lng } = useParams();
   const z = Math.round(
     useAppState((s) => s.core.mapPosition.target?.zoom) ?? 7
   );
+  const infoMarkerPosition = useAppState((s) => s.core.infoMarkerPosition);
   const runAction = useAppActions();
 
+  const { lat, lng } = infoMarkerPosition ?? {};
+
   // Todo: this is a pretty janky way to do state management
   useEffect(() => {
-    if (lat && lng) {
-      runAction({
-        type: "run-map-query",
-        lat: Number(lat),
-        lng: Number(lng),
-        z,
-        // Focused column or map unit from active layers.
-        // This is a bit anachronistic, since we want to be
-        // able to show columns that aren't necessarily shown on the map
-        columns: [],
-        map_id: null,
-      });
-    }
+    if (lat == null || lng == null) return;
+    runAction({
+      type: "run-map-query",
+      lat: Number(lat),
+      lng: Number(lng),
+      z,
+      // Focused column or map unit from active layers.
+      // This is a bit anachronistic, since we want to be
+      // able to show columns that aren't necessarily shown on the map
+      columns: [],
+      map_id: null,
+    });
   }, [lat, lng]);
   return null;
 }

From 83ca3d26e87647309fb9e4fb59c73b45983bf8dd Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 3 Jun 2024 03:34:34 -0500
Subject: [PATCH 032/151] Fix location hashes

---
 .../map-interface/app-state/reducers/index.ts    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pages/map/map-interface/app-state/reducers/index.ts b/src/pages/map/map-interface/app-state/reducers/index.ts
index 061f42d3..70e1f3d9 100644
--- a/src/pages/map/map-interface/app-state/reducers/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/index.ts
@@ -10,8 +10,6 @@ import { contextPanelIsInitiallyOpen } from "../nav-hooks";
 import { CoreAction, coreReducer } from "./core";
 import { hashStringReducer } from "./hash-string";
 import { AppAction, AppState, MenuAction, MenuState } from "./types";
-import update from "immutability-helper";
-import { MapLayer } from "./map";
 export const browserHistory = createBrowserHistory();
 
 const routerReducer = createRouterReducer(browserHistory);
@@ -43,13 +41,23 @@ function mainReducer(
    * state, we pass thm to individual reducers.
    */
   switch (action.type) {
+    case "@@INIT": {
+      const route = state.router.location;
+      const { pathname } = route;
+      const isOpen = contextPanelIsInitiallyOpen(pathname);
+      const s1 = setInfoMarkerPosition(state, pathname);
+      return {
+        ...s1,
+        core: { ...s1.core, menuOpen: isOpen, contextPanelOpen: isOpen },
+      };
+    }
     case "@@router/ON_LOCATION_CHANGED": {
-      const { pathname } = action.payload.location;
+      const newRoute = action.payload.location;
+      const { pathname } = newRoute;
       const isOpen = contextPanelIsInitiallyOpen(pathname);
 
       const s1 = setInfoMarkerPosition(state, pathname);
 
-      const newRoute = action.payload.location;
       let newAction = action;
       if (newRoute.hash == "") {
         newAction = {

From 1eec50ddfcd744cd1d055d25b76f86c64a4ee42f Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Mon, 3 Jun 2024 14:11:52 -0400
Subject: [PATCH 033/151] added config file to dev route

---
 src/pages/dev/+config.ts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/pages/dev/+config.ts

diff --git a/src/pages/dev/+config.ts b/src/pages/dev/+config.ts
new file mode 100644
index 00000000..eb856777
--- /dev/null
+++ b/src/pages/dev/+config.ts
@@ -0,0 +1,4 @@
+export default {
+    // Forces global style separation from other pages by reloading
+    clientRouting: false,
+  };
\ No newline at end of file

From 7a566abe389cf8ee837319c90817bb1e69d53723 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 01:21:35 -0500
Subject: [PATCH 034/151] Starting point for typescript server

---
 package.json                   |   4 +-
 server/{index.js => _index.js} |   0
 server/index.ts                |  94 ++++++++++++++++++
 server/vike-handler.ts         |  14 +++
 yarn.lock                      | 174 ++++++++++++++++++++++++++++++++-
 5 files changed, 282 insertions(+), 4 deletions(-)
 rename server/{index.js => _index.js} (100%)
 create mode 100644 server/index.ts
 create mode 100644 server/vike-handler.ts

diff --git a/package.json b/package.json
index c841443c..2f1dab88 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "dev": "NODE_NO_WARNINGS=1 yarn run server:dev",
     "build": "vite build",
     "server": "node ./server/index.js",
-    "server:dev": "node --env-file=.env ./server/index.js",
+    "server:dev": "tsx ./server/index.ts",
     "format": "prettier --write src packages",
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
     "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
@@ -90,6 +90,7 @@
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "@types/react-redux": "^7.1.7",
+    "@universal-middleware/express": "^0.0.2",
     "@visx/axis": "^2.14.0",
     "@visx/scale": "^2.2.2",
     "@vitejs/plugin-react": "^4.0.4",
@@ -129,6 +130,7 @@
     "swagger-ui-react": "^5.12.3",
     "topojson-client": "^3.0.0",
     "transition-hook": "^1.5.2",
+    "tsx": "^4.11.2",
     "use-debounce": "^9.0.4",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
diff --git a/server/index.js b/server/_index.js
similarity index 100%
rename from server/index.js
rename to server/_index.js
diff --git a/server/index.ts b/server/index.ts
new file mode 100644
index 00000000..f675b33e
--- /dev/null
+++ b/server/index.ts
@@ -0,0 +1,94 @@
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { vikeHandler } from "./vike-handler";
+import { createMiddleware } from "@universal-middleware/express";
+import express from "express";
+import sirv from "sirv";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const isProduction = process.env.NODE_ENV === "production";
+// Serve the app out of the `src` directory.
+const root = resolve(join(__dirname, ".."));
+const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
+const hmrPort = process.env.HMR_PORT
+  ? parseInt(process.env.HMR_PORT, 10)
+  : 24678;
+
+interface Middleware<
+  Context extends Record<string | number | symbol, unknown>
+> {
+  (request: Request, context: Context):
+    | Response
+    | void
+    | Promise<Response>
+    | Promise<void>;
+}
+
+export function handlerAdapter<
+  Context extends Record<string | number | symbol, unknown>
+>(handler: Middleware<Context>) {
+  return createMiddleware(
+    async (context) => {
+      const rawRequest = context.platform.request as unknown as Record<
+        string,
+        unknown
+      >;
+      rawRequest.context ??= {};
+      const response = await handler(
+        context.request,
+        rawRequest.context as Context
+      );
+
+      if (!response) {
+        context.passThrough();
+        return new Response("", {
+          status: 404,
+        });
+      }
+
+      return response;
+    },
+    {
+      alwaysCallNext: false,
+    }
+  );
+}
+
+startServer();
+
+async function startServer() {
+  const app = express();
+
+  if (isProduction) {
+    app.use(sirv(`${root}/dist/client`));
+    // Special case for cesium files at /cesium prefix
+    // These should be copied into the client bundle but are not right now.
+    // Ideally we'd be able to remove this fix.
+    app.use("/cesium", sirv(`${root}/dist/cesium`));
+  } else {
+    // Instantiate Vite's development server and integrate its middleware to our server.
+    // ⚠️ We should instantiate it *only* in development. (It isn't needed in production
+    // and would unnecessarily bloat our server in production.)
+    const vite = await import("vite");
+    const viteDevMiddleware = (
+      await vite.createServer({
+        root,
+        server: { middlewareMode: true, hmr: { port: hmrPort } },
+      })
+    ).middlewares;
+    app.use(viteDevMiddleware);
+  }
+
+  /**
+   * Vike route
+   *
+   * @link {@see https://vike.dev}
+   **/
+  app.all("*", handlerAdapter(vikeHandler));
+
+  app.listen(port, () => {
+    console.log(`Server listening on http://localhost:${port}`);
+  });
+}
diff --git a/server/vike-handler.ts b/server/vike-handler.ts
new file mode 100644
index 00000000..753437e8
--- /dev/null
+++ b/server/vike-handler.ts
@@ -0,0 +1,14 @@
+import { renderPage } from "vike/server";
+
+export async function vikeHandler<
+  Context extends Record<string | number | symbol, unknown>
+>(request: Request, context?: Context): Promise<Response> {
+  const pageContextInit = { ...(context ?? {}), urlOriginal: request.url };
+  const pageContext = await renderPage(pageContextInit);
+  const response = pageContext.httpResponse;
+
+  return new Response(response?.getReadableWebStream(), {
+    status: response?.statusCode,
+    headers: response?.headers,
+  });
+}
diff --git a/yarn.lock b/yarn.lock
index 4caafcec..cc5e9b1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5282,6 +5282,46 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hattip/core@npm:0.0.45, @hattip/core@npm:^0.0.45":
+  version: 0.0.45
+  resolution: "@hattip/core@npm:0.0.45"
+  checksum: 10/b733b63862ec9d84b1a13781b198bf8ec4817ac425f440e96b883e9042115b21aeb133376005690de272cf513f17d65d7b8b186f1a83e397a1b7184ccacd72fd
+  languageName: node
+  linkType: hard
+
+"@hattip/headers@npm:0.0.45":
+  version: 0.0.45
+  resolution: "@hattip/headers@npm:0.0.45"
+  dependencies:
+    "@hattip/core": "npm:0.0.45"
+  checksum: 10/940eca5ee23b8238bc218aa815e4130734567eb9b3abcfea573744169e955fb65b7338730e3d25571ba0a74334e6103aacbeb4cb2cd17fb7498977a30828e972
+  languageName: node
+  linkType: hard
+
+"@hattip/polyfills@npm:^0.0.45":
+  version: 0.0.45
+  resolution: "@hattip/polyfills@npm:0.0.45"
+  dependencies:
+    "@hattip/core": "npm:0.0.45"
+    "@whatwg-node/fetch": "npm:^0.9.17"
+    node-fetch-native: "npm:^1.6.4"
+  checksum: 10/b7520093aafe6981dc563340cdf71381cd08d1562a178a50e4b780ee7b1e992fc31ebd139699f1c5c5ee72e8e75c2d49a2b1a7bc7cab643896114eea33c78b6c
+  languageName: node
+  linkType: hard
+
+"@hattip/walk@npm:^0.0.45":
+  version: 0.0.45
+  resolution: "@hattip/walk@npm:0.0.45"
+  dependencies:
+    "@hattip/headers": "npm:0.0.45"
+    cac: "npm:^6.7.14"
+    mime-types: "npm:^2.1.35"
+  bin:
+    hattip-walk: cli.js
+  checksum: 10/aa430e2d2e2ff8692ba75c2c32952a8b3a700b6ae9e03eee4d4d19f1b8b9ef5ab011b853960278c883fe2cd163960b449aee1bf6a5f46f5fbfcdc81c3de491c5
+  languageName: node
+  linkType: hard
+
 "@iarna/cli@npm:^2.1.0":
   version: 2.1.0
   resolution: "@iarna/cli@npm:2.1.0"
@@ -5664,6 +5704,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@kamilkisiela/fast-url-parser@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "@kamilkisiela/fast-url-parser@npm:1.1.4"
+  checksum: 10/5b79438235a81817b02b96ddc581c996961cec5b40c7d6ebabd01ac6af8d4a35a43b9b263144af25386cef92c054c3ef6b1723b09eb0d8cf7b4053781a474c5f
+  languageName: node
+  linkType: hard
+
 "@lagunovsky/redux-react-router@npm:^3.2.0":
   version: 3.2.0
   resolution: "@lagunovsky/redux-react-router@npm:3.2.0"
@@ -6536,6 +6583,7 @@ __metadata:
     "@types/react-redux": "npm:^7.1.7"
     "@typescript-eslint/eslint-plugin": "npm:^6.3.0"
     "@typescript-eslint/parser": "npm:^6.3.0"
+    "@universal-middleware/express": "npm:^0.0.2"
     "@visx/axis": "npm:^2.14.0"
     "@visx/scale": "npm:^2.2.2"
     "@vitejs/plugin-react": "npm:^4.0.4"
@@ -6579,6 +6627,7 @@ __metadata:
     swagger-ui-react: "npm:^5.12.3"
     topojson-client: "npm:^3.0.0"
     transition-hook: "npm:^1.5.2"
+    tsx: "npm:^4.11.2"
     typescript: "npm:^5.1.6"
     use-debounce: "npm:^9.0.4"
     use-react-router-breadcrumbs: "npm:^3.2.1"
@@ -11809,6 +11858,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@universal-middleware/express@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "@universal-middleware/express@npm:0.0.2"
+  dependencies:
+    "@hattip/core": "npm:^0.0.45"
+    "@hattip/polyfills": "npm:^0.0.45"
+    "@hattip/walk": "npm:^0.0.45"
+  checksum: 10/8caa883047fc206594149c23dd54eb4c0f8b84d222bef7b6ea66d73545bc5354b359cbb07163db90bd75a62ec756a37411221acdbcdb9e798b861d9e08ec12e0
+  languageName: node
+  linkType: hard
+
 "@use-gesture/core@npm:10.3.1":
   version: 10.3.1
   resolution: "@use-gesture/core@npm:10.3.1"
@@ -12320,6 +12380,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@whatwg-node/events@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "@whatwg-node/events@npm:0.1.1"
+  checksum: 10/3a356ca23522190201e27446cfd7ebf1cf96815ddb9d1ba5da0a00bbe6c1d28b4094862104411101fbedd47c758b25fe3683033f6a3e80933029efd664c33567
+  languageName: node
+  linkType: hard
+
+"@whatwg-node/fetch@npm:^0.9.17":
+  version: 0.9.18
+  resolution: "@whatwg-node/fetch@npm:0.9.18"
+  dependencies:
+    "@whatwg-node/node-fetch": "npm:^0.5.7"
+    urlpattern-polyfill: "npm:^10.0.0"
+  checksum: 10/3ef78969991a44ea99c4f88929c1472b65f066c9d2734992d0de77d11089eec5c3477503cd9513201516056496e28c9fb172635f69867417a0c68e88f4409c96
+  languageName: node
+  linkType: hard
+
+"@whatwg-node/node-fetch@npm:^0.5.7":
+  version: 0.5.11
+  resolution: "@whatwg-node/node-fetch@npm:0.5.11"
+  dependencies:
+    "@kamilkisiela/fast-url-parser": "npm:^1.1.4"
+    "@whatwg-node/events": "npm:^0.1.0"
+    busboy: "npm:^1.6.0"
+    fast-querystring: "npm:^1.1.1"
+    tslib: "npm:^2.3.1"
+  checksum: 10/0ddbe236ce38b7859ad4b3c2097560585473d6d70afd5e72d88a97daa89176af7b888c95b6fc93a0bd6a471a42b7fb32ef8dac4d1558fbd6d835b25887329a91
+  languageName: node
+  linkType: hard
+
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
@@ -14027,6 +14117,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"busboy@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "busboy@npm:1.6.0"
+  dependencies:
+    streamsearch: "npm:^1.1.0"
+  checksum: 10/bee10fa10ea58e7e3e7489ffe4bda6eacd540a17de9f9cd21cc37e297b2dd9fe52b2715a5841afaec82900750d810d01d7edb4b2d456427f449b92b417579763
+  languageName: node
+  linkType: hard
+
 "byline@npm:^5.0.0":
   version: 5.0.0
   resolution: "byline@npm:5.0.0"
@@ -14055,7 +14154,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.0.0":
+"cac@npm:^6.0.0, cac@npm:^6.7.14":
   version: 6.7.14
   resolution: "cac@npm:6.7.14"
   checksum: 10/002769a0fbfc51c062acd2a59df465a2a947916b02ac50b56c69ec6c018ee99ac3e7f4dd7366334ea847f1ecacf4defaa61bcd2ac283db50156ce1f1d8c8ad42
@@ -17747,7 +17846,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0, esbuild@npm:^0.20.1":
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0, esbuild@npm:^0.20.1, esbuild@npm:~0.20.2":
   version: 0.20.2
   resolution: "esbuild@npm:0.20.2"
   dependencies:
@@ -18575,6 +18674,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-decode-uri-component@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "fast-decode-uri-component@npm:1.0.1"
+  checksum: 10/4b6ed26974414f688be4a15eab6afa997bad4a7c8605cb1deb928b28514817b4523a1af0fa06621c6cbfedb7e5615144c2c3e7512860e3a333a31a28d537dca7
+  languageName: node
+  linkType: hard
+
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
@@ -18629,6 +18735,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-querystring@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "fast-querystring@npm:1.1.2"
+  dependencies:
+    fast-decode-uri-component: "npm:^1.0.1"
+  checksum: 10/981da9b914f2b639dc915bdfa4f34ab028b967d428f02fbd293d99258593fde69c48eea73dfa03ced088268e0a8045c642e8debcd9b4821ebd125e130a0430c7
+  languageName: node
+  linkType: hard
+
 "fastclick@npm:^1.0.6":
   version: 1.0.6
   resolution: "fastclick@npm:1.0.6"
@@ -19532,6 +19647,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-tsconfig@npm:^4.7.5":
+  version: 4.7.5
+  resolution: "get-tsconfig@npm:4.7.5"
+  dependencies:
+    resolve-pkg-maps: "npm:^1.0.0"
+  checksum: 10/de7de5e4978354e8e6d9985baf40ea32f908a13560f793bc989930c229cc8d5c3f7b6b2896d8e43eb1a9b4e9e30018ef4b506752fd2a4b4d0dfee4af6841b119
+  languageName: node
+  linkType: hard
+
 "getpass@npm:^0.1.1":
   version: 0.1.7
   resolution: "getpass@npm:0.1.7"
@@ -24777,7 +24901,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.0.1, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.0.1, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:^2.1.35, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -25450,6 +25574,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-fetch-native@npm:^1.6.4":
+  version: 1.6.4
+  resolution: "node-fetch-native@npm:1.6.4"
+  checksum: 10/39c4c6d0c2a4bed1444943e1647ad0d79eb6638cf159bc37dffeafd22cffcf6a998e006aa1f3dd1d9d2258db7d78dee96b44bee4ba0bbaf0440ed348794f2543
+  languageName: node
+  linkType: hard
+
 "node-fetch-npm@npm:^2.0.2":
   version: 2.0.4
   resolution: "node-fetch-npm@npm:2.0.4"
@@ -30253,6 +30384,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-pkg-maps@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "resolve-pkg-maps@npm:1.0.0"
+  checksum: 10/0763150adf303040c304009231314d1e84c6e5ebfa2d82b7d94e96a6e82bacd1dcc0b58ae257315f3c8adb89a91d8d0f12928241cba2df1680fbe6f60bf99b0e
+  languageName: node
+  linkType: hard
+
 "resolve-protobuf-schema@npm:^2.1.0":
   version: 2.1.0
   resolution: "resolve-protobuf-schema@npm:2.1.0"
@@ -31961,6 +32099,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"streamsearch@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "streamsearch@npm:1.1.0"
+  checksum: 10/612c2b2a7dbcc859f74597112f80a42cbe4d448d03da790d5b7b39673c1197dd3789e91cd67210353e58857395d32c1e955a9041c4e6d5bae723436b3ed9ed14
+  languageName: node
+  linkType: hard
+
 "strict-uri-encode@npm:^2.0.0":
   version: 2.0.0
   resolution: "strict-uri-encode@npm:2.0.0"
@@ -33227,6 +33372,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsx@npm:^4.11.2":
+  version: 4.11.2
+  resolution: "tsx@npm:4.11.2"
+  dependencies:
+    esbuild: "npm:~0.20.2"
+    fsevents: "npm:~2.3.3"
+    get-tsconfig: "npm:^4.7.5"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    tsx: dist/cli.mjs
+  checksum: 10/2026b1f007ed7a2b45363ff260211351bdfa3cdb2c71975ed4e4a274918f5a3a6343b4e4ecd558a8eaebe707d242f8d5fdc7b60537272279dc59f2812d86dbdb
+  languageName: node
+  linkType: hard
+
 "tunnel-agent@npm:^0.6.0":
   version: 0.6.0
   resolution: "tunnel-agent@npm:0.6.0"
@@ -34080,6 +34241,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"urlpattern-polyfill@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "urlpattern-polyfill@npm:10.0.0"
+  checksum: 10/346819dbe718e929988298d02a988b8ddfa601d08daaa7e69b1148eab699c86c0f0f933d68d8c8cf913166fe64156ed28904e673200d18ef7e9ed6b58cea3fc7
+  languageName: node
+  linkType: hard
+
 "use-async-effect@npm:^2.2.1":
   version: 2.2.7
   resolution: "use-async-effect@npm:2.2.7"

From b91f3eaa4ea9afe3a5bc0b6a7fd4cfee04866e10 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 03:27:39 -0500
Subject: [PATCH 035/151] Server runs with more modern design

---
 package.json           |   4 +-
 server/_index.js       | 145 -----------------------------------------
 server/index.ts        |  14 ++++
 server/root.js         |   8 ---
 server/vike-handler.ts |  69 +++++++++++++++++++-
 5 files changed, 84 insertions(+), 156 deletions(-)
 delete mode 100644 server/_index.js
 delete mode 100644 server/root.js

diff --git a/package.json b/package.json
index 2f1dab88..7b0e5e82 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "clean": "rm -rf dist/*",
     "dev": "NODE_NO_WARNINGS=1 yarn run server:dev",
     "build": "vite build",
-    "server": "node ./server/index.js",
-    "server:dev": "tsx ./server/index.ts",
+    "server": "tsx ./server/index.ts",
+    "server:dev": "tsx --env-file=.env ./server/index.ts",
     "format": "prettier --write src packages",
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
     "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
diff --git a/server/_index.js b/server/_index.js
deleted file mode 100644
index c0b41ce1..00000000
--- a/server/_index.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file isn't processed by Vite, see https://github.com/brillout/vike/issues/562
-// Consequently:
-//  - When changing this file, you needed to manually restart your server for your changes to take effect.
-//  - To use your environment variables defined in your .env files, you need to install dotenv, see https://vike.dev/env
-//  - To use your path aliases defined in your vite.config.js, you need to tell Node.js about them, see https://vike.dev/path-aliases
-
-import { createMacrostratQlrAPI } from "@macrostrat-web/qgis-integration";
-import compression from "compression";
-import express from "express";
-import { renderPage } from "vike/server";
-import { root } from "./root.js";
-
-// Auth imports
-import cookieParser from "cookie-parser";
-import * as jose from "jose";
-
-const isProduction = process.env.NODE_ENV === "production";
-
-startServer();
-
-const flavors = [
-  "sandstone",
-  "shale",
-  "limestone",
-  "granite",
-  "basalt",
-  "gabbro",
-  "dolomite",
-];
-
-// Synthesize the config from the environment at runtime
-const environment = synthesizeConfigFromEnvironment();
-
-async function startServer() {
-  const app = express();
-
-  app.use(compression());
-  app.use(cookieParser());
-
-  // Vite integration
-  if (isProduction) {
-    // In production, we need to serve our static assets ourselves.
-    // (In dev, Vite's middleware serves our static assets.)
-    const sirv = (await import("sirv")).default;
-    app.use(sirv(`${root}/dist/client`));
-    // Special case for cesium files at /cesium prefix
-    // These should be copied into the client bundle but are not right now.
-    // Ideally we'd be able to remove this fix.
-    app.use("/cesium", sirv(`${root}/dist/cesium`));
-  } else {
-    // We instantiate Vite's development server and integrate its middleware to our server.
-    // ⚠️ We instantiate it only in development. (It isn't needed in production and it
-    // would unnecessarily bloat our production server.)
-    const vite = await import("vite");
-    const viteDevMiddleware = (
-      await vite.createServer({
-        root,
-        server: { middlewareMode: true },
-      })
-    ).middlewares;
-    app.use(viteDevMiddleware);
-  }
-
-  // ...
-  // Other middlewares (e.g. some RPC middleware such as Telefunc)
-  // ...
-
-  createMacrostratQlrAPI(
-    app,
-    "/docs/integrations/qgis/layers",
-    process.env.VITE_MACROSTRAT_TILESERVER_DOMAIN,
-    process.env.VITE_MACROSTRAT_INSTANCE
-  );
-
-  // vike middleware. It should always be our last middleware (because it's a
-  // catch-all middleware superseding any middleware placed after it).
-  app.get("*", async (req, res, next) => {
-    // Pull out the authorization cookie and decrypt it
-    let user = undefined;
-    try {
-      const authHeader = req.cookies?.Authorization;
-      const secret = new TextEncoder().encode(process.env.SECRET_KEY);
-      const jwt = authHeader.substring(7, authHeader.length);
-      // We probably don't need to verify the JWT on each request
-      user = (await jose.jwtVerify(jwt, secret)).payload;
-    } catch (e) {
-      // I don't care if it fails, it just means the user isn't logged in
-    }
-
-    if (!isProduction && process.env.DEV_ENABLE_AUTH !== "true") {
-      // Haha wow this is sketchy...this needs to be stopped.
-      user = { groups: [1] };
-    }
-
-    // Generate a Random logo
-    const random = Math.random();
-    const flavor = flavors[Math.floor(random * flavors.length)];
-
-    const pageContextInit = {
-      urlOriginal: req.originalUrl,
-      user: user,
-      macrostratLogoFlavor: flavor,
-      environment,
-    };
-
-    const pageContext = await renderPage(pageContextInit);
-
-    const { httpResponse } = pageContext;
-    if (!httpResponse) {
-      return next();
-    } else {
-      const { body, statusCode, headers, earlyHints } = httpResponse;
-      // if (res.writeEarlyHints) res.writeEarlyHints({ link: earlyHints.map((e) => e.earlyHintLink) })
-      headers.forEach(([name, value]) => res.setHeader(name, value));
-      res.status(statusCode);
-      if (!res.hasHeader("Content-Type"))
-        res.setHeader("Content-Type", "text/html");
-      // For HTTP streams use httpResponse.pipe() instead, see https://vike.dev/stream
-      res.send(body);
-    }
-  });
-
-  const port = process.env.PORT || 3000;
-  app.listen(port);
-  console.log(
-    `Server (${process.env.NODE_ENV}) running at http://localhost:${port}`
-  );
-}
-
-function synthesizeConfigFromEnvironment() {
-  /** Creates a mapping of environment variables that start with VITE_,
-   * and returns them as an object. This allows us to pass environment
-   * variables to the client.
-   *
-   * TODO: Ideally this would be defined in library code.
-   * */
-  const env = {};
-  for (const key of Object.keys(process.env)) {
-    if (key.startsWith("VITE_")) {
-      let newKey = key.substring(5);
-      env[newKey] = process.env[key];
-    }
-  }
-  return env;
-}
diff --git a/server/index.ts b/server/index.ts
index f675b33e..3760746a 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,8 +1,11 @@
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import cookieParser from "cookie-parser";
+import compression from "compression";
 
 import { vikeHandler } from "./vike-handler";
 import { createMiddleware } from "@universal-middleware/express";
+import { createMacrostratQlrAPI } from "@macrostrat-web/qgis-integration";
 import express from "express";
 import sirv from "sirv";
 
@@ -61,6 +64,9 @@ startServer();
 async function startServer() {
   const app = express();
 
+  app.use(compression());
+  app.use(cookieParser());
+
   if (isProduction) {
     app.use(sirv(`${root}/dist/client`));
     // Special case for cesium files at /cesium prefix
@@ -81,6 +87,14 @@ async function startServer() {
     app.use(viteDevMiddleware);
   }
 
+  // API layer handler: should restructure this as a middleware
+  createMacrostratQlrAPI(
+    app,
+    "/docs/integrations/qgis/layers",
+    process.env.VITE_MACROSTRAT_TILESERVER_DOMAIN,
+    process.env.VITE_MACROSTRAT_INSTANCE
+  );
+
   /**
    * Vike route
    *
diff --git a/server/root.js b/server/root.js
deleted file mode 100644
index e28176e1..00000000
--- a/server/root.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export { root };
-
-// https://stackoverflow.com/questions/46745014/alternative-for-dirname-in-node-when-using-the-experimental-modules-flag/50052194#50052194
-
-import { dirname } from "path";
-import { fileURLToPath } from "url";
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const root = `${__dirname}/..`;
diff --git a/server/vike-handler.ts b/server/vike-handler.ts
index 753437e8..fe840f65 100644
--- a/server/vike-handler.ts
+++ b/server/vike-handler.ts
@@ -1,9 +1,23 @@
 import { renderPage } from "vike/server";
 
+// Auth imports
+import * as jose from "jose";
+
+// Synthesize the config from the environment at runtime
+const environment = synthesizeConfigFromEnvironment();
+
 export async function vikeHandler<
   Context extends Record<string | number | symbol, unknown>
 >(request: Request, context?: Context): Promise<Response> {
-  const pageContextInit = { ...(context ?? {}), urlOriginal: request.url };
+  const baseContext = context ?? {};
+  const user = await getUserFromCookie(request);
+  const pageContextInit = {
+    ...baseContext,
+    urlOriginal: request.url,
+    environment,
+    user,
+    macrostratLogoFlavor: macrostratLogoFlavor(),
+  };
   const pageContext = await renderPage(pageContextInit);
   const response = pageContext.httpResponse;
 
@@ -12,3 +26,56 @@ export async function vikeHandler<
     headers: response?.headers,
   });
 }
+
+async function getUserFromCookie(request: Request) {
+  const isProduction = process.env.NODE_ENV === "production";
+  // Pull out the authorization cookie and decrypt it
+  let user: any = undefined;
+  try {
+    const authHeader = request.cookies?.Authorization;
+    const secret = new TextEncoder().encode(process.env.SECRET_KEY);
+    const jwt = authHeader.substring(7, authHeader.length);
+    // We probably don't need to verify the JWT on each request
+    user = (await jose.jwtVerify(jwt, secret)).payload;
+  } catch (e) {
+    // I don't care if it fails, it just means the user isn't logged in
+  }
+
+  if (!isProduction && process.env.DEV_ENABLE_AUTH !== "true") {
+    // Haha wow this is sketchy...this needs to be stopped.
+    user = { groups: [1] };
+  }
+  return user;
+}
+
+function synthesizeConfigFromEnvironment() {
+  /** Creates a mapping of environment variables that start with VITE_,
+   * and returns them as an object. This allows us to pass environment
+   * variables to the client.
+   *
+   * TODO: Ideally this would be defined in library code.
+   * */
+  const env = {};
+  for (const key of Object.keys(process.env)) {
+    if (key.startsWith("VITE_")) {
+      let newKey = key.substring(5);
+      env[newKey] = process.env[key];
+    }
+  }
+  return env;
+}
+
+function macrostratLogoFlavor() {
+  const flavors = [
+    "sandstone",
+    "shale",
+    "limestone",
+    "granite",
+    "basalt",
+    "gabbro",
+    "dolomite",
+  ];
+  // Generate a Random logo
+  const random = Math.random();
+  return flavors[Math.floor(random * flavors.length)];
+}

From 1aab234ddcc3b9fa128a4076416d0c463ffa756c Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 03:30:13 -0500
Subject: [PATCH 036/151] Removed apparently extraneous Babel config

---
 .babelrc        | 7 -------
 babel.config.js | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100644 .babelrc
 delete mode 100644 babel.config.js

diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 202d425a..00000000
--- a/.babelrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-react",
-    "@babel/preset-typescript"
-  ]
-}
diff --git a/babel.config.js b/babel.config.js
deleted file mode 100644
index 6af7345a..00000000
--- a/babel.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  presets: [
-    "@babel/preset-env",
-    "@babel/preset-react",
-    "@babel/preset-typescript",
-  ],
-};

From 38fb2c9484d5a169bf2ca5a49a24ada5895cba3a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 04:16:25 -0500
Subject: [PATCH 037/151] Start improving URL bar styles

---
 package.json                                  |  13 ++-
 src/{renderer => pages}/+config.ts            |  21 +++-
 .../+onPageTransitionEnd.ts                   |   2 +-
 .../+onPageTransitionStart.ts                 |   2 +-
 src/{renderer => pages}/+onRenderClient.ts    |   4 +-
 src/{renderer => pages}/+onRenderHtml.ts      |  13 ++-
 src/pages/dev/globe/+config.ts                |   7 +-
 src/pages/map/+config.ts                      |   1 +
 src/pages/sift/+config.ts                     |   1 -
 yarn.lock                                     | 108 ++++++++++++++----
 10 files changed, 122 insertions(+), 50 deletions(-)
 rename src/{renderer => pages}/+config.ts (53%)
 rename src/{renderer => pages}/+onPageTransitionEnd.ts (78%)
 rename src/{renderer => pages}/+onPageTransitionStart.ts (86%)
 rename src/{renderer => pages}/+onRenderClient.ts (95%)
 rename src/{renderer => pages}/+onRenderHtml.ts (90%)

diff --git a/package.json b/package.json
index 7b0e5e82..353bb77e 100644
--- a/package.json
+++ b/package.json
@@ -134,12 +134,17 @@
     "use-debounce": "^9.0.4",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
-    "vike": "^0.4.159",
-    "vike-react": "^0.4.2",
-    "vite": "^5.0.12",
+    "vike": "^0.4.172",
+    "vike-react": "^0.4.11",
+    "vite": "^5.2.11",
     "vite-plugin-cesium": "^1.2.22",
     "zustand": "^4.5.1"
   },
   "prettier": {},
-  "packageManager": "yarn@4.2.2"
+  "packageManager": "yarn@4.2.2",
+  "dependenciesMeta": {
+    "vike-react@0.4.11": {
+      "unplugged": true
+    }
+  }
 }
diff --git a/src/renderer/+config.ts b/src/pages/+config.ts
similarity index 53%
rename from src/renderer/+config.ts
rename to src/pages/+config.ts
index 9e550b2b..5a4bc392 100644
--- a/src/renderer/+config.ts
+++ b/src/pages/+config.ts
@@ -1,18 +1,27 @@
-import { Config, ConfigDefinition } from "vike/types";
+import vikeReact from "vike-react/config";
+import type { Config } from "vike/types";
+//const Layout = "import:~/layouts:BasePage";
+//import Head from "../layouts/HeadDefault.js";
 
+// Default config (can be overridden by pages)
 export default {
+  //Layout,
+  //Head,
+  // <title>
+  title: "Macrostrat",
+  extends: vikeReact,
   passToClient: [
     "pageProps",
     "pageStyle",
     "supportsDarkMode",
-    "isolateStyles",
     "macrostratLogoFlavor",
     "routeParams",
     "user",
     "urlPathname",
+    "description",
+    "title",
   ],
   clientRouting: true,
-  hydrationCanBeAborted: true,
   meta: {
     supportsDarkMode: {
       env: {
@@ -20,13 +29,13 @@ export default {
         server: true,
       },
     },
-    isolateStyles: {
+    scripts: {
       env: {
-        client: true,
+        client: false,
         server: true,
       },
     },
-    documentProps: {
+    description: {
       env: {
         client: true,
         server: true,
diff --git a/src/renderer/+onPageTransitionEnd.ts b/src/pages/+onPageTransitionEnd.ts
similarity index 78%
rename from src/renderer/+onPageTransitionEnd.ts
rename to src/pages/+onPageTransitionEnd.ts
index 89078435..6ab10336 100644
--- a/src/renderer/+onPageTransitionEnd.ts
+++ b/src/pages/+onPageTransitionEnd.ts
@@ -1,6 +1,6 @@
 // https://vike.dev/onPageTransitionEnd
 export { onPageTransitionEnd };
-import { usePageTransitionStore } from "./transitions";
+import { usePageTransitionStore } from "../renderer/transitions";
 
 function onPageTransitionEnd() {
   document.querySelector("body").classList.remove("in-page-transition");
diff --git a/src/renderer/+onPageTransitionStart.ts b/src/pages/+onPageTransitionStart.ts
similarity index 86%
rename from src/renderer/+onPageTransitionStart.ts
rename to src/pages/+onPageTransitionStart.ts
index 5e29e11d..1aab1bff 100644
--- a/src/renderer/+onPageTransitionStart.ts
+++ b/src/pages/+onPageTransitionStart.ts
@@ -1,5 +1,5 @@
 export { onPageTransitionStart };
-import { usePageTransitionStore } from "./transitions";
+import { usePageTransitionStore } from "../renderer/transitions";
 
 async function onPageTransitionStart() {
   // This function is called when a page transition starts.
diff --git a/src/renderer/+onRenderClient.ts b/src/pages/+onRenderClient.ts
similarity index 95%
rename from src/renderer/+onRenderClient.ts
rename to src/pages/+onRenderClient.ts
index 296f45fc..0766268b 100644
--- a/src/renderer/+onRenderClient.ts
+++ b/src/pages/+onRenderClient.ts
@@ -3,8 +3,8 @@ export { render as onRenderClient };
 import { FocusStyleManager } from "@blueprintjs/core";
 import h from "@macrostrat/hyper";
 import ReactDOM from "react-dom/client";
-import { PageShell } from "./page-shell";
-import type { PageContextClient } from "./types";
+import { PageShell } from "../renderer/page-shell";
+import type { PageContextClient } from "../renderer/types";
 
 let root: ReactDOM.Root;
 
diff --git a/src/renderer/+onRenderHtml.ts b/src/pages/+onRenderHtml.ts
similarity index 90%
rename from src/renderer/+onRenderHtml.ts
rename to src/pages/+onRenderHtml.ts
index f2f5e2be..3bb76de7 100644
--- a/src/renderer/+onRenderHtml.ts
+++ b/src/pages/+onRenderHtml.ts
@@ -4,8 +4,8 @@ export { render as onRenderHtml };
 import h from "@macrostrat/hyper";
 import ReactDOMServer from "react-dom/server";
 import { dangerouslySkipEscape, escapeInject } from "vike/server";
-import { PageShell } from "./page-shell";
-import type { PageContextServer } from "./types";
+import { PageShell } from "../renderer/page-shell";
+import type { PageContextServer } from "../renderer/types";
 
 async function render(pageContext: PageContextServer) {
   const { Page, pageProps, config, user, environment } = pageContext;
@@ -45,11 +45,12 @@ async function render(pageContext: PageContextServer) {
   // }
 
   // See https://vike.dev/head
-  const { documentProps } = pageContext.exports;
-  const title = (documentProps && documentProps.title) || "Macrostrat";
-  const desc = (documentProps && documentProps.description) || "Macrostrat";
+  const {
+    title = "Macrostrat",
+    desc = "Macrostrat",
+    scripts = [],
+  } = pageContext.exports;
 
-  const scripts = documentProps?.scripts ?? [];
   const scriptTags = scripts
     .map((src) => `<script src="${src}"></script>`)
     .join("\n");
diff --git a/src/pages/dev/globe/+config.ts b/src/pages/dev/globe/+config.ts
index 2821332f..3bf1c651 100644
--- a/src/pages/dev/globe/+config.ts
+++ b/src/pages/dev/globe/+config.ts
@@ -8,8 +8,7 @@ export default {
     },
   },
   clientRouting: false,
-  documentProps: {
-    scripts: ["/cesium/Cesium.js"],
-    title: "Macrostrat – Globe",
-  },
+  scripts: ["/cesium/Cesium.js"],
+  title: "Globe - Macrostrat",
+  description: "Macrostrat Globe",
 };
diff --git a/src/pages/map/+config.ts b/src/pages/map/+config.ts
index 0bc22b69..f0fe786d 100644
--- a/src/pages/map/+config.ts
+++ b/src/pages/map/+config.ts
@@ -12,4 +12,5 @@ export default {
       },
     },
   },
+  title: "Map - Macrostrat",
 };
diff --git a/src/pages/sift/+config.ts b/src/pages/sift/+config.ts
index cb2beb42..0acd0dec 100644
--- a/src/pages/sift/+config.ts
+++ b/src/pages/sift/+config.ts
@@ -1,7 +1,6 @@
 export default {
   clientRouting: false,
   supportsDarkMode: false,
-  isolateStyles: true,
   meta: {
     Page: {
       /* Sift must be rendered as a single-page app, because that is its design.
diff --git a/yarn.lock b/yarn.lock
index cc5e9b1f..de9803ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4119,13 +4119,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@brillout/json-serializer@npm:^0.5.1, @brillout/json-serializer@npm:^0.5.8":
+"@brillout/json-serializer@npm:^0.5.1":
   version: 0.5.8
   resolution: "@brillout/json-serializer@npm:0.5.8"
   checksum: 10/db70bb1e6fdb9711eb4901162a391a2ff83aec37914172a619b700f2e09a042f71eed383b9748432c799b751ed119131e464acba62422a2189d0a6e7aca42f74
   languageName: node
   linkType: hard
 
+"@brillout/json-serializer@npm:^0.5.10":
+  version: 0.5.10
+  resolution: "@brillout/json-serializer@npm:0.5.10"
+  checksum: 10/6e245c62891fd4f1b5a9945b23344b929b94b309f60d5b4bcfff7750a8c657e85713132ef73bdf6e42b10b6ab254a520c58cf8bdc7d32c76663851274ff71ee9
+  languageName: node
+  linkType: hard
+
 "@brillout/picocolors@npm:^1.0.10":
   version: 1.0.10
   resolution: "@brillout/picocolors@npm:1.0.10"
@@ -4133,6 +4140,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@brillout/picocolors@npm:^1.0.11":
+  version: 1.0.13
+  resolution: "@brillout/picocolors@npm:1.0.13"
+  checksum: 10/337fd4d9799b7cd55225a7405061c3aca1c6b357bb9f02996bf054713344dd1044cf7fb56e80044029d08a3c3169cb3e7094269bfcacc00b6530b408c39c6a69
+  languageName: node
+  linkType: hard
+
 "@brillout/require-shim@npm:^0.1.2":
   version: 0.1.2
   resolution: "@brillout/require-shim@npm:0.1.2"
@@ -4140,12 +4154,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@brillout/vite-plugin-server-entry@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "@brillout/vite-plugin-server-entry@npm:0.4.3"
+"@brillout/vite-plugin-server-entry@npm:^0.4.5":
+  version: 0.4.6
+  resolution: "@brillout/vite-plugin-server-entry@npm:0.4.6"
   dependencies:
     "@brillout/import": "npm:^0.2.3"
-  checksum: 10/b62333147a011e3f5c48f81631e292e579148ec0f4612ad252c0fa652bca04c3a841411a539297aabc7f4173af33618db72c51d2548b17407c78f2115ef6583f
+  checksum: 10/3db277830cdcc37c9bf59c21a231cd65dc10fb4acfee917923c375c3af1c90acb18b156f6d7f9cba0d7767267182b9180b494e131f99d6d6a1b0778f3e459154
   languageName: node
   linkType: hard
 
@@ -6632,12 +6646,15 @@ __metadata:
     use-debounce: "npm:^9.0.4"
     use-react-router-breadcrumbs: "npm:^3.2.1"
     use-resize-observer: "npm:^9.1.0"
-    vike: "npm:^0.4.159"
-    vike-react: "npm:^0.4.2"
-    vite: "npm:^5.0.12"
+    vike: "npm:^0.4.172"
+    vike-react: "npm:^0.4.11"
+    vite: "npm:^5.2.11"
     vite-plugin-cesium: "npm:^1.2.22"
     vite-plugin-rewrite-all: "npm:^1.0.1"
     zustand: "npm:^4.5.1"
+  dependenciesMeta:
+    vike-react@0.4.11:
+      unplugged: true
   languageName: unknown
   linkType: soft
 
@@ -29495,17 +29512,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-streaming@npm:^0.3.19":
-  version: 0.3.19
-  resolution: "react-streaming@npm:0.3.19"
+"react-streaming@npm:^0.3.27":
+  version: 0.3.28
+  resolution: "react-streaming@npm:0.3.28"
   dependencies:
     "@brillout/import": "npm:^0.2.3"
     "@brillout/json-serializer": "npm:^0.5.1"
+    "@brillout/picocolors": "npm:^1.0.11"
     isbot-fast: "npm:1.2.0"
   peerDependencies:
     react: ">=18"
     react-dom: ">=18"
-  checksum: 10/5c96dc355db925cf90830a001239a7e9788f01b53e5ad9dc1b054f52bab3f820f10422e3d395678f89f1f4b83eed3ec2b5577a7d857e134bc7cdd9c7d3cab680
+  checksum: 10/700f41b753425c2de894875b8c0e00fc685b7caa914d90ef3f7c39aa07fe269afe8e24c406cc57f170e7cc279e011b891220472b6922692b4a0ddd9ab757fa40
   languageName: node
   linkType: hard
 
@@ -34592,29 +34610,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vike-react@npm:^0.4.2":
-  version: 0.4.2
-  resolution: "vike-react@npm:0.4.2"
+"vike-react@npm:^0.4.11":
+  version: 0.4.11
+  resolution: "vike-react@npm:0.4.11"
   dependencies:
-    react-streaming: "npm:^0.3.19"
+    react-streaming: "npm:^0.3.27"
   peerDependencies:
     react: 18.x.x
     react-dom: 18.x.x
-    vike: ^0.4.159
+    vike: ^0.4.160
     vite: ^4.3.8 || ^5.0.10
-  checksum: 10/488e74b2cce2ddb38031fa172386d8d0795048271c432861fa5a45d04e673ef6bafa9047be971256cc70bf969e9ac961a44a45b3454148ccef140f90727a2e03
+  checksum: 10/38f08f58f884264aa15b8f63df815d374da3a9307ad7a55579de258bdf7657567214eb8b2ccdf11ac24f4e48b88feaa05d5122941b4a0f6ce8cbdeb9c15df7f6
   languageName: node
   linkType: hard
 
-"vike@npm:^0.4.159":
-  version: 0.4.159
-  resolution: "vike@npm:0.4.159"
+"vike@npm:^0.4.172":
+  version: 0.4.172
+  resolution: "vike@npm:0.4.172"
   dependencies:
     "@brillout/import": "npm:^0.2.3"
-    "@brillout/json-serializer": "npm:^0.5.8"
+    "@brillout/json-serializer": "npm:^0.5.10"
     "@brillout/picocolors": "npm:^1.0.10"
     "@brillout/require-shim": "npm:^0.1.2"
-    "@brillout/vite-plugin-server-entry": "npm:^0.4.3"
+    "@brillout/vite-plugin-server-entry": "npm:^0.4.5"
     acorn: "npm:^8.0.0"
     cac: "npm:^6.0.0"
     es-module-lexer: "npm:^1.0.0"
@@ -34624,13 +34642,13 @@ __metadata:
     source-map-support: "npm:^0.5.0"
   peerDependencies:
     react-streaming: ">=0.3.5"
-    vite: ">=3.1.0"
+    vite: ">=4.4.0"
   peerDependenciesMeta:
     react-streaming:
       optional: true
   bin:
     vike: node/cli/bin-entry.js
-  checksum: 10/8daf1447e04d50ec7f6eae55cda0016c84da0b0d55814cef0ed6925e9d1a0d1f56e755c4d9777ac0d2f7202b38c36b47b92315d65e3b33277c7619d36c3f47c7
+  checksum: 10/5a1adb43af3ed953318b14ada19b50ad65d674de474b49dcf1e2ae6d7ed6c23ac5a095c82dfab4bd40c42e629c9943ecd6e53d1e933f99ff2c26a11a8a5f3ab5
   languageName: node
   linkType: hard
 
@@ -34779,6 +34797,46 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite@npm:^5.2.11":
+  version: 5.2.12
+  resolution: "vite@npm:5.2.12"
+  dependencies:
+    esbuild: "npm:^0.20.1"
+    fsevents: "npm:~2.3.3"
+    postcss: "npm:^8.4.38"
+    rollup: "npm:^4.13.0"
+  peerDependencies:
+    "@types/node": ^18.0.0 || >=20.0.0
+    less: "*"
+    lightningcss: ^1.21.0
+    sass: "*"
+    stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    less:
+      optional: true
+    lightningcss:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 10/c27d3efff93016e8171b6a362f605ad5f78e24086292987097ad4a7382ae78d9e0659065976a13bf7b51ba0f593d675579010692097ef36d8a5cc965f3efec4c
+  languageName: node
+  linkType: hard
+
 "vlq@npm:^0.2.2":
   version: 0.2.3
   resolution: "vlq@npm:0.2.3"

From 5e5338f6a1d684cba6091c77dda9c9728fecebfa Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 18:31:49 -0400
Subject: [PATCH 038/151] Added correct handling of page title

---
 src/_utils/page-meta.ts                      | 15 +++++++++++
 src/pages/+onRenderClient.ts                 | 27 +++++---------------
 src/pages/+onRenderHtml.ts                   | 11 ++++----
 src/pages/dev/globe/+config.ts               |  2 +-
 src/pages/map/+config.ts                     |  2 +-
 src/pages/maps/+onBeforeRender.ts            |  2 +-
 src/pages/maps/@id/legend/+onBeforeRender.ts |  5 +---
 src/renderer/types.ts                        |  9 ++++---
 8 files changed, 36 insertions(+), 37 deletions(-)
 create mode 100644 src/_utils/page-meta.ts

diff --git a/src/_utils/page-meta.ts b/src/_utils/page-meta.ts
new file mode 100644
index 00000000..2edf8eed
--- /dev/null
+++ b/src/_utils/page-meta.ts
@@ -0,0 +1,15 @@
+import { PageContext } from "~/renderer/types";
+
+export function buildPageMeta(pageContext: PageContext): {
+  title: string;
+  description: string;
+} {
+  let title = pageContext.exports.title ?? "Macrostrat";
+  let description =
+    pageContext.exports.description ??
+    "A platform for geological data exploration, integration, and analysis.";
+  if (title != "Macrostrat") {
+    title = `${title} - Macrostrat`;
+  }
+  return { title, description };
+}
diff --git a/src/pages/+onRenderClient.ts b/src/pages/+onRenderClient.ts
index 0766268b..5858a437 100644
--- a/src/pages/+onRenderClient.ts
+++ b/src/pages/+onRenderClient.ts
@@ -5,10 +5,10 @@ import h from "@macrostrat/hyper";
 import ReactDOM from "react-dom/client";
 import { PageShell } from "../renderer/page-shell";
 import type { PageContextClient } from "../renderer/types";
+import { buildPageMeta } from "~/_utils/page-meta";
 
 let root: ReactDOM.Root;
 
-// This render() hook only supports SSR, see https://vike.dev/render-modes for how to modify render() to support SPA
 async function render(pageContext: PageContextClient) {
   const { Page, pageProps } = pageContext;
   if (!Page)
@@ -22,6 +22,8 @@ async function render(pageContext: PageContextClient) {
 
   const container = document.getElementById("app-container")!;
 
+  const { title, description } = buildPageMeta(pageContext);
+
   // TODO: we might be able to switch to vike-react's internal renderer
   if (container.innerHTML !== "" && pageContext.isHydration) {
     // First render (hydration)
@@ -32,27 +34,12 @@ async function render(pageContext: PageContextClient) {
       root = ReactDOM.createRoot(container);
     } else {
       // Client-side navigation
-      //const title = getHeadSetting("title", pageContext) || "Macrostrat";
-      //const lang = getHeadSetting("lang", pageContext) || "en";
-      // const favicon = getHeadSetting('favicon', pageContext)
-      // // We skip if the value is undefined because we shouldn't remove values set in HTML (by the Head setting).
-      // //  - This also means that previous values will leak: upon client-side navigation, the title set by the previous page won't be removed if the next page doesn't override it. But that's okay because usually pages always have a favicon and title, which means that previous values are always overriden. Also, as a workaround, the user can set the value to `null` to ensure that previous values are overriden.
-      //if (title !== undefined) document.title = title;
-      //if (lang !== undefined) document.documentElement.lang = lang;
-      //if (favicon !== undefined) setFavicon(favicon)
+      document.title = title;
+      document
+        .querySelector('meta[name="description"]')!
+        .setAttribute("content", description);
     }
 
     root.render(page);
   }
 }
-
-/* To enable Client-side Routing:
-export const clientRouting = true
-// !! WARNING !! Before doing so, read https://vike.dev/clientRouting */
-
-// function getHeadSetting(key: string, pageContext: PageContextClient) {
-//   return (
-//     pageContext.documentProps?.[key] ??
-//     pageContext.exports?.documentProps?.[key]
-//   );
-// }
diff --git a/src/pages/+onRenderHtml.ts b/src/pages/+onRenderHtml.ts
index 3bb76de7..b168653c 100644
--- a/src/pages/+onRenderHtml.ts
+++ b/src/pages/+onRenderHtml.ts
@@ -6,6 +6,7 @@ import ReactDOMServer from "react-dom/server";
 import { dangerouslySkipEscape, escapeInject } from "vike/server";
 import { PageShell } from "../renderer/page-shell";
 import type { PageContextServer } from "../renderer/types";
+import { buildPageMeta } from "~/_utils/page-meta";
 
 async function render(pageContext: PageContextServer) {
   const { Page, pageProps, config, user, environment } = pageContext;
@@ -45,16 +46,14 @@ async function render(pageContext: PageContextServer) {
   // }
 
   // See https://vike.dev/head
-  const {
-    title = "Macrostrat",
-    desc = "Macrostrat",
-    scripts = [],
-  } = pageContext.exports;
+  let { scripts = [] } = pageContext.exports;
 
   const scriptTags = scripts
     .map((src) => `<script src="${src}"></script>`)
     .join("\n");
 
+  const { title, description } = buildPageMeta(pageContext);
+
   const documentHtml = escapeInject`<!DOCTYPE html>
     <html lang="en">
       <head>
@@ -76,7 +75,7 @@ async function render(pageContext: PageContextServer) {
         />
         ${dangerouslySkipEscape(scriptTags)}
         ${dangerouslySkipEscape(envScript)}
-        <meta name="description" content="${desc}" />
+        <meta name="description" content="${description}" />
         <title>${title}</title>
       </head>
       <body onload="document.body.style.visibility='visible'">
diff --git a/src/pages/dev/globe/+config.ts b/src/pages/dev/globe/+config.ts
index 3bf1c651..2f7658ef 100644
--- a/src/pages/dev/globe/+config.ts
+++ b/src/pages/dev/globe/+config.ts
@@ -9,6 +9,6 @@ export default {
   },
   clientRouting: false,
   scripts: ["/cesium/Cesium.js"],
-  title: "Globe - Macrostrat",
+  title: "Globe",
   description: "Macrostrat Globe",
 };
diff --git a/src/pages/map/+config.ts b/src/pages/map/+config.ts
index f0fe786d..1e6dc4e7 100644
--- a/src/pages/map/+config.ts
+++ b/src/pages/map/+config.ts
@@ -12,5 +12,5 @@ export default {
       },
     },
   },
-  title: "Map - Macrostrat",
+  title: "Map",
 };
diff --git a/src/pages/maps/+onBeforeRender.ts b/src/pages/maps/+onBeforeRender.ts
index dee537ad..7d6d3ec1 100644
--- a/src/pages/maps/+onBeforeRender.ts
+++ b/src/pages/maps/+onBeforeRender.ts
@@ -6,7 +6,7 @@ export async function onBeforeRender(pageContext) {
   const res = await postgrest
     .from("sources_metadata")
     .select("*")
-    .order("source_id", { ascending: true })
+    .order("source_id", { ascending: true });
 
   const pageProps = { sources: res.data };
   return {
diff --git a/src/pages/maps/@id/legend/+onBeforeRender.ts b/src/pages/maps/@id/legend/+onBeforeRender.ts
index 9eae1d5f..92306474 100644
--- a/src/pages/maps/@id/legend/+onBeforeRender.ts
+++ b/src/pages/maps/@id/legend/+onBeforeRender.ts
@@ -19,10 +19,7 @@ export async function onBeforeRender(pageContext: PageContextServer) {
       pageProps: {
         map,
       },
-      documentProps: {
-        // The page's <title>
-        title: map.name + "– Legend",
-      },
+      title: map.name + "– Legend",
     },
   };
 }
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index dee47c5a..f5ae2b40 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -1,13 +1,12 @@
-export type { PageContext, PageContextClient, PageContextServer, PageProps };
+export type { PageContextClient, PageContextServer, PageProps };
 
-import { PageContextBuiltInServerInternal } from "vike/dist/esm/shared/types";
 import type {
   /*
           // When using Client Routing https://vike.dev/clientRouting
           PageContextBuiltInClientWithClientRouting as PageContextBuiltInClient
           /*/
   // When using Server Routing
-  PageContextBuiltInClientWithServerRouting as PageContextBuiltInClient,
+  PageContextServer as PageContextBuiltInServer,
   PageContextClient as PageContextClientBase,
   PageContextServer as PageContextServerBase,
 } from "vike/types";
@@ -31,13 +30,15 @@ export type PageContextCustom = {
   urlPathname: string;
   user?: User;
   macrostratLogoFlavor?: string;
-  config: PageContextBuiltInServerInternal["config"] & {
+  config: PageContextBuiltInServer["config"] & {
     clientRouting?: boolean;
     supportsDarkMode?: boolean;
     isolateStyles?: boolean;
     hydrationCanBeAborted?: boolean;
   };
   exports: {
+    title?: string;
+    description?: string;
     pageStyle?: PageStyle;
     supportsDarkMode?: boolean;
     documentProps?: DocumentProps;

From b75f508a78b21b36eaebcd7b94687e1bbbd10ea3 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 18:58:01 -0400
Subject: [PATCH 039/151] Updated titles for columns

---
 src/_utils/page-meta.ts                               | 4 ++++
 src/pages/columns/+config.ts                          | 3 +++
 src/pages/columns/@column/+title.ts                   | 6 ++++++
 src/pages/projects/@project/columns/@column/+title.ts | 6 ++++++
 src/renderer/breadcrumbs.ts                           | 2 +-
 5 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/columns/+config.ts
 create mode 100644 src/pages/columns/@column/+title.ts
 create mode 100644 src/pages/projects/@project/columns/@column/+title.ts

diff --git a/src/_utils/page-meta.ts b/src/_utils/page-meta.ts
index 2edf8eed..c6e100d0 100644
--- a/src/_utils/page-meta.ts
+++ b/src/_utils/page-meta.ts
@@ -5,6 +5,10 @@ export function buildPageMeta(pageContext: PageContext): {
   description: string;
 } {
   let title = pageContext.exports.title ?? "Macrostrat";
+  if (typeof title === "function") {
+    title = title(pageContext);
+  }
+
   let description =
     pageContext.exports.description ??
     "A platform for geological data exploration, integration, and analysis.";
diff --git a/src/pages/columns/+config.ts b/src/pages/columns/+config.ts
new file mode 100644
index 00000000..e24ef27b
--- /dev/null
+++ b/src/pages/columns/+config.ts
@@ -0,0 +1,3 @@
+export default {
+  title: "Columns",
+};
diff --git a/src/pages/columns/@column/+title.ts b/src/pages/columns/@column/+title.ts
new file mode 100644
index 00000000..3633021a
--- /dev/null
+++ b/src/pages/columns/@column/+title.ts
@@ -0,0 +1,6 @@
+function title(pageContext) {
+  const { col_name } = pageContext.pageProps.columnInfo;
+  return col_name;
+}
+
+export { title };
diff --git a/src/pages/projects/@project/columns/@column/+title.ts b/src/pages/projects/@project/columns/@column/+title.ts
new file mode 100644
index 00000000..3633021a
--- /dev/null
+++ b/src/pages/projects/@project/columns/@column/+title.ts
@@ -0,0 +1,6 @@
+function title(pageContext) {
+  const { col_name } = pageContext.pageProps.columnInfo;
+  return col_name;
+}
+
+export { title };
diff --git a/src/renderer/breadcrumbs.ts b/src/renderer/breadcrumbs.ts
index 9d96e455..c72d2674 100644
--- a/src/renderer/breadcrumbs.ts
+++ b/src/renderer/breadcrumbs.ts
@@ -73,7 +73,7 @@ interface Routes {
   children?: Routes[];
 }
 
-const sitemap: Routes = {
+export const sitemap: Routes = {
   slug: "",
   name: "Macrostrat",
   children: [

From 1b8ef4f33f6f3b601beb83916165b8f183f6f408 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 19:04:27 -0400
Subject: [PATCH 040/151] Updated titles for columns

---
 src/pages/columns/@column/+title.ts                         | 6 ------
 src/pages/columns/@column/column-inspector/index.ts         | 5 ++++-
 .../projects/@project/columns/@column/+onBeforeRender.ts    | 4 ++++
 src/pages/projects/@project/columns/@column/+title.ts       | 6 ------
 4 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 src/pages/columns/@column/+title.ts
 delete mode 100644 src/pages/projects/@project/columns/@column/+title.ts

diff --git a/src/pages/columns/@column/+title.ts b/src/pages/columns/@column/+title.ts
deleted file mode 100644
index 3633021a..00000000
--- a/src/pages/columns/@column/+title.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-function title(pageContext) {
-  const { col_name } = pageContext.pageProps.columnInfo;
-  return col_name;
-}
-
-export { title };
diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index b9af7601..a66654ce 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -60,7 +60,7 @@ function ColumnPage({ columnInfo, linkPrefix = "/" }) {
         ]),
       ]),
       h("div.right-column", [
-        h.if(selectedUnit == null)(ColumnNavigatorMap, {
+        h(ColumnNavigatorMap, {
           className: "column-map",
           format: "geojson_bare",
           currentColumn: {
@@ -72,6 +72,9 @@ function ColumnPage({ columnInfo, linkPrefix = "/" }) {
               project_id: columnInfo.project_id,
             },
           },
+          style: {
+            display: selectedUnit == null ? "block" : "none",
+          },
           setCurrentColumn(newColumn) {
             const { col_id } = newColumn.properties;
             navigate(linkPrefix + `columns/${col_id}`);
diff --git a/src/pages/projects/@project/columns/@column/+onBeforeRender.ts b/src/pages/projects/@project/columns/@column/+onBeforeRender.ts
index 7cd05052..1d19878b 100644
--- a/src/pages/projects/@project/columns/@column/+onBeforeRender.ts
+++ b/src/pages/projects/@project/columns/@column/+onBeforeRender.ts
@@ -45,6 +45,10 @@ export async function onBeforeRender(pageContext) {
 
   return {
     pageContext: {
+      exports: {
+        ...pageContext.exports,
+        title: columnInfo.col_name,
+      },
       pageProps: {
         columnInfo,
         linkPrefix,
diff --git a/src/pages/projects/@project/columns/@column/+title.ts b/src/pages/projects/@project/columns/@column/+title.ts
deleted file mode 100644
index 3633021a..00000000
--- a/src/pages/projects/@project/columns/@column/+title.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-function title(pageContext) {
-  const { col_name } = pageContext.pageProps.columnInfo;
-  return col_name;
-}
-
-export { title };

From d325c052b61766bdf429650b3c2ec0099a72753e Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 4 Jun 2024 19:08:42 -0400
Subject: [PATCH 041/151] Remove unplugged package

---
 package.json | 7 +------
 yarn.lock    | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 353bb77e..bf8c0c8d 100644
--- a/package.json
+++ b/package.json
@@ -141,10 +141,5 @@
     "zustand": "^4.5.1"
   },
   "prettier": {},
-  "packageManager": "yarn@4.2.2",
-  "dependenciesMeta": {
-    "vike-react@0.4.11": {
-      "unplugged": true
-    }
-  }
+  "packageManager": "yarn@4.2.2"
 }
diff --git a/yarn.lock b/yarn.lock
index de9803ce..6d7ddd9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6652,9 +6652,6 @@ __metadata:
     vite-plugin-cesium: "npm:^1.2.22"
     vite-plugin-rewrite-all: "npm:^1.0.1"
     zustand: "npm:^4.5.1"
-  dependenciesMeta:
-    vike-react@0.4.11:
-      unplugged: true
   languageName: unknown
   linkType: soft
 

From 56ea344c1d398badff44428101b0d64055f50cf4 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 5 Jun 2024 01:50:51 -0400
Subject: [PATCH 042/151] Fixed paleo page route

---
 src/pages/dev/paleo/+config.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/dev/paleo/+config.ts b/src/pages/dev/paleo/+config.ts
index 2199da7a..ac56ce59 100644
--- a/src/pages/dev/paleo/+config.ts
+++ b/src/pages/dev/paleo/+config.ts
@@ -1,10 +1,10 @@
 export default {
-  route: "/map/dev*",
   meta: {
     Page: {
       env: {
         client: true,
-      }
-    }
-  }
+        server: false,
+      },
+    },
+  },
 };

From 12ed9605d9d569c26ba3dec4040358e032e2d34f Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 10:31:38 -0400
Subject: [PATCH 043/151] removed extra files

---
 src/pages/+Page.mdx                |   4 -
 src/pages/dev/main-page/styles.css | 908 -----------------------------
 src/pages/styles.sass              | 560 ------------------
 3 files changed, 1472 deletions(-)
 delete mode 100644 src/pages/dev/main-page/styles.css
 delete mode 100644 src/pages/styles.sass

diff --git a/src/pages/+Page.mdx b/src/pages/+Page.mdx
index c09bf97a..0a79a604 100644
--- a/src/pages/+Page.mdx
+++ b/src/pages/+Page.mdx
@@ -44,7 +44,3 @@ These products come from a variety of sources throughout the geosciences.
 <LinkCard href="/docs/" title="Documentation">
   Macrostrat documentation
 </LinkCard>
-
-<LinkCard href="/mainpageTest" title="Test Site">
-  New test site @David
-</LinkCard>
diff --git a/src/pages/dev/main-page/styles.css b/src/pages/dev/main-page/styles.css
deleted file mode 100644
index 9ec89de9..00000000
--- a/src/pages/dev/main-page/styles.css
+++ /dev/null
@@ -1,908 +0,0 @@
-/* Snap styles */
-html, body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-.row-eq-height {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display:         flex;
-}
-
-#donate-title-container {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  width: 100%;
-  position: absolute;
-  text-align: center;
-}
-.snap-content {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: auto;
-  height: auto;
-  z-index: 2;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-transform: translate3d(0, 0, 0);
-     -moz-transform: translate3d(0, 0, 0);
-      -ms-transform: translate3d(0, 0, 0);
-       -o-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0);
-}
-
-.snap-drawers {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: auto;
-  height: auto;
-}
-
-.snap-drawer {
-  position: absolute;
-  top: 0;
-  right: auto;
-  bottom: 0;
-  left: auto;
-  width: 265px;
-  height: auto;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  -webkit-transition: width 0.3s ease;
-     -moz-transition: width 0.3s ease;
-      -ms-transition: width 0.3s ease;
-       -o-transition: width 0.3s ease;
-          transition: width 0.3s ease;
-}
-
-.snap-drawer-left {
-  left: 0;
-  z-index: 1;
-}
-
-.snap-drawer-right {
-  right: 0;
-  z-index: 1;
-}
-
-.snapjs-left .snap-drawer-right,
-.snapjs-right .snap-drawer-left {
-  display: none;
-}
-
-.snapjs-expand-left .snap-drawer-left,
-.snapjs-expand-right .snap-drawer-right {
-  width: 100%;
-}
-
-/* End snap styles */
-
-a:hover {
-  text-decoration: none;
-}
-.container-fluid {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-}
-.scrollable{
-  overflow: auto;
-  -webkit-transition-property: top, bottom;
-  transition-property: top, bottom;
-  -webkit-transition-duration: .2s, .2s;
-  transition-duration: .2s, .2s;
-  -webkit-transition-timing-function: linear, linear;
-  transition-timing-function: linear, linear;
-  -webkit-overflow-scrolling: touch;
-}
-.footer {
-  display: block;
-  bottom: 0;
-  width: 100%;
-  padding: 1em;
-  background-color: #015EAB;
-}
-#who-made-it {
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-}
-#who-made-it > a {
-  color: #E0E1E6;
-  font-weight: 200;
-}
-#who-made-it > a > img {
-  height: 75px;
-}
-#who-made-it > a > i {
-  margin-top: 10px;
-}
-#who-made-it > a > i:first-child {
-  margin-right: 10px;
-}
-#bottom-nav {
-  text-align: center;
-}
-.footer-nav > li > a {
-  color: #E0E1E6;
-  padding: 5px;
-}
-.funding {
-  color: #E0E1E6;
-  display: table;
-  text-align: center;
-}
-.funding-line {
-  display: table-cell;
-  vertical-align: middle;
-  font-weight: 200;
-}
-.funding-logo {
-  width: 75px;
-}
-.snap-content {
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-}
-.navbar-default {
-  background-color: rgba(0,0,0,0);
-  border: none;
-}
-.snap-drawers {
-  top: 50px;
-}
-.close-to-top {
-  background-color: #015EAB;
-  opacity: 1;
-}
-#second-nav {
-  background-color: #193441;
-}
-.navbar-default .navbar-nav>li>a {
-  color: #E0E1E6;
-  font-size: 1.1em;
-  font-weight: 400;
-  letter-spacing: 1px;
-}
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #E0E1E6;
-}
-.navbar-default .navbar-nav>li>a:hover, .navbar-default .navbar-nav>li>a:focus {
-  color: #fff;
-}
-.navbar-default .navbar-toggle {
-  border-color: rgba(0,0,0,0);
-}
-.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
-  background-color: rgba(0,0,0,0);
-}
-.logo {
-  height: 50px;
-  padding: 2px;
-}
-.main {
-  margin: auto;
-  color:#888;
-  background-size: cover;
-  background-repeat: no-repeat;
-}
-.main > h1 {
-  font-family: "Maven Pro", sans-serif;
-  font-size: 50px;
-  font-weight: 100;
-  line-height: 1.1;
-}
-.explore-sift {
-  background-color: #990000;
-  border-color: #990000;
-  margin-top: 10px;
-}
-.explore-sift.btn-info {
-  background-color: #015EAB;
-  border-color: #015EAB;
-}
-.rockd-button-container {
-  display: flex;
-  align-items: center;
-}
-.explore-sift.rockd {
-  background-color: #363434;
-  border-color: #363434;
-}
-.rockd-logo-small {
-  height: 21px;
-  margin-right: 5px;
-}
-.stats {
-  color: white;
-}
-.snap-drawer-right {
-  background-color: #015EAB;
-  opacity: 0.92;
-}
-.drawer-menu {
-  background-color: #015EAB;
-  line-height: 20px;
-  margin: 0;
-}
-.drawer-menu > a {
-  display: block;
-  color: #E0E1E6;
-  padding: 12px 35px !important;
-  border-bottom: 2px solid #0167bc;
-  font-size: 13px;
-  font-weight: 100;
-  letter-spacing: 1px;
-}
-.drawer-menu > a:hover {
-  color: #fff;
-}
-.nav>li>a:hover, .nav>li>a:focus {
-  background-color: rgba(0,0,0,0);
-}
-.nav.drawer {
-  margin-top: 60px;
-}
-#view {
-  height: 100%;
-  width: 100%;
-  position: relative;
-  background-color: #fff;
-  margin-top: 50px;
-}
-#view > .container-fluid {
-  height: 100%;
-  padding: 0;
-}
-.row {
-  margin: 0;
-}
-.slide {
-  height: 100%;
-  background-color: #fff;
-}
-.stat-row {
-  height: 50%;
-}
-.slide-container {
-  width: 100%;
-  height: 100%;
- /* text-align: center; */
-  display: table;
-  padding: 0;
-}
-.slide-content {
-  display: table-cell;
-  vertical-align: middle;
-}
-.slide-container > .stat-container {
-  display: table-cell;
-}
-
-.slide-content-padded {
-  padding-left: 10%;
-  padding-right: 10%;
-}
-
-.welcome {
-  background-color: rgba(0,0,0,0.3);
-  text-align: center;
-}
-.title {
-  margin-left: 1em;
-  margin-top: -6em;
-  padding: 40px;
-  border-radius: 20px;
-}
-
-.title > p {
-  color: #f7f7f7;
-  font-size: 20px;
-  font-weight: 300;
-}
-.top-stat, .top-stat-label {
-  display: block;
-  color: #f7f7f7;
-  font-size: 20px;
-}
-.top-stat {
-  font-weight: 600;
-}
-.top-stat-label {
-  font-size: 16px;
-  font-weight: 300;
-}
-.big {
-  font-size: 75px;
-  color: #E0E1E6;
-  font-family: "Maven Pro", sans-serif;
-}
-.nohighlight a{
-  color: white;
-}
-
-.stats > .slide-container {
-  text-align: center;
-}
-
-
-#app-title {
-  background-color: #4BABBf;
-  color: white;
-}
-
-.about-title {
-  border-bottom: 1px solid #eee;
-  margin-bottom: 18px;
-
-}
-#about {
-  padding: 100px 0;
-}
-#about > .slide-container {
-  padding-bottom: 100px;
-
-}
-.about {
-  padding: 0 15px;
-}
-.about-row {
-  padding: 15px 0;
-}
-.about-body {
-  padding: 0 30px;
-  color: #000 !important;
-}
-.about-body-subtitle {
-  font-size: 22px;
-  text-align: center;
-  font-weight: 200;
-  color: #777;
-}
-
-#apps {
-  max-width: 900px;
-  margin: 0 auto;
-  height: auto;
-}
-.app {
-  padding: 0;
-  height: 160px;
-}
-.app-background {
-  position: absolute;
-  font-size: 70px;
-  width: 100%;
-  height: 100%;
-  color: #777;
-  font-weight: 100;
-  letter-spacing: 15px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.blurb {
-  font-weight: 200;
-  font-size: 14px;
-  letter-spacing: 1px;
-}
-.app-background-text {
-  padding-right: 20px;
-  text-align: right;
-  max-width: 55%;
-}
-.app-background-text-small {
-  font-size: 50px;
-}
-.app-content {
-  z-index: 2;
-}
-
-.app-grid {
-  border: 1px solid #E5E5E5;
-  margin-top: -1px;
-  margin-bottom: 0;
-  margin-left: -1px;
-  min-height: 200px;
-  text-align: center;
-  display: table;
-}
-
-.app-grid-content {
-  display: table-cell;
-  vertical-align: middle;
-  color: #4BABBf;
-  font-weight: 500;
-  font-size: 16px;
-}
-
-.app-img {
-  height: 120px;
-  position: absolute;
-  border-radius: 4px;
-  left: 15px;
-  top: 15px;
-}
-
-#api {
- /* background-color: #D33A29;*/
-}
-.api-title {
-  background-color: #fff;
-  height:200px;
-  width: 200px;
-  border-radius: 50%;
-  text-align: center;
-  display: table;
-  border: 11px solid #6bbe98;
-  color: #4BABBf;
-}
-
-.big.apps {
-  color: #F5F5F5;
-}
-#apps {
-  padding-top: 150px;
-}
-#contact {
-  height: 1000px;
-  padding: 140px 0;
-}
-#contact-holder {
-  text-align: right;
-  color: #777;
-  border-bottom: 1px solid #eee;
-  margin-bottom: 18px;
-}
-.api-title > .big {
-  display: table-cell;
-  vertical-align: middle;
-  color: #6bbe98;
-}
-
-.stat-caption {
-  z-index: 10;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
-  position: absolute;
-  left: 20%;
-  right: 20%;
-  bottom: 20px;
-}
-.stat-caption > p {
-  font-size: 18px;
-}
-.stat-caption > h1 {
-  font-size: 45px;
-}
-
-.attribution {
-  height: 25px;
-  width: 25px;
-  position: absolute;
-  text-align: center;
-  right: 0;
-  bottom: 0;
-  margin-right: 10px;
-  margin-bottom: 10px;
-  padding: 5px;
-  border: 1px solid #eee;
-  border-radius: 50%;
-  color: #eee;
-  z-index: 500;
-}
-
-.stat {
-  background-repeat: no-repeat;
-  background-size: cover;
-}
-.stat-container {
-  height: 100%;
-}
-
-.page-info {
-  color: #4bab7f;
-  font-size: 18px;
-  line-height: 28px;
-  font-weight: 200;
-}
-.page-info.donate {
-  color: #333;
-}
-.page-info > a {
-  color: #4bab7f;
-  font-weight: bold;
-}
-.person {
-  background-repeat: no-repeat;
-  background-size: cover;
-  height: 200px;
-  border-bottom: 10px solid #fff;
-}
-.row > .person:first-child {
-  border-right: 5px solid #fff;
-}
-.row > .person:last-child {
-  border-left: 5px solid #fff;
-}
-.person-info {
-  float: right;
-  color: white;
-  font-size: 19px;
-  bottom: 0;
-  font-weight: 200;
-  position: absolute;
-  right: 0;
-  text-align: right;
-  background-color: rgba(0,0,0,0.2);
-  letter-spacing: 1px;
-  padding-top: 10px;
-  padding-left: 10px;
-  border-radius: 3px;
-}
-n, n > a {
-  font-size: 25px;
-  font-weight: 200;
-  color: inherit;
-}
-n > a:hover {
-  color: inherit;
-  font-weight: bolder;
-}
-n > a {
-  color: white;
-}
-t {
-  font-weight: 400;
-}
-e {
-  font-size: 14px;
-  font-weight: 200;
-}
-#people {
-  height: auto;
-}
-#shanan {
-  background-image: url("../img/shanan.jpg");
-}
-#shanan_wide {
-  background-image: url("../img/shanan_wide.jpg");
-}
-#daven {
-  background-image: url("../img/daven.jpg");
-}
-#evgeny {
-  background-image: url("../img/evgeny.jpg");
-}
-#casey {
-  background-image: url("../img/casey.jpg");
-}
-#afiqah {
-  background-image: url("../img/afiqah.jpg");
-}
-#daniel {
-  background-image: url("../img/daniel.jpg");
-}
-#shan {
-  background-image: url("../img/shan.jpg");
-}
-#michael {
-  background-image: url("../img/michael.jpg");
-}
-#ben {
-  background-image: url("../img/ben.jpg");
-}
-#jon {
-  background-image: url("../img/jon.jpg");
-  background-position-y: -45px;
-}
-#sharon {
-  background-image: url("../img/sharon.jpg");
-  background-position-y: -45px;
-}
-#victoria {
-  background-image: url("../img/victoria.jpg");
-}
-#john {
-  background-position: center;
-}
-#publications {
-  height: auto;
-  padding-top: 15%;
-  padding-bottom: 100px;
-}
-.pub-list {
-  counter-reset: pub-counter 70;
-  list-style: none;
-}
-.pub-list li {
-  counter-increment: pub-counter -1;
-  position: relative;
-  padding: 4px 0 20px 70px;
-}
-.pub-list li:before {
-  content: counter(pub-counter);
-  position: absolute;
-  left: 0;
-  top: -2px;
-  font-size: 35px;
-  color: #babdc8;
-}
-
-#donate {
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-image: url("../img/donate.jpg");
-}
-#donate-row {
-  padding: 100px 0;
-  background-color: #fff;
-}
-.donate-container > h1 {
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.6);
-  font-size: 90px;
-  font-weight: 700;
-}
-
-.page-info.donate {
-  background-color: rgba(255,255,255,0.7);
-  padding: 25px;
-  border-radius: 5px;
-}
-.burwell-title {
-  text-align: center;
-  color: #000000;
-}
-@media(max-width: 1200px), (min-width: 1200px) {
-  .snap-drawers {
-    display: none;
-  }
-  .main {
-    background-image: url("../img/cover_large.jpg");
-  }
-  .north-america {
-    background-image: url("../img/north_america.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new.jpg");
-  }
-  #john {
-    background-image: url("../img/john.jpg");
-  }
-  #puneet {
-    background-image: url("../img/puneet.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel.jpg");
-    background-position: 0 -35px, center;
-  }
-  #andrew {
-    background-image: url("../img/andrew.jpg");
-    background-position: 0 -35px, center;
-  }
-  #erika {
-    background-image: url("../img/erika.jpg");
-  }
-}
-@media(max-width: 992px) {
-  .snap-drawers {
-    display: none;
-  }
-  .main {
-    background-image: url("../img/cover_medium.jpg");
-  }
-  .north-america {
-    background-image: url("../img/north_america_med.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new_medium.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new_medium.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new_medium.jpg");
-  }
-  #john {
-    background-image: url("../img/john_med.jpg");
-  }
-  #puneet {
-    background-image: url("../img/puneet_med.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel_med.jpg");
-    background-position: 0 0;
-  }
-  #andrew {
-    background-image: url("../img/andrew_med.jpg");
-    background-position: 0 0;
-  }
-  #erika {
-    background-image: url("../img/erika_med.jpg");
-  }
-  #jon {
-    background-position: 0 0;
-  }
-  #donate {
-    background-image: url("../img/donate_medium.jpg");
-  }
-  .donate-container > h1 {
-    font-size: 60px;
-  }
-}
-@media(max-width: 768px) {
-  .top-stat-col {
-    margin-top: 15px;
-  }
-  .logo {
-    margin-left: 10px;
-  }
-  .snap-drawers {
-    display: block;
-  }
-  .main {
-  /*  background-image: url("../img/cover_small.jpg");*/
-  }
-  .north-america {
-    background-image: url("../img/north_america_small.jpg");
-  }
-  .caribbean {
-    background-image: url("../img/caribbean_new_small.jpg");
-  }
-  .new-zealand {
-    background-image: url("../img/new_zealand_new_small.jpg");
-  }
-  .deep-sea {
-    background-image: url("../img/deep_sea_new_small.jpg");
-  }
-  .big {
-    font-size: 50px;
-  }
-  .title {
-    margin-top: 0;
-    margin-right: 1em;
-  }
-  .app-grid {
-    width: 100%;
-  }
-  #api {
-    height: 150%;
-  }
-  .api-title {
-    margin-left: 7%;
-    margin-bottom: 50px;
-    margin-top: 50px;
-  }
-  .stat-caption > h1 {
-    font-size: 42px;
-  }
-  .stat-caption > p {
-    font-size: 16px;
-  }
-  .person-info {
-    line-height: 17px;
-  }
-  n {
-    font-size: 14px;
-  }
-  t {
-    font-size: 15px;
-  }
-  e {
-    font-size: 10px;
-  }
-  #john {
-    background-image: url("../img/john_low.jpg");
-  }
-  #noel {
-    background-image: url("../img/noel_low.jpg");
-  }
-  #andrew {
-    background-image: url("../img/andrew_low.jpg");
-  }
-  #donate {
-    background-image: url("../img/donate_small.jpg");
-  }
-  #erika {
-    background-image: url("../img/erika_low.jpg");
-  }
-  .funding {
-    display: block;
-  }
-  .funding-line {
-    display: block;
-  }
-  .stat-row {
-    height: 100%;
-  }
-  .stat {
-    height: 50%;
-  }
-  .donate-container > h1 {
-    font-size: 45px;
-  }
-  .page-info.donate {
-    font-size: 15px;
-    margin-bottom: 25px;
-    font-weight: 400;
-  }
-}
-@media(max-width: 450px) {
-  .row-eq-height {
-    display: block;
-  }
-  #donate-title-container {
-    position: relative;
-    margin-bottom: 15px;
-  }
-  .logo {
-    height: 40px;
-    padding-left: 10px;
-    padding-top: 7px;
-  }
-  .big {
-    font-size: 37px;
-  }
-  .col-xs-6 {
-    width: 100%;
-  }
-  .api-title {
-    margin-left: 21%;
-  }
-  .pub-list {
-    margin-left: -35px;
-  }
-  .slide-content-padded {
-    padding: 0;
-  }
-  .pub-list li:before {
-    font-size: 25px;
-  }
-  .app-img {
-    height: 80px;
-  }
-  .app-background-text {
-    font-size: 25px;
-    letter-spacing: 10px;
-  }
-
-  .person {
-    border: 5px solid #fff;
-  }
-  .footer .col-sm-4 {
-    padding: 25px 0;
-  }
-  .about-body-subtitle {
-    font-size: 25px;
-    font-weight: 400;
-  }
-  #app-title {
-    height: 250px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
-
-}
diff --git a/src/pages/styles.sass b/src/pages/styles.sass
deleted file mode 100644
index 2616991a..00000000
--- a/src/pages/styles.sass
+++ /dev/null
@@ -1,560 +0,0 @@
-/* Snap styles
-
-html, body
-  font-family: sans-serif
-  margin: 0
-  padding: 0
-  width: 100%
-  height: 100%
-  overflow: hidden
-
-.row-eq-height
-  display: -webkit-box
-  display: -webkit-flex
-  display: -ms-flexbox
-  display: flex
-
-#donate-title-container
-  display: flex
-  align-items: center
-  justify-content: center
-  height: 100%
-  width: 100%
-  position: absolute
-  text-align: center
-
-.snap-content
-  position: absolute
-  top: 0
-  right: 0
-  bottom: 0
-  left: 0
-  width: auto
-  height: auto
-  z-index: 2
-  overflow: auto
-  -webkit-overflow-scrolling: touch
-  -webkit-transform: translate3d(0, 0, 0)
-  -moz-transform: translate3d(0, 0, 0)
-  -ms-transform: translate3d(0, 0, 0)
-  -o-transform: translate3d(0, 0, 0)
-  transform: translate3d(0, 0, 0)
-
-.snap-drawers
-  position: absolute
-  top: 0
-  right: 0
-  bottom: 0
-  left: 0
-  width: auto
-  height: auto
-
-.snap-drawer
-  position: absolute
-  top: 0
-  right: auto
-  bottom: 0
-  left: auto
-  width: 265px
-  height: auto
-  overflow: auto
-  -webkit-overflow-scrolling: touch
-  -webkit-transition: width 0.3s ease
-  -moz-transition: width 0.3s ease
-  -ms-transition: width 0.3s ease
-  -o-transition: width 0.3s ease
-  transition: width 0.3s ease
-
-.snap-drawer-left
-  left: 0
-  z-index: 1
-
-.snap-drawer-right
-  right: 0
-  z-index: 1
-
-.snapjs-left .snap-drawer-right, .snapjs-right .snap-drawer-left
-  display: none
-
-.snapjs-expand-left .snap-drawer-left, .snapjs-expand-right .snap-drawer-right
-  width: 100%
-
-/* End snap styles
-
-a:hover
-  text-decoration: none
-
-.container-fluid
-  margin: 0
-  padding: 0
-  height: 100%
-
-.scrollable
-  overflow: auto
-  -webkit-transition-property: top, bottom
-  transition-property: top, bottom
-  -webkit-transition-duration: .2s, .2s
-  transition-duration: .2s, .2s
-  -webkit-transition-timing-function: linear, linear
-  transition-timing-function: linear, linear
-  -webkit-overflow-scrolling: touch
-
-.footer
-  display: block
-  bottom: 0
-  width: 100%
-  padding: 1em
-  background-color: #015EAB
-
-#who-made-it
-  color: #E0E1E6
-  font-weight: 200
-  text-align: center
-
-  > a
-    color: #E0E1E6
-    font-weight: 200
-
-    >
-      img
-        height: 75px
-
-      i
-        margin-top: 10px
-
-        &:first-child
-          margin-right: 10px
-
-#bottom-nav
-  text-align: center
-
-.footer-nav > li > a
-  color: #E0E1E6
-  padding: 5px
-
-.funding
-  color: #E0E1E6
-  display: table
-  text-align: center
-
-.funding-line
-  display: table-cell
-  vertical-align: middle
-  font-weight: 200
-
-.funding-logo
-  width: 75px
-
-.snap-content
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif
-
-.navbar-default
-  background-color: rgba(0, 0, 0, 0)
-  border: none
-
-.snap-drawers
-  top: 50px
-
-.close-to-top
-  background-color: #015EAB
-  opacity: 1
-
-#second-nav
-  background-color: #193441
-
-.navbar-default
-  .navbar-nav > li > a
-    color: #E0E1E6
-    font-size: 1.1em
-    font-weight: 400
-    letter-spacing: 1px
-
-  .navbar-toggle .icon-bar
-    background-color: #E0E1E6
-
-  .navbar-nav > li > a
-    &:hover, &:focus
-      color: #fff
-
-  .navbar-toggle
-    border-color: rgba(0, 0, 0, 0)
-
-    &:hover, &:focus
-      background-color: rgba(0, 0, 0, 0)
-
-.logo
-  height: 50px
-  padding: 2px
-
-.main
-  margin: auto
-  color: #888
-  background-size: cover
-  background-repeat: no-repeat
-
-  > h1
-    font-family: "Maven Pro", sans-serif
-    font-size: 50px
-    font-weight: 100
-    line-height: 1.1
-
-.explore-sift
-  background-color: #990000
-  border-color: #990000
-  margin-top: 10px
-
-  &.btn-info
-    background-color: #015EAB
-    border-color: #015EAB
-
-.rockd-button-container
-  display: flex
-  align-items: center
-
-.explore-sift.rockd
-  background-color: #363434
-  border-color: #363434
-
-.rockd-logo-small
-  height: 21px
-  margin-right: 5px
-
-.stats
-  color: white
-
-.snap-drawer-right
-  background-color: #015EAB
-  opacity: 0.92
-
-.drawer-menu
-  background-color: #015EAB
-  line-height: 20px
-  margin: 0
-
-  > a
-    display: block
-    color: #E0E1E6
-    padding: 12px 35px !important
-    border-bottom: 2px solid #0167bc
-    font-size: 13px
-    font-weight: 100
-    letter-spacing: 1px
-
-    &:hover
-      color: #fff
-
-.nav
-  > li > a
-    &:hover, &:focus
-      background-color: rgba(0, 0, 0, 0)
-
-  &.drawer
-    margin-top: 60px
-
-#view
-  height: 100%
-  width: 100%
-  position: relative
-  background-color: #fff
-  margin-top: 50px
-
-  > .container-fluid
-    height: 100%
-    padding: 0
-
-.row
-  margin: 0
-
-.slide
-  height: 100%
-  background-color: #fff
-
-.stat-row
-  height: 50%
-
-.slide-container
-  width: 100%
-  height: 100%
-
-  /* text-align: center;
-  display: table
-  padding: 0
-
-.slide-content
-  display: table-cell
-  vertical-align: middle
-
-.slide-container > .stat-container
-  display: table-cell
-
-.slide-content-padded
-  padding-left: 10%
-  padding-right: 10%
-
-.welcome
-  background-color: rgba(0, 0, 0, 0.3)
-  text-align: center
-
-.title
-  margin-left: 1em
-  margin-top: -6em
-  padding: 40px
-  border-radius: 20px
-
-  > p
-    color: #f7f7f7
-    font-size: 20px
-    font-weight: 300
-
-.top-stat, .top-stat-label
-  display: block
-  color: #f7f7f7
-  font-size: 20px
-
-.top-stat
-  font-weight: 600
-
-.top-stat-label
-  font-size: 16px
-  font-weight: 300
-
-.big
-  font-size: 75px
-  color: #E0E1E6
-  font-family: "Maven Pro", sans-serif
-
-.nohighlight a
-  color: white
-
-.stats > .slide-container
-  text-align: center
-
-#app-title
-  background-color: #4BABBf
-  color: white
-
-.about-title
-  border-bottom: 1px solid #eee
-  margin-bottom: 18px
-
-#about
-  padding: 100px 0
-
-  > .slide-container
-    padding-bottom: 100px
-
-.about
-  padding: 0 15px
-
-.about-row
-  padding: 15px 0
-
-.about-body
-  padding: 0 30px
-  color: #000 !important
-
-.about-body-subtitle
-  font-size: 22px
-  text-align: center
-  font-weight: 200
-  color: #777
-
-#apps
-  max-width: 900px
-  margin: 0 auto
-  height: auto
-
-.app
-  padding: 0
-  height: 160px
-
-.app-background
-  position: absolute
-  font-size: 70px
-  width: 100%
-  height: 100%
-  color: #777
-  font-weight: 100
-  letter-spacing: 15px
-  display: flex
-  align-items: center
-  justify-content: flex-end
-
-.blurb
-  font-weight: 200
-  font-size: 14px
-  letter-spacing: 1px
-
-.app-background-text
-  padding-right: 20px
-  text-align: right
-  max-width: 55%
-
-.app-background-text-small
-  font-size: 50px
-
-.app-content
-  z-index: 2
-
-.app-grid
-  border: 1px solid #E5E5E5
-  margin-top: -1px
-  margin-bottom: 0
-  margin-left: -1px
-  min-height: 200px
-  text-align: center
-  display: table
-
-.app-grid-content
-  display: table-cell
-  vertical-align: middle
-  color: #4BABBf
-  font-weight: 500
-  font-size: 16px
-
-.app-img
-  height: 120px
-  position: absolute
-  border-radius: 4px
-  left: 15px
-  top: 15px
-
-#api
-  /* background-color: #D33A29;
-
-.api-title
-  background-color: #fff
-  height: 200px
-  width: 200px
-  border-radius: 50%
-  text-align: center
-  display: table
-  border: 11px solid #6bbe98
-  color: #4BABBf
-
-.big.apps
-  color: #F5F5F5
-
-#apps
-  padding-top: 150px
-
-#contact
-  height: 1000px
-  padding: 140px 0
-
-#contact-holder
-  text-align: right
-  color: #777
-  border-bottom: 1px solid #eee
-  margin-bottom: 18px
-
-.api-title > .big
-  display: table-cell
-  vertical-align: middle
-  color: #6bbe98
-
-.stat-caption
-  z-index: 10
-  color: #fff
-  text-align: center
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6)
-  position: absolute
-  left: 20%
-  right: 20%
-  bottom: 20px
-
-  >
-    p
-      font-size: 18px
-
-    h1
-      font-size: 45px
-
-.attribution
-  height: 25px
-  width: 25px
-  position: absolute
-  text-align: center
-  right: 0
-  bottom: 0
-  margin-right: 10px
-  margin-bottom: 10px
-  padding: 5px
-  border: 1px solid #eee
-  border-radius: 50%
-  color: #eee
-  z-index: 500
-
-.stat
-  background-repeat: no-repeat
-  background-size: cover
-
-.stat-container
-  height: 100%
-
-.page-info
-  color: #4bab7f
-  font-size: 18px
-  line-height: 28px
-  font-weight: 200
-
-  &.donate
-    color: #333
-
-  > a
-    color: #4bab7f
-    font-weight: bold
-
-.person
-  background-repeat: no-repeat
-  background-size: cover
-  height: 200px
-  border-bottom: 10px solid #fff
-
-.row > .person
-  &:first-child
-    border-right: 5px solid #fff
-
-  &:last-child
-    border-left: 5px solid #fff
-
-.person-info
-  float: right
-  color: white
-  font-size: 19px
-  bottom: 0
-  font-weight: 200
-  position: absolute
-  right: 0
-  text-align: right
-  background-color: rgba(0, 0, 0, 0.2)
-  letter-spacing: 1px
-  padding-top: 10px
-  padding-left: 10px
-  border-radius: 3px
-
-n
-  font-size: 25px
-  font-weight: 200
-  color: inherit
-
-  > a
-    font-size: 25px
-    font-weight: 200
-    color: inherit
-
-    &:hover
-      color: inherit
-      font-weight: bolder
-
-    color: white
-
-t
-  font-weight: 400
-
-e
-  font-size: 14px
-  font-weight: 200
-
-#people
-  height: auto

From 79e988a8440230761a687f7439b0969c949280d6 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 10:40:29 -0400
Subject: [PATCH 044/151] start

---
 src/pages/dev/+Page.mdx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/dev/+Page.mdx b/src/pages/dev/+Page.mdx
index 5db9b2d9..382e2624 100644
--- a/src/pages/dev/+Page.mdx
+++ b/src/pages/dev/+Page.mdx
@@ -11,3 +11,4 @@ import { PageBreadcrumbs } from "~/renderer";
 - [Feedback](/dev/feedback)
 - [Map filter](/dev/filtering)
 - [Main Page](/dev/main-page)
+- [People](/dev/people)
\ No newline at end of file

From e356bc937e8e8540e933e01eb4f8efb351bca816 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 11:09:48 -0400
Subject: [PATCH 045/151] added people and formatting

---
 src/pages/dev/main-page/+Page.mdx | 142 ------------------------------
 1 file changed, 142 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index f1fe6d56..b0f9afe1 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -286,148 +286,6 @@ import "./main.styl";
     </div>
     <Image className="rock-border" src="rocks-border.jpg"></Image>
 
-    [//]: # "People"
-    <div class="row slide" id="people">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder" id="contact-holder">
-                <h1 class="big">People</h1>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-xs-6 person" id="shanan">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
-                <t>Professor, Database Developer</t>\
-                <e>peters -at geology.wisc.edu</e>
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daven">
-              <div class="person-info">
-                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
-                <t>Research Scientist, Developer</t> \
-                <e>daven.quinn -at wisc.edu</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="evgeny">
-              <div class="person-info">
-                <n>Evgeny Mazko</n> \
-                <t>Graduate Student</t> \
-                <e>mazko -at wisc.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="michael">
-              <div class="person-info">
-                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
-                <t>Senior Programmer Analyst</t> \
-                <e>mmcclenn -at- geology.wisc.edu</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="casey">
-              <div class="person-info">
-                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
-                <t>Research Specialist, Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daniel">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="shan">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="ben">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
-                <t>Postdoctoral Scholar (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="afiqah">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
-                <t>Undergrad Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="sharon">
-              <div class="person-info">
-                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="andrew">
-              <div class="person-info">
-                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
-                <t>Data Mobilization and Research Scientist</t> \
-                <e>azaffos -at- email.arizona.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="jon">
-              <div class="person-info">
-                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
-                <t>Postdoctoral Researcher (former)</t> \
-                <e>jhusson - at - uvic.ca</e> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="erika">
-              <div class="person-info">
-                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
-                <t>Research Intern (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="noel">
-              <div class="person-info">
-                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="john">
-              <div class="person-info">
-                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
-                <t>Next-level Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="puneet">
-              <div class="person-info">
-                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
-                <t>Generally Ignored</t> \
-                <e>punkish at eidesis.org</e> 
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </div>
-
     [//]: # "Donate"
     <div class="donate-container" id="donate">
       <Image className="back-img donate-img" src="donate_medium.jpg"></Image>

From df77fea9cf2668a51241b919520501932f6268d7 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 11:18:40 -0400
Subject: [PATCH 046/151] adding folder

---
 src/pages/dev/people/+Page.mdx | 103 +++++++++++++++++++++++++++++++++
 src/pages/dev/people/index.ts  |   6 ++
 src/pages/dev/people/main.styl |  29 ++++++++++
 3 files changed, 138 insertions(+)
 create mode 100644 src/pages/dev/people/+Page.mdx
 create mode 100644 src/pages/dev/people/index.ts
 create mode 100644 src/pages/dev/people/main.styl

diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
new file mode 100644
index 00000000..10634cfd
--- /dev/null
+++ b/src/pages/dev/people/+Page.mdx
@@ -0,0 +1,103 @@
+export { ContentPage as default } from "~/layouts";
+import { PageHeader } from "~/components";
+import { PageBreadcrumbs } from "~/renderer";
+import "./main.styl";
+import { Image } from "./index";
+
+[//]: # "People"
+<h1 class="big">People</h1>
+
+<Image className="back-img" src="shanan.jpg"></Image>
+
+<div class="people">
+    <div class="left">
+        <div class="person-info" id="shanan">
+            <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
+            <t>Professor, Database Developer</t>\
+            <e>peters -at geology.wisc.edu</e>
+        </div>
+
+        <div class="person-info" id="daven">
+            <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
+            <t>Research Scientist, Developer</t> \
+            <e>daven.quinn -at wisc.edu</e> 
+        </div>
+
+        <div class="person-info" id="evgeny">
+            <n>Evgeny Mazko</n> \
+            <t>Graduate Student</t> \
+            <e>mazko -at wisc.edu</e> 
+        </div>
+            
+        <div class="person-info" id="michael">
+            <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
+            <t>Senior Programmer Analyst</t> \
+            <e>mmcclenn -at- geology.wisc.edu</e> 
+        </div>
+
+        <div class="person-info" id="casey">
+            <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
+            <t>Research Specialist, Developer (former)</t> 
+        </div>
+
+        <div class="person-info" id="daniel">
+            <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
+            <t>Graduate Student (former)</t> 
+        </div>
+
+        <div class="person-info" id="shan">
+            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
+            <t>Graduate Student (former)</t> 
+        </div>
+
+        <div class="person-info" id="ben">
+            <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
+            <t>Postdoctoral Scholar (former)</t> 
+        </div>
+    </div>
+
+    <div class="right">
+        <div class="person-info" id="afiqah">
+            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
+            <t>Undergrad Student (former)</t> 
+        </div>
+
+        <div class="person-info" id="sharon">
+            <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
+            <t>Researcher (former)</t> 
+        </div>
+
+        <div class="person-info" id="andrew">
+            <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
+            <t>Data Mobilization and Research Scientist</t> \
+            <e>azaffos -at- email.arizona.edu</e> 
+        </div>
+
+        <div class="person-info" id="jon">
+            <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
+            <t>Postdoctoral Researcher (former)</t> \
+            <e>jhusson - at - uvic.ca</e> 
+        </div>
+
+        <div class="person-info" id="erika">
+            <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
+            <t>Research Intern (former)</t> 
+        </div>
+
+        <div class="person-info" id="noel">
+            <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
+            <t>Researcher (former)</t> 
+        </div>
+
+        <div class="person-info" id="john">
+            <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
+            <t>Next-level Developer (former)</t> 
+        </div>
+
+        <div class="person-info" id="puneet">
+            <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
+            <t>Generally Ignored</t> \
+            <e>punkish at eidesis.org</e> 
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/dev/people/index.ts b/src/pages/dev/people/index.ts
new file mode 100644
index 00000000..e3670446
--- /dev/null
+++ b/src/pages/dev/people/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/dev/people/main.styl b/src/pages/dev/people/main.styl
new file mode 100644
index 00000000..342c47e3
--- /dev/null
+++ b/src/pages/dev/people/main.styl
@@ -0,0 +1,29 @@
+.htnl, .body
+    background-color: white
+
+.people
+    z-index: 100
+.big
+    color: white
+
+.left
+    float: left
+    width: 50%
+    background-color: green
+
+.right
+    float: right
+    width: 50%
+    background-color: red
+
+.person-info
+    height: 10vh
+    text-align: right
+    padding: 3px 20px
+    color: blue
+    border: dotted
+
+.back-img
+    position:absolute
+    z-index:0
+    object-fit: cover

From 367883a3ae5d478b19a02ed75f96bfec9e45dc78 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 11:35:18 -0400
Subject: [PATCH 047/151] im confused

---
 deps/cesium-martini | 2 +-
 deps/cesium-viewer  | 2 +-
 deps/web-components | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/cesium-martini b/deps/cesium-martini
index 88779c30..f94340af 160000
--- a/deps/cesium-martini
+++ b/deps/cesium-martini
@@ -1 +1 @@
-Subproject commit 88779c309961a49df791d70efe9cc42adccb61e9
+Subproject commit f94340af535a9e0ac14d8d8f5e3c73a0a4e5109a
diff --git a/deps/cesium-viewer b/deps/cesium-viewer
index eb405972..cdca09dc 160000
--- a/deps/cesium-viewer
+++ b/deps/cesium-viewer
@@ -1 +1 @@
-Subproject commit eb4059725eb55454626f643179f7f3b189f23353
+Subproject commit cdca09dc9a01ba35987582d57b5627bc7bb7b4a6
diff --git a/deps/web-components b/deps/web-components
index 53dd60b3..09590e10 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 53dd60b3bcb37486e2a186f4ef5a055748c19276
+Subproject commit 09590e103921ab3f06d11f65e18c91a87e0b4671

From 98d8fe9a6898f09af9de04bc6597a15af25c1f6b Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 11:39:24 -0400
Subject: [PATCH 048/151] updated yarn

---
 yarn.lock | 5811 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 5677 insertions(+), 134 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6d7ddd9d..de1dacff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,6 +52,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.0.0-beta.35, @babel/code-frame@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
+  dependencies:
+    "@babel/highlight": "npm:^7.24.7"
+    picocolors: "npm:^1.0.0"
+  checksum: 10/4812e94885ba7e3213d49583a155fdffb05292330f0a9b2c41b49288da70cf3c746a3fda0bf1074041a6d741c33f8d7be24be5e96f41ef77395eeddc5c9ff624
+  languageName: node
+  linkType: hard
+
 "@babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
@@ -93,6 +103,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/compat-data@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/compat-data@npm:7.24.7"
+  checksum: 10/6edc09152ca51a22c33741c441f33f9475598fa59edc53369edb74b49f4ea4bef1281f5b0ed2b9b67fb66faef2da2069e21c4eef83405d8326e524b301f4e7e2
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.0.0":
+  version: 7.24.7
+  resolution: "@babel/core@npm:7.24.7"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helpers": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10/ef8cc1afa3ccecee6d1f5660c487ccc2a3f25106830ea9040e80ef4b2092e053607ee4ddd03493e4f7ef2f9967a956ca53b830d54c5bee738eeb58cce679dd4a
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.12, @babel/core@npm:^7.19.6, @babel/core@npm:^7.22.9, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
   version: 7.22.20
   resolution: "@babel/core@npm:7.22.20"
@@ -280,6 +320,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/generator@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^2.5.1"
+  checksum: 10/c71d24a4b41b19c10d2f2eb819f27d4cf94220e2322f7c8fed8bfbbb115b2bebbdd6dc1f27dac78a175e90604def58d763af87e0fa81ce4ab1582858162cf768
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -289,6 +341,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-annotate-as-pure@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-annotate-as-pure@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/a9017bfc1c4e9f2225b967fbf818004703de7cf29686468b54002ffe8d6b56e0808afa20d636819fcf3a34b89ba72f52c11bdf1d69f303928ee10d92752cad95
+  languageName: node
+  linkType: hard
+
 "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15, @babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
@@ -298,6 +359,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/3ddff45d1e086c9c6dcef53ef46521a0c11ddb09fe3ab42dca5af6bb1b1703895a9f4f8056f49fdf53c2dbf6e5cf1ddb4baf17d7e3766c63f051ab8d60a919ee
+  languageName: node
+  linkType: hard
+
 "@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
   version: 7.22.15
   resolution: "@babel/helper-compilation-targets@npm:7.22.15"
@@ -324,6 +395,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-compilation-targets@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
+    browserslist: "npm:^4.22.2"
+    lru-cache: "npm:^5.1.1"
+    semver: "npm:^6.3.1"
+  checksum: 10/8f8bc89af70a606ccb208513aa25d83e19b88f91b64a33174f7701a9479e67ddbb0a9c89033265070375cd24e690b93380b3a3ea11e4b3a711d742f0f4699ee7
+  languageName: node
+  linkType: hard
+
 "@babel/helper-create-class-features-plugin@npm:^7.12.1, @babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
@@ -381,6 +465,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-create-class-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/8ecb1c2acc808e1e0c21dccc7ea6899de9a140cb1856946800176b4784de6fccd575661fbff7744bb895d01aa6956ce963446b8577c4c2334293ba5579d5cdb9
+  languageName: node
+  linkType: hard
+
 "@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
@@ -394,6 +497,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-create-regexp-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    regexpu-core: "npm:^5.3.1"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/dd7238af30ea6b26a627192422822ae810873fd899150dd8d4348eb107045721a849abcfa2bd04f917493784a93724b8caf6994c31afd16f9347a8a9b9862425
+  languageName: node
+  linkType: hard
+
 "@babel/helper-define-polyfill-provider@npm:^0.4.2":
   version: 0.4.2
   resolution: "@babel/helper-define-polyfill-provider@npm:0.4.2"
@@ -446,6 +562,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-environment-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/079d86e65701b29ebc10baf6ed548d17c19b808a07aa6885cc141b690a78581b180ee92b580d755361dc3b16adf975b2d2058b8ce6c86675fcaf43cf22f2f7c6
+  languageName: node
+  linkType: hard
+
 "@babel/helper-function-name@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-function-name@npm:7.22.5"
@@ -466,6 +591,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-function-name@npm:7.24.7"
+  dependencies:
+    "@babel/template": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/2ceb3d9b2b35a0fc4100fc06ed7be3bc38f03ff0bf128ff0edbc0cc7dd842967b1496fc70b5c616c747d7711c2b87e7d025c8888f48740631d6148a9d3614f85
+  languageName: node
+  linkType: hard
+
 "@babel/helper-hoist-variables@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-hoist-variables@npm:7.22.5"
@@ -475,6 +610,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-hoist-variables@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/6cfdcf2289cd12185dcdbdf2435fa8d3447b797ac75851166de9fc8503e2fd0021db6baf8dfbecad3753e582c08e6a3f805c8d00cbed756060a877d705bd8d8d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-member-expression-to-functions@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/helper-member-expression-to-functions@npm:7.22.15"
@@ -502,6 +646,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-member-expression-to-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.7"
+  dependencies:
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/d990752aaff311aba0ca61539e1776c5ba2818836403f9bafac849deb4cd24c082cbde5f23e490b7f3614c95ff67f8d75fa5e2f14cb00586a72c96c158e1127b
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-module-imports@npm:7.22.15"
@@ -520,6 +674,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-imports@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-imports@npm:7.24.7"
+  dependencies:
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/df8bfb2bb18413aa151ecd63b7d5deb0eec102f924f9de6bc08022ced7ed8ca7fed914562d2f6fa5b59b74a5d6e255dc35612b2bc3b8abf361e13f61b3704770
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-transforms@npm:^7.22.15, @babel/helper-module-transforms@npm:^7.22.20, @babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.22.9":
   version: 7.22.20
   resolution: "@babel/helper-module-transforms@npm:7.22.20"
@@ -565,6 +729,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-transforms@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-transforms@npm:7.24.7"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-simple-access": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/4f2b232bf6d1be8d3a72b084a2a7ac1b0b93ea85717411a11ae1fb6375d4392019e781d8cc155789e649a2caa7eec378dd1404210603d6d4230f042c5feacffb
+  languageName: node
+  linkType: hard
+
 "@babel/helper-optimise-call-expression@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
@@ -574,6 +753,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-optimise-call-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-optimise-call-expression@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/da7a7f2d1bb1be4cffd5fa820bd605bc075c7dd014e0458f608bb6f34f450fe9412c8cea93e788227ab396e0e02c162d7b1db3fbcb755a6360e354c485d61df0
+  languageName: node
+  linkType: hard
+
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.22.5
   resolution: "@babel/helper-plugin-utils@npm:7.22.5"
@@ -588,6 +776,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-plugin-utils@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-plugin-utils@npm:7.24.7"
+  checksum: 10/dad51622f0123fdba4e2d40a81a6b7d6ef4b1491b2f92fd9749447a36bde809106cf117358705057a2adc8fd73d5dc090222e0561b1213dae8601c8367f5aac8
+  languageName: node
+  linkType: hard
+
 "@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5, @babel/helper-remap-async-to-generator@npm:^7.22.9":
   version: 7.22.20
   resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
@@ -601,6 +796,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-remap-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-wrap-function": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/4b7c925e71811902c8aa57904044921027eae10ac9b5b029df491ed4abc1ea18b450a7923fd0feb1248ae37703889e72b6c27f2a0e2d5811103c7655c49ad355
+  languageName: node
+  linkType: hard
+
 "@babel/helper-replace-supers@npm:^7.22.20, @babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
   version: 7.22.20
   resolution: "@babel/helper-replace-supers@npm:7.22.20"
@@ -627,6 +835,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-replace-supers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-replace-supers@npm:7.24.7"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/18b7c3709819d008a14953e885748f3e197537f131d8f7ae095fec245506d854ff40b236edb1754afb6467f795aa90ae42a1d961a89557702249bacfc3fdad19
+  languageName: node
+  linkType: hard
+
 "@babel/helper-simple-access@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-simple-access@npm:7.22.5"
@@ -645,6 +866,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-simple-access@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-simple-access@npm:7.24.7"
+  dependencies:
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/5083e190186028e48fc358a192e4b93ab320bd016103caffcfda81302a13300ccce46c9cd255ae520c25d2a6a9b47671f93e5fe5678954a2329dc0a685465c49
+  languageName: node
+  linkType: hard
+
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0, @babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
@@ -654,6 +885,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.7"
+  dependencies:
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/784a6fdd251a9a7e42ccd04aca087ecdab83eddc60fda76a2950e00eb239cc937d3c914266f0cc476298b52ac3f44ffd04c358e808bd17552a7e008d75494a77
+  languageName: node
+  linkType: hard
+
 "@babel/helper-split-export-declaration@npm:^7.22.6":
   version: 7.22.6
   resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
@@ -672,6 +913,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-split-export-declaration@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/ff04a3071603c87de0d6ee2540b7291ab36305b329bd047cdbb6cbd7db335a12f9a77af1cf708779f75f13c4d9af46093c00b34432e50b2411872c658d1a2e5e
+  languageName: node
+  linkType: hard
+
 "@babel/helper-string-parser@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-string-parser@npm:7.22.5"
@@ -693,6 +943,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-string-parser@npm:7.24.7"
+  checksum: 10/603d8d962bbe89907aa99a8f19a006759ab7b2464615f20a6a22e3e2e8375af37ddd0e5175c9e622e1c4b2d83607ffb41055a59d0ce34404502af30fde573a5c
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.19, @babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.22.5":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
@@ -707,6 +964,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 10/86875063f57361471b531dbc2ea10bbf5406e12b06d249b03827d361db4cad2388c6f00936bcd9dc86479f7e2c69ea21412c2228d4b3672588b754b70a449d4b
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/helper-validator-option@npm:7.22.15"
@@ -721,6 +985,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-option@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-option@npm:7.24.7"
+  checksum: 10/9689166bf3f777dd424c026841c8cd651e41b21242dbfd4569a53086179a3e744c8eddd56e9d10b54142270141c91581b53af0d7c00c82d552d2540e2a919f7e
+  languageName: node
+  linkType: hard
+
 "@babel/helper-wrap-function@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-wrap-function@npm:7.22.20"
@@ -732,6 +1003,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-wrap-function@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-wrap-function@npm:7.24.7"
+  dependencies:
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/1c248accfbb09a891293840506e3fbfc807b524abf16fc32115a6e73f760387d2dc7935282b48caa281c8033bf93dc80eca7649250524cfb95da8643771bca02
+  languageName: node
+  linkType: hard
+
 "@babel/helpers@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/helpers@npm:7.22.15"
@@ -787,6 +1070,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helpers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helpers@npm:7.24.7"
+  dependencies:
+    "@babel/template": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/f7496f0d7a0b13ea86136ac2053371027125734170328215f8a90eac96fafaaae4e5398c0729bdadf23261c00582a31e14bc70113427653b718220641a917f9d
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.22.13":
   version: 7.22.20
   resolution: "@babel/highlight@npm:7.22.20"
@@ -821,6 +1114,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
+    chalk: "npm:^2.4.2"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.0.0"
+  checksum: 10/69b73f38cdd4f881b09b939a711e76646da34f4834f4ce141d7a49a6bb1926eab1c594148970a8aa9360398dff800f63aade4e81fafdd7c8d8a8489ea93bfec1
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.3.3":
   version: 7.22.16
   resolution: "@babel/parser@npm:7.22.16"
@@ -884,6 +1189,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/parser@npm:7.24.7"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10/ef9ebce60e13db560ccc7af9235d460f6726bb7e23ae2d675098c1fc43d5249067be60d4118889dad33b1d4f85162cf66baf554719e1669f29bb20e71322568e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
   version: 7.24.5
   resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
@@ -896,6 +1210,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/d5091ca6b58c54316c4d3b6e8120a1bb70cfe2e61cb7ec11f5fdc8ba3ff5124de21e527fabc28f239bf6efc0660046aa416e8fc1e3d920d0e57b78edb507ec3f
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
@@ -929,6 +1255,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/f0e0e9bdcf5479f8c5b4494353dc64dee37205e5ffd30920e649e75537a8f795cdcf32dfb40a00e908469a5d61cf62806bc359294cb2a6f2e604bf4efe086301
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
@@ -968,6 +1305,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.13.0
+  checksum: 10/887f1b8bd0ef61206ece47919fda78a32eef35da31c0d95ab8d7adc8b4722534dc5177c86c8d6d81bcf4343f3c08c6adab2b46cfd2bea8e33c6c04e51306f9cc
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7":
   version: 7.23.7
   resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7"
@@ -992,6 +1342,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/ad63317eb72ca7e160394e9223768b1f826287eaf65297f2794d0203510225f20dd9858bce217af4a050754abf94565841617b45b35a2de355c4e2bba546b39c
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-proposal-class-properties@npm:7.12.1":
   version: 7.12.1
   resolution: "@babel/plugin-proposal-class-properties@npm:7.12.1"
@@ -1171,6 +1533,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-syntax-import-assertions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/bd065cd73ae3dbe69e6f9167aa605da3df77d69bbad2ede95e4aa9e7af7744d5bc1838b928c77338ca62df7691a7adf6e608279be50c18e4b3c70cf77e3013d7
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-syntax-import-attributes@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5"
@@ -1204,6 +1577,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-syntax-import-attributes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/22fc50bd85a491bb8d22065f330a41f60d66f2f2d7a1deb73e80c8a4b5d7a42a092a03f8da18800650eca0fc14585167cc4e5c9fab351f0d390d1592347162ae
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3":
   version: 7.10.4
   resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
@@ -1403,6 +1787,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-arrow-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/6720173645826046878015c579c2ca9d93cdba79a2832f0180f5cf147d9817c85bf9c8338b16d6bdaa71f87809b7a194a6902e6c82ec00b6354aca6b40abe5e6
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-async-generator-functions@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.15"
@@ -1445,6 +1840,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/cf0a4b5ffc6d7f3f3bf12d4792535e8a46332714211326fd5058a6e45988891ee402b26cb9cc6c7121b2c8283ebd160e431827f885bdfa51d6127f934bd9ba7f
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-async-to-generator@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5"
@@ -1484,6 +1893,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.7"
+  dependencies:
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/b2041d9d50b09afef983c4f1dece63fdfc5a8e4646e42591db398bc4322958434d60b3cb0f5d0f9f9dbdad8577e8a1a33ba9859aacc3004bf6d25d094d20193f
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
@@ -1517,6 +1939,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/33e2fb9f24c11889b2bacbe9c3625f738edafc2136c8206598e0422664267ec5ca9422cb4563cc42039ccfc333fb42ce5f8513382e56c5b02f934005d0d6e8ff
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-block-scoping@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-block-scoping@npm:7.22.15"
@@ -1550,6 +1983,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-block-scoping@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/9656e7bb0673279e18d9f9408027786f1b20d657e2cc106456e0bd7826bd12d81813299adbef2b2a5837b05740f2295fe8fb62389122d38c9e961b3005270777
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-class-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
@@ -1586,6 +2030,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-class-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/1c6f645dd3889257028f27bfbb04526ac7676763a923fc8203aa79aa5232820e0201cb858c73b684b1922327af10304121ac013c7b756876d54560a9c1a7bc79
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-class-static-block@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
@@ -1625,6 +2081,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-class-static-block@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.12.0
+  checksum: 10/00b4d35788bcfefb56b6a1d3506ca23f11dd55d4bb5a34eb70397c06283dc7f596cd9d40995c4a6cb897b45ad220de211f854e7a030a05e26a307c8f56b6ba4b
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-classes@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-classes@npm:7.22.15"
@@ -1680,6 +2149,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-classes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-classes@npm:7.24.7"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    globals: "npm:^11.1.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/5d5577fcb0ec9ef33d889358c54720abe462325bed5483d71f9aa0a704f491520777be5411d6fd8a08a8ebe352e2445d46d1e6577a5a2c9333bc37b9ff8b9a74
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-computed-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5"
@@ -1716,6 +2203,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-computed-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/fecf3c770b2dd8e70be6da12d4dd0273de9d8ef4d0f46be98d56fddb3a451932cdc9bb81de3057c9acb903e05ece657886cc31886d5762afa7b0a256db0f791e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-destructuring@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-destructuring@npm:7.22.15"
@@ -1749,6 +2248,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-destructuring@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/eec43df24a07b3c61f335883e50c6642762fdd3cc5c5f95532cebeb51ea9bf77ca9a38011b678d91549dd75e29e1c58bd6e0ebc34bb763c300bc2cc65801e663
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-dotall-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
@@ -1785,6 +2295,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-dotall-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/51b75638748f6e5adab95b711d3365b8d7757f881c178946618a43b15063ec1160b07f4aa3b116bf3f1e097a88226a01db4cae2c5c4aad4c71fe5568828a03f5
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
@@ -1818,6 +2340,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/4284d8fe058c838f80d594bace1380ce02995fa9a271decbece59c40815bc2f7e715807dcbe4d5da8b444716e6d05cc6d79771f500fb044cd0dd00ce4324b619
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-dynamic-import@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
@@ -1854,6 +2387,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-dynamic-import@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/e949c02aa57098d916eb6edcbef0f3f7d62640f37e1a061b0692523964e081f8182f2c4292173b4dbea4edb8d146e65d6a20ce4b6b5f8c33be34bd846ae114ea
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-exponentiation-operator@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5"
@@ -1890,6 +2435,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.7"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/014b211f73a524ee98441541ddc4f6b067eefcf94d509e99074a45ea8c3f3ad0e36cab6f5f96666ac05b747a21fa6fda949aa25153656bb2821545a4b302e0d4
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
@@ -1926,6 +2483,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/d59d21945d2fd1ead914bb21f909f75b70ebe0e7627c2b1326ce500babca4c8e4a2513af6899d92e06e87186c61ee5087209345f5102fb4ff5a0e47e7b159a2c
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-flow-strip-types@npm:^7.12.10, @babel/plugin-transform-flow-strip-types@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5"
@@ -1985,6 +2554,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-for-of@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/ea471ad1345f1153f7f72f1f084e74f48dc349272ca1b2d8710b841b015c9861d673e12c3c98d42ab3c640cb6ab88bb9a8da1f4ca9c57a8f71f00815fa23ecef
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-function-name@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-function-name@npm:7.22.5"
@@ -2024,6 +2605,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/9d4dcffea45acd255fed4a97e372ada234579f9bae01a4d0ced657091f159edf1635ff2a666508a08f8e59390def09ae6ce8372679faad894aa6f3247728ebe1
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-json-strings@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
@@ -2060,6 +2654,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-json-strings@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/5549dc97fc2d429a089d14ccfd51d8b3ba23c39b79edfe6d754e804fb1d50e6a4c070e73550be514a919c4db1553d8e6f7406178d68756b5959afe025a602cb2
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-literals@npm:7.22.5"
@@ -2093,6 +2699,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/bf341a5a0ffb5129670ac9a14ea53b67bd1d3d0e13173ce7ac2d4184c4b405d33f67df68c59a2e94a895bf80269ec1df82c011d9ddb686f9f08a40c37b881177
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
@@ -2129,6 +2746,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/e39581cf1f9a43330b8340177c618fdb3232deb03faab1937819ef39327660a1fe94fd0ec2f66d1f5b5f98acba68871a77a9931588011c13dded3d7094ecc9de
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-member-expression-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5"
@@ -2162,6 +2791,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/837b60ea42fc69a430c8f7fb124247ba009ff6d93187a521fe9f83556fe124715bd46533b1684a3e139f272849a14d1d4faf3397bde13714f99ce0938526ea6f
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-amd@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-modules-amd@npm:7.22.5"
@@ -2198,6 +2838,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-amd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.7"
+  dependencies:
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/66465ffba49af7a7b7a62995eb58f591ecd23ab42b0c67f8a70020177b3789d2a379bd6cbb68cbd09a69fd75c38a91f5a09ea70f5c8347bf4c6ea81caa0f6c6b
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-commonjs@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.15"
@@ -2237,6 +2889,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.7"
+  dependencies:
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-simple-access": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/9bd10cd03cce138a644f4e671025058348d8ff364253122bed60f9a2a32759445b93e8a6501773491cb19906602b18fd26255df0caac425343a1584599b36b24
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-systemjs@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.11"
@@ -2279,6 +2944,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
+  dependencies:
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/14f0ed1a252a2a04e075cd9051b809e33cd45374a2495dc0a428517893b8e951819acc8343c61d348c51ba54e42660bc93990a77aa3460d16a1c21d52d9c2cf1
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-modules-umd@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5"
@@ -2315,6 +2994,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-modules-umd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.7"
+  dependencies:
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/cef9c8917b3c35c3b6cb424dc2e6f74016122f1d25c196e2c7e51eb080d95e96c5d34966c0d5b9d4e17b8e60d455a97ed271317ed104e0e70bff159830a59678
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
@@ -2327,6 +3018,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/b0ecb1afd22946b21fb8f34e826cfbfea4b5337f7592a5ff8af7937eddec4440149c59d2d134b4f21b2ed91b57611f39b19827729e19d99b7c11eaf614435f83
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-new-target@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
@@ -2360,6 +3063,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-new-target@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/91b6a7439b7622f80dc755ddfb9ab083355bedc0b2af18e7c7a948faed14467599609331c8d59cfab4273640e3fc36e4cd02ad5b6dcb4a428f5a8baefc507acc
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
@@ -2396,6 +3110,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/113cd24b6ce4d0a8e54ad9324428244942ce752a3fd38f8b615c3a786641ec18a00a01b662fe4cbebf369358f5904a975bbde0a977b839f2438b16f0d7d1dd36
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-numeric-separator@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
@@ -2432,6 +3158,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-numeric-separator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/dc5bb0534889d207b1da125635471c42da61a4a4e9e68855f24b1cd04ccdcf8325b2c29112e719913c2097242e7e62d660e0fea2a46f3a9a983c9d02a0ec7a04
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
@@ -2476,6 +3214,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.7"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-transform-parameters": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/d586995dc3396bbf8fb75b84f0a3548d923e4c3500bb414641a7fe30762a4ffd82987887fece6381f600d8de2da1e3310fc9a725271724d35f9020fcd5d4b2a3
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-object-super@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-object-super@npm:7.22.5"
@@ -2512,6 +3264,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-object-super@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/382739a017972d7126416b958ea81b4b950b6275414908a54bfef6aeed9b9fcc6c8d247db3a1134b09a3b355a60039670ce41ee41c626f8acec70f49c3c8d2a6
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
@@ -2548,6 +3312,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/605ae3764354e83f73c1e6430bac29e308806abcce8d1369cf69e4921771ff3592e8f60ba60c15990070d79b8d8740f0841069d64b466b3ce8a8c43e9743da7e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-optional-chaining@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.15"
@@ -2587,6 +3363,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/0835caa8fa8561ba5da8edb82aee93aef8e5145eae33e5400569bb4fae879c596cd35d3bfe7519b222261fc370b1291c499870ca6ad9903e1a71cfaaa27a5454
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-parameters@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
@@ -2620,6 +3409,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-parameters@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/41ff6bda926fabfb2e5d90b70621f279330691bed92009297340a8e776cfe9c3f2dda6afbc31dd3cbdccdfa9a5c57f2046e3ccc84f963c3797356df003d1703a
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-private-methods@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
@@ -2656,6 +3456,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-private-methods@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/5338df2aae53c43e6a7ea0c44f20a1100709778769c7e42d4901a61945c3200ba0e7fca83832f48932423a68528219fbea233cb5b8741a2501fdecbacdc08292
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
@@ -2698,6 +3510,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.7"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/a23ee18340818e292abfcb98b1086a188c81d640b1045e6809e9a3e8add78f9cb26607774de4ed653cbecd4277965dc4f4f1affc3504682209bb2a65fd4251f8
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-property-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-property-literals@npm:7.22.5"
@@ -2731,6 +3557,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-property-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/71708890fe007d45ad7a130150a2ba1fea0205f575b925ca2e1bb65018730636a68e65c634a474e5b658378d72871c337c953560009c081a645e088769bf168a
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-react-display-name@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5"
@@ -2921,6 +3758,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-regenerator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    regenerator-transform: "npm:^0.15.2"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/70fa2bb36d3e2ce69a25c7227da8ad92307ab7b50cb6dfcc4dc5ce8f1cc79b0fcf997292a1cb3b4ae7cb136f515d1b2c3fb78c927bdba8d719794430403eb0c6
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-reserved-words@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5"
@@ -2954,6 +3803,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-reserved-words@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/64a2669671bb97c3dee3830a82c3e932fe6e02d56a4053c6ee4453d317b5f436d3d44907fbb0f4fbd8a56ebee34f6aee250e49743b7243d14d00c069215f3113
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-shorthand-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
@@ -2987,6 +3847,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/c68c2be965007e0cb6667daa209bc0af877cab4b327ef2e21b2114c38554243c3f7fdcc5b03679b20f72a26d966aa646af771f3165c882067e85a3887647f028
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-spread@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-spread@npm:7.22.5"
@@ -3023,6 +3894,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-spread@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/76e2c8544129d727d5a698e2a67d74e438bc35df843adb5f769316ec432c5e1bbb4128123a95b2fe8ef0aec7b26d87efe81d64326291c77ad757ff184d38448a
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-sticky-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
@@ -3056,6 +3939,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-sticky-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/3b9a99ae043ef363c81bfb097fa7a553fcf7c7d9fddc13dd2b47b3b2e45cf2741a9ca78cfe55f463983b043b365f0f8452f2d5eaadbdea20e6d6de50c16bed25
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-template-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
@@ -3089,6 +3983,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-template-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/ecf05a8511176d5570cb0d481577a407a4e8a9a430f86522d809e0ac2c823913e854ef9e2a1c83c0bd7c12489d82e1b48fabb52e697e80d6a6962125197593ca
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
@@ -3122,6 +4027,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/c07847a3bcb27509d392de7a59b9836669b90ca508d4b63b36bb73b63413bc0b2571a64410b65999a73abeac99957b31053225877dcbfaf4eb21d8cc0ae4002f
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-typescript@npm:^7.11.0, @babel/plugin-transform-typescript@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-typescript@npm:7.22.15"
@@ -3183,6 +4099,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/6b8bca3495acedc89e880942de7b83c263fb5b4c9599594dcf3923e2128ae25f1f4725a295fe101027f75d8ef081ef28319296adf274b5022e57039e42836103
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-unicode-property-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5"
@@ -3219,6 +4146,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/c0c284bbbdead7e17e059d72e1b288f86b0baacc410398ef6c6c703fe4326b069e68515ccb84359601315cd8e888f9226731d00624b7c6959b1c0853f072b61f
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-unicode-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
@@ -3255,6 +4194,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-unicode-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/b545310d0d592d75566b9cd158f4b8951e34d07d839656789d179b39b3fd92b32bd387cdfaf33a93e636609f3bfb9bb03d41f3e43be598116c9c6c80cc3418c4
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5"
@@ -3291,7 +4242,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/polyfill@npm:^7.4.4":
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/183b72d5987dc93f9971667ce3f26d28b0e1058e71b129733dd9d5282aecba4c062b67c9567526780d2defd2bfbf950ca58d8306dc90b2761fd1e960d867ddb7
+  languageName: node
+  linkType: hard
+
+"@babel/polyfill@npm:^7.0.0, @babel/polyfill@npm:^7.4.4":
   version: 7.12.1
   resolution: "@babel/polyfill@npm:7.12.1"
   dependencies:
@@ -3301,6 +4264,97 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/preset-env@npm:^7.0.0":
+  version: 7.24.7
+  resolution: "@babel/preset-env@npm:7.24.7"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.7"
+    "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.7"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.7"
+    "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
+    "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
+    "@babel/plugin-transform-classes": "npm:^7.24.7"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.7"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
+    "@babel/plugin-transform-for-of": "npm:^7.24.7"
+    "@babel/plugin-transform-function-name": "npm:^7.24.7"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.7"
+    "@babel/plugin-transform-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-new-target": "npm:^7.24.7"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.7"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.7"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
+    "@babel/plugin-transform-object-super": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-transform-parameters": "npm:^7.24.7"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.7"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.7"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.7"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-spread": "npm:^7.24.7"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7"
+    "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
+    core-js-compat: "npm:^3.31.0"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/2fd90c46efefadb48dae6d13de190ac48753af187ee394924cf532c79870ebb87658bd31f06649630827a478b17a4adc41717cc6d4c460ff2ed9fafa51e5b515
+  languageName: node
+  linkType: hard
+
 "@babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:^7.16.11, @babel/preset-env@npm:^7.19.4, @babel/preset-env@npm:^7.7.7":
   version: 7.22.20
   resolution: "@babel/preset-env@npm:7.22.20"
@@ -3689,6 +4743,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/register@npm:^7.0.0":
+  version: 7.24.6
+  resolution: "@babel/register@npm:7.24.6"
+  dependencies:
+    clone-deep: "npm:^4.0.1"
+    find-cache-dir: "npm:^2.0.0"
+    make-dir: "npm:^2.1.0"
+    pirates: "npm:^4.0.6"
+    source-map-support: "npm:^0.5.16"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10/94580678ee541218475d605720ea1c3b4a647c504c8a08124373efad24a523f219dd7441de92f09c692c22362ea4422c5f3c51a3b3048b7a64deb1f6daea96b6
+  languageName: node
+  linkType: hard
+
 "@babel/register@npm:^7.22.15":
   version: 7.23.7
   resolution: "@babel/register@npm:7.23.7"
@@ -3790,6 +4859,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/template@npm:7.24.7"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10/5975d404ef51cf379515eb0f80b115981d0b9dff5539e53a47516644abb8c83d7559f5b083eb1d4977b20d8359ebb2f911ccd4f729143f8958fdc465f976d843
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.9":
   version: 7.23.9
   resolution: "@babel/traverse@npm:7.23.9"
@@ -3880,6 +4960,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/traverse@npm:7.24.7"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10/785cf26383a992740e492efba7016de964cd06c05c9d7146fa1b5ead409e054c444f50b36dc37856884a56e32cf9d3105ddf1543486b6df68300bffb117a245a
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
   version: 7.22.19
   resolution: "@babel/types@npm:7.22.19"
@@ -3946,6 +5044,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/types@npm:7.24.7"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10/ad3c8c0d6fb4acb0bb74bb5b4bb849b181bf6185677ef9c59c18856c81e43628d0858253cf232f0eca806f02e08eff85a1d3e636a3e94daea737597796b0b430
+  languageName: node
+  linkType: hard
+
 "@base2/pretty-print-object@npm:1.0.1":
   version: 1.0.1
   resolution: "@base2/pretty-print-object@npm:1.0.1"
@@ -4235,6 +5344,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@commitlint/config-validator@npm:^19.0.3":
+  version: 19.0.3
+  resolution: "@commitlint/config-validator@npm:19.0.3"
+  dependencies:
+    "@commitlint/types": "npm:^19.0.3"
+    ajv: "npm:^8.11.0"
+  checksum: 10/a1a9678e0994d87fa98f0aee1a877dfaf60640b657589260ec958898d51affabba73d6684edafa1cc979e4e94b51f14fbd9b605eae77c2838ee52bcbcc110bef
+  languageName: node
+  linkType: hard
+
 "@commitlint/ensure@npm:^7.6.0":
   version: 7.6.0
   resolution: "@commitlint/ensure@npm:7.6.0"
@@ -4244,6 +5363,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@commitlint/execute-rule@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@commitlint/execute-rule@npm:19.0.0"
+  checksum: 10/4c5cbf9ab0e2b85b00ceea84e5598b1b3cceaa20a655ee954c45259cca9efc80cf5cf7d9eec04715a100c2da282cbcf6aba960ad53a47178090c0513426ac236
+  languageName: node
+  linkType: hard
+
 "@commitlint/execute-rule@npm:^7.6.0":
   version: 7.6.0
   resolution: "@commitlint/execute-rule@npm:7.6.0"
@@ -4285,6 +5411,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@commitlint/load@npm:>6.1.1":
+  version: 19.2.0
+  resolution: "@commitlint/load@npm:19.2.0"
+  dependencies:
+    "@commitlint/config-validator": "npm:^19.0.3"
+    "@commitlint/execute-rule": "npm:^19.0.0"
+    "@commitlint/resolve-extends": "npm:^19.1.0"
+    "@commitlint/types": "npm:^19.0.3"
+    chalk: "npm:^5.3.0"
+    cosmiconfig: "npm:^9.0.0"
+    cosmiconfig-typescript-loader: "npm:^5.0.0"
+    lodash.isplainobject: "npm:^4.0.6"
+    lodash.merge: "npm:^4.6.2"
+    lodash.uniq: "npm:^4.5.0"
+  checksum: 10/5cd35a0a60064c70c06ab6bd8b1ae02cf6ecc1d0520b76c68cdc7c12094338f04c19e2df5d7ae30d681e858871c4f1963ae39e4969ed61139959cf4b300030fc
+  languageName: node
+  linkType: hard
+
 "@commitlint/load@npm:^7.6.1":
   version: 7.6.2
   resolution: "@commitlint/load@npm:7.6.2"
@@ -4329,6 +5473,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@commitlint/resolve-extends@npm:^19.1.0":
+  version: 19.1.0
+  resolution: "@commitlint/resolve-extends@npm:19.1.0"
+  dependencies:
+    "@commitlint/config-validator": "npm:^19.0.3"
+    "@commitlint/types": "npm:^19.0.3"
+    global-directory: "npm:^4.0.1"
+    import-meta-resolve: "npm:^4.0.0"
+    lodash.mergewith: "npm:^4.6.2"
+    resolve-from: "npm:^5.0.0"
+  checksum: 10/453f8828b091886dc7cb4b13285bf3300be94266c3fc13453ab62fddc524a3969434dcebea3e4c4775621576fa25b41efbc62d773e3c44c1e87d12d7211166de
+  languageName: node
+  linkType: hard
+
 "@commitlint/resolve-extends@npm:^7.6.0":
   version: 7.6.0
   resolution: "@commitlint/resolve-extends@npm:7.6.0"
@@ -4370,6 +5528,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@commitlint/types@npm:^19.0.3":
+  version: 19.0.3
+  resolution: "@commitlint/types@npm:19.0.3"
+  dependencies:
+    "@types/conventional-commits-parser": "npm:^5.0.0"
+    chalk: "npm:^5.3.0"
+  checksum: 10/44e67f4861f9b137f43a441f8ab255676b7a276c82ca46ba7846ca1057d170af92a87d3e2a1378713dc4e33a68c8af513683cb96dcd29544e48e2c825109ea6f
+  languageName: node
+  linkType: hard
+
 "@cspotcode/source-map-support@npm:^0.8.0":
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
@@ -6100,7 +7268,7 @@ __metadata:
     d3-array: "npm:^3.2.1"
     d3-geo-voronoi: "npm:^2.0.1"
   peerDependencies:
-    "@blueprintjs/core": ^3.43.0 || ^4.3.0 || ^5.0.0
+    "@blueprintjs/core": ^3.43.0 || ^4.3.0
     react: ^16.8.6||^17.0.0||^18.0.0
   languageName: unknown
   linkType: soft
@@ -6145,7 +7313,6 @@ __metadata:
     "@testing-library/react": "npm:^12.1.2"
     "@types/jest": "npm:^27.4.0"
     "@types/react": "npm:^17.0.38"
-    "@vx/gradient": "npm:^0.0.199"
     axios: "npm:^0.27.2"
     babel-jest: "npm:^27.4.6"
     identity-obj-proxy: "npm:^3.0.0"
@@ -6303,17 +7470,27 @@ __metadata:
     "@types/jest": "npm:^26.0.10"
     "@types/node": "npm:^14.6.0"
     "@types/react-dom": "npm:^16.9.8"
+    colors: "npm:^1.3.2"
+    commitizen: "npm:^4.1.2"
+    coveralls: "npm:^3.0.2"
+    cross-env: "npm:^7.0.2"
+    cz-conventional-changelog: "npm:^3.2.0"
     d3-array: "npm:^2.5.1"
     d3-drag: "npm:^1.2.5"
     d3-geo: "npm:^1.11.9"
     d3-selection: "npm:^1.4.1"
     d3-zoom: "npm:^1.8.3"
+    husky: "npm:^4.2.5"
+    jest: "npm:^23.6.0"
+    jest-config: "npm:^23.6.0"
     kld-intersections: "npm:^0.7.0"
     kld-path-parser: "npm:^0.2.1"
+    lint-staged: "npm:^8.0.0"
     npm-run-all: "npm:^4.1.5"
     postcss: "npm:^8.3.6"
     prettier: "npm:^2.0.5"
     prompt: "npm:^1.0.0"
+    prop-types: "npm:^15.7.2"
     replace-in-file: "npm:^3.4.2"
     rimraf: "npm:^2.6.2"
     rollup: "npm:^2.26.4"
@@ -6322,6 +7499,14 @@ __metadata:
     semantic-release: "npm:^15.9.16"
     shelljs: "npm:^0.8.3"
     stylus: "npm:^0.59.0"
+    travis-deploy-once: "npm:^5.0.9"
+    ts-jest: "npm:^23.10.2"
+    ts-node: "npm:^7.0.1"
+    tslint: "npm:^5.11.0"
+    tslint-config-prettier: "npm:^1.15.0"
+    tslint-config-standard: "npm:^8.0.1"
+    typedoc: "npm:^0.12.0"
+    typescript: "npm:^3.8.3"
   peerDependencies:
     react: ^16.11.0||^17.0.0||^18.0.0
     react-dom: ^16.11.0||^17.0.0||^18.0.0
@@ -6348,7 +7533,7 @@ __metadata:
     underscore: "npm:^1.13.6"
     use-resize-observer: "npm:^9.1.0"
   peerDependencies:
-    "@blueprintjs/core": ^3.43.0 || ^4.3.0 || ^5.0.0
+    "@blueprintjs/core": ^3.43.0 || ^4.3.0
     react: ^16.8.6||^17.0.0||^18.0.0
     react-dom: ^16.8.6||^17.0.0||^18.0.0
   languageName: unknown
@@ -8884,6 +10069,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@samverschueren/stream-to-observable@npm:^0.3.0":
+  version: 0.3.1
+  resolution: "@samverschueren/stream-to-observable@npm:0.3.1"
+  dependencies:
+    any-observable: "npm:^0.3.0"
+  peerDependenciesMeta:
+    rxjs:
+      optional: true
+    zen-observable:
+      optional: true
+  checksum: 10/2b62bff492d58b4fdc8339ecc29ac3d8e1c37ae920c9d41fcb490a574422c3df1eae26b07103198b97b586c5e7106d47440ce24580a2a919aa5f9359d9914f2c
+  languageName: node
+  linkType: hard
+
 "@semantic-release/commit-analyzer@npm:^6.1.0":
   version: 6.3.3
   resolution: "@semantic-release/commit-analyzer@npm:6.3.3"
@@ -8975,6 +10174,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sindresorhus/is@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "@sindresorhus/is@npm:0.14.0"
+  checksum: 10/789cd128f0b43e158e657c4505539c8997905fcb5c06d750b7df778cab2b6887bc1eb8878026a20d84524528786ef69fc3d12a964ae56a478a87bcfc7f8272f3
+  languageName: node
+  linkType: hard
+
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -10388,6 +11594,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@szmarczak/http-timer@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "@szmarczak/http-timer@npm:1.1.2"
+  dependencies:
+    defer-to-connect: "npm:^1.0.1"
+  checksum: 10/9b63853bd53bff72c4990ebc9cd3f625bbab757247099af172564da6649a27a1d41b1a70cd849dd65b2a078300029c1c80bf3079e6a91e285da7b259eb147146
+  languageName: node
+  linkType: hard
+
 "@szmarczak/http-timer@npm:^4.0.5":
   version: 4.0.6
   resolution: "@szmarczak/http-timer@npm:4.0.6"
@@ -10770,6 +11985,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/conventional-commits-parser@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@types/conventional-commits-parser@npm:5.0.0"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/0992617c7274e9ddcbdb30cc5b735fa067343c40e16f539615b3ad9213cacbe9a32483bc8e0302d297c6de9cc7fd3794549635761a66bd9dc220d609822d86e7
+  languageName: node
+  linkType: hard
+
 "@types/cookie@npm:^0.3.1":
   version: 0.3.3
   resolution: "@types/cookie@npm:0.3.3"
@@ -11099,6 +12323,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/fs-extra@npm:^5.0.3":
+  version: 5.1.0
+  resolution: "@types/fs-extra@npm:5.1.0"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/091911cf9f7c1e54b40738abd6bed0282e02a8a3c0e08dbbe8b0ea957e8d603bb9af798d0f2c16e2e0f877be6eacb01bb8dd64d4d6023c3cebf1b6855e213656
+  languageName: node
+  linkType: hard
+
 "@types/geojson@npm:*, @types/geojson@npm:^7946.0.10, @types/geojson@npm:^7946.0.8":
   version: 7946.0.11
   resolution: "@types/geojson@npm:7946.0.11"
@@ -11113,7 +12346,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/glob@npm:^7.1.1, @types/glob@npm:^7.1.3":
+"@types/glob@npm:^7.1.1, @types/glob@npm:^7.1.3, @types/glob@npm:~7.2.0":
   version: 7.2.0
   resolution: "@types/glob@npm:7.2.0"
   dependencies:
@@ -11132,6 +12365,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/handlebars@npm:^4.0.38":
+  version: 4.0.40
+  resolution: "@types/handlebars@npm:4.0.40"
+  checksum: 10/1e6dc9ebc17b5691743e8b0784ab124f438bade50ed6ae1ceaa3ae26e3ef9d04c048964a58420b72a7189161d2464f71078bcaaef605ee2e00a6f6cea1a216f3
+  languageName: node
+  linkType: hard
+
 "@types/hast@npm:^2.0.0":
   version: 2.3.6
   resolution: "@types/hast@npm:2.3.6"
@@ -11150,6 +12390,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/highlight.js@npm:^9.12.3":
+  version: 9.12.4
+  resolution: "@types/highlight.js@npm:9.12.4"
+  checksum: 10/e409a264da4cf7ff17f4cfe7eecb2d8d028a8cc72f67897b752544aea7c18e17398b5cb35688a34a1e58877b226b17b0026e847ab5584bffe43d3330154774d0
+  languageName: node
+  linkType: hard
+
 "@types/hoist-non-react-statics@npm:^3.0.1, @types/hoist-non-react-statics@npm:^3.3.0":
   version: 3.3.2
   resolution: "@types/hoist-non-react-statics@npm:3.3.2"
@@ -11251,6 +12498,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash@npm:^4.14.110":
+  version: 4.17.4
+  resolution: "@types/lodash@npm:4.17.4"
+  checksum: 10/3ec19f9fc48200006e71733e08bcb1478b0398673657fcfb21a8643d41a80bcce09a01000077c3b23a3c6d86b9b314abe0672a8fdfc0fd66b893bd41955cfab8
+  languageName: node
+  linkType: hard
+
 "@types/lodash@npm:^4.14.146, @types/lodash@npm:^4.14.172, @types/lodash@npm:^4.14.178":
   version: 4.14.199
   resolution: "@types/lodash@npm:4.14.199"
@@ -11284,6 +12538,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/marked@npm:^0.4.0":
+  version: 0.4.2
+  resolution: "@types/marked@npm:0.4.2"
+  checksum: 10/76ec88c531cbab2a4a1224c1cbfc10baed3be1d3ef3b5a4573abe5a87e3af331b2d965bf2510e21c6701698adaf2f469cad117aabcbed3f1f228c5ab91d80b2e
+  languageName: node
+  linkType: hard
+
 "@types/mdast@npm:^3.0.0":
   version: 3.0.12
   resolution: "@types/mdast@npm:3.0.12"
@@ -11321,6 +12582,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/minimatch@npm:3.0.3":
+  version: 3.0.3
+  resolution: "@types/minimatch@npm:3.0.3"
+  checksum: 10/dfb9f8c55342868f9b9d57ebd969ff09f16f8732218178db4da80400bc4f665aa046f71c5f4b1599ef59a2871b1bd74b5fcefc79383fccd878819c8094ca1fa6
+  languageName: node
+  linkType: hard
+
 "@types/minimist@npm:^1.2.0":
   version: 1.2.2
   resolution: "@types/minimist@npm:1.2.2"
@@ -11658,6 +12926,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/shelljs@npm:^0.8.0":
+  version: 0.8.15
+  resolution: "@types/shelljs@npm:0.8.15"
+  dependencies:
+    "@types/glob": "npm:~7.2.0"
+    "@types/node": "npm:*"
+  checksum: 10/1f756acc24441239687a0ffb4de908175380968ded1f9be697374ef09637c999634858a2f212e2f8ff65a48663d54b8b6e3449962dca086e08d1ab725596e802
+  languageName: node
+  linkType: hard
+
 "@types/sockjs@npm:^0.3.33":
   version: 0.3.34
   resolution: "@types/sockjs@npm:0.3.34"
@@ -12130,18 +13408,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vx/gradient@npm:^0.0.199":
-  version: 0.0.199
-  resolution: "@vx/gradient@npm:0.0.199"
-  dependencies:
-    "@types/react": "npm:*"
-    prop-types: "npm:^15.5.7"
-  peerDependencies:
-    react: ^15.0.0-0 || ^16.0.0-0
-  checksum: 10/f5e98c2def87a159af8a0d11eebeea0fb246403dcbc5a752bbb192fc9d8c605bcf04d13510f32ca64c2f8c8184d31adc6804bd3481f9c5b2e6baf9ecec7794d1
-  languageName: node
-  linkType: hard
-
 "@vx/group@npm:0.0.198":
   version: 0.0.198
   resolution: "@vx/group@npm:0.0.198"
@@ -12625,7 +13891,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.3, abab@npm:^2.0.5":
+"abab@npm:^2.0.0, abab@npm:^2.0.3, abab@npm:^2.0.5":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
   checksum: 10/ebe95d7278999e605823fc515a3b05d689bc72e7f825536e73c95ebf621636874c6de1b749b3c4bf866b96ccd4b3a2802efa313d0e45ad51a413c8c73247db20
@@ -12656,6 +13922,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-globals@npm:^4.1.0":
+  version: 4.3.4
+  resolution: "acorn-globals@npm:4.3.4"
+  dependencies:
+    acorn: "npm:^6.0.1"
+    acorn-walk: "npm:^6.0.1"
+  checksum: 10/c31bfde102d8a104835e9591c31dd037ec771449f9c86a6b1d2ac3c7c336694f828cfabba7687525b094f896a854affbf1afe6e1b12c0d998be6bab5d49c9663
+  languageName: node
+  linkType: hard
+
 "acorn-globals@npm:^6.0.0":
   version: 6.0.0
   resolution: "acorn-globals@npm:6.0.0"
@@ -12684,6 +13960,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-walk@npm:^6.0.1":
+  version: 6.2.0
+  resolution: "acorn-walk@npm:6.2.0"
+  checksum: 10/163de3239300eb3d11b2d443164d6408655ec2ddafbb1f3ddfcc4ffb4dd9578ee414e4ee561c3cd67e64238d0de4685aa0aea267de100fe40078c639ffb87381
+  languageName: node
+  linkType: hard
+
 "acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
@@ -12698,6 +13981,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn@npm:^5.5.3":
+  version: 5.7.4
+  resolution: "acorn@npm:5.7.4"
+  bin:
+    acorn: bin/acorn
+  checksum: 10/97f2ae55e99aed81a7aa9039719c60283a66817fadb3152beb323ba6038824770512f807436e99090be38602f23bcbf6021867d86442616da471f1dfaca7c3d9
+  languageName: node
+  linkType: hard
+
+"acorn@npm:^6.0.1":
+  version: 6.4.2
+  resolution: "acorn@npm:6.4.2"
+  bin:
+    acorn: bin/acorn
+  checksum: 10/b430c346813289daf1b4e673333d10c54a7c452a776f097597c7b0bd71c7ff58f0e8f850f334963eac806a52928985ff20c0fa39c67cd5276d10e0ed4370f9c8
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^7.1.1, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
@@ -12861,6 +14162,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ajv@npm:^8.11.0":
+  version: 8.16.0
+  resolution: "ajv@npm:8.16.0"
+  dependencies:
+    fast-deep-equal: "npm:^3.1.3"
+    json-schema-traverse: "npm:^1.0.0"
+    require-from-string: "npm:^2.0.2"
+    uri-js: "npm:^4.4.1"
+  checksum: 10/9b4b380efaf8be2639736d535662bd142a6972b43075b404380165c37ab6ceb72f01c7c987536747ff3e9e21eb5cd2e2a194f1e0fa8355364ea6204b1262fcd1
+  languageName: node
+  linkType: hard
+
 "alphanum-sort@npm:^1.0.0":
   version: 1.0.2
   resolution: "alphanum-sort@npm:1.0.2"
@@ -12884,7 +14197,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^3.1.0":
+"ansi-escapes@npm:^3.0.0, ansi-escapes@npm:^3.1.0":
   version: 3.2.0
   resolution: "ansi-escapes@npm:3.2.0"
   checksum: 10/0f94695b677ea742f7f1eed961f7fd8d05670f744c6ad1f8f635362f6681dcfbc1575cb05b43abc7bb6d67e25a75fb8c7ea8f2a57330eb2c76b33f18cb2cef0a
@@ -13004,6 +14317,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"any-observable@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "any-observable@npm:0.3.0"
+  checksum: 10/21f27ed714c54aac6db4c1200674933f93416b832433cd14e5071db53f7d480de66a4c529181655dee52371be7f73ebeb0880b02a95571d70152fd6b226c11e9
+  languageName: node
+  linkType: hard
+
+"anymatch@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "anymatch@npm:2.0.0"
+  dependencies:
+    micromatch: "npm:^3.1.4"
+    normalize-path: "npm:^2.1.1"
+  checksum: 10/f7bb1929842b4585cdc28edbb385767d499ce7d673f96a8f11348d2b2904592ffffc594fe9229b9a1e9e4dccb9329b7692f9f45e6a11dcefbb76ecdc9ab740f6
+  languageName: node
+  linkType: hard
+
 "anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
   version: 3.1.3
   resolution: "anymatch@npm:3.1.3"
@@ -13021,6 +14351,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"append-transform@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "append-transform@npm:0.4.0"
+  dependencies:
+    default-require-extensions: "npm:^1.0.0"
+  checksum: 10/f5edcf48e3327e8c9594d3ff57ea250401c1cda8dd2460704025fca5ef304b31cdba6e4ad522101ca69bd2245835add4831427bb18a7eb454ec275af08be11d0
+  languageName: node
+  linkType: hard
+
 "aproba@npm:^1.0.3 || ^2.0.0, aproba@npm:^1.1.2 || 2, aproba@npm:^2.0.0":
   version: 2.0.0
   resolution: "aproba@npm:2.0.0"
@@ -13110,6 +14449,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"arr-diff@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "arr-diff@npm:2.0.0"
+  dependencies:
+    arr-flatten: "npm:^1.0.1"
+  checksum: 10/b56e8d34e8c8d8dba40de3235c61e3ef4e3626486d6d1c83c34fba4fe6187eff96ffde872100e834e8931e724a96ab9dbd71b0bf0068ba5a3deb7d19cb596892
+  languageName: node
+  linkType: hard
+
+"arr-diff@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "arr-diff@npm:4.0.0"
+  checksum: 10/ea7c8834842ad3869297f7915689bef3494fd5b102ac678c13ffccab672d3d1f35802b79e90c4cfec2f424af3392e44112d1ccf65da34562ed75e049597276a0
+  languageName: node
+  linkType: hard
+
+"arr-flatten@npm:^1.0.1, arr-flatten@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "arr-flatten@npm:1.1.0"
+  checksum: 10/963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22
+  languageName: node
+  linkType: hard
+
+"arr-union@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "arr-union@npm:3.1.0"
+  checksum: 10/b5b0408c6eb7591143c394f3be082fee690ddd21f0fdde0a0a01106799e847f67fcae1b7e56b0a0c173290e29c6aca9562e82b300708a268bc8f88f3d6613cb9
+  languageName: node
+  linkType: hard
+
 "array-buffer-byte-length@npm:^1.0.0":
   version: 1.0.0
   resolution: "array-buffer-byte-length@npm:1.0.0"
@@ -13120,6 +14489,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10/53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e
+  languageName: node
+  linkType: hard
+
+"array-equal@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "array-equal@npm:1.0.2"
+  checksum: 10/5c37df0cad330516d1255663dfa4fa761fb0ea63878f535aa70dfefe5499853a8b372faf0a27b91781ca1230f4b4333bbeb751e9b1748527d96df2bee30032ea
+  languageName: node
+  linkType: hard
+
 "array-find-index@npm:^1.0.1":
   version: 1.0.2
   resolution: "array-find-index@npm:1.0.2"
@@ -13148,6 +14534,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-union@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "array-union@npm:1.0.2"
+  dependencies:
+    array-uniq: "npm:^1.0.1"
+  checksum: 10/82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d
+  languageName: node
+  linkType: hard
+
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
@@ -13155,6 +14550,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-uniq@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "array-uniq@npm:1.0.3"
+  checksum: 10/1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e
+  languageName: node
+  linkType: hard
+
+"array-unique@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "array-unique@npm:0.2.1"
+  checksum: 10/899deaf07abedf17ee89a757c7bcc9253fb248a7f6c394a1fec9ec3f3ac244314feb3048efee80ed7fdcb047960e32d7c234291bfd26b78ced668c346d9f4e3c
+  languageName: node
+  linkType: hard
+
+"array-unique@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "array-unique@npm:0.3.2"
+  checksum: 10/da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888
+  languageName: node
+  linkType: hard
+
 "array.prototype.reduce@npm:^1.0.6":
   version: 1.0.6
   resolution: "array.prototype.reduce@npm:1.0.6"
@@ -13183,7 +14599,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arrify@npm:^1.0.1":
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.3"
+    is-array-buffer: "npm:^3.0.4"
+    is-shared-array-buffer: "npm:^1.0.2"
+  checksum: 10/0221f16c1e3ec7b67da870ee0e1f12b825b5f9189835392b59a22990f715827561a4f4cd5330dc7507de272d8df821be6cd4b0cb569babf5ea4be70e365a2f3d
+  languageName: node
+  linkType: hard
+
+"arrify@npm:^1.0.0, arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
   checksum: 10/745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7
@@ -13226,6 +14658,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"assign-symbols@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "assign-symbols@npm:1.0.0"
+  checksum: 10/c0eb895911d05b6b2d245154f70461c5e42c107457972e5ebba38d48967870dee53bcdf6c7047990586daa80fab8dab3cc6300800fbd47b454247fdedd859a2c
+  languageName: node
+  linkType: hard
+
 "ast-types@npm:^0.16.1":
   version: 0.16.1
   resolution: "ast-types@npm:0.16.1"
@@ -13235,6 +14674,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"astral-regex@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "astral-regex@npm:1.0.0"
+  checksum: 10/93417fc0879531cd95ace2560a54df865c9461a3ac0714c60cbbaa5f1f85d2bee85489e78d82f70b911b71ac25c5f05fc5a36017f44c9bb33c701bee229ff848
+  languageName: node
+  linkType: hard
+
 "astring@npm:^1.8.0":
   version: 1.8.6
   resolution: "astring@npm:1.8.6"
@@ -13244,6 +14690,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async-limiter@npm:~1.0.0":
+  version: 1.0.1
+  resolution: "async-limiter@npm:1.0.1"
+  checksum: 10/2b849695b465d93ad44c116220dee29a5aeb63adac16c1088983c339b0de57d76e82533e8e364a93a9f997f28bbfc6a92948cefc120652bd07f3b59f8d75cf2b
+  languageName: node
+  linkType: hard
+
 "async@npm:3.2.3":
   version: 3.2.3
   resolution: "async@npm:3.2.3"
@@ -13258,7 +14711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^2.6.4":
+"async@npm:^2.1.4, async@npm:^2.6.4":
   version: 2.6.4
   resolution: "async@npm:2.6.4"
   dependencies:
@@ -13361,6 +14814,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/6c9da3a66caddd83c875010a1ca8ef11eac02ba15fb592dc9418b2b5e7b77b645fa7729380a92d9835c2f05f2ca1b6251f39b993e0feb3f1517c74fa1af02cab
+  languageName: node
+  linkType: hard
+
 "aws-sign2@npm:~0.7.0":
   version: 0.7.0
   resolution: "aws-sign2@npm:0.7.0"
@@ -13405,6 +14867,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-code-frame@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-code-frame@npm:6.26.0"
+  dependencies:
+    chalk: "npm:^1.1.3"
+    esutils: "npm:^2.0.2"
+    js-tokens: "npm:^3.0.2"
+  checksum: 10/9410c3d5a921eb02fa409675d1a758e493323a49e7b9dddb7a2a24d47e61d39ab1129dd29f9175836eac9ce8b1d4c0a0718fcdc57ce0b865b529fd250dbab313
+  languageName: node
+  linkType: hard
+
+"babel-core@npm:^6.0.0, babel-core@npm:^6.26.0":
+  version: 6.26.3
+  resolution: "babel-core@npm:6.26.3"
+  dependencies:
+    babel-code-frame: "npm:^6.26.0"
+    babel-generator: "npm:^6.26.0"
+    babel-helpers: "npm:^6.24.1"
+    babel-messages: "npm:^6.23.0"
+    babel-register: "npm:^6.26.0"
+    babel-runtime: "npm:^6.26.0"
+    babel-template: "npm:^6.26.0"
+    babel-traverse: "npm:^6.26.0"
+    babel-types: "npm:^6.26.0"
+    babylon: "npm:^6.18.0"
+    convert-source-map: "npm:^1.5.1"
+    debug: "npm:^2.6.9"
+    json5: "npm:^0.5.1"
+    lodash: "npm:^4.17.4"
+    minimatch: "npm:^3.0.4"
+    path-is-absolute: "npm:^1.0.1"
+    private: "npm:^0.1.8"
+    slash: "npm:^1.0.0"
+    source-map: "npm:^0.5.7"
+  checksum: 10/35bac77f434ff474234c2db43267949e30fd26c53b251b911632df36241782f4e3351c4361c3db9c22520be8cdc5011da0b13d5788fa4e8e64105b3d41281041
+  languageName: node
+  linkType: hard
+
 "babel-core@npm:^7.0.0-bridge.0":
   version: 7.0.0-bridge.0
   resolution: "babel-core@npm:7.0.0-bridge.0"
@@ -13414,6 +14914,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-generator@npm:^6.18.0, babel-generator@npm:^6.26.0":
+  version: 6.26.1
+  resolution: "babel-generator@npm:6.26.1"
+  dependencies:
+    babel-messages: "npm:^6.23.0"
+    babel-runtime: "npm:^6.26.0"
+    babel-types: "npm:^6.26.0"
+    detect-indent: "npm:^4.0.0"
+    jsesc: "npm:^1.3.0"
+    lodash: "npm:^4.17.4"
+    source-map: "npm:^0.5.7"
+    trim-right: "npm:^1.0.1"
+  checksum: 10/837616810a769a3aadfd1aa4ec01efb803eb5183ef7fa4098caa7ccdf8ed6c7e2866bd68047ee48839bb49d873a8b56d20bf20ee55a2ff430e43d67fcf17dc57
+  languageName: node
+  linkType: hard
+
+"babel-helpers@npm:^6.24.1":
+  version: 6.24.1
+  resolution: "babel-helpers@npm:6.24.1"
+  dependencies:
+    babel-runtime: "npm:^6.22.0"
+    babel-template: "npm:^6.24.1"
+  checksum: 10/0a49a75e1c639aebe6580f64c0dec602eb9ec9c33f9a27250c4981f52def6773b520d71ee3bbad6a91c0788ceadc127ce491e800d2a51f93c2a75f2d403850e3
+  languageName: node
+  linkType: hard
+
+"babel-jest@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "babel-jest@npm:23.6.0"
+  dependencies:
+    babel-plugin-istanbul: "npm:^4.1.6"
+    babel-preset-jest: "npm:^23.2.0"
+  peerDependencies:
+    babel-core: ^6.0.0 || ^7.0.0-0
+  checksum: 10/c22e3342efa5f1aef6cdd9e404f13a111bad8235e73d3c5eba5159f2e0e0ded1d1d012334f4c2f27323d9802aafc440c375f586f9c3adabfac248fcaa1b6be3a
+  languageName: node
+  linkType: hard
+
 "babel-jest@npm:^27.4.6, babel-jest@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-jest@npm:27.5.1"
@@ -13447,6 +14985,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-messages@npm:^6.23.0":
+  version: 6.23.0
+  resolution: "babel-messages@npm:6.23.0"
+  dependencies:
+    babel-runtime: "npm:^6.22.0"
+  checksum: 10/c8075c17587a33869e1a5bd0a5b73bbe395b68188362dacd5418debbc7c8fd784bcd3295e81ee7e410dc2c2655755add6af03698c522209f6a68334c15e6d6ca
+  languageName: node
+  linkType: hard
+
 "babel-plugin-emotion@npm:^10.0.27":
   version: 10.2.2
   resolution: "babel-plugin-emotion@npm:10.2.2"
@@ -13465,6 +15012,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-istanbul@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "babel-plugin-istanbul@npm:4.1.6"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread: "npm:^6.13.0"
+    find-up: "npm:^2.1.0"
+    istanbul-lib-instrument: "npm:^1.10.1"
+    test-exclude: "npm:^4.2.1"
+  checksum: 10/4776b3a5bb90dd92483249d879ef33805d0e23a58da6c68eda510fa89b2cee81c715ac3a2ad5375768c146c80ad418f7f019e633ffa5a5ab694fc083d32231d9
+  languageName: node
+  linkType: hard
+
 "babel-plugin-istanbul@npm:^6.1.1":
   version: 6.1.1
   resolution: "babel-plugin-istanbul@npm:6.1.1"
@@ -13478,6 +15037,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-jest-hoist@npm:^23.2.0":
+  version: 23.2.0
+  resolution: "babel-plugin-jest-hoist@npm:23.2.0"
+  checksum: 10/d608911e52f2edd987ba9d12d8e335d61fe7aed5d531db860d23db3bcc828daf948c405f7590c5690612a8178d47159a055e11842be9c20f2908adb8b3691845
+  languageName: node
+  linkType: hard
+
 "babel-plugin-jest-hoist@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-plugin-jest-hoist@npm:27.5.1"
@@ -13627,6 +15193,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-syntax-object-rest-spread@npm:^6.13.0":
+  version: 6.13.0
+  resolution: "babel-plugin-syntax-object-rest-spread@npm:6.13.0"
+  checksum: 10/14083f2783c760f5f199160f48e42ad4505fd35fc7cf9c4530812b176705259562b77db6d3ddc5e3cbce9e9b2b61ec9db3065941f0949b68e77cae3e395a6eef
+  languageName: node
+  linkType: hard
+
 "babel-plugin-transform-async-to-promises@npm:^0.8.15":
   version: 0.8.18
   resolution: "babel-plugin-transform-async-to-promises@npm:0.8.18"
@@ -13678,6 +15251,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-preset-jest@npm:^23.2.0":
+  version: 23.2.0
+  resolution: "babel-preset-jest@npm:23.2.0"
+  dependencies:
+    babel-plugin-jest-hoist: "npm:^23.2.0"
+    babel-plugin-syntax-object-rest-spread: "npm:^6.13.0"
+  checksum: 10/aa17dc7607612554fc8f42ba2200f446e1c3e78ba9632286093d109aa70bd273e76567484033dc5acbd608a0081a6b92afd540311d28da395606c7fd609713db
+  languageName: node
+  linkType: hard
+
 "babel-preset-jest@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-preset-jest@npm:27.5.1"
@@ -13690,7 +15273,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-runtime@npm:6.26.0, babel-runtime@npm:^6.23.0, babel-runtime@npm:^6.26.0":
+"babel-register@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-register@npm:6.26.0"
+  dependencies:
+    babel-core: "npm:^6.26.0"
+    babel-runtime: "npm:^6.26.0"
+    core-js: "npm:^2.5.0"
+    home-or-tmp: "npm:^2.0.0"
+    lodash: "npm:^4.17.4"
+    mkdirp: "npm:^0.5.1"
+    source-map-support: "npm:^0.4.15"
+  checksum: 10/5fb5502167f18534247c7777d1859b48e17d29799a84223c3a9163816cb7ad9f89d0b78d408c25c60822fd7bda66103cf02a4fc328beaea3c55bbfec3d369075
+  languageName: node
+  linkType: hard
+
+"babel-runtime@npm:6.26.0, babel-runtime@npm:^6.22.0, babel-runtime@npm:^6.23.0, babel-runtime@npm:^6.26.0":
   version: 6.26.0
   resolution: "babel-runtime@npm:6.26.0"
   dependencies:
@@ -13700,6 +15298,57 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-template@npm:^6.16.0, babel-template@npm:^6.24.1, babel-template@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-template@npm:6.26.0"
+  dependencies:
+    babel-runtime: "npm:^6.26.0"
+    babel-traverse: "npm:^6.26.0"
+    babel-types: "npm:^6.26.0"
+    babylon: "npm:^6.18.0"
+    lodash: "npm:^4.17.4"
+  checksum: 10/028dd57380f09b5641b74874a19073c53c4fb3f1696e849575aae18f8c80eaf21db75209057db862f3b893ce2cd9b795d539efa591b58f4a0fb011df0a56fbed
+  languageName: node
+  linkType: hard
+
+"babel-traverse@npm:^6.0.0, babel-traverse@npm:^6.18.0, babel-traverse@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-traverse@npm:6.26.0"
+  dependencies:
+    babel-code-frame: "npm:^6.26.0"
+    babel-messages: "npm:^6.23.0"
+    babel-runtime: "npm:^6.26.0"
+    babel-types: "npm:^6.26.0"
+    babylon: "npm:^6.18.0"
+    debug: "npm:^2.6.8"
+    globals: "npm:^9.18.0"
+    invariant: "npm:^2.2.2"
+    lodash: "npm:^4.17.4"
+  checksum: 10/0a81da7fe59a5198503983acfdbcb1d02048ea486890cba0308e6620b24e46b2b95dd7dc2237dfc5f69941197370ff8f16f55eda0f17108f70ddb98b25ecc592
+  languageName: node
+  linkType: hard
+
+"babel-types@npm:^6.0.0, babel-types@npm:^6.18.0, babel-types@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-types@npm:6.26.0"
+  dependencies:
+    babel-runtime: "npm:^6.26.0"
+    esutils: "npm:^2.0.2"
+    lodash: "npm:^4.17.4"
+    to-fast-properties: "npm:^1.0.3"
+  checksum: 10/7ddab92e0dfbda4ddb69d2dbf5825ef4df18d47a609b6dbc452229a40291286aeaec7b2241e6c6755868a5840eca2e6cddcc0a7f571bb004d27b85d246c3d4d6
+  languageName: node
+  linkType: hard
+
+"babylon@npm:^6.18.0":
+  version: 6.18.0
+  resolution: "babylon@npm:6.18.0"
+  bin:
+    babylon: ./bin/babylon.js
+  checksum: 10/b35e415886a012545305eede2fd3cbd6ec7c54ed0b19e74f9c3478831fef9bbc24f1c3917e29b338d76d8e58ad1c895a296e27c8f76cef4f3be1ccaad3bfaecb
+  languageName: node
+  linkType: hard
+
 "bail@npm:^2.0.0":
   version: 2.0.2
   resolution: "bail@npm:2.0.2"
@@ -13744,6 +15393,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"base@npm:^0.11.1":
+  version: 0.11.2
+  resolution: "base@npm:0.11.2"
+  dependencies:
+    cache-base: "npm:^1.0.1"
+    class-utils: "npm:^0.3.5"
+    component-emitter: "npm:^1.2.1"
+    define-property: "npm:^1.0.0"
+    isobject: "npm:^3.0.1"
+    mixin-deep: "npm:^1.2.0"
+    pascalcase: "npm:^0.1.1"
+  checksum: 10/33b0c5d570840873cf370248e653d43e8d82ce4f03161ad3c58b7da6238583cfc65bf4bbb06b27050d6c2d8f40628777f3933f483c0a7c0274fcef4c51f70a7e
+  languageName: node
+  linkType: hard
+
 "batch-processor@npm:1.0.0":
   version: 1.0.0
   resolution: "batch-processor@npm:1.0.0"
@@ -13818,6 +15482,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bindings@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "bindings@npm:1.5.0"
+  dependencies:
+    file-uri-to-path: "npm:1.0.0"
+  checksum: 10/593d5ae975ffba15fbbb4788fe5abd1e125afbab849ab967ab43691d27d6483751805d98cb92f7ac24a2439a8a8678cd0131c535d5d63de84e383b0ce2786133
+  languageName: node
+  linkType: hard
+
 "bit-twiddle@npm:^1.0.0":
   version: 1.0.2
   resolution: "bit-twiddle@npm:1.0.2"
@@ -13966,6 +15639,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"braces@npm:^1.8.2":
+  version: 1.8.5
+  resolution: "braces@npm:1.8.5"
+  dependencies:
+    expand-range: "npm:^1.8.1"
+    preserve: "npm:^0.2.0"
+    repeat-element: "npm:^1.1.2"
+  checksum: 10/0750559062fc484507bcf2c4ab1a5d11354ab85e8d08b3c96b684bebe1deaa533a879b8ae5061215603950d95831c49a01432641f94d1c0301b3dead480a9476
+  languageName: node
+  linkType: hard
+
+"braces@npm:^2.3.1":
+  version: 2.3.2
+  resolution: "braces@npm:2.3.2"
+  dependencies:
+    arr-flatten: "npm:^1.1.0"
+    array-unique: "npm:^0.3.2"
+    extend-shallow: "npm:^2.0.1"
+    fill-range: "npm:^4.0.0"
+    isobject: "npm:^3.0.1"
+    repeat-element: "npm:^1.1.2"
+    snapdragon: "npm:^0.8.1"
+    snapdragon-node: "npm:^2.0.1"
+    split-string: "npm:^3.0.2"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/7c0f0d962570812009b050ee2e6243fd425ea80d3136aace908d0038bde9e7a43e9326fa35538cebf7c753f0482655f08ea11be074c9a140394287980a5c66c9
+  languageName: node
+  linkType: hard
+
 "braces@npm:^3.0.2, braces@npm:~3.0.2":
   version: 3.0.2
   resolution: "braces@npm:3.0.2"
@@ -14012,6 +15714,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browser-resolve@npm:^1.11.3":
+  version: 1.11.3
+  resolution: "browser-resolve@npm:1.11.3"
+  dependencies:
+    resolve: "npm:1.1.7"
+  checksum: 10/9755391a7d26aa36dc9666c3335448b6f507588c57c30f9b49b46f39e91946459391d754c540016806c8edc15b5c549349876a6995da71cdec55b47422e57041
+  languageName: node
+  linkType: hard
+
 "browserify-zlib@npm:^0.1.4":
   version: 0.1.4
   resolution: "browserify-zlib@npm:0.1.4"
@@ -14077,6 +15788,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bs-logger@npm:0.x":
+  version: 0.2.6
+  resolution: "bs-logger@npm:0.2.6"
+  dependencies:
+    fast-json-stable-stringify: "npm:2.x"
+  checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212
+  languageName: node
+  linkType: hard
+
 "bser@npm:2.1.1":
   version: 2.1.1
   resolution: "bser@npm:2.1.1"
@@ -14100,7 +15820,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-from@npm:^1.0.0":
+"buffer-from@npm:1.x, buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
   checksum: 10/0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
@@ -14117,6 +15837,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"builtin-modules@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "builtin-modules@npm:1.1.1"
+  checksum: 10/0fbf69ffe77fecf11c441b9a7d1e664bb8119a7d3004831d9bd6ce0eacfd5d121ed4b667172870b5f66ecfce4bd54f7c20060d21c339c29049a7a5dd2bb7bf8c
+  languageName: node
+  linkType: hard
+
 "builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0":
   version: 3.3.0
   resolution: "builtin-modules@npm:3.3.0"
@@ -14218,6 +15945,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cache-base@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "cache-base@npm:1.0.1"
+  dependencies:
+    collection-visit: "npm:^1.0.0"
+    component-emitter: "npm:^1.2.1"
+    get-value: "npm:^2.0.6"
+    has-value: "npm:^1.0.0"
+    isobject: "npm:^3.0.1"
+    set-value: "npm:^2.0.0"
+    to-object-path: "npm:^0.3.0"
+    union-value: "npm:^1.0.0"
+    unset-value: "npm:^1.0.0"
+  checksum: 10/50dd11af5ce4aaa8a8bff190a870c940db80234cf087cd47dd177be8629c36ad8cd0716e62418ec1e135f2d01b28aafff62cd22d33412c3d18b2109dd9073711
+  languageName: node
+  linkType: hard
+
 "cacheable-lookup@npm:^5.0.3":
   version: 5.0.4
   resolution: "cacheable-lookup@npm:5.0.4"
@@ -14225,6 +15969,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cacheable-request@npm:^6.0.0":
+  version: 6.1.0
+  resolution: "cacheable-request@npm:6.1.0"
+  dependencies:
+    clone-response: "npm:^1.0.2"
+    get-stream: "npm:^5.1.0"
+    http-cache-semantics: "npm:^4.0.0"
+    keyv: "npm:^3.0.0"
+    lowercase-keys: "npm:^2.0.0"
+    normalize-url: "npm:^4.1.0"
+    responselike: "npm:^1.0.2"
+  checksum: 10/804f6c377ce6fef31c584babde31d55c69305569058ad95c24a41bb7b33d0ea188d388467a9da6cb340e95a3a1f8a94e1f3a709fef5eaf9c6b88e62448fa29be
+  languageName: node
+  linkType: hard
+
 "cacheable-request@npm:^7.0.2":
   version: 7.0.4
   resolution: "cacheable-request@npm:7.0.4"
@@ -14240,6 +15999,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cachedir@npm:2.3.0":
+  version: 2.3.0
+  resolution: "cachedir@npm:2.3.0"
+  checksum: 10/ec90cb0f2e6336e266aa748dbadf3da9e0b20e843e43f1591acab7a3f1451337dc2f26cb9dd833ae8cfefeffeeb43ef5b5ff62782a685f4e3c2305dd98482fcb
+  languageName: node
+  linkType: hard
+
 "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
   version: 1.0.2
   resolution: "call-bind@npm:1.0.2"
@@ -14250,7 +16016,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.5, call-bind@npm:^1.0.7":
+"call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
   version: 1.0.7
   resolution: "call-bind@npm:1.0.7"
   dependencies:
@@ -14406,6 +16172,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"capture-exit@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "capture-exit@npm:1.2.0"
+  dependencies:
+    rsvp: "npm:^3.3.3"
+  checksum: 10/8d38f66d36cdc891fc5371315c0e6e8e094bfb86d769f0781d8acf1551ef513a43f5b8bd4c984255fc85ce4cc7a111f334d2aae454b86eef535d44ddec344ec7
+  languageName: node
+  linkType: hard
+
 "capture-stack-trace@npm:^1.0.0":
   version: 1.0.2
   resolution: "capture-stack-trace@npm:1.0.2"
@@ -14473,7 +16248,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.0.1, chalk@npm:^2.3.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+"chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.3.1, chalk@npm:^2.3.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -14494,7 +16269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
+"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
@@ -14504,6 +16279,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea
+  languageName: node
+  linkType: hard
+
 "chalk@npm:~0.4.0":
   version: 0.4.0
   resolution: "chalk@npm:0.4.0"
@@ -14591,6 +16373,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chardet@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "chardet@npm:0.7.0"
+  checksum: 10/b0ec668fba5eeec575ed2559a0917ba41a6481f49063c8445400e476754e0957ee09e44dc032310f526182b8f1bf25e9d4ed371f74050af7be1383e06bc44952
+  languageName: node
+  linkType: hard
+
 "chart.js@npm:^1.0.2":
   version: 1.1.1
   resolution: "chart.js@npm:1.1.1"
@@ -14698,6 +16487,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"class-utils@npm:^0.3.5":
+  version: 0.3.6
+  resolution: "class-utils@npm:0.3.6"
+  dependencies:
+    arr-union: "npm:^3.1.0"
+    define-property: "npm:^0.2.5"
+    isobject: "npm:^3.0.0"
+    static-extend: "npm:^0.1.1"
+  checksum: 10/b236d9deb6594828966e45c5f48abac9a77453ee0dbdb89c635ce876f59755d7952309d554852b6f7d909198256c335a4bd51b09c1d238b36b92152eb2b9d47a
+  languageName: node
+  linkType: hard
+
 "classnames@npm:*, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.0, classnames@npm:^2.3.1, classnames@npm:^2.3.2":
   version: 2.3.2
   resolution: "classnames@npm:2.3.2"
@@ -14745,6 +16546,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-cursor@npm:^2.0.0, cli-cursor@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "cli-cursor@npm:2.1.0"
+  dependencies:
+    restore-cursor: "npm:^2.0.0"
+  checksum: 10/d88e97bfdac01046a3ffe7d49f06757b3126559d7e44aa2122637eb179284dc6cd49fca2fac4f67c19faaf7e6dab716b6fe1dfcd309977407d8c7578ec2d044d
+  languageName: node
+  linkType: hard
+
 "cli-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "cli-cursor@npm:3.1.0"
@@ -14797,6 +16607,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-truncate@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "cli-truncate@npm:0.2.1"
+  dependencies:
+    slice-ansi: "npm:0.0.4"
+    string-width: "npm:^1.0.1"
+  checksum: 10/c2b0de7c08915eab1e660884251411ad31691c5036a876f98e1bf747f1c165dc8345afdba92b7efb3678478c9fc17c9c9c47c76d181e35478aaa1047459f98aa
+  languageName: node
+  linkType: hard
+
+"cli-width@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "cli-width@npm:3.0.0"
+  checksum: 10/8730848b04fb189666ab037a35888d191c8f05b630b1d770b0b0e4c920b47bb5cc14bddf6b8ffe5bfc66cee97c8211d4d18e756c1ffcc75d7dbe7e1186cd7826
+  languageName: node
+  linkType: hard
+
 "clipanion@npm:^4.0.0-rc.2":
   version: 4.0.0-rc.2
   resolution: "clipanion@npm:4.0.0-rc.2"
@@ -14808,6 +16635,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cliui@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "cliui@npm:4.1.0"
+  dependencies:
+    string-width: "npm:^2.1.1"
+    strip-ansi: "npm:^4.0.0"
+    wrap-ansi: "npm:^2.0.0"
+  checksum: 10/b73eea68d48774dc178ac6aeb411c7000c1d9a5ae532e5a1d496f395acb797c47337e32285d54448d60d7d703e4ac6398d65f2db26bcadc3c73e59a2027471f3
+  languageName: node
+  linkType: hard
+
 "cliui@npm:^5.0.0":
   version: 5.0.0
   resolution: "cliui@npm:5.0.0"
@@ -14924,6 +16762,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"collection-visit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "collection-visit@npm:1.0.0"
+  dependencies:
+    map-visit: "npm:^1.0.0"
+    object-visit: "npm:^1.0.0"
+  checksum: 10/15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9
+  languageName: node
+  linkType: hard
+
 "color-convert@npm:^1.9.0, color-convert@npm:^1.9.3":
   version: 1.9.3
   resolution: "color-convert@npm:1.9.3"
@@ -15006,7 +16854,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colors@npm:^1.1.2":
+"colors@npm:^1.1.2, colors@npm:^1.3.2":
   version: 1.4.0
   resolution: "colors@npm:1.4.0"
   checksum: 10/90b2d5465159813a3983ea72ca8cff75f784824ad70f2cc2b32c233e95bcfbcda101ebc6d6766bc50f57263792629bfb4f1f8a4dfbd1d240f229fc7f69b785fc
@@ -15046,7 +16894,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:2, commander@npm:^2.20.0":
+"commander@npm:2, commander@npm:^2.12.1, commander@npm:^2.14.1, commander@npm:^2.20.0, commander@npm:^2.9.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
   checksum: 10/90c5b6898610cd075984c58c4f88418a4fb44af08c1b1415e9854c03171bec31b336b7f3e4cefe33de994b3f12b03c5e2d638da4316df83593b9e82554e7e95b
@@ -15086,6 +16934,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commitizen@npm:^4.0.3, commitizen@npm:^4.1.2":
+  version: 4.3.0
+  resolution: "commitizen@npm:4.3.0"
+  dependencies:
+    cachedir: "npm:2.3.0"
+    cz-conventional-changelog: "npm:3.3.0"
+    dedent: "npm:0.7.0"
+    detect-indent: "npm:6.1.0"
+    find-node-modules: "npm:^2.1.2"
+    find-root: "npm:1.1.0"
+    fs-extra: "npm:9.1.0"
+    glob: "npm:7.2.3"
+    inquirer: "npm:8.2.5"
+    is-utf8: "npm:^0.2.1"
+    lodash: "npm:4.17.21"
+    minimist: "npm:1.2.7"
+    strip-bom: "npm:4.0.0"
+    strip-json-comments: "npm:3.1.1"
+  bin:
+    commitizen: bin/commitizen
+    cz: bin/git-cz
+    git-cz: bin/git-cz
+  checksum: 10/45a82b7fdeb901654b39de37567995ef99c6e33e02406b25dd1059a75f880d9cd593fa4d52a32b2e70baef8754bb32c1bf8e5b9d9336f32087bf7f451cb3f72c
+  languageName: node
+  linkType: hard
+
 "commondir@npm:^1.0.1":
   version: 1.0.1
   resolution: "commondir@npm:1.0.1"
@@ -15113,6 +16987,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"compare-versions@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "compare-versions@npm:3.6.0"
+  checksum: 10/7492a50cdaa2c27f5254eee7c4b38856e1c164991bab3d98d7fd067fe4b570d47123ecb92523b78338be86aa221668fd3868bfe8caa5587dc3ebbe1a03d52b5d
+  languageName: node
+  linkType: hard
+
+"component-emitter@npm:^1.2.1":
+  version: 1.3.1
+  resolution: "component-emitter@npm:1.3.1"
+  checksum: 10/94550aa462c7bd5a61c1bc480e28554aa306066930152d1b1844a0dd3845d4e5db7e261ddec62ae184913b3e59b55a2ad84093b9d3596a8f17c341514d6c483d
+  languageName: node
+  linkType: hard
+
 "compressible@npm:~2.0.16":
   version: 2.0.18
   resolution: "compressible@npm:2.0.18"
@@ -15306,6 +17194,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"conventional-commit-types@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "conventional-commit-types@npm:3.0.0"
+  checksum: 10/1c6d9b9693b5c40b67b86780d15baf607b4893c3014aa857015ab59d0c8915bf67cdf0d6def820c0d157da796ad75ca9c9174a642a936db18072683f58d40666
+  languageName: node
+  linkType: hard
+
 "conventional-commits-filter@npm:^2.0.0, conventional-commits-filter@npm:^2.0.7":
   version: 2.0.7
   resolution: "conventional-commits-filter@npm:2.0.7"
@@ -15433,6 +17328,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"copy-descriptor@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "copy-descriptor@npm:0.1.1"
+  checksum: 10/edf4651bce36166c7fcc60b5c1db2c5dad1d87820f468507331dd154b686ece8775f5d383127d44aeef813462520c866f83908aa2d4291708f898df776816860
+  languageName: node
+  linkType: hard
+
 "copy-to-clipboard@npm:^3.3.1":
   version: 3.3.3
   resolution: "copy-to-clipboard@npm:3.3.3"
@@ -15527,6 +17429,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cosmiconfig-typescript-loader@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cosmiconfig-typescript-loader@npm:5.0.0"
+  dependencies:
+    jiti: "npm:^1.19.1"
+  peerDependencies:
+    "@types/node": "*"
+    cosmiconfig: ">=8.2"
+    typescript: ">=4"
+  checksum: 10/ccbb367fe92e623207cb33a85c1fe2e2b592e2af845b38c39c0781e0b05c1a72642eec9bea1ed589d0ac95b47c5d1f232f43cbbe0f68b6218f7d887d9813f850
+  languageName: node
+  linkType: hard
+
 "cosmiconfig@npm:^5.0.0, cosmiconfig@npm:^5.2.0":
   version: 5.2.1
   resolution: "cosmiconfig@npm:5.2.1"
@@ -15582,6 +17497,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cosmiconfig@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "cosmiconfig@npm:9.0.0"
+  dependencies:
+    env-paths: "npm:^2.2.1"
+    import-fresh: "npm:^3.3.0"
+    js-yaml: "npm:^4.1.0"
+    parse-json: "npm:^5.2.0"
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/8bdf1dfbb6fdb3755195b6886dc0649a3c742ec75afa4cb8da7b070936aed22a4f4e5b7359faafe03180358f311dbc300d248fd6586c458203d376a40cc77826
+  languageName: node
+  linkType: hard
+
+"coveralls@npm:^3.0.2":
+  version: 3.1.1
+  resolution: "coveralls@npm:3.1.1"
+  dependencies:
+    js-yaml: "npm:^3.13.1"
+    lcov-parse: "npm:^1.0.0"
+    log-driver: "npm:^1.2.7"
+    minimist: "npm:^1.2.5"
+    request: "npm:^2.88.2"
+  bin:
+    coveralls: bin/coveralls.js
+  checksum: 10/2508710c0b29a92e45c1cd401f55da0ac1a1b57b3ccf8b359690648e50f4f13fd34c53eeda7fd8e6817ce285f70f666b972937c959785b1b82bd00450011445d
+  languageName: node
+  linkType: hard
+
 "create-error-class@npm:^3.0.0":
   version: 3.0.2
   resolution: "create-error-class@npm:3.0.2"
@@ -16003,6 +17950,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cssom@npm:0.3.x, cssom@npm:>= 0.3.2 < 0.4.0, cssom@npm:~0.3.6":
+  version: 0.3.8
+  resolution: "cssom@npm:0.3.8"
+  checksum: 10/49eacc88077555e419646c0ea84ddc73c97e3a346ad7cb95e22f9413a9722d8964b91d781ce21d378bd5ae058af9a745402383fa4e35e9cdfd19654b63f892a9
+  languageName: node
+  linkType: hard
+
 "cssom@npm:^0.4.4":
   version: 0.4.4
   resolution: "cssom@npm:0.4.4"
@@ -16010,10 +17964,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssom@npm:~0.3.6":
-  version: 0.3.8
-  resolution: "cssom@npm:0.3.8"
-  checksum: 10/49eacc88077555e419646c0ea84ddc73c97e3a346ad7cb95e22f9413a9722d8964b91d781ce21d378bd5ae058af9a745402383fa4e35e9cdfd19654b63f892a9
+"cssstyle@npm:^1.0.0":
+  version: 1.4.0
+  resolution: "cssstyle@npm:1.4.0"
+  dependencies:
+    cssom: "npm:0.3.x"
+  checksum: 10/cc8ed156d75767f4e84757726a3a2ed2044812f43da875e5bb486fddfda0473e33d63505956e44349ffbabb99fc1bf7f27863463a126524a111a4cea3c59bad1
   languageName: node
   linkType: hard
 
@@ -16079,6 +18035,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cz-conventional-changelog@npm:3.3.0, cz-conventional-changelog@npm:^3.2.0":
+  version: 3.3.0
+  resolution: "cz-conventional-changelog@npm:3.3.0"
+  dependencies:
+    "@commitlint/load": "npm:>6.1.1"
+    chalk: "npm:^2.4.1"
+    commitizen: "npm:^4.0.3"
+    conventional-commit-types: "npm:^3.0.0"
+    lodash.map: "npm:^4.5.1"
+    longest: "npm:^2.0.1"
+    word-wrap: "npm:^1.0.3"
+  dependenciesMeta:
+    "@commitlint/load":
+      optional: true
+  checksum: 10/790c201a7fbbf082f780fa0542843a3f85bb6894d29194e544440edaacc727ad9c11cfd526de766bf8e1c89ddec66bc7d489e2b2af2bcf092022b554f3d1ee73
+  languageName: node
+  linkType: hard
+
 "d3-array@npm:1, d3-array@npm:^1.1.1, d3-array@npm:^1.2.0":
   version: 1.2.4
   resolution: "d3-array@npm:1.2.4"
@@ -16647,6 +18621,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-urls@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "data-urls@npm:1.1.0"
+  dependencies:
+    abab: "npm:^2.0.0"
+    whatwg-mimetype: "npm:^2.2.0"
+    whatwg-url: "npm:^7.0.0"
+  checksum: 10/dc4bd9621df0dff336d7c4c0517c792488ef3cf11cd37e72ab80f3a7f0a0aa14bad677ac97cf22c87c6eb9518e58b98590e1c8c756b56240940f0e470c81612e
+  languageName: node
+  linkType: hard
+
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -16658,6 +18643,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-view-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-buffer@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/5919a39a18ee919573336158fd162fdf8ada1bc23a139f28543fd45fac48e0ea4a3ad3bfde91de124d4106e65c4a7525f6a84c20ba0797ec890a77a96d13a82a
+  languageName: node
+  linkType: hard
+
+"data-view-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/f33c65e58d8d0432ad79761f2e8a579818d724b5dc6dc4e700489b762d963ab30873c0f1c37d8f2ed12ef51c706d1195f64422856d25f067457aeec50cc40aac
+  languageName: node
+  linkType: hard
+
+"data-view-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "data-view-byte-offset@npm:1.0.0"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/96f34f151bf02affb7b9f98762fb7aca1dd5f4553cb57b80bce750ca609c15d33ca659568ef1d422f7e35680736cbccb893a3d4b012760c758c1446bbdc4c6db
+  languageName: node
+  linkType: hard
+
 "date-fns-tz@npm:^2.0.0":
   version: 2.0.1
   resolution: "date-fns-tz@npm:2.0.1"
@@ -16667,6 +18685,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"date-fns@npm:^1.27.2":
+  version: 1.30.1
+  resolution: "date-fns@npm:1.30.1"
+  checksum: 10/24c0937f4e5704f25627c9d1e92e1fe03cd6165d9f32334b7f923a737a57ef992c287cad0694356071e617fbbfa6bd10dec9192ea9035a3e6d0745b9d1594883
+  languageName: node
+  linkType: hard
+
 "date-fns@npm:^2.15.0, date-fns@npm:^2.28.0":
   version: 2.30.0
   resolution: "date-fns@npm:2.30.0"
@@ -16683,7 +18708,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9":
+"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8, debug@npm:^2.6.9":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
@@ -16722,6 +18747,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"debug@npm:^4.0.1":
+  version: 4.3.5
+  resolution: "debug@npm:4.3.5"
+  dependencies:
+    ms: "npm:2.1.2"
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 10/cb6eab424c410e07813ca1392888589972ce9a32b8829c6508f5e1f25f3c3e70a76731610ae55b4bbe58d1a2fffa1424b30e97fa8d394e49cd2656a9643aedd2
+  languageName: node
+  linkType: hard
+
 "debuglog@npm:*, debuglog@npm:^1.0.1":
   version: 1.0.1
   resolution: "debuglog@npm:1.0.1"
@@ -16739,7 +18776,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decamelize@npm:^1.1.0, decamelize@npm:^1.2.0":
+"decamelize@npm:^1.1.0, decamelize@npm:^1.1.1, decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
   checksum: 10/ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
@@ -16776,6 +18813,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decompress-response@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "decompress-response@npm:3.3.0"
+  dependencies:
+    mimic-response: "npm:^1.0.0"
+  checksum: 10/952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380
+  languageName: node
+  linkType: hard
+
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -16785,7 +18831,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dedent@npm:^0.7.0":
+"dedent@npm:0.7.0, dedent@npm:^0.7.0":
   version: 0.7.0
   resolution: "dedent@npm:0.7.0"
   checksum: 10/87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
@@ -16858,6 +18904,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"default-require-extensions@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "default-require-extensions@npm:1.0.0"
+  dependencies:
+    strip-bom: "npm:^2.0.0"
+  checksum: 10/8be10a3e1f997c8a579c3f00fdd8117c30fa3a12d2ac544dc1ee93fd6138c77fba69fe69546c76d0299d7f74c26416301b9a1dc775557e99991a6ebe2f850df4
+  languageName: node
+  linkType: hard
+
 "defaults@npm:^1.0.3":
   version: 1.0.4
   resolution: "defaults@npm:1.0.4"
@@ -16867,6 +18922,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"defer-to-connect@npm:^1.0.1":
+  version: 1.1.3
+  resolution: "defer-to-connect@npm:1.1.3"
+  checksum: 10/9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930
+  languageName: node
+  linkType: hard
+
 "defer-to-connect@npm:^2.0.0":
   version: 2.0.1
   resolution: "defer-to-connect@npm:2.0.1"
@@ -16903,7 +18965,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -16914,6 +18976,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"define-property@npm:^0.2.5":
+  version: 0.2.5
+  resolution: "define-property@npm:0.2.5"
+  dependencies:
+    is-descriptor: "npm:^0.1.0"
+  checksum: 10/85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "define-property@npm:1.0.0"
+  dependencies:
+    is-descriptor: "npm:^1.0.0"
+  checksum: 10/5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "define-property@npm:2.0.2"
+  dependencies:
+    is-descriptor: "npm:^1.0.2"
+    isobject: "npm:^3.0.1"
+  checksum: 10/3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99
+  languageName: node
+  linkType: hard
+
 "defu@npm:^6.1.3":
   version: 6.1.4
   resolution: "defu@npm:6.1.4"
@@ -16921,6 +19011,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"del@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "del@npm:3.0.0"
+  dependencies:
+    globby: "npm:^6.1.0"
+    is-path-cwd: "npm:^1.0.0"
+    is-path-in-cwd: "npm:^1.0.0"
+    p-map: "npm:^1.1.1"
+    pify: "npm:^3.0.0"
+    rimraf: "npm:^2.2.8"
+  checksum: 10/88192c10411b55ba644456ac4881c6ed92029b53b882bb6067011af05e8da8d9c87f5ddacf2999cc45a05a9f03af345b83f17f341a88f456417c7daa04458d38
+  languageName: node
+  linkType: hard
+
 "del@npm:^6.0.0":
   version: 6.1.1
   resolution: "del@npm:6.1.1"
@@ -16995,13 +19099,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-indent@npm:^6.1.0":
+"detect-file@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "detect-file@npm:1.0.0"
+  checksum: 10/1861e4146128622e847abe0e1ed80fef01e78532665858a792267adf89032b7a9c698436137707fcc6f02956c2a6a0052d6a0cef5be3d4b76b1ff0da88e2158a
+  languageName: node
+  linkType: hard
+
+"detect-indent@npm:6.1.0, detect-indent@npm:^6.1.0":
   version: 6.1.0
   resolution: "detect-indent@npm:6.1.0"
   checksum: 10/ab953a73c72dbd4e8fc68e4ed4bfd92c97eb6c43734af3900add963fd3a9316f3bc0578b018b24198d4c31a358571eff5f0656e81a1f3b9ad5c547d58b2d093d
   languageName: node
   linkType: hard
 
+"detect-indent@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "detect-indent@npm:4.0.0"
+  dependencies:
+    repeating: "npm:^2.0.0"
+  checksum: 10/328f273915c1610899bc7d4784ce874413d0a698346364cd3ee5d79afba1c5cf4dbc97b85a801e20f4d903c0598bd5096af32b800dfb8696b81464ccb3dfda2c
+  languageName: node
+  linkType: hard
+
 "detect-indent@npm:~5.0.0":
   version: 5.0.0
   resolution: "detect-indent@npm:5.0.0"
@@ -17099,6 +19219,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff@npm:^3.1.0, diff@npm:^3.2.0":
+  version: 3.5.0
+  resolution: "diff@npm:3.5.0"
+  checksum: 10/cfbc2df98d6f8eb82c0f7735c8468695f65189d31f95a708d4c97cd96a8083fdfd83d87a067a29924ae7d8ff64f578e7da78391af537815750268555fe0df9f0
+  languageName: node
+  linkType: hard
+
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -17149,6 +19276,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"doctrine@npm:0.7.2":
+  version: 0.7.2
+  resolution: "doctrine@npm:0.7.2"
+  dependencies:
+    esutils: "npm:^1.1.6"
+    isarray: "npm:0.0.1"
+  checksum: 10/b8da8df16b22fdb3cdc9956ac2c02cc240b2ca1444f1df7c5d301fcc0f7774f322cf628cbd0aa08db9ebeec188d2bb896d22bf72acd9d9ac6d2c189d319e8076
+  languageName: node
+  linkType: hard
+
 "doctrine@npm:^3.0.0":
   version: 3.0.0
   resolution: "doctrine@npm:3.0.0"
@@ -17235,6 +19372,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"domexception@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "domexception@npm:1.0.1"
+  dependencies:
+    webidl-conversions: "npm:^4.0.2"
+  checksum: 10/1cf5a22ffe5aeab51a2235b882c688719ed22112bf83758410bd64f5dfd1f24e53132f355b930be18e57bcd05857ba74967cf8977d6be5b9d7945b15acdee9bc
+  languageName: node
+  linkType: hard
+
 "domexception@npm:^2.0.1":
   version: 2.0.1
   resolution: "domexception@npm:2.0.1"
@@ -17536,6 +19682,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"elegant-spinner@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "elegant-spinner@npm:1.0.1"
+  checksum: 10/d6a773d950c5d403b5f0fa402787e37dde99989ab6c943558fe8491cf7cd0df0e2747a9ff4d391d5a5f20a447cc9e9a63bdc956354ba47bea462f1603a5b04fe
+  languageName: node
+  linkType: hard
+
 "element-resize-detector@npm:^1.2.1":
   version: 1.2.4
   resolution: "element-resize-detector@npm:1.2.4"
@@ -17646,7 +19799,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"env-paths@npm:^2.2.0":
+"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
   checksum: 10/65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
@@ -17687,7 +19840,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"error-ex@npm:^1.3.1":
+"error-ex@npm:^1.2.0, error-ex@npm:^1.3.1":
   version: 1.3.2
   resolution: "error-ex@npm:1.3.2"
   dependencies:
@@ -17743,6 +19896,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2":
+  version: 1.23.3
+  resolution: "es-abstract@npm:1.23.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    data-view-buffer: "npm:^1.0.1"
+    data-view-byte-length: "npm:^1.0.1"
+    data-view-byte-offset: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    es-to-primitive: "npm:^1.2.1"
+    function.prototype.name: "npm:^1.1.6"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
+    globalthis: "npm:^1.0.3"
+    gopd: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
+    has-symbols: "npm:^1.0.3"
+    hasown: "npm:^2.0.2"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
+    is-callable: "npm:^1.2.7"
+    is-data-view: "npm:^1.0.1"
+    is-negative-zero: "npm:^2.0.3"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.3"
+    is-string: "npm:^1.0.7"
+    is-typed-array: "npm:^1.1.13"
+    is-weakref: "npm:^1.0.2"
+    object-inspect: "npm:^1.13.1"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.2"
+    safe-array-concat: "npm:^1.1.2"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.trim: "npm:^1.2.9"
+    string.prototype.trimend: "npm:^1.0.8"
+    string.prototype.trimstart: "npm:^1.0.8"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.6"
+    unbox-primitive: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.15"
+  checksum: 10/2da795a6a1ac5fc2c452799a409acc2e3692e06dc6440440b076908617188899caa562154d77263e3053bcd9389a07baa978ab10ac3b46acc399bd0c77be04cb
+  languageName: node
+  linkType: hard
+
 "es-array-method-boxes-properly@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-array-method-boxes-properly@npm:1.0.0"
@@ -17759,7 +19966,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-errors@npm:^1.3.0":
+"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
   version: 1.3.0
   resolution: "es-errors@npm:1.3.0"
   checksum: 10/96e65d640156f91b707517e8cdc454dd7d47c32833aa3e85d79f24f9eb7ea85f39b63e36216ef0114996581969b59fe609a94e30316b08f5f4df1d44134cf8d5
@@ -17804,6 +20011,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-object-atoms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-object-atoms@npm:1.0.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+  checksum: 10/f8910cf477e53c0615f685c5c96210591841850871b81924fcf256bfbaa68c254457d994a4308c60d15b20805e7f61ce6abc669375e01a5349391a8c1767584f
+  languageName: node
+  linkType: hard
+
 "es-set-tostringtag@npm:^2.0.1":
   version: 2.0.1
   resolution: "es-set-tostringtag@npm:2.0.1"
@@ -17815,6 +20031,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10/7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129
+  languageName: node
+  linkType: hard
+
 "es-to-primitive@npm:^1.2.1":
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
@@ -18191,7 +20418,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5":
+"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.4, escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
   checksum: 10/6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
@@ -18212,6 +20439,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escodegen@npm:^1.9.1":
+  version: 1.14.3
+  resolution: "escodegen@npm:1.14.3"
+  dependencies:
+    esprima: "npm:^4.0.1"
+    estraverse: "npm:^4.2.0"
+    esutils: "npm:^2.0.2"
+    optionator: "npm:^0.8.1"
+    source-map: "npm:~0.6.1"
+  dependenciesMeta:
+    source-map:
+      optional: true
+  bin:
+    escodegen: bin/escodegen.js
+    esgenerate: bin/esgenerate.js
+  checksum: 10/70f095ca9393535f9f1c145ef99dc0b3ff14cca6bc4a79d90ff3352f90c3f2e07f75af6d6c05174ea67c45271f75e80dd440dd7d04ed2cf44c9452c3042fa84a
+  languageName: node
+  linkType: hard
+
 "escodegen@npm:^2.0.0, escodegen@npm:^2.1.0":
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
@@ -18387,6 +20633,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esutils@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "esutils@npm:1.1.6"
+  checksum: 10/1657640cda545532db1d7096c7ef7ec2c50b29469ab50bba43d59388b32e1a13f29b9bcf9a079a41eb86118b269d8c72caaee3fdc328ab29fba6b495ba152c86
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -18457,6 +20710,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"exec-sh@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "exec-sh@npm:0.2.2"
+  dependencies:
+    merge: "npm:^1.2.0"
+  checksum: 10/f0e2bdc9fded34f33a6473293cf06dd89f09da1dd7850369001e56b055bb00dae449dbf2e1dd0a1bce2083f13e30e0a0e1b9ab9e42efb1954a538349340c5562
+  languageName: node
+  linkType: hard
+
 "execa@npm:^0.7.0":
   version: 0.7.0
   resolution: "execa@npm:0.7.0"
@@ -18546,6 +20808,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expand-brackets@npm:^0.1.4":
+  version: 0.1.5
+  resolution: "expand-brackets@npm:0.1.5"
+  dependencies:
+    is-posix-bracket: "npm:^0.1.0"
+  checksum: 10/71b2971027eb026f055a1c310d24d18a266427b84fc18cadddcedb4de2e07aaef6084e252406b20e58f7aa7613f6bfbe6136962955562529a66675bf49bb10d7
+  languageName: node
+  linkType: hard
+
+"expand-brackets@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "expand-brackets@npm:2.1.4"
+  dependencies:
+    debug: "npm:^2.3.3"
+    define-property: "npm:^0.2.5"
+    extend-shallow: "npm:^2.0.1"
+    posix-character-classes: "npm:^0.1.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/aa4acc62084638c761ecdbe178bd3136f01121939f96bbfc3be27c46c66625075f77fe0a446b627c9071b1aaf6d93ccf5bde5ff34b7ef883e4f46067a8e63e41
+  languageName: node
+  linkType: hard
+
+"expand-range@npm:^1.8.1":
+  version: 1.8.2
+  resolution: "expand-range@npm:1.8.2"
+  dependencies:
+    fill-range: "npm:^2.1.0"
+  checksum: 10/8383d0ced4f992dab75b4116720b54715d3e0507d0b7663b2e04e2b9178f91c37134c93cbc5abac27a20464640e3880f60021d63d359c6f7180107d74d32c64e
+  languageName: node
+  linkType: hard
+
 "expand-template@npm:^2.0.3":
   version: 2.0.3
   resolution: "expand-template@npm:2.0.3"
@@ -18553,6 +20848,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expand-tilde@npm:^2.0.0, expand-tilde@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "expand-tilde@npm:2.0.2"
+  dependencies:
+    homedir-polyfill: "npm:^1.0.1"
+  checksum: 10/2efe6ed407d229981b1b6ceb552438fbc9e5c7d6a6751ad6ced3e0aa5cf12f0b299da695e90d6c2ac79191b5c53c613e508f7149e4573abfbb540698ddb7301a
+  languageName: node
+  linkType: hard
+
+"expect@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "expect@npm:23.6.0"
+  dependencies:
+    ansi-styles: "npm:^3.2.0"
+    jest-diff: "npm:^23.6.0"
+    jest-get-type: "npm:^22.1.0"
+    jest-matcher-utils: "npm:^23.6.0"
+    jest-message-util: "npm:^23.4.0"
+    jest-regex-util: "npm:^23.3.0"
+  checksum: 10/98e3b394e5a5002d144fe66cb198a0dd7b5902223091564ea9eceab51ea797caa50061f7feb9fdee7c2f2943d7d51cb7c023b7e71043e99d7bb12527d8b4a400
+  languageName: node
+  linkType: hard
+
 "expect@npm:^27.5.1":
   version: 27.5.1
   resolution: "expect@npm:27.5.1"
@@ -18650,6 +20968,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"extend-shallow@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "extend-shallow@npm:2.0.1"
+  dependencies:
+    is-extendable: "npm:^0.1.0"
+  checksum: 10/8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
+  languageName: node
+  linkType: hard
+
+"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "extend-shallow@npm:3.0.2"
+  dependencies:
+    assign-symbols: "npm:^1.0.0"
+    is-extendable: "npm:^1.0.1"
+  checksum: 10/a920b0cd5838a9995ace31dfd11ab5e79bf6e295aa566910ce53dff19f4b1c0fda2ef21f26b28586c7a2450ca2b42d97bd8c0f5cec9351a819222bf861e02461
+  languageName: node
+  linkType: hard
+
 "extend@npm:^3.0.0, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
@@ -18657,6 +20994,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"external-editor@npm:^3.0.3":
+  version: 3.1.0
+  resolution: "external-editor@npm:3.1.0"
+  dependencies:
+    chardet: "npm:^0.7.0"
+    iconv-lite: "npm:^0.4.24"
+    tmp: "npm:^0.0.33"
+  checksum: 10/776dff1d64a1d28f77ff93e9e75421a81c062983fd1544279d0a32f563c0b18c52abbb211f31262e2827e48edef5c9dc8f960d06dd2d42d1654443b88568056b
+  languageName: node
+  linkType: hard
+
+"extglob@npm:^0.3.1":
+  version: 0.3.2
+  resolution: "extglob@npm:0.3.2"
+  dependencies:
+    is-extglob: "npm:^1.0.0"
+  checksum: 10/c1c8d5365fe4992fc5b007140cbb37292ffadcd767cb602606de4d572ff96f38620e42855f8cb75020c050aacf1eeb51212dd6312de46eab42e2200277b5fc45
+  languageName: node
+  linkType: hard
+
+"extglob@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "extglob@npm:2.0.4"
+  dependencies:
+    array-unique: "npm:^0.3.2"
+    define-property: "npm:^1.0.0"
+    expand-brackets: "npm:^2.1.4"
+    extend-shallow: "npm:^2.0.1"
+    fragment-cache: "npm:^0.2.1"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/6869edd48d40c322e1cda9bf494ed2407c69a19063fd2897184cb62d6d35c14fa7402b01d9dedd65d77ed1ccc74a291235a702c68b4f28a7314da0cdee97c85b
+  languageName: node
+  linkType: hard
+
 "extsprintf@npm:1.3.0":
   version: 1.3.0
   resolution: "extsprintf@npm:1.3.0"
@@ -18735,7 +21108,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-stable-stringify@npm:^2.0.0":
+"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
   checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e
@@ -18844,7 +21217,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"figures@npm:^1.0.1":
+"figures@npm:^1.0.1, figures@npm:^1.7.0":
   version: 1.7.0
   resolution: "figures@npm:1.7.0"
   dependencies:
@@ -18903,6 +21276,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"file-uri-to-path@npm:1.0.0":
+  version: 1.0.0
+  resolution: "file-uri-to-path@npm:1.0.0"
+  checksum: 10/b648580bdd893a008c92c7ecc96c3ee57a5e7b6c4c18a9a09b44fb5d36d79146f8e442578bc0e173dc027adf3987e254ba1dfd6e3ec998b7c282873010502144
+  languageName: node
+  linkType: hard
+
 "filelist@npm:^1.0.4":
   version: 1.0.4
   resolution: "filelist@npm:1.0.4"
@@ -18912,6 +21292,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filename-regex@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "filename-regex@npm:2.0.1"
+  checksum: 10/ac181f8184cf49d2f08889a446995537c3967e6f6195752d903b69c7d85f134425fb1446c4e384e77390bac488b60a9658805debc5a91e8c0bc9f81340505371
+  languageName: node
+  linkType: hard
+
+"fileset@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "fileset@npm:2.0.3"
+  dependencies:
+    glob: "npm:^7.0.3"
+    minimatch: "npm:^3.0.3"
+  checksum: 10/7da22f3a6675ac892957c7349b872eb9f0fd259c0e19f807f2d9519d023430539c45ba9db2a67a1eb3e0f76aa77a2b0645efed5d27f177a77f435aa865d05c6a
+  languageName: node
+  linkType: hard
+
 "filesize@npm:^6.1.0":
   version: 6.4.0
   resolution: "filesize@npm:6.4.0"
@@ -18919,6 +21316,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fill-range@npm:^2.1.0":
+  version: 2.2.4
+  resolution: "fill-range@npm:2.2.4"
+  dependencies:
+    is-number: "npm:^2.1.0"
+    isobject: "npm:^2.0.0"
+    randomatic: "npm:^3.0.0"
+    repeat-element: "npm:^1.1.2"
+    repeat-string: "npm:^1.5.2"
+  checksum: 10/ad71c3d699bb6b9dc8b2da5c246ab03335f8824c5a7500285cf045814a375c6f847410b4e75c0fca035ad00c4faf1247537f53e26251abbc72e311d10f31e069
+  languageName: node
+  linkType: hard
+
+"fill-range@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "fill-range@npm:4.0.0"
+  dependencies:
+    extend-shallow: "npm:^2.0.1"
+    is-number: "npm:^3.0.0"
+    repeat-string: "npm:^1.6.1"
+    to-regex-range: "npm:^2.1.0"
+  checksum: 10/68be23b3c40d5a3fd2847ce18e3a5eac25d9f4c05627291e048ba1346ed0e429668b58a3429e61c0db9fa5954c4402fe99322a65d8a0eb06ebed8d3a18fbb09a
+  languageName: node
+  linkType: hard
+
 "fill-range@npm:^7.0.1":
   version: 7.0.1
   resolution: "fill-range@npm:7.0.1"
@@ -18979,6 +21401,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-node-modules@npm:^2.1.2":
+  version: 2.1.3
+  resolution: "find-node-modules@npm:2.1.3"
+  dependencies:
+    findup-sync: "npm:^4.0.0"
+    merge: "npm:^2.1.1"
+  checksum: 10/4b8a194ffd56ccf1a1033de35e2ee8209869b05cce68ff7c4ab0dbf04e63fd7196283383eee4c84596c7b311755b2836815209d558234cadc330a87881e5a3f4
+  languageName: node
+  linkType: hard
+
 "find-npm-prefix@npm:^1.0.2":
   version: 1.0.2
   resolution: "find-npm-prefix@npm:1.0.2"
@@ -18986,13 +21418,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-root@npm:^1.1.0":
+"find-root@npm:1.1.0, find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
   checksum: 10/caa799c976a14925ba7f31ca1a226fe73d3aa270f4f1b623fcfeb1c6e263111db4beb807d8acd31bd4d48d44c343b93688a9288dfbccca27463c36a0301b0bb9
   languageName: node
   linkType: hard
 
+"find-up@npm:^1.0.0":
+  version: 1.1.2
+  resolution: "find-up@npm:1.1.2"
+  dependencies:
+    path-exists: "npm:^2.0.0"
+    pinkie-promise: "npm:^2.0.0"
+  checksum: 10/a2cb9f4c9f06ee3a1e92ed71d5aed41ac8ae30aefa568132f6c556fac7678a5035126153b59eaec68da78ac409eef02503b2b059706bdbf232668d7245e3240a
+  languageName: node
+  linkType: hard
+
 "find-up@npm:^2.0.0, find-up@npm:^2.1.0":
   version: 2.1.0
   resolution: "find-up@npm:2.1.0"
@@ -19040,6 +21482,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-versions@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "find-versions@npm:4.0.0"
+  dependencies:
+    semver-regex: "npm:^3.1.2"
+  checksum: 10/2b4c749dc33e3fa73a457ca4df616ac13b4b32c53f6297bc862b0814d402a6cfec93a0d308d5502eeb47f2c125906e0f861bf01b756f08395640892186357711
+  languageName: node
+  linkType: hard
+
 "find-yarn-workspace-root@npm:^2.0.0":
   version: 2.0.0
   resolution: "find-yarn-workspace-root@npm:2.0.0"
@@ -19049,6 +21500,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"findup-sync@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "findup-sync@npm:4.0.0"
+  dependencies:
+    detect-file: "npm:^1.0.0"
+    is-glob: "npm:^4.0.0"
+    micromatch: "npm:^4.0.2"
+    resolve-dir: "npm:^1.0.1"
+  checksum: 10/94131e1107ad63790ed00c4c39ca131a93ea602607bd97afeffd92b69a9a63cf2c6f57d6db88cb753fe748ac7fde79e1e76768ff784247026b7c5ebf23ede3a0
+  languageName: node
+  linkType: hard
+
 "flow-parser@npm:0.*":
   version: 0.227.0
   resolution: "flow-parser@npm:0.227.0"
@@ -19066,6 +21529,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fn-name@npm:~2.0.1":
+  version: 2.0.1
+  resolution: "fn-name@npm:2.0.1"
+  checksum: 10/ea06f4a99be824edf774f8314be9b1e7eeef62a9e462f243f452b1422c73f7b98a5dafe734256e57212239d1ac1204a7b79fdb8cc920af1ec414684a1b00ae66
+  languageName: node
+  linkType: hard
+
 "focus-lock@npm:^0.11.6":
   version: 0.11.6
   resolution: "focus-lock@npm:0.11.6"
@@ -19104,6 +21574,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"for-in@npm:^1.0.1, for-in@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "for-in@npm:1.0.2"
+  checksum: 10/09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d
+  languageName: node
+  linkType: hard
+
+"for-own@npm:^0.1.4":
+  version: 0.1.5
+  resolution: "for-own@npm:0.1.5"
+  dependencies:
+    for-in: "npm:^1.0.1"
+  checksum: 10/07eb0a2e98eb55ce13b56dd11ef4fb5e619ba7380aaec388b9eec1946153d74fa734ce409e8434020557e9489a50c34bc004d55754f5863bf7d77b441d8dee8c
+  languageName: node
+  linkType: hard
+
 "foreground-child@npm:^3.1.0":
   version: 3.1.1
   resolution: "foreground-child@npm:3.1.1"
@@ -19182,6 +21668,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fragment-cache@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "fragment-cache@npm:0.2.1"
+  dependencies:
+    map-cache: "npm:^0.2.2"
+  checksum: 10/1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc
+  languageName: node
+  linkType: hard
+
 "fresh@npm:0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
@@ -19238,6 +21733,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-extra@npm:9.1.0, fs-extra@npm:^9.0.0, fs-extra@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "fs-extra@npm:9.1.0"
+  dependencies:
+    at-least-node: "npm:^1.0.0"
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10/08600da1b49552ed23dfac598c8fc909c66776dd130fea54fbcad22e330f7fcc13488bb995f6bc9ce5651aa35b65702faf616fe76370ee56f1aade55da982dca
+  languageName: node
+  linkType: hard
+
 "fs-extra@npm:^11.1.0":
   version: 11.2.0
   resolution: "fs-extra@npm:11.2.0"
@@ -19249,15 +21756,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^9.0.0, fs-extra@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "fs-extra@npm:9.1.0"
+"fs-extra@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "fs-extra@npm:7.0.1"
   dependencies:
-    at-least-node: "npm:^1.0.0"
-    graceful-fs: "npm:^4.2.0"
-    jsonfile: "npm:^6.0.1"
-    universalify: "npm:^2.0.0"
-  checksum: 10/08600da1b49552ed23dfac598c8fc909c66776dd130fea54fbcad22e330f7fcc13488bb995f6bc9ce5651aa35b65702faf616fe76370ee56f1aade55da982dca
+    graceful-fs: "npm:^4.1.2"
+    jsonfile: "npm:^4.0.0"
+    universalify: "npm:^0.1.0"
+  checksum: 10/3fc6e56ba2f07c00d452163f27f21a7076b72ef7da8a50fef004336d59ef4c34deda11d10ecd73fd8fbcf20e4f575f52857293090b3c9f8741d4e0598be30fea
   languageName: node
   linkType: hard
 
@@ -19332,6 +21838,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fsevents@npm:^1.2.3":
+  version: 1.2.13
+  resolution: "fsevents@npm:1.2.13"
+  dependencies:
+    bindings: "npm:^1.5.0"
+    nan: "npm:^2.12.1"
+  checksum: 10/ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
 "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
   version: 2.3.3
   resolution: "fsevents@npm:2.3.3"
@@ -19342,6 +21859,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fsevents@patch:fsevents@npm%3A^1.2.3#optional!builtin<compat/fsevents>":
+  version: 1.2.13
+  resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin<compat/fsevents>::version=1.2.13&hash=d11327"
+  dependencies:
+    bindings: "npm:^1.5.0"
+    nan: "npm:^2.12.1"
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
 "fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
   version: 2.3.3
   resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
@@ -19384,6 +21911,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"g-status@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "g-status@npm:2.0.2"
+  dependencies:
+    arrify: "npm:^1.0.1"
+    matcher: "npm:^1.0.0"
+    simple-git: "npm:^1.85.0"
+  checksum: 10/df405d086f61d77e67bebaf380b9d4454245e26387463656d8badf0dbbb90b771611d1b53b2e2336d3c52e9b8a85ddd90f087c83fea03c7273265140b95abe5c
+  languageName: node
+  linkType: hard
+
 "gauge@npm:^4.0.3":
   version: 4.0.4
   resolution: "gauge@npm:4.0.4"
@@ -19512,6 +22050,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-caller-file@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "get-caller-file@npm:1.0.3"
+  checksum: 10/0b776558c1d94ac131ec0d47bf9da4e00a38e7d3a6cbde534e0e4656c13ead344e69ef7ed2c0bca16620cc2e1e26529f90e2336c8962736517b64890d583a2a0
+  languageName: node
+  linkType: hard
+
 "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
@@ -19531,7 +22076,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -19565,6 +22110,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-own-enumerable-property-symbols@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
+  checksum: 10/8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede
+  languageName: node
+  linkType: hard
+
 "get-package-type@npm:^0.1.0":
   version: 0.1.0
   resolution: "get-package-type@npm:0.1.0"
@@ -19661,6 +22213,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10/e1cb53bc211f9dbe9691a4f97a46837a553c4e7caadd0488dc24ac694db8a390b93edd412b48dcdd0b4bbb4c595de1709effc75fc87c0839deedc6968f5bd973
+  languageName: node
+  linkType: hard
+
 "get-tsconfig@npm:^4.7.5":
   version: 4.7.5
   resolution: "get-tsconfig@npm:4.7.5"
@@ -19670,6 +22233,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-value@npm:^2.0.3, get-value@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "get-value@npm:2.0.6"
+  checksum: 10/5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb
+  languageName: node
+  linkType: hard
+
 "getpass@npm:^0.1.1":
   version: 0.1.7
   resolution: "getpass@npm:0.1.7"
@@ -19764,6 +22334,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob-base@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "glob-base@npm:0.3.0"
+  dependencies:
+    glob-parent: "npm:^2.0.0"
+    is-glob: "npm:^2.0.0"
+  checksum: 10/106477297e0e2a120a2ba530a0b443d82a2750dc614c21b8d1ac064d100e3ba262397501828cb768c21e0b2d645da717d06ff58d7979a0d6ce6cbb29aa2d62e0
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "glob-parent@npm:2.0.0"
+  dependencies:
+    is-glob: "npm:^2.0.0"
+  checksum: 10/734fc461d9d2753dd490dd072df6ce41fe4ebb60e9319b108bc538707b21780af3a61c3961ec2264131fad5d3d9a493e013a775aef11a69ac2f49fd7d8f46457
+  languageName: node
+  linkType: hard
+
 "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
@@ -19800,6 +22389,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:7.2.3, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
+  dependencies:
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^3.1.1"
+    once: "npm:^1.3.0"
+    path-is-absolute: "npm:^1.0.0"
+  checksum: 10/59452a9202c81d4508a43b8af7082ca5c76452b9fcc4a9ab17655822e6ce9b21d4f8fbadabe4fe3faef448294cec249af305e2cd824b7e9aaf689240e5e96a7b
+  languageName: node
+  linkType: hard
+
 "glob@npm:^10.0.0":
   version: 10.3.10
   resolution: "glob@npm:10.3.10"
@@ -19830,17 +22433,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^7.0.0, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
+"global-directory@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "global-directory@npm:4.0.1"
   dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^3.1.1"
-    once: "npm:^1.3.0"
-    path-is-absolute: "npm:^1.0.0"
-  checksum: 10/59452a9202c81d4508a43b8af7082ca5c76452b9fcc4a9ab17655822e6ce9b21d4f8fbadabe4fe3faef448294cec249af305e2cd824b7e9aaf689240e5e96a7b
+    ini: "npm:4.1.1"
+  checksum: 10/5b4df24438a4e5f21e43fbdd9e54f5e12bb48dce01a0a83b415d8052ce91be2d3a97e0c8f98a535e69649b2190036155e9f0f7d3c62f9318f31bdc3fd4f235f5
   languageName: node
   linkType: hard
 
@@ -19853,6 +22451,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"global-modules@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "global-modules@npm:1.0.0"
+  dependencies:
+    global-prefix: "npm:^1.0.1"
+    is-windows: "npm:^1.0.1"
+    resolve-dir: "npm:^1.0.0"
+  checksum: 10/e4031a01c0c7401349bb69e1499c7268d636552b16374c0002d677c7a6185da6782a2927a7a3a7c046eb7be97cd26b3c7b1b736f9818ecc7ac09e9d61449065e
+  languageName: node
+  linkType: hard
+
+"global-prefix@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "global-prefix@npm:1.0.2"
+  dependencies:
+    expand-tilde: "npm:^2.0.2"
+    homedir-polyfill: "npm:^1.0.1"
+    ini: "npm:^1.3.4"
+    is-windows: "npm:^1.0.1"
+    which: "npm:^1.2.14"
+  checksum: 10/68cf78f81cd85310095ca1f0ec22dd5f43a1059646b2c7b3fc4a7c9ce744356e66ca833adda4e5753e38021847aaec393a159a029ba2d257c08ccb3f00ca2899
+  languageName: node
+  linkType: hard
+
 "global@npm:~4.4.0":
   version: 4.4.0
   resolution: "global@npm:4.4.0"
@@ -19879,6 +22501,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globals@npm:^9.18.0":
+  version: 9.18.0
+  resolution: "globals@npm:9.18.0"
+  checksum: 10/492600be44eb7ae107d37fa8536fb98f36a6f051c1420cd912a6de307758d502b9930a8f7beda0e74a98a5613aae464c828bb81418fc335c9ff4707ba9fd9070
+  languageName: node
+  linkType: hard
+
 "globalthis@npm:^1.0.3":
   version: 1.0.3
   resolution: "globalthis@npm:1.0.3"
@@ -19938,6 +22567,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globby@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "globby@npm:6.1.0"
+  dependencies:
+    array-union: "npm:^1.0.1"
+    glob: "npm:^7.0.3"
+    object-assign: "npm:^4.0.1"
+    pify: "npm:^2.0.0"
+    pinkie-promise: "npm:^2.0.0"
+  checksum: 10/18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424
+  languageName: node
+  linkType: hard
+
 "globrex@npm:^0.1.2":
   version: 0.1.2
   resolution: "globrex@npm:0.1.2"
@@ -19992,6 +22634,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"got@npm:^9.1.0":
+  version: 9.6.0
+  resolution: "got@npm:9.6.0"
+  dependencies:
+    "@sindresorhus/is": "npm:^0.14.0"
+    "@szmarczak/http-timer": "npm:^1.1.2"
+    cacheable-request: "npm:^6.0.0"
+    decompress-response: "npm:^3.3.0"
+    duplexer3: "npm:^0.1.4"
+    get-stream: "npm:^4.1.0"
+    lowercase-keys: "npm:^1.0.1"
+    mimic-response: "npm:^1.0.1"
+    p-cancelable: "npm:^1.0.0"
+    to-readable-stream: "npm:^1.0.0"
+    url-parse-lax: "npm:^3.0.0"
+  checksum: 10/fae3273b44392b6b1d88071d04ea984784e63dbf8ba3f70b04cb7edda53c7668ee17288ac46af507a9f2aa60c183c5ea1732339141d253dda3eb19f92985c771
+  languageName: node
+  linkType: hard
+
 "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
@@ -20020,6 +22681,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"growly@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "growly@npm:1.3.0"
+  checksum: 10/77f9abc3a854ec628580939f004ba8f05c677f9a6c957be817525f20f68f75368c4879c64d12551f262a9a00de33fbefc4deb24f8f2124429c906ef20ec3c678
+  languageName: node
+  linkType: hard
+
 "gunzip-maybe@npm:^1.4.2":
   version: 1.4.2
   resolution: "gunzip-maybe@npm:1.4.2"
@@ -20068,7 +22736,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"handlebars@npm:^4.7.6, handlebars@npm:^4.7.7":
+"handlebars@npm:^4.0.3, handlebars@npm:^4.0.6, handlebars@npm:^4.7.6, handlebars@npm:^4.7.7":
   version: 4.7.8
   resolution: "handlebars@npm:4.7.8"
   dependencies:
@@ -20200,6 +22868,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: 10/0b67c2c94e3bea37db3e412e3c41f79d59259875e636ba471e94c009cdfb1fa82bf045deeffafc7dbb9c148e36cae6b467055aaa5d9fad4316e11b41e3ba551a
+  languageName: node
+  linkType: hard
+
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
@@ -20216,6 +22891,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
+  dependencies:
+    has-symbols: "npm:^1.0.3"
+  checksum: 10/c74c5f5ceee3c8a5b8bc37719840dc3749f5b0306d818974141dda2471a1a2ca6c8e46b9d6ac222c5345df7a901c9b6f350b1e6d62763fec877e26609a401bfe
+  languageName: node
+  linkType: hard
+
 "has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1, has-unicode@npm:~2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
@@ -20223,6 +22907,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-value@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "has-value@npm:0.3.1"
+  dependencies:
+    get-value: "npm:^2.0.3"
+    has-values: "npm:^0.1.4"
+    isobject: "npm:^2.0.0"
+  checksum: 10/29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f
+  languageName: node
+  linkType: hard
+
+"has-value@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-value@npm:1.0.0"
+  dependencies:
+    get-value: "npm:^2.0.6"
+    has-values: "npm:^1.0.0"
+    isobject: "npm:^3.0.0"
+  checksum: 10/b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847
+  languageName: node
+  linkType: hard
+
+"has-values@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "has-values@npm:0.1.4"
+  checksum: 10/ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc
+  languageName: node
+  linkType: hard
+
+"has-values@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-values@npm:1.0.0"
+  dependencies:
+    is-number: "npm:^3.0.0"
+    kind-of: "npm:^4.0.0"
+  checksum: 10/77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11
+  languageName: node
+  linkType: hard
+
 "has@npm:^1.0.0, has@npm:^1.0.3":
   version: 1.0.3
   resolution: "has@npm:1.0.3"
@@ -20239,7 +22962,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0":
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
   version: 2.0.2
   resolution: "hasown@npm:2.0.2"
   dependencies:
@@ -20374,6 +23097,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"highlight.js@npm:^9.0.0":
+  version: 9.18.5
+  resolution: "highlight.js@npm:9.18.5"
+  checksum: 10/56ddbd562ece7da84847770d96e8e52bd0e6151f69efb95e249d8e1fde2b5ed78cdaa2c0d33e4c838caa434cb0fe1aeeca4edca9c2c3343daf23dcf2ffbd3dc9
+  languageName: node
+  linkType: hard
+
 "history@npm:^4.9.0":
   version: 4.10.1
   resolution: "history@npm:4.10.1"
@@ -20406,6 +23136,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"home-or-tmp@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "home-or-tmp@npm:2.0.0"
+  dependencies:
+    os-homedir: "npm:^1.0.0"
+    os-tmpdir: "npm:^1.0.1"
+  checksum: 10/ad0a101a56ecd159d531f640e5949e7d58f4a6f464f07c16f1c8cb14d9c35895e80d834ef0de416887596506b90e7566235880e37eeb70ebc8c873363b3ded93
+  languageName: node
+  linkType: hard
+
+"homedir-polyfill@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "homedir-polyfill@npm:1.0.3"
+  dependencies:
+    parse-passwd: "npm:^1.0.0"
+  checksum: 10/18dd4db87052c6a2179d1813adea0c4bfcfa4f9996f0e226fefb29eb3d548e564350fa28ec46b0bf1fbc0a1d2d6922ceceb80093115ea45ff8842a4990139250
+  languageName: node
+  linkType: hard
+
 "hook-std@npm:^2.0.0":
   version: 2.0.0
   resolution: "hook-std@npm:2.0.0"
@@ -20475,6 +23224,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "html-encoding-sniffer@npm:1.0.2"
+  dependencies:
+    whatwg-encoding: "npm:^1.0.1"
+  checksum: 10/d8984b63836abadc5e1270c648d5b3c447ba9473d687b730c3ea8397f4cb15b33ca271e93f987150203717eeb8bfb5ec82646f84419a0bef040cd41f7cc428df
+  languageName: node
+  linkType: hard
+
 "html-encoding-sniffer@npm:^2.0.1":
   version: 2.0.1
   resolution: "html-encoding-sniffer@npm:2.0.1"
@@ -20831,6 +23589,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"husky@npm:^4.2.5":
+  version: 4.3.8
+  resolution: "husky@npm:4.3.8"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^2.0.0"
+    compare-versions: "npm:^3.6.0"
+    cosmiconfig: "npm:^7.0.0"
+    find-versions: "npm:^4.0.0"
+    opencollective-postinstall: "npm:^2.0.2"
+    pkg-dir: "npm:^5.0.0"
+    please-upgrade-node: "npm:^3.2.0"
+    slash: "npm:^3.0.0"
+    which-pm-runs: "npm:^1.0.0"
+  bin:
+    husky-run: bin/run.js
+    husky-upgrade: lib/upgrader/bin.js
+  checksum: 10/bf525b1133ac68131a50acfea1b6348ed4b3230ff471492852edd97f3038e858ccf075eac431db47c27d928638a108eef70bc3940f289f5a3ac0eca20808969a
+  languageName: node
+  linkType: hard
+
 "hyphenate-style-name@npm:^1.0.2":
   version: 1.0.4
   resolution: "hyphenate-style-name@npm:1.0.4"
@@ -20845,7 +23624,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24":
+"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -21009,6 +23788,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"import-local@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "import-local@npm:1.0.0"
+  dependencies:
+    pkg-dir: "npm:^2.0.0"
+    resolve-cwd: "npm:^2.0.0"
+  bin:
+    import-local-fixture: fixtures/cli.js
+  checksum: 10/e7918eb5e20dcc755d6aa6b710ef0a346478256a3d7d7cde9e813c8f33019eda0fa3fe7427a9874314512f514c66c8156b7859e75ce8639769f25f2509ebd013
+  languageName: node
+  linkType: hard
+
 "import-local@npm:^3.0.2":
   version: 3.1.0
   resolution: "import-local@npm:3.1.0"
@@ -21021,6 +23812,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"import-meta-resolve@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "import-meta-resolve@npm:4.1.0"
+  checksum: 10/40162f67eb406c8d5d49266206ef12ff07b54f5fad8cfd806db9efe3a055958e9969be51d6efaf82e34b8bea6758113dcc17bb79ff148292a4badcabc3472f22
+  languageName: node
+  linkType: hard
+
 "imurmurhash@npm:*, imurmurhash@npm:^0.1.4":
   version: 0.1.4
   resolution: "imurmurhash@npm:0.1.4"
@@ -21090,6 +23888,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ini@npm:4.1.1":
+  version: 4.1.1
+  resolution: "ini@npm:4.1.1"
+  checksum: 10/64c7102301742a7527bb17257d18451410eacf63b4b5648a20e108816c355c21c4e8a1761bbcbf3fe8c4ded3297f1b832b885d5e3e485d781e293ebfaf56fea6
+  languageName: node
+  linkType: hard
+
 "ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:^1.3.8, ini@npm:~1.3.0":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
@@ -21139,6 +23944,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"inquirer@npm:8.2.5":
+  version: 8.2.5
+  resolution: "inquirer@npm:8.2.5"
+  dependencies:
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.1.1"
+    cli-cursor: "npm:^3.1.0"
+    cli-width: "npm:^3.0.0"
+    external-editor: "npm:^3.0.3"
+    figures: "npm:^3.0.0"
+    lodash: "npm:^4.17.21"
+    mute-stream: "npm:0.0.8"
+    ora: "npm:^5.4.1"
+    run-async: "npm:^2.4.0"
+    rxjs: "npm:^7.5.5"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+    through: "npm:^2.3.6"
+    wrap-ansi: "npm:^7.0.0"
+  checksum: 10/50a240dfeaca37a14e6a6d11d7d6f7da947be3a9fe1e34ac41db6a49fc27022e7b3875ebe8ccd739497359808694488f3509792cc986f9ac48c43135f4e14172
+  languageName: node
+  linkType: hard
+
 "internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
   version: 1.0.5
   resolution: "internal-slot@npm:1.0.5"
@@ -21150,6 +23978,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    hasown: "npm:^2.0.0"
+    side-channel: "npm:^1.0.4"
+  checksum: 10/3e66720508831153ecf37d13def9f6856f9f2960989ec8a0a0476c98f887fca9eff0163127466485cb825c900c2d6fc601aa9117b7783b90ffce23a71ea5d053
+  languageName: node
+  linkType: hard
+
 "internmap@npm:1 - 2":
   version: 2.0.3
   resolution: "internmap@npm:2.0.3"
@@ -21197,6 +24036,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"invert-kv@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "invert-kv@npm:2.0.0"
+  checksum: 10/0a03bfaa5b01406250ff7daae34fe5d4103db2b7d967655c7935b70f5fd8b2543fd98320a564a0ed037803c927156d2f77bb3bcf1fee489b3651cab955af7684
+  languageName: node
+  linkType: hard
+
 "io-ts@npm:^2.1.2":
   version: 2.2.20
   resolution: "io-ts@npm:2.2.20"
@@ -21269,6 +24115,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-accessor-descriptor@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-accessor-descriptor@npm:1.0.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10/df0d1da1a320e57c594e6f9b52dab8a6bece6dc90e51689d05ac8e5247164aa3eb3e9c66b37027bebfc0ea5fcce6d9503dbc41dccd82f4b57add79a307735365
+  languageName: node
+  linkType: hard
+
 "is-alphabetical@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-alphabetical@npm:1.0.4"
@@ -21324,6 +24179,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10/34a26213d981d58b30724ef37a1e0682f4040d580fa9ff58fdfdd3cefcb2287921718c63971c1c404951e7b747c50fdc7caf6e867e951353fa71b369c04c969b
+  languageName: node
+  linkType: hard
+
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
@@ -21366,7 +24231,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-buffer@npm:^1.0.2":
+"is-buffer@npm:^1.0.2, is-buffer@npm:^1.1.5":
   version: 1.1.6
   resolution: "is-buffer@npm:1.1.6"
   checksum: 10/f63da109e74bbe8947036ed529d43e4ae0c5fcd0909921dce4917ad3ea212c6a87c29f525ba1d17c0858c18331cf1046d4fc69ef59ed26896b25c8288a627133
@@ -21439,6 +24304,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-data-descriptor@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-descriptor@npm:1.0.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10/49b36e903b31623b0c5b416e182e366810ef97a3a19ab0e6cd501eb5599112680b7d9e768b07a84fb52aa2510a92b3eb51a3e18ce8d5f7978a49f4b50e6ec6dd
+  languageName: node
+  linkType: hard
+
+"is-data-view@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-view@npm:1.0.1"
+  dependencies:
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/4ba4562ac2b2ec005fefe48269d6bd0152785458cd253c746154ffb8a8ab506a29d0cfb3b74af87513843776a88e4981ae25c89457bf640a33748eab1a7216b5
+  languageName: node
+  linkType: hard
+
 "is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
@@ -21469,6 +24352,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-descriptor@npm:^0.1.0":
+  version: 0.1.7
+  resolution: "is-descriptor@npm:0.1.7"
+  dependencies:
+    is-accessor-descriptor: "npm:^1.0.1"
+    is-data-descriptor: "npm:^1.0.1"
+  checksum: 10/38783182c3d83f839a9fa3e87b4d6de11fa9639833ed98993ea51aea2296b2da155121956e148695a738228871d1057c5f963d0b1c857bb8a4a38d8dd9ceeb56
+  languageName: node
+  linkType: hard
+
+"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "is-descriptor@npm:1.0.3"
+  dependencies:
+    is-accessor-descriptor: "npm:^1.0.1"
+    is-data-descriptor: "npm:^1.0.1"
+  checksum: 10/b940d04d93adaffb749b3ca7f7f6d73dd3c5582b674f372513ecb5511a8a3f3ff4a24f4c1161cb10e48fe4886f9e84c09fa71785def27905ca8df1197e563dc6
+  languageName: node
+  linkType: hard
+
 "is-directory@npm:^0.3.1":
   version: 0.3.1
   resolution: "is-directory@npm:0.3.1"
@@ -21485,6 +24388,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-dotfile@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "is-dotfile@npm:1.0.3"
+  checksum: 10/5257760d998d50ba2d5b4707007c043c69da0b62172f2221505edc6671ff634581c05df494a19d8d7206d248154c2f29f8432193ee199d33b09733e66371fb35
+  languageName: node
+  linkType: hard
+
+"is-equal-shallow@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "is-equal-shallow@npm:0.1.3"
+  dependencies:
+    is-primitive: "npm:^2.0.0"
+  checksum: 10/1a296b660b8749ba1449017d9572e81fe8a96764877d5f9739c523a20cc7cdfa49594c16fa17052d0c3ee4711e35fd6919b06bf1b11b7126feab61abb9503ce6
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "is-extendable@npm:0.1.1"
+  checksum: 10/3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-extendable@npm:1.0.1"
+  dependencies:
+    is-plain-object: "npm:^2.0.4"
+  checksum: 10/db07bc1e9de6170de70eff7001943691f05b9d1547730b11be01c0ebfe67362912ba743cf4be6fd20a5e03b4180c685dad80b7c509fe717037e3eee30ad8e84f
+  languageName: node
+  linkType: hard
+
+"is-extglob@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-extglob@npm:1.0.0"
+  checksum: 10/5eea8517feeae5206547c0fc838c1416ec763b30093c286e1965a05f46b74a59ad391f912565f3b67c9c31cab4769ab9c35420e016b608acb47309be8d0d6e94
+  languageName: node
+  linkType: hard
+
 "is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
@@ -21492,6 +24434,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-finite@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "is-finite@npm:1.1.0"
+  checksum: 10/532b97ed3d03e04c6bd203984d9e4ba3c0c390efee492bad5d1d1cd1802a68ab27adbd3ef6382f6312bed6c8bb1bd3e325ea79a8dc8fe080ed7a06f5f97b93e7
+  languageName: node
+  linkType: hard
+
 "is-fullwidth-code-point@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-fullwidth-code-point@npm:1.0.0"
@@ -21522,6 +24471,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-generator-fn@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-generator-fn@npm:1.0.0"
+  checksum: 10/9ea6404bdcbafc1edf2881e8fc57a7e2e8f48b2c04f24e4e889e670837d538c7e5a6ee645ee5217abb3e327ae511ed143824f8fde9c5c8e83129b20df9d2c78e
+  languageName: node
+  linkType: hard
+
 "is-generator-fn@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-generator-fn@npm:2.1.0"
@@ -21538,7 +24494,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
+"is-glob@npm:^2.0.0, is-glob@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "is-glob@npm:2.0.1"
+  dependencies:
+    is-extglob: "npm:^1.0.0"
+  checksum: 10/089f5f93640072491396a5f075ce73e949a90f35832b782bc49a6b7637d58e392d53cb0b395e059ccab70fcb82ff35d183f6f9ebbcb43227a1e02e3fed5430c9
+  languageName: node
+  linkType: hard
+
+"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
   dependencies:
@@ -21630,6 +24595,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10/8fe5cffd8d4fb2ec7b49d657e1691889778d037494c6f40f4d1a524cadd658b4b53ad7b6b73a59bcb4b143ae9a3d15829af864b2c0f9d65ac1e678c4c80f17e5
+  languageName: node
+  linkType: hard
+
 "is-npm@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-npm@npm:1.0.0"
@@ -21646,6 +24618,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-number@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "is-number@npm:2.1.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10/d80e041a43a8de31ecc02037d532f1f448ec9c5b6c02fe7ee67bdd45d21cd9a4b3b4cf07e428ae5adafc2f17408c49fcb0a227915916d94a16d576c39e689f60
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-number@npm:3.0.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10/0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "is-number@npm:4.0.0"
+  checksum: 10/7f25967eb4fd92c4c5c282f6510c86d257de5894501b831ae6ab44a964c690ba721eef931eb2aaad2aacf35fd0cf57b9d2135b0bd25147dc5bc64f99fbca1785
+  languageName: node
+  linkType: hard
+
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
@@ -21653,7 +24650,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-obj@npm:^1.0.0":
+"is-obj@npm:^1.0.0, is-obj@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-obj@npm:1.0.1"
   checksum: 10/3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c
@@ -21667,6 +24664,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-observable@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-observable@npm:1.1.0"
+  dependencies:
+    symbol-observable: "npm:^1.1.0"
+  checksum: 10/ab3d7e740915e6b53a81d96ce7d581f4dd26dacceb95278b74e7bf3123221073ea02cde810f864cff94ed5c394f18248deefd6a8f2d40137d868130eb5be6f85
+  languageName: node
+  linkType: hard
+
+"is-path-cwd@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-path-cwd@npm:1.0.0"
+  checksum: 10/ade6d8d59bb6a00079fb515ad78a741b757a66bc6208a2dab2c9f8ad535bc61e21b6823ae8b23df2bf4d2b9dac8df4f3df2e68105698eb3e15ceb5ca90dac097
+  languageName: node
+  linkType: hard
+
 "is-path-cwd@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-path-cwd@npm:2.2.0"
@@ -21674,6 +24687,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-path-in-cwd@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "is-path-in-cwd@npm:1.0.1"
+  dependencies:
+    is-path-inside: "npm:^1.0.0"
+  checksum: 10/bacfc67c0dacd09002668abb1565fa77ee9593914f1502ec8ecae9821ddd39a2a98e7a95053e3446421b3429c3b3df1a26669c95cecc9f4f556609ec9760ba2a
+  languageName: node
+  linkType: hard
+
 "is-path-inside@npm:^1.0.0":
   version: 1.0.1
   resolution: "is-path-inside@npm:1.0.1"
@@ -21718,7 +24740,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-plain-object@npm:^2.0.4":
+"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4":
   version: 2.0.4
   resolution: "is-plain-object@npm:2.0.4"
   dependencies:
@@ -21727,6 +24749,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-posix-bracket@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "is-posix-bracket@npm:0.1.1"
+  checksum: 10/8a6391b41e7acef6898e64b00e06885b28c14b0c76398d3251a6ab1e5350d495dd32ec3f7f88f3f877558ce4b970939356fb315ee607f8f99a1716d4db7bdd40
+  languageName: node
+  linkType: hard
+
 "is-potential-custom-element-name@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-potential-custom-element-name@npm:1.0.1"
@@ -21734,6 +24763,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-primitive@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-primitive@npm:2.0.0"
+  checksum: 10/4d63fe952e31a4bc1d1a65d72f8485f5952407dce8d1cd8d8f070586936ea9ae2df79e0a83956b224aa7776cbbf5767eba3277f28119c36a616b20a439f057c0
+  languageName: node
+  linkType: hard
+
+"is-promise@npm:^2.1.0":
+  version: 2.2.2
+  resolution: "is-promise@npm:2.2.2"
+  checksum: 10/18bf7d1c59953e0ad82a1ed963fb3dc0d135c8f299a14f89a17af312fc918373136e56028e8831700e1933519630cc2fd4179a777030330fde20d34e96f40c78
+  languageName: node
+  linkType: hard
+
 "is-redirect@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-redirect@npm:1.0.0"
@@ -21769,6 +24812,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-regexp@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-regexp@npm:1.0.0"
+  checksum: 10/be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef
+  languageName: node
+  linkType: hard
+
 "is-resolvable@npm:^1.0.0":
   version: 1.1.0
   resolution: "is-resolvable@npm:1.1.0"
@@ -21799,6 +24849,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+  checksum: 10/bc5402900dc62b96ebb2548bf5b0a0bcfacc2db122236fe3ab3b3e3c884293a0d5eb777e73f059bcbf8dc8563bb65eae972fee0fb97e38a9ae27c8678f62bcfe
+  languageName: node
+  linkType: hard
+
 "is-stream@npm:^1.0.0, is-stream@npm:^1.0.1, is-stream@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-stream@npm:1.1.0"
@@ -21856,6 +24915,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-typed-array@npm:^1.1.13":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
+  dependencies:
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10/f850ba08286358b9a11aee6d93d371a45e3c59b5953549ee1c1a9a55ba5c1dd1bd9952488ae194ad8f32a9cf5e79c8fa5f0cc4d78c00720aa0bbcf238b38062d
+  languageName: node
+  linkType: hard
+
 "is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "is-typedarray@npm:1.0.0"
@@ -21870,6 +24938,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-utf8@npm:^0.2.0, is-utf8@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "is-utf8@npm:0.2.1"
+  checksum: 10/167ccd2be869fc228cc62c1a28df4b78c6b5485d15a29027d3b5dceb09b383e86a3522008b56dcac14b592b22f0a224388718c2505027a994fd8471465de54b3
+  languageName: node
+  linkType: hard
+
 "is-weakmap@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-weakmap@npm:2.0.1"
@@ -21896,6 +24971,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-windows@npm:^1.0.1, is-windows@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-windows@npm:1.0.2"
+  checksum: 10/438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-wsl@npm:1.1.0"
+  checksum: 10/ea157d232351e68c92bd62fc541771096942fe72f69dff452dd26dcc31466258c570a3b04b8cda2e01cd2968255b02951b8670d08ea4ed76d6b1a646061ac4fe
+  languageName: node
+  linkType: hard
+
 "is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
@@ -21912,6 +25001,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isarray@npm:1.0.0, isarray@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "isarray@npm:1.0.0"
+  checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
+  languageName: node
+  linkType: hard
+
 "isarray@npm:^2.0.1, isarray@npm:^2.0.5":
   version: 2.0.5
   resolution: "isarray@npm:2.0.5"
@@ -21919,13 +25015,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "isarray@npm:1.0.0"
-  checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
-  languageName: node
-  linkType: hard
-
 "isbot-fast@npm:1.2.0":
   version: 1.2.0
   resolution: "isbot-fast@npm:1.2.0"
@@ -21940,7 +25029,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isobject@npm:^3.0.1":
+"isobject@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "isobject@npm:2.1.0"
+  dependencies:
+    isarray: "npm:1.0.0"
+  checksum: 10/811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f
+  languageName: node
+  linkType: hard
+
+"isobject@npm:^3.0.0, isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
   checksum: 10/db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
@@ -21977,6 +25075,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-api@npm:^1.3.1":
+  version: 1.3.7
+  resolution: "istanbul-api@npm:1.3.7"
+  dependencies:
+    async: "npm:^2.1.4"
+    fileset: "npm:^2.0.2"
+    istanbul-lib-coverage: "npm:^1.2.1"
+    istanbul-lib-hook: "npm:^1.2.2"
+    istanbul-lib-instrument: "npm:^1.10.2"
+    istanbul-lib-report: "npm:^1.1.5"
+    istanbul-lib-source-maps: "npm:^1.2.6"
+    istanbul-reports: "npm:^1.5.1"
+    js-yaml: "npm:^3.7.0"
+    mkdirp: "npm:^0.5.1"
+    once: "npm:^1.4.0"
+  checksum: 10/080f3d3cf9e98a2bf037b910f504d23b6708dc199c65ff540dc6b9be2c95ec2a7471c6e84586a2fd63490ee463990c7600ed386a95d83c47f9a4f4e7c75e44de
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-coverage@npm:^1.2.0, istanbul-lib-coverage@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "istanbul-lib-coverage@npm:1.2.1"
+  checksum: 10/d22f18573e6c8b1de731a00297d1c2fe22e6b959243765f184d4441c41700c1e94111efa4160a0f22e2c7d23294ec412905e382adef12d1064e9dfbd1572606a
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
@@ -21984,6 +25108,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-hook@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "istanbul-lib-hook@npm:1.2.2"
+  dependencies:
+    append-transform: "npm:^0.4.0"
+  checksum: 10/5fdde55b0abd162acd8b53214b2fe2e6f6f8e0d9ed9d9e5d434e1e2734e18df02a17057937b4a59953ceb58aa251cbabe40ef65dbe2501f04ce679d219772204
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-instrument@npm:^1.10.1, istanbul-lib-instrument@npm:^1.10.2":
+  version: 1.10.2
+  resolution: "istanbul-lib-instrument@npm:1.10.2"
+  dependencies:
+    babel-generator: "npm:^6.18.0"
+    babel-template: "npm:^6.16.0"
+    babel-traverse: "npm:^6.18.0"
+    babel-types: "npm:^6.18.0"
+    babylon: "npm:^6.18.0"
+    istanbul-lib-coverage: "npm:^1.2.1"
+    semver: "npm:^5.3.0"
+  checksum: 10/0a821b3e2d0a798c0ee5e26782c4c0b4c7a10f3a78be631aed21545654d412516d1c75e7eae4783b62c4e32f4656ca8d52270ba95f58a3fd6bdab78e05a00417
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0":
   version: 5.2.1
   resolution: "istanbul-lib-instrument@npm:5.2.1"
@@ -21997,6 +25145,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-report@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "istanbul-lib-report@npm:1.1.5"
+  dependencies:
+    istanbul-lib-coverage: "npm:^1.2.1"
+    mkdirp: "npm:^0.5.1"
+    path-parse: "npm:^1.0.5"
+    supports-color: "npm:^3.1.2"
+  checksum: 10/0063ef8af0ca4a4bee69d9b0e5b40cc219a6b5faee39aa5b824725a2e2ccb6a41f376767b69dbf00d275916b6371c32a0a9ecb94812a9663d23f973a6147073d
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-report@npm:^3.0.0":
   version: 3.0.1
   resolution: "istanbul-lib-report@npm:3.0.1"
@@ -22008,6 +25168,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-source-maps@npm:^1.2.4, istanbul-lib-source-maps@npm:^1.2.6":
+  version: 1.2.6
+  resolution: "istanbul-lib-source-maps@npm:1.2.6"
+  dependencies:
+    debug: "npm:^3.1.0"
+    istanbul-lib-coverage: "npm:^1.2.1"
+    mkdirp: "npm:^0.5.1"
+    rimraf: "npm:^2.6.1"
+    source-map: "npm:^0.5.3"
+  checksum: 10/c3db201497e7345e9ce9cb59b076253b506a56d18842228e033ccbf793c6438cd34b3331465be220addf4b74789b70421926f7495a85b6ff94177c6917a4810d
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-source-maps@npm:^4.0.0":
   version: 4.0.1
   resolution: "istanbul-lib-source-maps@npm:4.0.1"
@@ -22019,6 +25192,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-reports@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "istanbul-reports@npm:1.5.1"
+  dependencies:
+    handlebars: "npm:^4.0.3"
+  checksum: 10/4f97372bf38c2158a18b231665728b2aec15bb8852e290e9b1d2fa91314dc80eef7fb9fa3ec864329deefd6b11f66354d7632e0ca6bc4ce46d3bd5fba8c5d9d2
+  languageName: node
+  linkType: hard
+
 "istanbul-reports@npm:^3.1.3":
   version: 3.1.6
   resolution: "istanbul-reports@npm:3.1.6"
@@ -22076,6 +25258,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-changed-files@npm:^23.4.2":
+  version: 23.4.2
+  resolution: "jest-changed-files@npm:23.4.2"
+  dependencies:
+    throat: "npm:^4.0.0"
+  checksum: 10/07dad83c96f8caea732884cc8c328145f146c17ee9a288d5d72d6db3e83b4e74fa009ae576b8bdc82849c21cae035fb87fe4dec0c3724f64d0dbe61a0b1ecc61
+  languageName: node
+  linkType: hard
+
 "jest-changed-files@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-changed-files@npm:27.5.1"
@@ -22114,6 +25305,52 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-cli@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-cli@npm:23.6.0"
+  dependencies:
+    ansi-escapes: "npm:^3.0.0"
+    chalk: "npm:^2.0.1"
+    exit: "npm:^0.1.2"
+    glob: "npm:^7.1.2"
+    graceful-fs: "npm:^4.1.11"
+    import-local: "npm:^1.0.0"
+    is-ci: "npm:^1.0.10"
+    istanbul-api: "npm:^1.3.1"
+    istanbul-lib-coverage: "npm:^1.2.0"
+    istanbul-lib-instrument: "npm:^1.10.1"
+    istanbul-lib-source-maps: "npm:^1.2.4"
+    jest-changed-files: "npm:^23.4.2"
+    jest-config: "npm:^23.6.0"
+    jest-environment-jsdom: "npm:^23.4.0"
+    jest-get-type: "npm:^22.1.0"
+    jest-haste-map: "npm:^23.6.0"
+    jest-message-util: "npm:^23.4.0"
+    jest-regex-util: "npm:^23.3.0"
+    jest-resolve-dependencies: "npm:^23.6.0"
+    jest-runner: "npm:^23.6.0"
+    jest-runtime: "npm:^23.6.0"
+    jest-snapshot: "npm:^23.6.0"
+    jest-util: "npm:^23.4.0"
+    jest-validate: "npm:^23.6.0"
+    jest-watcher: "npm:^23.4.0"
+    jest-worker: "npm:^23.2.0"
+    micromatch: "npm:^2.3.11"
+    node-notifier: "npm:^5.2.1"
+    prompts: "npm:^0.1.9"
+    realpath-native: "npm:^1.0.0"
+    rimraf: "npm:^2.5.4"
+    slash: "npm:^1.0.0"
+    string-length: "npm:^2.0.0"
+    strip-ansi: "npm:^4.0.0"
+    which: "npm:^1.2.12"
+    yargs: "npm:^11.0.0"
+  bin:
+    jest: ./bin/jest.js
+  checksum: 10/35d94c7da75f4e0eddbf17fc85149db904e146e552af2c6c5b391680e751221edfdc620277120d304bbcb649004dd6775ca07fbd4aa76e6f2a073df77edf732e
+  languageName: node
+  linkType: hard
+
 "jest-cli@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-cli@npm:27.5.1"
@@ -22141,6 +25378,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-config@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-config@npm:23.6.0"
+  dependencies:
+    babel-core: "npm:^6.0.0"
+    babel-jest: "npm:^23.6.0"
+    chalk: "npm:^2.0.1"
+    glob: "npm:^7.1.1"
+    jest-environment-jsdom: "npm:^23.4.0"
+    jest-environment-node: "npm:^23.4.0"
+    jest-get-type: "npm:^22.1.0"
+    jest-jasmine2: "npm:^23.6.0"
+    jest-regex-util: "npm:^23.3.0"
+    jest-resolve: "npm:^23.6.0"
+    jest-util: "npm:^23.4.0"
+    jest-validate: "npm:^23.6.0"
+    micromatch: "npm:^2.3.11"
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/801633d9fecfc44bf9a0935b35e4e223d3716adb70b2f2db069fc49e63dc71b234d0e8b44eecc1b96dbc2292cfa39c5391f3cce6208d599de3fe22cffae345b6
+  languageName: node
+  linkType: hard
+
 "jest-config@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-config@npm:27.5.1"
@@ -22178,6 +25437,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-diff@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-diff@npm:23.6.0"
+  dependencies:
+    chalk: "npm:^2.0.1"
+    diff: "npm:^3.2.0"
+    jest-get-type: "npm:^22.1.0"
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/358360b5ed3d48d569579be074b3e0f4e72ae7d37f0f720c5a2c8ef16a674741f9c4fad5cf0a8666debd022a5df11276794c409ccc6b0ec3b77e37e60ae4dadc
+  languageName: node
+  linkType: hard
+
 "jest-diff@npm:^26.0.0":
   version: 26.6.2
   resolution: "jest-diff@npm:26.6.2"
@@ -22202,6 +25473,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-docblock@npm:^23.2.0":
+  version: 23.2.0
+  resolution: "jest-docblock@npm:23.2.0"
+  dependencies:
+    detect-newline: "npm:^2.1.0"
+  checksum: 10/1b225189884751ad3503f901ebc157457d495a53a033390ac0093b20312bff18593bb3c963cbe860b0c2b9cb33e0da5761ce1f444498e5013ac80b5c06e4e52c
+  languageName: node
+  linkType: hard
+
 "jest-docblock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-docblock@npm:27.5.1"
@@ -22211,6 +25491,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-each@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-each@npm:23.6.0"
+  dependencies:
+    chalk: "npm:^2.0.1"
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/7b32903697701101330c92f5ec4984d3e8a2c154b87fb828e8fbf4e0bb283578e9e037e3cf2f726877df744f57252eac72d9d5a2a9050726bf98fde93d7450f5
+  languageName: node
+  linkType: hard
+
 "jest-each@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-each@npm:27.5.1"
@@ -22224,6 +25514,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-environment-jsdom@npm:^23.4.0":
+  version: 23.4.0
+  resolution: "jest-environment-jsdom@npm:23.4.0"
+  dependencies:
+    jest-mock: "npm:^23.2.0"
+    jest-util: "npm:^23.4.0"
+    jsdom: "npm:^11.5.1"
+  checksum: 10/b13e29cfdfd566a5976d8c91507409de64097aea81be2782042904960e29c1ca746966688b5e5e6b222629bd1434304b6d4d3b099ec620786bd014a95f40d3f5
+  languageName: node
+  linkType: hard
+
 "jest-environment-jsdom@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-environment-jsdom@npm:27.5.1"
@@ -22239,6 +25540,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-environment-node@npm:^23.4.0":
+  version: 23.4.0
+  resolution: "jest-environment-node@npm:23.4.0"
+  dependencies:
+    jest-mock: "npm:^23.2.0"
+    jest-util: "npm:^23.4.0"
+  checksum: 10/a0f117a3ab2c25e26c55a1c02cf48439459a36f5889211483999c64d602d8a9169a7e3dbfcd174256a31536a6520c891b2736462ac6fa9d4357476f5e6b3e65e
+  languageName: node
+  linkType: hard
+
 "jest-environment-node@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-environment-node@npm:27.5.1"
@@ -22253,6 +25564,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-get-type@npm:^22.1.0":
+  version: 22.4.3
+  resolution: "jest-get-type@npm:22.4.3"
+  checksum: 10/f2daab7cb762457cdcd5500e3b0222cc96856649b685c40a621fe7395147ee67bbb594a2285b28c0b3cb9d80819eca4f99dd450df1bcac8a7cffa8a2dbaeec31
+  languageName: node
+  linkType: hard
+
 "jest-get-type@npm:^26.3.0":
   version: 26.3.0
   resolution: "jest-get-type@npm:26.3.0"
@@ -22267,6 +25585,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-haste-map@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-haste-map@npm:23.6.0"
+  dependencies:
+    fb-watchman: "npm:^2.0.0"
+    graceful-fs: "npm:^4.1.11"
+    invariant: "npm:^2.2.4"
+    jest-docblock: "npm:^23.2.0"
+    jest-serializer: "npm:^23.0.1"
+    jest-worker: "npm:^23.2.0"
+    micromatch: "npm:^2.3.11"
+    sane: "npm:^2.0.0"
+  checksum: 10/a2b549031fdba127e704d0a06e567847378c2bdc84f78188754c610ab36e8bd0a01b1a057b5d07c1a7254d92b38e00122c5c24ce8d08e64dc64268bb72fe8852
+  languageName: node
+  linkType: hard
+
 "jest-haste-map@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-haste-map@npm:27.5.1"
@@ -22291,6 +25625,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-jasmine2@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-jasmine2@npm:23.6.0"
+  dependencies:
+    babel-traverse: "npm:^6.0.0"
+    chalk: "npm:^2.0.1"
+    co: "npm:^4.6.0"
+    expect: "npm:^23.6.0"
+    is-generator-fn: "npm:^1.0.0"
+    jest-diff: "npm:^23.6.0"
+    jest-each: "npm:^23.6.0"
+    jest-matcher-utils: "npm:^23.6.0"
+    jest-message-util: "npm:^23.4.0"
+    jest-snapshot: "npm:^23.6.0"
+    jest-util: "npm:^23.4.0"
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/a4126092f8bc81d7fd7801eb2bdfea08b6f0dd7fa75e2a389d9868000cef808ad8051aa538d6c5fd4e5ed6cace4b75f0d6cb85e4f90161b95b938068d0f72d34
+  languageName: node
+  linkType: hard
+
 "jest-jasmine2@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-jasmine2@npm:27.5.1"
@@ -22316,6 +25670,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-leak-detector@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-leak-detector@npm:23.6.0"
+  dependencies:
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/f17357685e62d6188838f3309cdef3148762362d525aee3732db0e7dc356779ede12d760cb030079df028affb2d6ff70e0f8b8a47f68f1ebe4f182370bbef334
+  languageName: node
+  linkType: hard
+
 "jest-leak-detector@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-leak-detector@npm:27.5.1"
@@ -22326,6 +25689,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-matcher-utils@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-matcher-utils@npm:23.6.0"
+  dependencies:
+    chalk: "npm:^2.0.1"
+    jest-get-type: "npm:^22.1.0"
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/ae2d864c8fda68f32f783d0bf22b6793915e1ce0a3fc038104cc12df43adb0cca02715642998c7a90d425fd2ad4fb40ae9affa09024b604221c642d85fcb5fe4
+  languageName: node
+  linkType: hard
+
 "jest-matcher-utils@npm:^27.0.0, jest-matcher-utils@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-matcher-utils@npm:27.5.1"
@@ -22338,6 +25712,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-message-util@npm:^23.4.0":
+  version: 23.4.0
+  resolution: "jest-message-util@npm:23.4.0"
+  dependencies:
+    "@babel/code-frame": "npm:^7.0.0-beta.35"
+    chalk: "npm:^2.0.1"
+    micromatch: "npm:^2.3.11"
+    slash: "npm:^1.0.0"
+    stack-utils: "npm:^1.0.1"
+  checksum: 10/f6235c559b8bf9f4ff3b8f31fc2cda24125b9e07efd8ab7460f8117d0f8459ca197e45b1f685c625047e5a420ea6dce5b647e9ac9b56e8ab0a7343a49590b3f7
+  languageName: node
+  linkType: hard
+
 "jest-message-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-message-util@npm:27.5.1"
@@ -22355,6 +25742,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-mock@npm:^23.2.0":
+  version: 23.2.0
+  resolution: "jest-mock@npm:23.2.0"
+  checksum: 10/520339b81e8399aa69ac438c95581f419d5160d6b4315978716cc99021054eadce6e339eb322f5f10a7a68f569dcde36eb25103cb48c7b7603352edc56a8717f
+  languageName: node
+  linkType: hard
+
 "jest-mock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-mock@npm:27.5.1"
@@ -22377,6 +25771,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-regex-util@npm:^23.3.0":
+  version: 23.3.0
+  resolution: "jest-regex-util@npm:23.3.0"
+  checksum: 10/5cdf684fe11d224a38c4191fae158edb879f93e3b8b21e3554df1b4171e84f5113f61ce085ea8ef8b2a286d7d8af59d64a1c04a9da484aeacb70040a455517bc
+  languageName: node
+  linkType: hard
+
 "jest-regex-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-regex-util@npm:27.5.1"
@@ -22384,6 +25785,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-resolve-dependencies@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-resolve-dependencies@npm:23.6.0"
+  dependencies:
+    jest-regex-util: "npm:^23.3.0"
+    jest-snapshot: "npm:^23.6.0"
+  checksum: 10/a6de3b97a2f637c8af4876eba544bc43af907aa017e2efcc8d42ba432daa2d4e8cff63052938d6db05d077054161542278e39e0631735af163ef1b25036a6a5e
+  languageName: node
+  linkType: hard
+
 "jest-resolve-dependencies@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-resolve-dependencies@npm:27.5.1"
@@ -22395,6 +25806,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-resolve@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-resolve@npm:23.6.0"
+  dependencies:
+    browser-resolve: "npm:^1.11.3"
+    chalk: "npm:^2.0.1"
+    realpath-native: "npm:^1.0.0"
+  checksum: 10/76cd6eacfc08dadcaecc819fec7f7e354279def0982038059af03e15828712f10163a6dca898357acbba70f78728e247c553f434d0ea14e5e36b081fe40069b7
+  languageName: node
+  linkType: hard
+
 "jest-resolve@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-resolve@npm:27.5.1"
@@ -22413,6 +25835,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-runner@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-runner@npm:23.6.0"
+  dependencies:
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.1.11"
+    jest-config: "npm:^23.6.0"
+    jest-docblock: "npm:^23.2.0"
+    jest-haste-map: "npm:^23.6.0"
+    jest-jasmine2: "npm:^23.6.0"
+    jest-leak-detector: "npm:^23.6.0"
+    jest-message-util: "npm:^23.4.0"
+    jest-runtime: "npm:^23.6.0"
+    jest-util: "npm:^23.4.0"
+    jest-worker: "npm:^23.2.0"
+    source-map-support: "npm:^0.5.6"
+    throat: "npm:^4.0.0"
+  checksum: 10/9e09d67fa4aef0f100b89411dea669b28f3b2fc4c695f4409786731b43fac3ef3f8bc187f71dbc96d95140e4c6919d0ba70a6e7541d8da08f75db3791b1b968f
+  languageName: node
+  linkType: hard
+
 "jest-runner@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-runner@npm:27.5.1"
@@ -22442,6 +25885,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-runtime@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-runtime@npm:23.6.0"
+  dependencies:
+    babel-core: "npm:^6.0.0"
+    babel-plugin-istanbul: "npm:^4.1.6"
+    chalk: "npm:^2.0.1"
+    convert-source-map: "npm:^1.4.0"
+    exit: "npm:^0.1.2"
+    fast-json-stable-stringify: "npm:^2.0.0"
+    graceful-fs: "npm:^4.1.11"
+    jest-config: "npm:^23.6.0"
+    jest-haste-map: "npm:^23.6.0"
+    jest-message-util: "npm:^23.4.0"
+    jest-regex-util: "npm:^23.3.0"
+    jest-resolve: "npm:^23.6.0"
+    jest-snapshot: "npm:^23.6.0"
+    jest-util: "npm:^23.4.0"
+    jest-validate: "npm:^23.6.0"
+    micromatch: "npm:^2.3.11"
+    realpath-native: "npm:^1.0.0"
+    slash: "npm:^1.0.0"
+    strip-bom: "npm:3.0.0"
+    write-file-atomic: "npm:^2.1.0"
+    yargs: "npm:^11.0.0"
+  bin:
+    jest-runtime: ./bin/jest-runtime.js
+  checksum: 10/aff7d15e2fe0fcdad66d936b710c54499cb09a4fa56337289550c0060d14bbe0cef4af3beea9adbd10b61bebebfb6d98c607bca50e9086d6ce491d5b1487cc9f
+  languageName: node
+  linkType: hard
+
 "jest-runtime@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-runtime@npm:27.5.1"
@@ -22472,6 +25946,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-serializer@npm:^23.0.1":
+  version: 23.0.1
+  resolution: "jest-serializer@npm:23.0.1"
+  checksum: 10/04243d06fef006566d6ed035e56bfce996bb8b91ddb5509c79e15a51e9b273fcd553843600161ea463e3104f2eb9b33ede92d23799fd9b6ed6dd073f05739c9f
+  languageName: node
+  linkType: hard
+
 "jest-serializer@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-serializer@npm:27.5.1"
@@ -22482,6 +25963,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-snapshot@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-snapshot@npm:23.6.0"
+  dependencies:
+    babel-types: "npm:^6.0.0"
+    chalk: "npm:^2.0.1"
+    jest-diff: "npm:^23.6.0"
+    jest-matcher-utils: "npm:^23.6.0"
+    jest-message-util: "npm:^23.4.0"
+    jest-resolve: "npm:^23.6.0"
+    mkdirp: "npm:^0.5.1"
+    natural-compare: "npm:^1.4.0"
+    pretty-format: "npm:^23.6.0"
+    semver: "npm:^5.5.0"
+  checksum: 10/5ae44966202a79bed59344fdc2923639cf4b47ecef0727d4795b6008dfced0f08a02177e375b63fe9edbba03f4538cb2ebbd6d8bc2c7ef140fd06acaae33ba01
+  languageName: node
+  linkType: hard
+
 "jest-snapshot@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-snapshot@npm:27.5.1"
@@ -22512,6 +26011,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-util@npm:^23.4.0":
+  version: 23.4.0
+  resolution: "jest-util@npm:23.4.0"
+  dependencies:
+    callsites: "npm:^2.0.0"
+    chalk: "npm:^2.0.1"
+    graceful-fs: "npm:^4.1.11"
+    is-ci: "npm:^1.0.10"
+    jest-message-util: "npm:^23.4.0"
+    mkdirp: "npm:^0.5.1"
+    slash: "npm:^1.0.0"
+    source-map: "npm:^0.6.0"
+  checksum: 10/ded9d5d3b5fe4c2b84085160ed741fe8e3f5faf040ccd31acd0027c591e53d3b7ac95cc3bfd4c8817d9914cdd30e94b56f11239798de440314b87ff062d078c1
+  languageName: node
+  linkType: hard
+
 "jest-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-util@npm:27.5.1"
@@ -22526,6 +26041,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-validate@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest-validate@npm:23.6.0"
+  dependencies:
+    chalk: "npm:^2.0.1"
+    jest-get-type: "npm:^22.1.0"
+    leven: "npm:^2.1.0"
+    pretty-format: "npm:^23.6.0"
+  checksum: 10/d57b37b97748c17cbc226da6753efb2be8cb62d3aadfffac186eee3af0d5be098235b30a43adb0bffbf1cd2a211173846a54ef2d194520b1e8a8fe45192b9db2
+  languageName: node
+  linkType: hard
+
 "jest-validate@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-validate@npm:27.5.1"
@@ -22540,6 +26067,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-watcher@npm:^23.4.0":
+  version: 23.4.0
+  resolution: "jest-watcher@npm:23.4.0"
+  dependencies:
+    ansi-escapes: "npm:^3.0.0"
+    chalk: "npm:^2.0.1"
+    string-length: "npm:^2.0.0"
+  checksum: 10/c7285cd595644f824ca60bbcb1b342ae0c72f8a4f87f89a20c1326fa19efc80dbe0b14972660f1e037ffa64c3541ea1d06990836b2cf6b767ffa0006505d6c24
+  languageName: node
+  linkType: hard
+
 "jest-watcher@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-watcher@npm:27.5.1"
@@ -22555,6 +26093,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-worker@npm:^23.2.0":
+  version: 23.2.0
+  resolution: "jest-worker@npm:23.2.0"
+  dependencies:
+    merge-stream: "npm:^1.0.1"
+  checksum: 10/13f0428e17fa4ee79455d699b2ccdb9b871619164acd3838a1d93d3e89317b50c2b284cb9a2e275741374718251272fda0a4096e5f9197d32c160dfe53d5c516
+  languageName: node
+  linkType: hard
+
 "jest-worker@npm:^26.2.1":
   version: 26.6.2
   resolution: "jest-worker@npm:26.6.2"
@@ -22577,6 +26124,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "jest@npm:23.6.0"
+  dependencies:
+    import-local: "npm:^1.0.0"
+    jest-cli: "npm:^23.6.0"
+  bin:
+    jest: ./bin/jest.js
+  checksum: 10/a8b0e0229cbd6e00bc1e56900229bdb6523a6298901809bd0ececd8665af8cd006c6f0640d7919650ea18a32dca16d8e977fc98a3a0e2398ffddb3347780e48b
+  languageName: node
+  linkType: hard
+
 "jest@npm:^27.4.7":
   version: 27.5.1
   resolution: "jest@npm:27.5.1"
@@ -22595,6 +26154,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jiti@npm:^1.19.1":
+  version: 1.21.3
+  resolution: "jiti@npm:1.21.3"
+  bin:
+    jiti: bin/jiti.js
+  checksum: 10/5a9f36c610f8a5f750ebdea9295d7966dbf77129e8daaa8fc6ea2e60f38019a61bd79fced4e917023305ffdd66f4fc5bddcbdd6be450881393121a55d02b2241
+  languageName: node
+  linkType: hard
+
 "jose@npm:^5.1.2":
   version: 5.1.3
   resolution: "jose@npm:5.1.3"
@@ -22623,6 +26191,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-tokens@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "js-tokens@npm:3.0.2"
+  checksum: 10/a2d47dbe77c2d7d1abd99f25fcec61c825797e5775a187101879c4fb8e7bbbf89eb83bd315157b92c35d5eed5951962a47b1fedc8c778824b5d95cfb164a310c
+  languageName: node
+  linkType: hard
+
 "js-yaml@npm:=4.1.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -22634,7 +26209,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1":
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.7.0":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
@@ -22688,6 +26263,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsdom@npm:^11.5.1":
+  version: 11.12.0
+  resolution: "jsdom@npm:11.12.0"
+  dependencies:
+    abab: "npm:^2.0.0"
+    acorn: "npm:^5.5.3"
+    acorn-globals: "npm:^4.1.0"
+    array-equal: "npm:^1.0.0"
+    cssom: "npm:>= 0.3.2 < 0.4.0"
+    cssstyle: "npm:^1.0.0"
+    data-urls: "npm:^1.0.0"
+    domexception: "npm:^1.0.1"
+    escodegen: "npm:^1.9.1"
+    html-encoding-sniffer: "npm:^1.0.2"
+    left-pad: "npm:^1.3.0"
+    nwsapi: "npm:^2.0.7"
+    parse5: "npm:4.0.0"
+    pn: "npm:^1.1.0"
+    request: "npm:^2.87.0"
+    request-promise-native: "npm:^1.0.5"
+    sax: "npm:^1.2.4"
+    symbol-tree: "npm:^3.2.2"
+    tough-cookie: "npm:^2.3.4"
+    w3c-hr-time: "npm:^1.0.1"
+    webidl-conversions: "npm:^4.0.2"
+    whatwg-encoding: "npm:^1.0.3"
+    whatwg-mimetype: "npm:^2.1.0"
+    whatwg-url: "npm:^6.4.1"
+    ws: "npm:^5.2.0"
+    xml-name-validator: "npm:^3.0.0"
+  checksum: 10/60c2ba990ec5cdb44b1434a312fb41a20734ffb3888e7547e36851b0060c62d4719a5f7ef8b93c7b131ecb9beeb6927d9000bb20971b68742a35a300addc8229
+  languageName: node
+  linkType: hard
+
 "jsdom@npm:^16.6.0":
   version: 16.7.0
   resolution: "jsdom@npm:16.7.0"
@@ -22735,6 +26344,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsesc@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "jsesc@npm:1.3.0"
+  bin:
+    jsesc: bin/jsesc
+  checksum: 10/d6aa8ebbd57fb5bafeeb31df3ff9580b30e655a049a196bdd1630bc53026e8dc07b462bb4251e33888e83fe53f76f1bebfde4ddfd30f0af78acc0efccb130572
+  languageName: node
+  linkType: hard
+
 "jsesc@npm:^2.5.1":
   version: 2.5.2
   resolution: "jsesc@npm:2.5.2"
@@ -22753,6 +26371,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-buffer@npm:3.0.0":
+  version: 3.0.0
+  resolution: "json-buffer@npm:3.0.0"
+  checksum: 10/6e364585600598c42f1cc85d1305569aeb1a6a13e7c67960f17b403f087e2700104ec8e49fc681ab6d6278ee4d132ac033f2625c22a9777ed9b83b403b40f23e
+  languageName: node
+  linkType: hard
+
 "json-buffer@npm:3.0.1":
   version: 3.0.1
   resolution: "json-buffer@npm:3.0.1"
@@ -22814,6 +26439,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json5@npm:2.x, json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2, json5@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
+  bin:
+    json5: lib/cli.js
+  checksum: 10/1db67b853ff0de3534085d630691d3247de53a2ed1390ba0ddff681ea43e9b3e30ecbdb65c5e9aab49435e44059c23dbd6fee8ee619419ba37465bb0dd7135da
+  languageName: node
+  linkType: hard
+
+"json5@npm:^0.5.1":
+  version: 0.5.1
+  resolution: "json5@npm:0.5.1"
+  bin:
+    json5: lib/cli.js
+  checksum: 10/1d95c1cb98d884b4620321b5361062ed0febcef78576687beec014382e51ee07a8c8118421bd327e55080e8ccc4c394f4940ee5d8aedc050b8df7b7a261c9add
+  languageName: node
+  linkType: hard
+
 "json5@npm:^1.0.1":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
@@ -22825,15 +26468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2, json5@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "json5@npm:2.2.3"
-  bin:
-    json5: lib/cli.js
-  checksum: 10/1db67b853ff0de3534085d630691d3247de53a2ed1390ba0ddff681ea43e9b3e30ecbdb65c5e9aab49435e44059c23dbd6fee8ee619419ba37465bb0dd7135da
-  languageName: node
-  linkType: hard
-
 "jsonfile@npm:^4.0.0":
   version: 4.0.0
   resolution: "jsonfile@npm:4.0.0"
@@ -22904,6 +26538,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"keyv@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "keyv@npm:3.1.0"
+  dependencies:
+    json-buffer: "npm:3.0.0"
+  checksum: 10/6de272b3f78975a9a0b12259953c09d5bbe9de9acfd845471ebd758928b523f70563462f0c16a866fe9b447ff5bdebda72c62bc23734eb72cd1fb8f1d7076843
+  languageName: node
+  linkType: hard
+
 "keyv@npm:^4.0.0":
   version: 4.5.3
   resolution: "keyv@npm:4.5.3"
@@ -22913,7 +26556,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"kind-of@npm:^6.0.2, kind-of@npm:^6.0.3":
+"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0":
+  version: 3.2.2
+  resolution: "kind-of@npm:3.2.2"
+  dependencies:
+    is-buffer: "npm:^1.1.5"
+  checksum: 10/b6e7eed10f9dea498500e73129c9bf289bc417568658648aecfc2e104aa32683b908e5d349563fc78d6752da0ea60c9ed1dda4b24dd85a0c8fc0c7376dc0acac
+  languageName: node
+  linkType: hard
+
+"kind-of@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "kind-of@npm:4.0.0"
+  dependencies:
+    is-buffer: "npm:^1.1.5"
+  checksum: 10/b35a90e0690f06bf07c8970b5290256b1740625fb3bf17ef8c9813a9e197302dbe9ad710b0d97a44556c9280becfc2132cbc3b370056f63b7e350a85f79088f1
+  languageName: node
+  linkType: hard
+
+"kind-of@npm:^6.0.0, kind-of@npm:^6.0.2, kind-of@npm:^6.0.3":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
   checksum: 10/5873d303fb36aad875b7538798867da2ae5c9e328d67194b0162a3659a627d22f742fc9c4ae95cd1704132a24b00cae5041fc00c0f6ef937dc17080dc4dbb962
@@ -22961,6 +26622,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"kleur@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "kleur@npm:2.0.2"
+  checksum: 10/c00cbef88bb70b11035e81ae523469471db6ce7664e1bf30a76daaaf7c5f2f6ead61164a455f72b52fd1340d6a0ce6d4f6743665c8ad26d5694335669f914227
+  languageName: node
+  linkType: hard
+
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
@@ -23044,6 +26712,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lcid@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "lcid@npm:2.0.0"
+  dependencies:
+    invert-kv: "npm:^2.0.0"
+  checksum: 10/278e27b5a0707cf9ab682146963ebff2328795be10cd6f8ea8edae293439325d345ac5e33079cce77ac3a86a3dcfb97a34f279dbc46b03f3e419aa39b5915a16
+  languageName: node
+  linkType: hard
+
+"lcov-parse@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "lcov-parse@npm:1.0.0"
+  bin:
+    lcov-parse: ./bin/cli.js
+  checksum: 10/a30674716c5819ceb2e0119f50069ab7cfa11452dbb555119ac72b12d53744de8ebba3c21130ed9eab091d43a9d1f11c094ad9eefb27866f79ee0d40fc3a779c
+  languageName: node
+  linkType: hard
+
 "leaflet-hash@npm:^0.2.1":
   version: 0.2.1
   resolution: "leaflet-hash@npm:0.2.1"
@@ -23058,6 +26744,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"left-pad@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "left-pad@npm:1.3.0"
+  checksum: 10/13fa96e17b70a54836490de22d4bab706e2ed508338bbabecfac72ecce445a74139c5b009a8112252cab8fc4ab7ac4ebd870e5b35bd236b443b12be96f8745ac
+  languageName: node
+  linkType: hard
+
 "lerc@npm:^2.0.0":
   version: 2.0.0
   resolution: "lerc@npm:2.0.0"
@@ -23065,6 +26758,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"leven@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "leven@npm:2.1.0"
+  checksum: 10/f7b4a01b15c0ee2f92a04c0367ea025d10992b044df6f0d4ee1a845d4a488b343e99799e2f31212d72a2b1dea67124f57c1bb1b4561540df45190e44b5b8b394
+  languageName: node
+  linkType: hard
+
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
@@ -23359,6 +27059,94 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lint-staged@npm:^8.0.0":
+  version: 8.2.1
+  resolution: "lint-staged@npm:8.2.1"
+  dependencies:
+    chalk: "npm:^2.3.1"
+    commander: "npm:^2.14.1"
+    cosmiconfig: "npm:^5.2.0"
+    debug: "npm:^3.1.0"
+    dedent: "npm:^0.7.0"
+    del: "npm:^3.0.0"
+    execa: "npm:^1.0.0"
+    g-status: "npm:^2.0.2"
+    is-glob: "npm:^4.0.0"
+    is-windows: "npm:^1.0.2"
+    listr: "npm:^0.14.2"
+    listr-update-renderer: "npm:^0.5.0"
+    lodash: "npm:^4.17.11"
+    log-symbols: "npm:^2.2.0"
+    micromatch: "npm:^3.1.8"
+    npm-which: "npm:^3.0.1"
+    p-map: "npm:^1.1.1"
+    path-is-inside: "npm:^1.0.2"
+    pify: "npm:^3.0.0"
+    please-upgrade-node: "npm:^3.0.2"
+    staged-git-files: "npm:1.1.2"
+    string-argv: "npm:^0.0.2"
+    stringify-object: "npm:^3.2.2"
+    yup: "npm:^0.27.0"
+  bin:
+    lint-staged: index.js
+  checksum: 10/640933f1d581687caefcd43bd8ba94b728e84b08dc57780a2520116d143bc422f958b35eed7f852e162abf49206827a33eeb5051f7b3f61c6179aa706cd52df3
+  languageName: node
+  linkType: hard
+
+"listr-silent-renderer@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "listr-silent-renderer@npm:1.1.1"
+  checksum: 10/81982612e4d207be2e69c4dcf2a6e0aaa6080e41bfe0b73e8d0b040dcdb79874248b1040558793a2f0fcc9c2252ec8af47379650f59bf2a7656c11cd5a48c948
+  languageName: node
+  linkType: hard
+
+"listr-update-renderer@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "listr-update-renderer@npm:0.5.0"
+  dependencies:
+    chalk: "npm:^1.1.3"
+    cli-truncate: "npm:^0.2.1"
+    elegant-spinner: "npm:^1.0.1"
+    figures: "npm:^1.7.0"
+    indent-string: "npm:^3.0.0"
+    log-symbols: "npm:^1.0.2"
+    log-update: "npm:^2.3.0"
+    strip-ansi: "npm:^3.0.1"
+  peerDependencies:
+    listr: ^0.14.2
+  checksum: 10/2dddc763837a9086a684545ee9049fcb102d423b0c840ad929471ab461075ed78d5c79f1e8334cd7a76aa9076e7631c04a38733bb4d88c23ca6082c087335864
+  languageName: node
+  linkType: hard
+
+"listr-verbose-renderer@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "listr-verbose-renderer@npm:0.5.0"
+  dependencies:
+    chalk: "npm:^2.4.1"
+    cli-cursor: "npm:^2.1.0"
+    date-fns: "npm:^1.27.2"
+    figures: "npm:^2.0.0"
+  checksum: 10/3e504be729f9dd15b40db743e403673b76331774411dbc29d6f48136f6ba8bc1dee645a4e621c1cb781e6e69a58b78cb9aa8c153c7ceccfe4e4ea74d563bca3a
+  languageName: node
+  linkType: hard
+
+"listr@npm:^0.14.2":
+  version: 0.14.3
+  resolution: "listr@npm:0.14.3"
+  dependencies:
+    "@samverschueren/stream-to-observable": "npm:^0.3.0"
+    is-observable: "npm:^1.1.0"
+    is-promise: "npm:^2.1.0"
+    is-stream: "npm:^1.1.0"
+    listr-silent-renderer: "npm:^1.1.1"
+    listr-update-renderer: "npm:^0.5.0"
+    listr-verbose-renderer: "npm:^0.5.0"
+    p-map: "npm:^2.0.0"
+    rxjs: "npm:^6.3.3"
+  checksum: 10/6d5dc899c62b240bd28a22c26e88cf005696786a28e7239adbe044fd9ebcb5261b1503a555c8ba7f45b10d0eabb5d159c91791daee83d803b4caf64fd8adbdf9
+  languageName: node
+  linkType: hard
+
 "lmdb@npm:2.7.11":
   version: 2.7.11
   resolution: "lmdb@npm:2.7.11"
@@ -23394,6 +27182,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"load-json-file@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "load-json-file@npm:1.1.0"
+  dependencies:
+    graceful-fs: "npm:^4.1.2"
+    parse-json: "npm:^2.2.0"
+    pify: "npm:^2.0.0"
+    pinkie-promise: "npm:^2.0.0"
+    strip-bom: "npm:^2.0.0"
+  checksum: 10/bb16e169d87df38806f5ffa7efa3287921839fdfee2c20c8525f53b53ba43d14b56b6881901c04190f7da4a4ba6e0c9784d212e83ee3a32d49bb986b5a6094cb
+  languageName: node
+  linkType: hard
+
 "load-json-file@npm:^4.0.0":
   version: 4.0.0
   resolution: "load-json-file@npm:4.0.0"
@@ -23654,6 +27455,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.map@npm:^4.5.1":
+  version: 4.6.0
+  resolution: "lodash.map@npm:4.6.0"
+  checksum: 10/f1e69def35025be1e6213f1099df8acfa478442de8dfac3511e6eeeb5ef939b911f59db858251cc6b96076984d869fdd329ea360982d83240206124589f56f5d
+  languageName: node
+  linkType: hard
+
 "lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
@@ -23668,6 +27476,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.mergewith@npm:^4.6.2":
+  version: 4.6.2
+  resolution: "lodash.mergewith@npm:4.6.2"
+  checksum: 10/aea75a4492541a4902ac7e551dc6c54b722da0c187f84385d02e8fc33a7ae3454b837822446e5f63fcd5ad1671534ea408740b776670ea4d9c7890b10105fce0
+  languageName: node
+  linkType: hard
+
 "lodash.restparam@npm:*":
   version: 3.6.1
   resolution: "lodash.restparam@npm:3.6.1"
@@ -23750,13 +27565,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.0.1, lodash@npm:^4.15.0, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.2.1, lodash@npm:^4.7.0":
+"lodash@npm:4.17.21, lodash@npm:^4.0.1, lodash@npm:^4.15.0, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.2.1, lodash@npm:^4.7.0":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
   languageName: node
   linkType: hard
 
+"log-driver@npm:^1.2.7":
+  version: 1.2.7
+  resolution: "log-driver@npm:1.2.7"
+  checksum: 10/0cd54adf0de8a3e28affc862550634855a1a66a3e5feb1e93c0900a3330634217e00c086e2e54aa60d92c4dd4bc67d4a00a899d97865d0025777a2d8e0a9ac90
+  languageName: node
+  linkType: hard
+
+"log-symbols@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "log-symbols@npm:1.0.2"
+  dependencies:
+    chalk: "npm:^1.0.0"
+  checksum: 10/5214ade9381db5d40528c171fdfd459b75cad7040eb6a347294ae47fa80cfebba4adbc3aa73a1c9da744cbfa240dd93b38f80df8615717affeea6c4bb6b8dfe7
+  languageName: node
+  linkType: hard
+
+"log-symbols@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "log-symbols@npm:2.2.0"
+  dependencies:
+    chalk: "npm:^2.0.1"
+  checksum: 10/4c95e3b65f0352dbe91dc4989c10baf7a44e2ef5b0db7e6721e1476268e2b6f7090c3aa880d4f833a05c5c3ff18f4ec5215a09bd0099986d64a8186cfeb48ac8
+  languageName: node
+  linkType: hard
+
 "log-symbols@npm:^4.1.0":
   version: 4.1.0
   resolution: "log-symbols@npm:4.1.0"
@@ -23767,6 +27607,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"log-update@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "log-update@npm:2.3.0"
+  dependencies:
+    ansi-escapes: "npm:^3.0.0"
+    cli-cursor: "npm:^2.0.0"
+    wrap-ansi: "npm:^3.0.1"
+  checksum: 10/84fd8e93bfc316eb6ca479a37743f2edcb7563fe5b9161205ce2980f0b3c822717b8f8f1871369697fcb0208521d7b8d00750c594edc3f8a8273dd8b48dd14a3
+  languageName: node
+  linkType: hard
+
 "long@npm:^5.0.0":
   version: 5.2.3
   resolution: "long@npm:5.2.3"
@@ -23781,6 +27632,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"longest@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "longest@npm:2.0.1"
+  checksum: 10/9587c153919a883ecbcc33e9439bc2592aa6fdbbd2d343f8ab17d8d3e0373c4e4350e3b428566fd689d704800a23f2b4d145cbdcca4ef3fd35742e5927f919a9
+  languageName: node
+  linkType: hard
+
 "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
@@ -23811,7 +27669,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lowercase-keys@npm:^1.0.0":
+"lowercase-keys@npm:^1.0.0, lowercase-keys@npm:^1.0.1":
   version: 1.0.1
   resolution: "lowercase-keys@npm:1.0.1"
   checksum: 10/12ba64572dc25ae9ee30d37a11f3a91aea046c1b6b905fdf8ac77e2f268f153ed36e60d39cb3bfa47a89f31d981dae9a8cc9915124a56fe51ff01ed6e8bb68fa
@@ -23975,7 +27833,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-error@npm:^1.1.1":
+"make-error@npm:1.x, make-error@npm:^1.1.1":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
   checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
@@ -24033,6 +27891,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"map-age-cleaner@npm:^0.1.1":
+  version: 0.1.3
+  resolution: "map-age-cleaner@npm:0.1.3"
+  dependencies:
+    p-defer: "npm:^1.0.0"
+  checksum: 10/cb2804a5bcb3cbdfe4b59066ea6d19f5e7c8c196cd55795ea4c28f792b192e4c442426ae52524e5e1acbccf393d3bddacefc3d41f803e66453f6c4eda3650bc1
+  languageName: node
+  linkType: hard
+
+"map-cache@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "map-cache@npm:0.2.2"
+  checksum: 10/3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969
+  languageName: node
+  linkType: hard
+
 "map-obj@npm:^1.0.0":
   version: 1.0.1
   resolution: "map-obj@npm:1.0.1"
@@ -24061,6 +27935,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"map-visit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "map-visit@npm:1.0.0"
+  dependencies:
+    object-visit: "npm:^1.0.0"
+  checksum: 10/c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a
+  languageName: node
+  linkType: hard
+
 "mapbox-gl-controls@npm:^2.3.5":
   version: 2.3.5
   resolution: "mapbox-gl-controls@npm:2.3.5"
@@ -24156,6 +28039,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"marked@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "marked@npm:0.4.0"
+  bin:
+    marked: ./bin/marked
+  checksum: 10/8e8c67c92c2596ad6716ddbec1079519a88b9ff5b6ae7b529e2ca53c88d7626e8cb9537b6b17a86f6058add8c53b4c28b9ace8da9853c3d0e8e646a88c1332e7
+  languageName: node
+  linkType: hard
+
 "marked@npm:^0.7.0":
   version: 0.7.0
   resolution: "marked@npm:0.7.0"
@@ -24165,6 +28057,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"matcher@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "matcher@npm:1.1.1"
+  dependencies:
+    escape-string-regexp: "npm:^1.0.4"
+  checksum: 10/77bc490253901bb7b07bd4a1b7418201336d57029aa1320e6ec951744baf3acf07e907d3ed33d76f0bb2e399783c2b3d28049d29b1971073bbe11523b6ad059b
+  languageName: node
+  linkType: hard
+
 "material-colors@npm:^1.2.1":
   version: 1.2.6
   resolution: "material-colors@npm:1.2.6"
@@ -24179,6 +28080,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"math-random@npm:^1.0.1":
+  version: 1.0.4
+  resolution: "math-random@npm:1.0.4"
+  checksum: 10/9edf31ea337bba21994eb968218fd571d55fce86b51661158d8e241886b73121d9e1a35a5bb8997dba8ce67417a83c8dbd0811917248f886840035b7f1c667b9
+  languageName: node
+  linkType: hard
+
 "maxmin@npm:^2.1.0":
   version: 2.1.0
   resolution: "maxmin@npm:2.1.0"
@@ -24367,6 +28275,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mem@npm:^4.0.0":
+  version: 4.3.0
+  resolution: "mem@npm:4.3.0"
+  dependencies:
+    map-age-cleaner: "npm:^0.1.1"
+    mimic-fn: "npm:^2.0.0"
+    p-is-promise: "npm:^2.0.0"
+  checksum: 10/ae4afa1cac2b4d64e089ecd54e06ae857b6e5aae410802564032cb407aad13aa598c5aededae8cca6c5827f4057ec3f58415a078c80181dd08019ae1a9aa1226
+  languageName: node
+  linkType: hard
+
 "memfs@npm:^3.4.3":
   version: 3.5.3
   resolution: "memfs@npm:3.5.3"
@@ -24468,6 +28387,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"merge-stream@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "merge-stream@npm:1.0.1"
+  dependencies:
+    readable-stream: "npm:^2.0.1"
+  checksum: 10/3be7887dffd8899da0f930c0f85812ab8993252f467dcd61e60a8d085836ebbb23756b8e481a7f71824206342afe1b1a2b80c05a1cd0ed0e792a09c5812a9082
+  languageName: node
+  linkType: hard
+
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
@@ -24482,6 +28410,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"merge@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "merge@npm:1.2.1"
+  checksum: 10/2298c4fdcf64561f320b92338681f7ffcafafb579a6e294066ae3e7bd10ae25df363903d2f028072733b9f79a1f75d2b999aef98ad5d73de13641da39cda0913
+  languageName: node
+  linkType: hard
+
+"merge@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "merge@npm:2.1.1"
+  checksum: 10/1875521a8e429ba8d82c6d24bf3f229b4b64a348873c41a1245851b422c0caa7fbeb958118c24fbfcbb71e416a29924b3b1c4518911529db175f49eb5bcb5e62
+  languageName: node
+  linkType: hard
+
 "mersenne-twister@npm:^1.1.0":
   version: 1.1.0
   resolution: "mersenne-twister@npm:1.1.0"
@@ -24898,6 +28840,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromatch@npm:^2.3.11":
+  version: 2.3.11
+  resolution: "micromatch@npm:2.3.11"
+  dependencies:
+    arr-diff: "npm:^2.0.0"
+    array-unique: "npm:^0.2.1"
+    braces: "npm:^1.8.2"
+    expand-brackets: "npm:^0.1.4"
+    extglob: "npm:^0.3.1"
+    filename-regex: "npm:^2.0.0"
+    is-extglob: "npm:^1.0.0"
+    is-glob: "npm:^2.0.1"
+    kind-of: "npm:^3.0.2"
+    normalize-path: "npm:^2.0.1"
+    object.omit: "npm:^2.0.0"
+    parse-glob: "npm:^3.0.4"
+    regex-cache: "npm:^0.4.2"
+  checksum: 10/25b10db54a95ac0b3409005cf74ccb267e4693f14171c88860a6505e8f1a51940fee1f0bf629a3f85c34ec725ecbf48986fb3edf2d8f9283c322fcdb0512ed42
+  languageName: node
+  linkType: hard
+
+"micromatch@npm:^3.1.4, micromatch@npm:^3.1.8":
+  version: 3.1.10
+  resolution: "micromatch@npm:3.1.10"
+  dependencies:
+    arr-diff: "npm:^4.0.0"
+    array-unique: "npm:^0.3.2"
+    braces: "npm:^2.3.1"
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    extglob: "npm:^2.0.4"
+    fragment-cache: "npm:^0.2.1"
+    kind-of: "npm:^6.0.2"
+    nanomatch: "npm:^1.2.9"
+    object.pick: "npm:^1.3.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.2"
+  checksum: 10/4102bac83685dc7882ca1a28443d158b464653f84450de68c07cf77dbd531ed98c25006e9d9f6082bf3b95aabbff4cf231b26fd3bc84f7c4e7f263376101fad6
+  languageName: node
+  linkType: hard
+
 "micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
@@ -24942,7 +28926,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-fn@npm:^2.1.0":
+"mimic-fn@npm:^1.0.0":
+  version: 1.2.0
+  resolution: "mimic-fn@npm:1.2.0"
+  checksum: 10/69c08205156a1f4906d9c46f9b4dc08d18a50176352e77fdeb645cedfe9f20c0b19865d465bd2dec27a5c432347f24dc07fc3695e11159d193f892834233e939
+  languageName: node
+  linkType: hard
+
+"mimic-fn@npm:^2.0.0, mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
   checksum: 10/d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
@@ -24956,7 +28947,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-response@npm:^1.0.0":
+"mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1":
   version: 1.0.1
   resolution: "mimic-response@npm:1.0.1"
   checksum: 10/034c78753b0e622bc03c983663b1cdf66d03861050e0c8606563d149bc2b02d63f62ce4d32be4ab50d0553ae0ffe647fc34d1f5281184c6e1e8cf4d85e8d9823
@@ -25002,7 +28993,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
+"minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.3, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
@@ -25066,7 +29057,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.1.0, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
+"minimist@npm:1.2.7":
+  version: 1.2.7
+  resolution: "minimist@npm:1.2.7"
+  checksum: 10/0202378a8eb1a9d98a44f623f43c89793a095f4bde6981bda29f6ae61e82a15c18b1690b5efc4c66ddbd402a3e9b7175e6ebdabb2b28037c279ac823b7360e00
+  languageName: node
+  linkType: hard
+
+"minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
   checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f
@@ -25208,6 +29206,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mixin-deep@npm:^1.2.0":
+  version: 1.3.2
+  resolution: "mixin-deep@npm:1.3.2"
+  dependencies:
+    for-in: "npm:^1.0.2"
+    is-extendable: "npm:^1.0.1"
+  checksum: 10/820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d
+  languageName: node
+  linkType: hard
+
 "mkdirp-classic@npm:^0.5.2, mkdirp-classic@npm:^0.5.3":
   version: 0.5.3
   resolution: "mkdirp-classic@npm:0.5.3"
@@ -25226,7 +29234,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.0, mkdirp@npm:~0.5.1":
+"mkdirp@npm:0.x, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.0, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
   dependencies:
@@ -25392,14 +29400,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mute-stream@npm:~0.0.4":
+"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4":
   version: 0.0.8
   resolution: "mute-stream@npm:0.0.8"
   checksum: 10/a2d2e79dde87e3424ffc8c334472c7f3d17b072137734ca46e6f221131f1b014201cc593b69a38062e974fb2394d3d1cb4349f80f012bbf8b8ac1b28033e515f
   languageName: node
   linkType: hard
 
-"nan@npm:^2.14.0, nan@npm:^2.17.0, nan@npm:^2.18.0":
+"nan@npm:^2.12.1, nan@npm:^2.14.0, nan@npm:^2.17.0, nan@npm:^2.18.0":
   version: 2.19.0
   resolution: "nan@npm:2.19.0"
   dependencies:
@@ -25426,6 +29434,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nanomatch@npm:^1.2.9":
+  version: 1.2.13
+  resolution: "nanomatch@npm:1.2.13"
+  dependencies:
+    arr-diff: "npm:^4.0.0"
+    array-unique: "npm:^0.3.2"
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    fragment-cache: "npm:^0.2.1"
+    is-windows: "npm:^1.0.2"
+    kind-of: "npm:^6.0.2"
+    object.pick: "npm:^1.3.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/5c4ec7d6264b93795248f22d19672f0b972f900772c057bc67e43ae4999165b5fea7b937359efde78707930a460ceaa6d93e0732ac1d993dab8654655a2e959b
+  languageName: node
+  linkType: hard
+
 "napi-build-utils@npm:^1.0.1":
   version: 1.0.2
   resolution: "napi-build-utils@npm:1.0.2"
@@ -25708,6 +29735,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-notifier@npm:^5.2.1":
+  version: 5.4.5
+  resolution: "node-notifier@npm:5.4.5"
+  dependencies:
+    growly: "npm:^1.3.0"
+    is-wsl: "npm:^1.1.0"
+    semver: "npm:^5.5.0"
+    shellwords: "npm:^0.1.1"
+    which: "npm:^1.3.0"
+  checksum: 10/1c4de3fd0ace1401889cca349b2abad16f798a1df8677d0774e41cce6e1878d8c0749b0194fc069fd1f62284d86e49792060b37ef0e6b3e0ef01fb852c14fe62
+  languageName: node
+  linkType: hard
+
 "node-releases@npm:^2.0.13":
   version: 2.0.13
   resolution: "node-releases@npm:2.0.13"
@@ -25779,6 +29819,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"normalize-path@npm:^2.0.1, normalize-path@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "normalize-path@npm:2.1.1"
+  dependencies:
+    remove-trailing-separator: "npm:^1.0.1"
+  checksum: 10/7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea
+  languageName: node
+  linkType: hard
+
 "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
@@ -25800,7 +29849,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-url@npm:^4.0.0":
+"normalize-url@npm:^4.0.0, normalize-url@npm:^4.1.0":
   version: 4.5.1
   resolution: "normalize-url@npm:4.5.1"
   checksum: 10/20ced2845fcfaa46da74efc0aa39b7bed22f3db39e6e8b844261613082a36a2dcd468decad89fa9313b5464bebab4034f96bda7880e8fc468027fecf6a6fa254
@@ -25916,6 +29965,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"npm-path@npm:^2.0.2":
+  version: 2.0.4
+  resolution: "npm-path@npm:2.0.4"
+  dependencies:
+    which: "npm:^1.2.10"
+  bin:
+    npm-path: bin/npm-path
+  checksum: 10/b62f5c7739da994684a1df64ccc987f232dc348ae307986eadf2234338b54714ba44b5372e0327cff9794ed0f57e4c0382dab79af710ce0e33bd1f124b1d6e35
+  languageName: node
+  linkType: hard
+
 "npm-pick-manifest@npm:^3.0.0, npm-pick-manifest@npm:^3.0.2":
   version: 3.0.2
   resolution: "npm-pick-manifest@npm:3.0.2"
@@ -26008,6 +30068,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"npm-which@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "npm-which@npm:3.0.1"
+  dependencies:
+    commander: "npm:^2.9.0"
+    npm-path: "npm:^2.0.2"
+    which: "npm:^1.2.10"
+  bin:
+    npm-which: bin/npm-which.js
+  checksum: 10/742e24acdd6503edd6093bf8fa88f437760143301c6c5d846f532cf02ff40e815a7c28c96eca170398dfbbed97e7ab4dff07fbdcbb2ae3000a6a9845bc77b8c7
+  languageName: node
+  linkType: hard
+
 "npm@npm:^6.10.3":
   version: 6.14.18
   resolution: "npm@npm:6.14.18"
@@ -26198,6 +30271,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nwsapi@npm:^2.0.7":
+  version: 2.2.10
+  resolution: "nwsapi@npm:2.2.10"
+  checksum: 10/b310e9dd0886da338cbbb1be9fec473a50269e2935d537f95a03d0038f7ea831ce12b4816d97f42e458e5273158aea2a6c86bc4bb60f79911226154aa66740f7
+  languageName: node
+  linkType: hard
+
 "nwsapi@npm:^2.2.0":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
@@ -26226,13 +30306,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
+"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: 10/fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
   languageName: node
   linkType: hard
 
+"object-copy@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "object-copy@npm:0.1.0"
+  dependencies:
+    copy-descriptor: "npm:^0.1.0"
+    define-property: "npm:^0.2.5"
+    kind-of: "npm:^3.0.3"
+  checksum: 10/a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783
+  languageName: node
+  linkType: hard
+
 "object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
@@ -26271,6 +30362,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-visit@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "object-visit@npm:1.0.1"
+  dependencies:
+    isobject: "npm:^3.0.0"
+  checksum: 10/77abf807de86fa65bf1ba92699b45b1e5485f2d899300d5cb92cca0863909e9528b6cbf366c237c9f5d2264dab6cfbeda2201252ed0e605ae1b3e263515c5cea
+  languageName: node
+  linkType: hard
+
 "object.assign@npm:^4.1.4":
   version: 4.1.4
   resolution: "object.assign@npm:4.1.4"
@@ -26283,6 +30383,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.assign@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    has-symbols: "npm:^1.0.3"
+    object-keys: "npm:^1.1.1"
+  checksum: 10/dbb22da4cda82e1658349ea62b80815f587b47131b3dd7a4ab7f84190ab31d206bbd8fe7e26ae3220c55b65725ac4529825f6142154211220302aa6b1518045d
+  languageName: node
+  linkType: hard
+
 "object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.0":
   version: 2.1.7
   resolution: "object.getownpropertydescriptors@npm:2.1.7"
@@ -26296,6 +30408,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.getownpropertydescriptors@npm:^2.1.6":
+  version: 2.1.8
+  resolution: "object.getownpropertydescriptors@npm:2.1.8"
+  dependencies:
+    array.prototype.reduce: "npm:^1.0.6"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+    gopd: "npm:^1.0.1"
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10/8c50f52e0d702d30836f3d2772ba02807ca25a5381be6f9470c6d143ee0bad01bce3fff0fedea2bdbc0c9297e4eb7785ffee5739f6a3a7c60fcd622b42f8a9fb
+  languageName: node
+  linkType: hard
+
+"object.omit@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "object.omit@npm:2.0.1"
+  dependencies:
+    for-own: "npm:^0.1.4"
+    is-extendable: "npm:^0.1.1"
+  checksum: 10/431088be6af5860560b61a252e5f020ca1894f111743ee7ffa329a32c084b1b7fa8d7d70ab45fdcb2c2872648a67170d8120d109fae32b4b4bbe2491ac9a3719
+  languageName: node
+  linkType: hard
+
+"object.pick@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "object.pick@npm:1.3.0"
+  dependencies:
+    isobject: "npm:^3.0.1"
+  checksum: 10/92d7226a6b581d0d62694a5632b6a1594c81b3b5a4eb702a7662e0b012db532557067d6f773596c577f75322eba09cdca37ca01ea79b6b29e3e17365f15c615e
+  languageName: node
+  linkType: hard
+
 "object.values@npm:^1.1.0":
   version: 1.1.7
   resolution: "object.values@npm:1.1.7"
@@ -26360,6 +30506,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"onetime@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "onetime@npm:2.0.1"
+  dependencies:
+    mimic-fn: "npm:^1.0.0"
+  checksum: 10/5b4f6079e6b4973244017e157833ab5a7a3de4bd2612d69411e3ee46f61fe8bb57b7c2e243b0b23dbaa5bad7641a15f9100a5c80295ff64c0d87aab5d1576ef9
+  languageName: node
+  linkType: hard
+
 "onetime@npm:^5.1.0, onetime@npm:^5.1.2":
   version: 5.1.2
   resolution: "onetime@npm:5.1.2"
@@ -26399,6 +30554,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"opencollective-postinstall@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "opencollective-postinstall@npm:2.0.3"
+  bin:
+    opencollective-postinstall: index.js
+  checksum: 10/69d63778087cd10c9d707d9ed360556780cfdd0cd6241ded0e26632f467f1d5a064f4a9aec19a30c187770c17adba034d988f7684b226f3a73e79f44e73fab0e
+  languageName: node
+  linkType: hard
+
 "opener@npm:^1.5.2":
   version: 1.5.2
   resolution: "opener@npm:1.5.2"
@@ -26462,6 +30626,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"os-locale@npm:^3.0.0, os-locale@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "os-locale@npm:3.1.0"
+  dependencies:
+    execa: "npm:^1.0.0"
+    lcid: "npm:^2.0.0"
+    mem: "npm:^4.0.0"
+  checksum: 10/53c542b11af3c5fe99624b09c7882b6944f9ae7c69edbc6006b7d42cff630b1f7fd9d63baf84ed31d1ef02b34823b6b31f23a1ecdd593757873d716bc6374099
+  languageName: node
+  linkType: hard
+
 "os-name@npm:^3.1.0":
   version: 3.1.0
   resolution: "os-name@npm:3.1.0"
@@ -26472,7 +30647,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-tmpdir@npm:^1.0.0, os-tmpdir@npm:~1.0.2":
+"os-tmpdir@npm:^1.0.0, os-tmpdir@npm:^1.0.1, os-tmpdir@npm:~1.0.2":
   version: 1.0.2
   resolution: "os-tmpdir@npm:1.0.2"
   checksum: 10/5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
@@ -26489,6 +30664,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-cancelable@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "p-cancelable@npm:1.1.0"
+  checksum: 10/2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece
+  languageName: node
+  linkType: hard
+
 "p-cancelable@npm:^2.0.0":
   version: 2.1.1
   resolution: "p-cancelable@npm:2.1.1"
@@ -26496,6 +30678,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-defer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "p-defer@npm:1.0.0"
+  checksum: 10/1d8fb7138a0ccebb65479160fd93f245303c06c977c976105d75838f7f504a9a6ef11b7e058f98b4c957a6a8df268c616da1ee339285d565f9e5ba00304e027b
+  languageName: node
+  linkType: hard
+
 "p-filter@npm:^2.0.0":
   version: 2.1.0
   resolution: "p-filter@npm:2.1.0"
@@ -26519,6 +30708,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-is-promise@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "p-is-promise@npm:2.1.0"
+  checksum: 10/c9a8248c8b5e306475a5d55ce7808dbce4d4da2e3d69526e4991a391a7809bfd6cfdadd9bf04f1c96a3db366c93d9a0f5ee81d949e7b1684c4e0f61f747199ef
+  languageName: node
+  linkType: hard
+
 "p-is-promise@npm:^3.0.0":
   version: 3.0.0
   resolution: "p-is-promise@npm:3.0.0"
@@ -26589,6 +30785,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-map@npm:^1.1.1":
+  version: 1.2.0
+  resolution: "p-map@npm:1.2.0"
+  checksum: 10/e7fd1175f5be449e3664a2fbceb4f53a5c1a4a1f078387f5e83dc4110b1421fd01e172c9de97ca03ae2b95401270918fd6f76778c0b52bd70edcdc2202d26ea8
+  languageName: node
+  linkType: hard
+
 "p-map@npm:^2.0.0":
   version: 2.1.0
   resolution: "p-map@npm:2.1.0"
@@ -26622,6 +30825,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-retry@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "p-retry@npm:3.0.1"
+  dependencies:
+    retry: "npm:^0.12.0"
+  checksum: 10/702efc63fc13ef7fc0bab9a1b08432ab38a0236efcbce64af0cf692030ba6ed8009f29ba66e3301cb98dc69ef33e7ccab29ba1ac2bea897f802f81f4f7e468dd
+  languageName: node
+  linkType: hard
+
 "p-retry@npm:^4.0.0, p-retry@npm:^4.5.0":
   version: 4.6.2
   resolution: "p-retry@npm:4.6.2"
@@ -26821,6 +31033,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-glob@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "parse-glob@npm:3.0.4"
+  dependencies:
+    glob-base: "npm:^0.3.0"
+    is-dotfile: "npm:^1.0.0"
+    is-extglob: "npm:^1.0.0"
+    is-glob: "npm:^2.0.0"
+  checksum: 10/447bc442d76522c5e03b5babc8582d4a37fe9d59b3e5ef8d7ddae4e03060637ae38d5d28686e03c27e4d20be34983b5cb053cf8b066d34be0f9d1867eb677e45
+  languageName: node
+  linkType: hard
+
 "parse-headers@npm:^2.0.0":
   version: 2.0.5
   resolution: "parse-headers@npm:2.0.5"
@@ -26828,6 +31052,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-json@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "parse-json@npm:2.2.0"
+  dependencies:
+    error-ex: "npm:^1.2.0"
+  checksum: 10/39924c0ddbf6f2544ab92acea61d91a0fb0ac959b0d19d273468cf8aa977522f8076e8fbb29cdab75c1440ebc2e172389988274890373d95fe308837074cc7e0
+  languageName: node
+  linkType: hard
+
 "parse-json@npm:^4.0.0":
   version: 4.0.0
   resolution: "parse-json@npm:4.0.0"
@@ -26850,6 +31083,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-passwd@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "parse-passwd@npm:1.0.0"
+  checksum: 10/4e55e0231d58f828a41d0f1da2bf2ff7bcef8f4cb6146e69d16ce499190de58b06199e6bd9b17fbf0d4d8aef9052099cdf8c4f13a6294b1a522e8e958073066e
+  languageName: node
+  linkType: hard
+
+"parse5@npm:4.0.0":
+  version: 4.0.0
+  resolution: "parse5@npm:4.0.0"
+  checksum: 10/ba851b10a328e21b437f7c685ef52e078cc75e7bfbff7449c4ff5e0734343ebd65e5f3e338830d9b970862eca94e92a4e55e36cefb934e1e027e3d17138d1db4
+  languageName: node
+  linkType: hard
+
 "parse5@npm:6.0.1":
   version: 6.0.1
   resolution: "parse5@npm:6.0.1"
@@ -26874,6 +31121,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pascalcase@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "pascalcase@npm:0.1.1"
+  checksum: 10/f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925
+  languageName: node
+  linkType: hard
+
 "patch-package@npm:^8.0.0":
   version: 8.0.0
   resolution: "patch-package@npm:8.0.0"
@@ -26916,6 +31170,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-exists@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "path-exists@npm:2.1.0"
+  dependencies:
+    pinkie-promise: "npm:^2.0.0"
+  checksum: 10/fdb734f1d00f225f7a0033ce6d73bff6a7f76ea08936abf0e5196fa6e54a645103538cd8aedcb90d6d8c3fa3705ded0c58a4da5948ae92aa8834892c1ab44a84
+  languageName: node
+  linkType: hard
+
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
@@ -26930,7 +31193,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-is-absolute@npm:^1.0.0":
+"path-is-absolute@npm:^1.0.0, path-is-absolute@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
   checksum: 10/060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
@@ -26965,7 +31228,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
+"path-parse@npm:^1.0.5, path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
   checksum: 10/49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
@@ -26998,6 +31261,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-type@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "path-type@npm:1.1.0"
+  dependencies:
+    graceful-fs: "npm:^4.1.2"
+    pify: "npm:^2.0.0"
+    pinkie-promise: "npm:^2.0.0"
+  checksum: 10/59a4b2c0e566baf4db3021a1ed4ec09a8b36fca960a490b54a6bcefdb9987dafe772852982b6011cd09579478a96e57960a01f75fa78a794192853c9d468fc79
+  languageName: node
+  linkType: hard
+
 "path-type@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-type@npm:3.0.0"
@@ -27099,6 +31373,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pify@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "pify@npm:2.3.0"
+  checksum: 10/9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
+  languageName: node
+  linkType: hard
+
 "pify@npm:^3.0.0":
   version: 3.0.0
   resolution: "pify@npm:3.0.0"
@@ -27120,6 +31401,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pinkie-promise@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "pinkie-promise@npm:2.0.1"
+  dependencies:
+    pinkie: "npm:^2.0.0"
+  checksum: 10/b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca
+  languageName: node
+  linkType: hard
+
+"pinkie@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "pinkie@npm:2.0.4"
+  checksum: 10/11d207257a044d1047c3755374d36d84dda883a44d030fe98216bf0ea97da05a5c9d64e82495387edeb9ee4f52c455bca97cdb97629932be65e6f54b29f5aec8
+  languageName: node
+  linkType: hard
+
 "pirates@npm:^4.0.4, pirates@npm:^4.0.6":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
@@ -27137,6 +31434,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-dir@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "pkg-dir@npm:2.0.0"
+  dependencies:
+    find-up: "npm:^2.1.0"
+  checksum: 10/8c72b712305b51e1108f0ffda5ec1525a8307e54a5855db8fb1dcf77561a5ae98e2ba3b4814c9806a679f76b2f7e5dd98bde18d07e594ddd9fdd25e9cf242ea1
+  languageName: node
+  linkType: hard
+
 "pkg-dir@npm:^3.0.0":
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"
@@ -27164,6 +31470,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"please-upgrade-node@npm:^3.0.2, please-upgrade-node@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "please-upgrade-node@npm:3.2.0"
+  dependencies:
+    semver-compare: "npm:^1.0.0"
+  checksum: 10/d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb
+  languageName: node
+  linkType: hard
+
+"pn@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "pn@npm:1.1.0"
+  checksum: 10/f597172ff5d83166b66179dc31b65e8601caf0d6d0691f07613b58d9ac439154a017c081b5ba5f6432dd5bbedfa90d7a2d2d7a5b2e799c1ebb11545ea254213c
+  languageName: node
+  linkType: hard
+
 "pngjs@npm:^3.3.3":
   version: 3.4.0
   resolution: "pngjs@npm:3.4.0"
@@ -27180,6 +31502,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"posix-character-classes@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "posix-character-classes@npm:0.1.1"
+  checksum: 10/dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442
+  languageName: node
+  linkType: hard
+
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10/8ed3e96dfeea1c5880c1f4c9cb707e5fb26e8be22f14f82ef92df20fd2004e635c62ba47fbe8f2bb63bfd80dac1474be2fb39798da8c2feba2815435d1f749af
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^7.0.1":
   version: 7.0.5
   resolution: "postcss-calc@npm:7.0.5"
@@ -28107,6 +32443,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prepend-http@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "prepend-http@npm:2.0.0"
+  checksum: 10/7694a9525405447662c1ffd352fcb41b6410c705b739b6f4e3a3e21cf5fdede8377890088e8934436b8b17ba55365a615f153960f30877bf0d0392f9e93503ea
+  languageName: node
+  linkType: hard
+
+"preserve@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "preserve@npm:0.2.0"
+  checksum: 10/dd31d4fd0e6b218cac7178712ae0683c96e6eaa3e5490a37aba6d47095f87c47ffe980a3061ebe72ca07cb2a9a4f1a41bbeecee8944ec77be311c294e05b2e43
+  languageName: node
+  linkType: hard
+
 "prettier@npm:^2.0.5, prettier@npm:^2.7.1":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
@@ -28151,6 +32501,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-format@npm:^23.6.0":
+  version: 23.6.0
+  resolution: "pretty-format@npm:23.6.0"
+  dependencies:
+    ansi-regex: "npm:^3.0.0"
+    ansi-styles: "npm:^3.2.0"
+  checksum: 10/7fda1f30c374e24b4ff2ce1d517ecd42a25b0eb759e3289b04ca93d95d38e84a56fc240e76bdd90b0ac471e77088e543ac581223cafcb56e9be05c9d6ac10516
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^26.0.0, pretty-format@npm:^26.6.2":
   version: 26.6.2
   resolution: "pretty-format@npm:26.6.2"
@@ -28195,6 +32555,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"private@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "private@npm:0.1.8"
+  checksum: 10/192ce0764e1708a40e42ad3b679c8553c275e4ee9d5dcfdf3de99b01d43a6ee3047f0d293e892c003276cde3829f0548e60f77fa49e2e51b380939e662794a1e
+  languageName: node
+  linkType: hard
+
 "process-nextick-args@npm:~1.0.6":
   version: 1.0.7
   resolution: "process-nextick-args@npm:1.0.7"
@@ -28216,6 +32583,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"progress@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "progress@npm:2.0.3"
+  checksum: 10/e6f0bcb71f716eee9dfac0fe8a2606e3704d6a64dd93baaf49fbadbc8499989a610fe14cf1bc6f61b6d6653c49408d94f4a94e124538084efd8e4cf525e0293d
+  languageName: node
+  linkType: hard
+
 "promise-inflight@npm:^1.0.1, promise-inflight@npm:~1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -28272,6 +32646,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prompts@npm:^0.1.9":
+  version: 0.1.14
+  resolution: "prompts@npm:0.1.14"
+  dependencies:
+    kleur: "npm:^2.0.1"
+    sisteransi: "npm:^0.1.1"
+  checksum: 10/dba88d7ed11dcc76952a83ab4f0ec1f23f040a540499cb8af2b6380f7bacee3ddcbb2c24c2d119064a432ac2dcf6b0e909022c10388c4a16ec0bb81ca2ca158c
+  languageName: node
+  linkType: hard
+
 "prompts@npm:^2.0.1, prompts@npm:^2.4.0":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -28302,6 +32686,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"property-expr@npm:^1.5.0":
+  version: 1.5.1
+  resolution: "property-expr@npm:1.5.1"
+  checksum: 10/8d5bd40224ed502fc09c20749f27bb680a2645a5d4ee51978eb534e241ea9dbb05813dee6a0471b7c00ffec37e8b202f7b4ead90ad80e52cea15431522707bfe
+  languageName: node
+  linkType: hard
+
 "property-information@npm:^5.0.0":
   version: 5.6.0
   resolution: "property-information@npm:5.6.0"
@@ -28647,6 +33038,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"randomatic@npm:^3.0.0":
+  version: 3.1.1
+  resolution: "randomatic@npm:3.1.1"
+  dependencies:
+    is-number: "npm:^4.0.0"
+    kind-of: "npm:^6.0.0"
+    math-random: "npm:^1.0.1"
+  checksum: 10/fd7517e78425722b67ad6ddbf930f668bf00624d7210546e32562888d8558d0fcca9b5b7ca8639943eea6dc1b03ea666d5af0a7fd698b7b08e1cdb84c94fd5b5
+  languageName: node
+  linkType: hard
+
 "randombytes@npm:^2.1.0":
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"
@@ -29761,6 +34163,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-pkg-up@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "read-pkg-up@npm:1.0.1"
+  dependencies:
+    find-up: "npm:^1.0.0"
+    read-pkg: "npm:^1.0.0"
+  checksum: 10/d18399a0f46e2da32beb2f041edd0cda49d2f2cc30195a05c759ef3ed9b5e6e19ba1ad1bae2362bdec8c6a9f2c3d18f4d5e8c369e808b03d498d5781cb9122c7
+  languageName: node
+  linkType: hard
+
 "read-pkg-up@npm:^3.0.0":
   version: 3.0.0
   resolution: "read-pkg-up@npm:3.0.0"
@@ -29782,6 +34194,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-pkg@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "read-pkg@npm:1.1.0"
+  dependencies:
+    load-json-file: "npm:^1.0.0"
+    normalize-package-data: "npm:^2.3.2"
+    path-type: "npm:^1.0.0"
+  checksum: 10/a0f5d5e32227ec8e6a028dd5c5134eab229768dcb7a5d9a41a284ed28ad4b9284fecc47383dc1593b5694f4de603a7ffaee84b738956b9b77e0999567485a366
+  languageName: node
+  linkType: hard
+
 "read-pkg@npm:^3.0.0":
   version: 3.0.0
   resolution: "read-pkg@npm:3.0.0"
@@ -29887,6 +34310,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"realpath-native@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "realpath-native@npm:1.1.0"
+  dependencies:
+    util.promisify: "npm:^1.0.0"
+  checksum: 10/75ef0595dea6186384b785a9e0993c58ec604f8be2e39b602fec6d7837c7f770af4a4eb3c81f864a7d81c518a7167a6eaabbc7695b7a88c56e1ef04b91c1d586
+  languageName: node
+  linkType: hard
+
 "recast@npm:^0.23.3":
   version: 0.23.4
   resolution: "recast@npm:0.23.4"
@@ -30076,6 +34508,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regex-cache@npm:^0.4.2":
+  version: 0.4.4
+  resolution: "regex-cache@npm:0.4.4"
+  dependencies:
+    is-equal-shallow: "npm:^0.1.3"
+  checksum: 10/06b605c4ffd411f36ebf2d201f51f37bc23aa7e1f71d30d1c241833697ab8d33122d19701e982be2dc925cfee8cf03e007d374cafa3e1028674729665e0f2a15
+  languageName: node
+  linkType: hard
+
+"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "regex-not@npm:1.0.2"
+  dependencies:
+    extend-shallow: "npm:^3.0.2"
+    safe-regex: "npm:^1.1.0"
+  checksum: 10/3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77
+  languageName: node
+  linkType: hard
+
 "regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
   version: 1.5.1
   resolution: "regexp.prototype.flags@npm:1.5.1"
@@ -30087,6 +34538,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regexp.prototype.flags@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "regexp.prototype.flags@npm:1.5.2"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    set-function-name: "npm:^2.0.1"
+  checksum: 10/9fffc01da9c4e12670ff95bc5204364615fcc12d86fc30642765af908675678ebb0780883c874b2dbd184505fb52fa603d80073ecf69f461ce7f56b15d10be9c
+  languageName: node
+  linkType: hard
+
 "regexpu-core@npm:^5.3.1":
   version: 5.3.2
   resolution: "regexpu-core@npm:5.3.2"
@@ -30226,6 +34689,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"remove-trailing-separator@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "remove-trailing-separator@npm:1.1.0"
+  checksum: 10/d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419
+  languageName: node
+  linkType: hard
+
 "renderkid@npm:^3.0.0":
   version: 3.0.0
   resolution: "renderkid@npm:3.0.0"
@@ -30239,6 +34709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"repeat-element@npm:^1.1.2":
+  version: 1.1.4
+  resolution: "repeat-element@npm:1.1.4"
+  checksum: 10/1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9
+  languageName: node
+  linkType: hard
+
 "repeat-string@npm:^1.5.2, repeat-string@npm:^1.6.1":
   version: 1.6.1
   resolution: "repeat-string@npm:1.6.1"
@@ -30246,6 +34723,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"repeating@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "repeating@npm:2.0.1"
+  dependencies:
+    is-finite: "npm:^1.0.0"
+  checksum: 10/d2db0b69c5cb0c14dd750036e0abcd6b3c3f7b2da3ee179786b755cf737ca15fa0fff417ca72de33d6966056f4695440e680a352401fc02c95ade59899afbdd0
+  languageName: node
+  linkType: hard
+
 "replace-in-file@npm:^3.4.2":
   version: 3.4.4
   resolution: "replace-in-file@npm:3.4.4"
@@ -30259,7 +34745,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request@npm:^2.44.0, request@npm:^2.88.0, request@npm:^2.88.2":
+"request-promise-core@npm:1.1.4":
+  version: 1.1.4
+  resolution: "request-promise-core@npm:1.1.4"
+  dependencies:
+    lodash: "npm:^4.17.19"
+  peerDependencies:
+    request: ^2.34
+  checksum: 10/79714e46b078c8de539c4de13e78878a3c7e3f33e194547c5ec3f0c8e47b0b222aa1718bbd2dbfb1a7990149041c6cc0be6c5916e03d99f4e75939f2a840046e
+  languageName: node
+  linkType: hard
+
+"request-promise-native@npm:^1.0.5":
+  version: 1.0.9
+  resolution: "request-promise-native@npm:1.0.9"
+  dependencies:
+    request-promise-core: "npm:1.1.4"
+    stealthy-require: "npm:^1.1.1"
+    tough-cookie: "npm:^2.3.3"
+  peerDependencies:
+    request: ^2.34
+  checksum: 10/6df0cf75cbddd08b568e462570fb63033f040efdf961f39af572e52821a831a13ee9027db7ba78f1d980759cc7913f2a12a34424deac5a0ec56c5d8ebbf45391
+  languageName: node
+  linkType: hard
+
+"request@npm:^2.44.0, request@npm:^2.87.0, request@npm:^2.88.0, request@npm:^2.88.2":
   version: 2.88.2
   resolution: "request@npm:2.88.2"
   dependencies:
@@ -30301,6 +34811,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"require-main-filename@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "require-main-filename@npm:1.0.1"
+  checksum: 10/49e4586207c138dabe885cffb9484f3f4583fc839851cd6705466eb343d8bb6af7dfa3d8e611fbd44d40441d4cddaadb34b4d537092b92adafa6a6f440dc1da8
+  languageName: node
+  linkType: hard
+
 "require-main-filename@npm:^2.0.0":
   version: 2.0.0
   resolution: "require-main-filename@npm:2.0.0"
@@ -30353,6 +34870,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-cwd@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "resolve-cwd@npm:2.0.0"
+  dependencies:
+    resolve-from: "npm:^3.0.0"
+  checksum: 10/e7c16880c460656e77f102d537a6dc82b3657d9173697cd6ea82ffce37df96f6c1fc79d0bb35fd73fff8871ac13f21b4396958b5f0a13e5b99c97d69f5e319fa
+  languageName: node
+  linkType: hard
+
 "resolve-cwd@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-cwd@npm:3.0.0"
@@ -30362,6 +34888,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-dir@npm:^1.0.0, resolve-dir@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "resolve-dir@npm:1.0.1"
+  dependencies:
+    expand-tilde: "npm:^2.0.0"
+    global-modules: "npm:^1.0.0"
+  checksum: 10/ef736b8ed60d6645c3b573da17d329bfb50ec4e1d6c5ffd6df49e3497acef9226f9810ea6823b8ece1560e01dcb13f77a9f6180d4f242d00cc9a8f4de909c65c
+  languageName: node
+  linkType: hard
+
 "resolve-from@npm:5.0.0, resolve-from@npm:^5.0.0":
   version: 5.0.0
   resolution: "resolve-from@npm:5.0.0"
@@ -30415,6 +34951,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-url@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "resolve-url@npm:0.2.1"
+  checksum: 10/c8bbf6385730add6657103929ebd7e4aa623a2c2df29bba28a58fec73097c003edcce475efefa51c448a904aa344a4ebabe6ad85c8e75c72c4ce9a0c0b5652d2
+  languageName: node
+  linkType: hard
+
 "resolve.exports@npm:^1.1.0":
   version: 1.1.1
   resolution: "resolve.exports@npm:1.1.1"
@@ -30422,6 +34965,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@npm:1.1.7":
+  version: 1.1.7
+  resolution: "resolve@npm:1.1.7"
+  checksum: 10/0a4ff8a102b1d059321caf77563cb2c495979c734f9dc400a70e3ceaaafe76a72bbcc625f9361756348d7b6af6d3cd2815cfbe3109be655a2b18e62d1cdadfc5
+  languageName: node
+  linkType: hard
+
 "resolve@npm:1.17.0":
   version: 1.17.0
   resolution: "resolve@npm:1.17.0"
@@ -30431,7 +34981,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.5, resolve@npm:^1.22.1, resolve@npm:^1.22.8":
+"resolve@npm:1.x, resolve@npm:^1.1.5, resolve@npm:^1.22.1, resolve@npm:^1.22.8, resolve@npm:^1.3.2":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -30457,6 +35007,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@patch:resolve@npm%3A1.1.7#optional!builtin<compat/resolve>":
+  version: 1.1.7
+  resolution: "resolve@patch:resolve@npm%3A1.1.7#optional!builtin<compat/resolve>::version=1.1.7&hash=3bafbf"
+  checksum: 10/dc5c99fb47807d3771be3135ac6bdb892186973d0895ab17838f0b85bb575e03111214aa16cb68b6416df3c1dd658081a066dd7a9af6e668c28b0025080b615c
+  languageName: node
+  linkType: hard
+
 "resolve@patch:resolve@npm%3A1.17.0#optional!builtin<compat/resolve>":
   version: 1.17.0
   resolution: "resolve@patch:resolve@npm%3A1.17.0#optional!builtin<compat/resolve>::version=1.17.0&hash=c3c19d"
@@ -30466,7 +35023,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A1.x#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -30492,6 +35049,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"responselike@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "responselike@npm:1.0.2"
+  dependencies:
+    lowercase-keys: "npm:^1.0.0"
+  checksum: 10/2e9e70f1dcca3da621a80ce71f2f9a9cad12c047145c6ece20df22f0743f051cf7c73505e109814915f23f9e34fb0d358e22827723ee3d56b623533cab8eafcd
+  languageName: node
+  linkType: hard
+
 "responselike@npm:^2.0.0":
   version: 2.0.1
   resolution: "responselike@npm:2.0.1"
@@ -30501,6 +35067,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"restore-cursor@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "restore-cursor@npm:2.0.0"
+  dependencies:
+    onetime: "npm:^2.0.0"
+    signal-exit: "npm:^3.0.2"
+  checksum: 10/482e13d02d834b6e5e3aa90304a8b5e840775d6f06916cc92a50038adf9f098dcc72405b567da8a37e137ae40ad3e31896fa3136ae62f7a426c2fbf53d036536
+  languageName: node
+  linkType: hard
+
 "restore-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
@@ -30518,6 +35094,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ret@npm:~0.1.10":
+  version: 0.1.15
+  resolution: "ret@npm:0.1.15"
+  checksum: 10/07c9e7619b4c86053fa57689bf7606b5a40fc1231fc87682424d0b3e296641cc19c218c3b8a8917305fbcca3bfc43038a5b6a63f54755c1bbca2f91857253b03
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.10.0":
   version: 0.10.1
   resolution: "retry@npm:0.10.1"
@@ -30567,7 +35150,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^2.5.2, rimraf@npm:^2.5.4, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3, rimraf@npm:^2.7.1":
+"rimraf@npm:^2.2.8, rimraf@npm:^2.5.2, rimraf@npm:^2.5.4, rimraf@npm:^2.6.1, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3, rimraf@npm:^2.7.1":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
   dependencies:
@@ -30943,6 +35526,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rsvp@npm:^3.3.3":
+  version: 3.6.2
+  resolution: "rsvp@npm:3.6.2"
+  checksum: 10/ff38536f9a030f70ebdd18df16b521b0e4e6d24b48ef3d115d0d4135af14e1fb31fb13ace62a265e31850feb01497a64dc55cf2364d63595f3ca39a7b0b7b6e6
+  languageName: node
+  linkType: hard
+
+"run-async@npm:^2.4.0":
+  version: 2.4.1
+  resolution: "run-async@npm:2.4.1"
+  checksum: 10/c79551224dafa26ecc281cb1efad3510c82c79116aaf681f8a931ce70fdf4ca880d58f97d3b930a38992c7aad7955a08e065b32ec194e1dd49d7790c874ece50
+  languageName: node
+  linkType: hard
+
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -30975,6 +35572,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^6.3.3":
+  version: 6.6.7
+  resolution: "rxjs@npm:6.6.7"
+  dependencies:
+    tslib: "npm:^1.9.0"
+  checksum: 10/c8263ebb20da80dd7a91c452b9e96a178331f402344bbb40bc772b56340fcd48d13d1f545a1e3d8e464893008c5e306cc42a1552afe0d562b1a6d4e1e6262b03
+  languageName: node
+  linkType: hard
+
+"rxjs@npm:^7.5.5":
+  version: 7.8.1
+  resolution: "rxjs@npm:7.8.1"
+  dependencies:
+    tslib: "npm:^2.1.0"
+  checksum: 10/b10cac1a5258f885e9dd1b70d23c34daeb21b61222ee735d2ec40a8685bdca40429000703a44f0e638c27a684ac139e1c37e835d2a0dc16f6fc061a138ae3abb
+  languageName: node
+  linkType: hard
+
 "sade@npm:^1.7.3, sade@npm:^1.7.4":
   version: 1.8.1
   resolution: "sade@npm:1.8.1"
@@ -30996,6 +35611,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-array-concat@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "safe-array-concat@npm:1.1.2"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    get-intrinsic: "npm:^1.2.4"
+    has-symbols: "npm:^1.0.3"
+    isarray: "npm:^2.0.5"
+  checksum: 10/a54f8040d7cb696a1ee38d19cc71ab3cfb654b9b81bae00c6459618cfad8214ece7e6666592f9c925aafef43d0a20c5e6fbb3413a2b618e1ce9d516a2e6dcfc5
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
@@ -31028,6 +35655,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-regex-test@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "safe-regex-test@npm:1.0.3"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-regex: "npm:^1.1.4"
+  checksum: 10/b04de61114b10274d92e25b6de7ccb5de07f11ea15637ff636de4b5190c0f5cd8823fe586dde718504cf78055437d70fd8804976894df502fcf5a210c970afb3
+  languageName: node
+  linkType: hard
+
+"safe-regex@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-regex@npm:1.1.0"
+  dependencies:
+    ret: "npm:~0.1.10"
+  checksum: 10/5405b5a3effed649e6133d51d45cecbbbb02a1dd8d5b78a5e7979a69035870c817a5d2682d0ebb62188d3a840f7b24ea00ebbad2e418d5afabed151e8db96d04
+  languageName: node
+  linkType: hard
+
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:^2.1.2, safer-buffer@npm:~2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
@@ -31035,6 +35682,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sane@npm:^2.0.0":
+  version: 2.5.2
+  resolution: "sane@npm:2.5.2"
+  dependencies:
+    anymatch: "npm:^2.0.0"
+    capture-exit: "npm:^1.2.0"
+    exec-sh: "npm:^0.2.0"
+    fb-watchman: "npm:^2.0.0"
+    fsevents: "npm:^1.2.3"
+    micromatch: "npm:^3.1.4"
+    minimist: "npm:^1.1.1"
+    walker: "npm:~1.0.5"
+    watch: "npm:~0.18.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    sane: ./src/cli.js
+  checksum: 10/be4c3b5abde6c9d2c0f708158f5dc6d97e217b101c0b0403adae661499740ddf5cc667027c9b04dacde5e11a1b51bed5162b3dd04d6e93870ae7fc35b63b0073
+  languageName: node
+  linkType: hard
+
 "sass@npm:^1.32.8, sass@npm:^1.49.0, sass@npm:^1.49.8, sass@npm:^1.50.0":
   version: 1.68.0
   resolution: "sass@npm:1.68.0"
@@ -31048,6 +35717,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sax@npm:^1.2.4":
+  version: 1.4.1
+  resolution: "sax@npm:1.4.1"
+  checksum: 10/b1c784b545019187b53a0c28edb4f6314951c971e2963a69739c6ce222bfbc767e54d320e689352daba79b7d5e06d22b5d7113b99336219d6e93718e2f99d335
+  languageName: node
+  linkType: hard
+
 "sax@npm:~1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
@@ -31169,6 +35845,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver-compare@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "semver-compare@npm:1.0.0"
+  checksum: 10/75f9c7a7786d1756f64b1429017746721e07bd7691bdad6368f7643885d3a98a27586777e9699456564f4844b407e9f186cc1d588a3f9c0be71310e517e942c3
+  languageName: node
+  linkType: hard
+
 "semver-diff@npm:^2.0.0":
   version: 2.1.0
   resolution: "semver-diff@npm:2.1.0"
@@ -31185,7 +35868,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5, semver@npm:2.x || 3.x || 4 || 5, semver@npm:^2.3.0 || 3.x || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.1":
+"semver-regex@npm:^3.1.2":
+  version: 3.1.4
+  resolution: "semver-regex@npm:3.1.4"
+  checksum: 10/3962105908e326aa2cd5c851a2f6d4cc7340d1b06560afc35cd5348d9fa5b1cc0ac0cad7e7cef2072bc12b992c5ae654d9e8d355c19d75d4216fced3b6c5d8a7
+  languageName: node
+  linkType: hard
+
+"semver@npm:2 || 3 || 4 || 5, semver@npm:2.x || 3.x || 4 || 5, semver@npm:^2.3.0 || 3.x || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.1":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
   bin:
@@ -31341,6 +36031,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-function-name@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "set-function-name@npm:2.0.2"
+  dependencies:
+    define-data-property: "npm:^1.1.4"
+    es-errors: "npm:^1.3.0"
+    functions-have-names: "npm:^1.2.3"
+    has-property-descriptors: "npm:^1.0.2"
+  checksum: 10/c7614154a53ebf8c0428a6c40a3b0b47dac30587c1a19703d1b75f003803f73cdfa6a93474a9ba678fa565ef5fbddc2fae79bca03b7d22ab5fd5163dbe571a74
+  languageName: node
+  linkType: hard
+
+"set-value@npm:^2.0.0, set-value@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "set-value@npm:2.0.1"
+  dependencies:
+    extend-shallow: "npm:^2.0.1"
+    is-extendable: "npm:^0.1.1"
+    is-plain-object: "npm:^2.0.3"
+    split-string: "npm:^3.0.1"
+  checksum: 10/4f1ccac2e9ad4d1b0851761d41df4bbd3780ed69805f24a80ab237a56d9629760b7b98551cd370931620defe5da329645834e1e9a18574cecad09ce7b2b83296
+  languageName: node
+  linkType: hard
+
 "setimmediate@npm:^1.0.5":
   version: 1.0.5
   resolution: "setimmediate@npm:1.0.5"
@@ -31460,7 +36174,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shelljs@npm:^0.8.3":
+"shelljs@npm:^0.8.2, shelljs@npm:^0.8.3":
   version: 0.8.5
   resolution: "shelljs@npm:0.8.5"
   dependencies:
@@ -31473,6 +36187,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"shellwords@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "shellwords@npm:0.1.1"
+  checksum: 10/c122808ca53c828747ee69503755a5d35d8c1493e943d15ebfd6fe028517ec1af6f8a4c2dc9d995b0df75bd4246382c0dd2dc792a82ce5a6448307a643fc5a38
+  languageName: node
+  linkType: hard
+
 "short-unique-id@npm:^5.0.2":
   version: 5.0.3
   resolution: "short-unique-id@npm:5.0.3"
@@ -31549,6 +36270,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"simple-git@npm:^1.85.0":
+  version: 1.132.0
+  resolution: "simple-git@npm:1.132.0"
+  dependencies:
+    debug: "npm:^4.0.1"
+  checksum: 10/a93bd2bf3cb14841ba471bd9b0fbaf4f2e09f4ce9ec76c24ff3fb10849cdcb74ba283b377f2cd62ef258f0d23d6b4a1fd1ec3ff6bc306104dca05a74e1de2491
+  languageName: node
+  linkType: hard
+
 "simple-swizzle@npm:^0.2.2":
   version: 0.2.2
   resolution: "simple-swizzle@npm:0.2.2"
@@ -31590,6 +36320,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sisteransi@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "sisteransi@npm:0.1.1"
+  checksum: 10/7bb2c4e54c43834a91352f12ca65a94c13a8c93cb1139ac62f383056c45cc9e44850cc4e5b6e0a3e3c16cf4ae1d00233917a2bfa6c8a0882210a2187cd21d01c
+  languageName: node
+  linkType: hard
+
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -31597,6 +36334,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slash@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "slash@npm:1.0.0"
+  checksum: 10/4b6e21b1fba6184a7e2efb1dd173f692d8a845584c1bbf9dc818ff86f5a52fc91b413008223d17cc684604ee8bb9263a420b1182027ad9762e35388434918860
+  languageName: node
+  linkType: hard
+
 "slash@npm:^2.0.0":
   version: 2.0.0
   resolution: "slash@npm:2.0.0"
@@ -31618,6 +36362,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slice-ansi@npm:0.0.4":
+  version: 0.0.4
+  resolution: "slice-ansi@npm:0.0.4"
+  checksum: 10/481d969c6aa771b27d7baacd6fe321751a0b9eb410274bda10ca81ea641bbfe747e428025d6d8f15bd635fdcfd57e8b2d54681ee6b0ce0c40f78644b144759e3
+  languageName: node
+  linkType: hard
+
 "slide@npm:^1.1.6, slide@npm:~1.1.3, slide@npm:~1.1.6":
   version: 1.1.6
   resolution: "slide@npm:1.1.6"
@@ -31642,6 +36393,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"snapdragon-node@npm:^2.0.1":
+  version: 2.1.1
+  resolution: "snapdragon-node@npm:2.1.1"
+  dependencies:
+    define-property: "npm:^1.0.0"
+    isobject: "npm:^3.0.0"
+    snapdragon-util: "npm:^3.0.1"
+  checksum: 10/093c3584efc51103d8607d28cb7a3079f7e371b2320a60c685a84a57956cf9693f3dec8b2f77250ba48063cf42cb5261f3970e6d3bb7e68fd727299c991e0bff
+  languageName: node
+  linkType: hard
+
+"snapdragon-util@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "snapdragon-util@npm:3.0.1"
+  dependencies:
+    kind-of: "npm:^3.2.0"
+  checksum: 10/b776b15bf683c9ac0243582d7b13f2070f85c9036d73c2ba31da61d1effe22d4a39845b6f43ce7e7ec82c7e686dc47d9c3cffa1a75327bb16505b9afc34f516d
+  languageName: node
+  linkType: hard
+
+"snapdragon@npm:^0.8.1":
+  version: 0.8.2
+  resolution: "snapdragon@npm:0.8.2"
+  dependencies:
+    base: "npm:^0.11.1"
+    debug: "npm:^2.2.0"
+    define-property: "npm:^0.2.5"
+    extend-shallow: "npm:^2.0.1"
+    map-cache: "npm:^0.2.2"
+    source-map: "npm:^0.5.6"
+    source-map-resolve: "npm:^0.5.0"
+    use: "npm:^3.1.0"
+  checksum: 10/cbe35b25dca5504be0ced90d907948d8efeda0b118d9a032bfc499e22b7f78515832f2706d9c9297c87906eaa51c12bfcaa8ea5a4f3e98ecf1116a73428e344a
+  languageName: node
+  linkType: hard
+
 "sockjs@npm:^0.3.24":
   version: 0.3.24
   resolution: "sockjs@npm:0.3.24"
@@ -31725,6 +36512,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-resolve@npm:^0.5.0":
+  version: 0.5.3
+  resolution: "source-map-resolve@npm:0.5.3"
+  dependencies:
+    atob: "npm:^2.1.2"
+    decode-uri-component: "npm:^0.2.0"
+    resolve-url: "npm:^0.2.1"
+    source-map-url: "npm:^0.4.0"
+    urix: "npm:^0.1.0"
+  checksum: 10/98e281cceb86b80c8bd3453110617b9df93132d6a50c7bf5847b5d74b4b5d6e1d4d261db276035b9b7e5ba7f32c2d6a0d2c13d581e37870a0219a524402efcab
+  languageName: node
+  linkType: hard
+
 "source-map-resolve@npm:^0.6.0":
   version: 0.6.0
   resolution: "source-map-resolve@npm:0.6.0"
@@ -31735,6 +36535,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-support@npm:^0.4.15":
+  version: 0.4.18
+  resolution: "source-map-support@npm:0.4.18"
+  dependencies:
+    source-map: "npm:^0.5.6"
+  checksum: 10/673eced6927cd6ae91e52659a26cf0c9bca4cde182e46773198f1bf703cf56ffe21d03fe37a40cdb6ea15dd807e332c7fd9cf86a235491fc401e83ac359f1ce8
+  languageName: node
+  linkType: hard
+
 "source-map-support@npm:^0.5.0, source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20":
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
@@ -31745,7 +36554,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.5.6, source-map@npm:^0.5.7":
+"source-map-url@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "source-map-url@npm:0.4.1"
+  checksum: 10/7fec0460ca017330568e1a4d67c80c397871f27d75b034e1117eaa802076db5cda5944659144d26eafd2a95008ada19296c8e0d5ec116302c32c6daa4e430003
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.5.3, source-map@npm:^0.5.6, source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
   checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269
@@ -31869,6 +36685,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"split-string@npm:^3.0.1, split-string@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "split-string@npm:3.1.0"
+  dependencies:
+    extend-shallow: "npm:^3.0.0"
+  checksum: 10/f31f4709d2b14fe4ff46b4fb88b2fb68a1c59b59e573c5417907c182397ddb2cb67903232bdc3a8b9dd3bb660c6f533ff11b5d624aff7b1fe0a213e3e4c75f20
+  languageName: node
+  linkType: hard
+
 "split2@npm:^2.0.0":
   version: 2.2.0
   resolution: "split2@npm:2.2.0"
@@ -31972,6 +36797,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stack-utils@npm:^1.0.1":
+  version: 1.0.5
+  resolution: "stack-utils@npm:1.0.5"
+  dependencies:
+    escape-string-regexp: "npm:^2.0.0"
+  checksum: 10/040a977495e5b38992111b338c5d236d1067297e74b2624a0efccfd614ee60ca1b7f7a416f270336d1627b322fb2ed23b5d3758877a2e26d94f13ded2742432f
+  languageName: node
+  linkType: hard
+
 "stack-utils@npm:^2.0.3":
   version: 2.0.6
   resolution: "stack-utils@npm:2.0.6"
@@ -31981,6 +36815,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"staged-git-files@npm:1.1.2":
+  version: 1.1.2
+  resolution: "staged-git-files@npm:1.1.2"
+  bin:
+    sgf: bin/cli.js
+  checksum: 10/077da24435bbadfb06a2d7e53fb8e7f2b437088279854113517d688b3b1d5f515c2c75a78ebcbc167b470112f6f20ceae35fbb754124ae1365216f17215e1953
+  languageName: node
+  linkType: hard
+
 "stampit@npm:^4.3.2":
   version: 4.3.2
   resolution: "stampit@npm:4.3.2"
@@ -31997,6 +36840,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"static-extend@npm:^0.1.1":
+  version: 0.1.2
+  resolution: "static-extend@npm:0.1.2"
+  dependencies:
+    define-property: "npm:^0.2.5"
+    object-copy: "npm:^0.1.0"
+  checksum: 10/8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c
+  languageName: node
+  linkType: hard
+
 "static-module@npm:^2.2.0":
   version: 2.2.5
   resolution: "static-module@npm:2.2.5"
@@ -32033,6 +36886,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stealthy-require@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "stealthy-require@npm:1.1.1"
+  checksum: 10/a408a51f5b6c1fe535e4459732ac0b66d7921583f89fc8289bfdc937a497fe8196219d1e04d234047349b90723ecff1a1cb4a92bef2315e01a3081dc72db8d41
+  languageName: node
+  linkType: hard
+
 "stop-iteration-iterator@npm:^1.0.0":
   version: 1.0.0
   resolution: "stop-iteration-iterator@npm:1.0.0"
@@ -32128,6 +36988,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-argv@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "string-argv@npm:0.0.2"
+  checksum: 10/35f789c0288e9036a5bcfb1bd04645667f8e938d8e2672f4ad8ce116ce6c4523b100ce0575cfa278e800d814cbb947af59c59609632b76b730ce2d96158cecad
+  languageName: node
+  linkType: hard
+
 "string-hash@npm:^1.1.1":
   version: 1.1.3
   resolution: "string-hash@npm:1.1.3"
@@ -32135,6 +37002,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-length@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "string-length@npm:2.0.0"
+  dependencies:
+    astral-regex: "npm:^1.0.0"
+    strip-ansi: "npm:^4.0.0"
+  checksum: 10/3a339b63fd39d6a1077dfbbe3279545e1b67fa4b0a558906158cf0121632b280f34c8768ec7270fb25db732d6323eceb9c7254f6026509694b6a7533ca8cb89e
+  languageName: node
+  linkType: hard
+
 "string-length@npm:^4.0.1":
   version: 4.0.2
   resolution: "string-length@npm:4.0.2"
@@ -32238,6 +37115,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.trim@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "string.prototype.trim@npm:1.2.9"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.0"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/b2170903de6a2fb5a49bb8850052144e04b67329d49f1343cdc6a87cb24fb4e4b8ad00d3e273a399b8a3d8c32c89775d93a8f43cb42fbff303f25382079fb58a
+  languageName: node
+  linkType: hard
+
 "string.prototype.trimend@npm:^1.0.7":
   version: 1.0.7
   resolution: "string.prototype.trimend@npm:1.0.7"
@@ -32249,6 +37138,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.trimend@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimend@npm:1.0.8"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/c2e862ae724f95771da9ea17c27559d4eeced9208b9c20f69bbfcd1b9bc92375adf8af63a103194dba17c4cc4a5cb08842d929f415ff9d89c062d44689c8761b
+  languageName: node
+  linkType: hard
+
 "string.prototype.trimstart@npm:^1.0.7":
   version: 1.0.7
   resolution: "string.prototype.trimstart@npm:1.0.7"
@@ -32260,6 +37160,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.trimstart@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimstart@npm:1.0.8"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/160167dfbd68e6f7cb9f51a16074eebfce1571656fc31d40c3738ca9e30e35496f2c046fe57b6ad49f65f238a152be8c86fd9a2dd58682b5eba39dad995b3674
+  languageName: node
+  linkType: hard
+
 "string_decoder@npm:^1.1.1":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
@@ -32295,6 +37206,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stringify-object@npm:^3.2.2":
+  version: 3.3.0
+  resolution: "stringify-object@npm:3.3.0"
+  dependencies:
+    get-own-enumerable-property-symbols: "npm:^3.0.0"
+    is-obj: "npm:^1.0.1"
+    is-regexp: "npm:^1.0.0"
+  checksum: 10/973782f09a3df3f39a2cf07dbf43fb9ba6cb32976f3616cd0f6c10e0a5c5415dd72b7b700e72920e8da2bf57c3001b8e37b5af7174bab9a748ce0416989e19b1
+  languageName: node
+  linkType: hard
+
 "stringify-package@npm:^1.0.0, stringify-package@npm:^1.0.1":
   version: 1.0.1
   resolution: "stringify-package@npm:1.0.1"
@@ -32356,20 +37278,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-bom@npm:^3.0.0":
+"strip-bom@npm:3.0.0, strip-bom@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-bom@npm:3.0.0"
   checksum: 10/8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b
   languageName: node
   linkType: hard
 
-"strip-bom@npm:^4.0.0":
+"strip-bom@npm:4.0.0, strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
   checksum: 10/9dbcfbaf503c57c06af15fe2c8176fb1bf3af5ff65003851a102749f875a6dbe0ab3b30115eccf6e805e9d756830d3e40ec508b62b3f1ddf3761a20ebe29d3f3
   languageName: node
   linkType: hard
 
+"strip-bom@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "strip-bom@npm:2.0.0"
+  dependencies:
+    is-utf8: "npm:^0.2.0"
+  checksum: 10/08efb746bc67b10814cd03d79eb31bac633393a782e3f35efbc1b61b5165d3806d03332a97f362822cf0d4dd14ba2e12707fcff44fe1c870c48a063a0c9e4944
+  languageName: node
+  linkType: hard
+
 "strip-eof@npm:^1.0.0":
   version: 1.0.0
   resolution: "strip-eof@npm:1.0.0"
@@ -32416,7 +37347,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1":
+"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
   checksum: 10/492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
@@ -32550,7 +37481,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^3.2.3":
+"supports-color@npm:^3.1.2, supports-color@npm:^3.2.3":
   version: 3.2.3
   resolution: "supports-color@npm:3.2.3"
   dependencies:
@@ -32721,13 +37652,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"symbol-tree@npm:^3.2.4":
+"symbol-observable@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "symbol-observable@npm:1.2.0"
+  checksum: 10/4684327a2fef2453dcd4238b5bd8f69c460a4708fb8c024a824c6a707ca644b2b2a586e36e5197d0d1162ff48e288299a48844a8c46274ffcfd9260e03df7692
+  languageName: node
+  linkType: hard
+
+"symbol-tree@npm:^3.2.2, symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
   checksum: 10/c09a00aadf279d47d0c5c46ca3b6b2fbaeb45f0a184976d599637d412d3a70bbdc043ff33effe1206dea0e36e0ad226cb957112e7ce9a4bf2daedf7fa4f85c53
   languageName: node
   linkType: hard
 
+"synchronous-promise@npm:^2.0.6":
+  version: 2.0.17
+  resolution: "synchronous-promise@npm:2.0.17"
+  checksum: 10/dd74b1c05caab8ea34e26c8b52a0966efd70b0229ad39447ce066501dd6931d4d97a3f88b0f306880a699660cd334180a24d9738b385aed0bd0104a5be207ec1
+  languageName: node
+  linkType: hard
+
 "tabbable@npm:1.1.2":
   version: 1.1.2
   resolution: "tabbable@npm:1.1.2"
@@ -32914,6 +37859,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"test-exclude@npm:^4.2.1":
+  version: 4.2.3
+  resolution: "test-exclude@npm:4.2.3"
+  dependencies:
+    arrify: "npm:^1.0.1"
+    micromatch: "npm:^2.3.11"
+    object-assign: "npm:^4.1.0"
+    read-pkg-up: "npm:^1.0.1"
+    require-main-filename: "npm:^1.0.1"
+  checksum: 10/4093f0e7a5e37b7aba0977ccd790b03ac76e12cdc9130374c1982743105ee3b871f860ad9406f1851aada95fdefc7ae600e2725eae911d855804dc997d427267
+  languageName: node
+  linkType: hard
+
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -32946,6 +37904,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"throat@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "throat@npm:4.1.0"
+  checksum: 10/43519b0cea6d3b2a8fe056fcbc319e289037be67d2204d4d33513d20d6ee9da6255f7ba8c89e2ec8c97b0f188a910b8666def38d1058d2bf4a39613812c36d98
+  languageName: node
+  linkType: hard
+
 "throat@npm:^6.0.1":
   version: 6.0.2
   resolution: "throat@npm:6.0.2"
@@ -32979,7 +37944,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4":
+"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
   checksum: 10/5da78346f70139a7d213b65a0106f3c398d6bc5301f9248b5275f420abc2c4b1e77c2abc72d218dedc28c41efb2e7c312cb76a7730d04f9c2d37d247da3f4198
@@ -33082,6 +38047,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-fast-properties@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "to-fast-properties@npm:1.0.3"
+  checksum: 10/bd0abb58c4722851df63419de3f6d901d5118f0440d3f71293ed776dd363f2657edaaf2dc470e3f6b7b48eb84aa411193b60db8a4a552adac30de9516c5cc580
+  languageName: node
+  linkType: hard
+
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
@@ -33089,6 +38061,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-object-path@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "to-object-path@npm:0.3.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10/9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70
+  languageName: node
+  linkType: hard
+
+"to-readable-stream@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "to-readable-stream@npm:1.0.0"
+  checksum: 10/a99e23d49777d9d03686f03cc0bbbcb4648d991648990a98bc93b55cf91a2ae830c41b5efa36802f1c00a34bba93bd33b10346772fd3f49bcf1667a99c85f354
+  languageName: node
+  linkType: hard
+
+"to-regex-range@npm:^2.1.0":
+  version: 2.1.1
+  resolution: "to-regex-range@npm:2.1.1"
+  dependencies:
+    is-number: "npm:^3.0.0"
+    repeat-string: "npm:^1.6.1"
+  checksum: 10/2eed5f897188de8ec8745137f80c0f564810082d506278dd6a80db4ea313b6d363ce8d7dc0e0406beeaba0bb7f90f01b41fa3d08fb72dd02c329b2ec579cd4e8
+  languageName: node
+  linkType: hard
+
 "to-regex-range@npm:^5.0.1":
   version: 5.0.1
   resolution: "to-regex-range@npm:5.0.1"
@@ -33098,6 +38096,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "to-regex@npm:3.0.2"
+  dependencies:
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    regex-not: "npm:^1.0.2"
+    safe-regex: "npm:^1.1.0"
+  checksum: 10/ab87c22f0719f7def00145b53e2c90d2fdcc75efa0fec1227b383aaf88ed409db2542b2b16bcbfbf95fe0727f879045803bb635b777c0306762241ca3e5562c6
+  languageName: node
+  linkType: hard
+
 "tocbot@npm:^4.20.1":
   version: 4.25.0
   resolution: "tocbot@npm:4.25.0"
@@ -33152,6 +38162,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"toposort@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "toposort@npm:2.0.2"
+  checksum: 10/6f128353e4ed9739e49a28fb756b0a00f3752b29fc9b862ff781446598ee3b486cd229697feebc4eabd916eac5de219f3dae450c585bf13673f6b133a7226e06
+  languageName: node
+  linkType: hard
+
 "totalist@npm:^3.0.0":
   version: 3.0.1
   resolution: "totalist@npm:3.0.1"
@@ -33159,6 +38176,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^2.3.3, tough-cookie@npm:^2.3.4, tough-cookie@npm:~2.5.0":
+  version: 2.5.0
+  resolution: "tough-cookie@npm:2.5.0"
+  dependencies:
+    psl: "npm:^1.1.28"
+    punycode: "npm:^2.1.1"
+  checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:^4.0.0":
   version: 4.1.3
   resolution: "tough-cookie@npm:4.1.3"
@@ -33171,13 +38198,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
+"tr46@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "tr46@npm:1.0.1"
   dependencies:
-    psl: "npm:^1.1.28"
-    punycode: "npm:^2.1.1"
-  checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f
+    punycode: "npm:^2.1.0"
+  checksum: 10/6e80d75480cb6658f7f283c15f5f41c2d4dfa243ca99a0e1baf3de6cc823fc4c829f89782a7a11e029905781fccfea42d08d8a6674ba7948c7dbc595b6f27dd3
   languageName: node
   linkType: hard
 
@@ -33214,6 +38240,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"travis-deploy-once@npm:^5.0.9":
+  version: 5.0.11
+  resolution: "travis-deploy-once@npm:5.0.11"
+  dependencies:
+    "@babel/core": "npm:^7.0.0"
+    "@babel/polyfill": "npm:^7.0.0"
+    "@babel/preset-env": "npm:^7.0.0"
+    "@babel/register": "npm:^7.0.0"
+    chalk: "npm:^2.1.0"
+    execa: "npm:^1.0.0"
+    got: "npm:^9.1.0"
+    p-retry: "npm:^3.0.0"
+    semver: "npm:^5.4.1"
+    update-notifier: "npm:^2.3.0"
+    url-join: "npm:^4.0.0"
+    yargs: "npm:^12.0.1"
+  bin:
+    travis-deploy-once: bin/travis-deploy-once.js
+  checksum: 10/71141db2295d92c26314b92ce4c57897bd869d1f081f6dbc6e8081cf4f7b59b5642cc54f352cafcfb78ec9e3318840fc8742b874d2658889a84d4d81d22ca93d
+  languageName: node
+  linkType: hard
+
 "tree-sitter-json@npm:=0.20.2":
   version: 0.20.2
   resolution: "tree-sitter-json@npm:0.20.2"
@@ -33280,6 +38328,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"trim-right@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "trim-right@npm:1.0.1"
+  checksum: 10/9120af534e006a7424a4f9358710e6e707887b6ccf7ea69e50d6ac6464db1fe22268400def01752f09769025d480395159778153fb98d4a2f6f40d4cf5d4f3b6
+  languageName: node
+  linkType: hard
+
 "trough@npm:^2.0.0":
   version: 2.1.0
   resolution: "trough@npm:2.1.0"
@@ -33303,6 +38358,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-jest@npm:^23.10.2":
+  version: 23.10.5
+  resolution: "ts-jest@npm:23.10.5"
+  dependencies:
+    bs-logger: "npm:0.x"
+    buffer-from: "npm:1.x"
+    fast-json-stable-stringify: "npm:2.x"
+    json5: "npm:2.x"
+    make-error: "npm:1.x"
+    mkdirp: "npm:0.x"
+    resolve: "npm:1.x"
+    semver: "npm:^5.5"
+    yargs-parser: "npm:10.x"
+  peerDependencies:
+    jest: ">=22 <24"
+  bin:
+    ts-jest: cli.js
+  checksum: 10/b13bfb5725b16d82119122d0ee874e666a7c481eca40a09672826185c690a42c8222ae3c49246f9dd8e37ab5d6bca6494573feffad957d7a9818771120dbad59
+  languageName: node
+  linkType: hard
+
 "ts-mixer@npm:^6.0.3":
   version: 6.0.4
   resolution: "ts-mixer@npm:6.0.4"
@@ -33348,6 +38424,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-node@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "ts-node@npm:7.0.1"
+  dependencies:
+    arrify: "npm:^1.0.0"
+    buffer-from: "npm:^1.1.0"
+    diff: "npm:^3.1.0"
+    make-error: "npm:^1.1.1"
+    minimist: "npm:^1.2.0"
+    mkdirp: "npm:^0.5.1"
+    source-map-support: "npm:^0.5.6"
+    yn: "npm:^2.0.0"
+  bin:
+    ts-node: dist/bin.js
+  checksum: 10/c1e0f1582867c34a03a25b1861e86922b9576931d473d48cd13275400832972350c4564e5f2c2df5817be6acbbb8e1dedf43bdd6f8c0f06b15d3530562a08a90
+  languageName: node
+  linkType: hard
+
 "ts-toolbelt@npm:^9.6.0":
   version: 9.6.0
   resolution: "ts-toolbelt@npm:9.6.0"
@@ -33366,6 +38460,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:1.9.0":
+  version: 1.9.0
+  resolution: "tslib@npm:1.9.0"
+  checksum: 10/3fb8dc249b5db6ff16289c1d6bf238996ff25b01c5f56db6559352ff17854d29a755d3cb4769074bf9be55dd0960aaacdf6650e07bcb6775d98b965a6c304792
+  languageName: node
+  linkType: hard
+
 "tslib@npm:2.0.1":
   version: 2.0.1
   resolution: "tslib@npm:2.0.1"
@@ -33373,7 +38474,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.13.0":
+"tslib@npm:^1.13.0, tslib@npm:^1.8.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
@@ -33387,6 +38488,85 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslint-config-prettier@npm:^1.15.0":
+  version: 1.18.0
+  resolution: "tslint-config-prettier@npm:1.18.0"
+  bin:
+    tslint-config-prettier-check: bin/check.js
+  checksum: 10/f0c548a7a520f9247f8e4ddba1136f300d1b2ec48a8255b030c05e35866cc22c105d9120540dd5ee82e2a04a769d82f5d098b7eaf6928820f6dba1badad6704c
+  languageName: node
+  linkType: hard
+
+"tslint-config-standard@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "tslint-config-standard@npm:8.0.1"
+  dependencies:
+    tslint-eslint-rules: "npm:^5.3.1"
+  checksum: 10/38ccb6a85866cb92742750e687a87fbc100c9310909d1fad48cb915b219519787bc61b62867b3e313020e5ac1ff06849f38790eefca10a524bf2ad27afc14af5
+  languageName: node
+  linkType: hard
+
+"tslint-eslint-rules@npm:^5.3.1":
+  version: 5.4.0
+  resolution: "tslint-eslint-rules@npm:5.4.0"
+  dependencies:
+    doctrine: "npm:0.7.2"
+    tslib: "npm:1.9.0"
+    tsutils: "npm:^3.0.0"
+  peerDependencies:
+    tslint: ^5.0.0
+    typescript: ^2.2.0 || ^3.0.0
+  checksum: 10/603cb951c71a54a694cbb46c680bfd7ae734eb02263567fb6b88b8b9ad8d56b07be473d031d379bfaa41e4a2abbb77dfd836d55899892a7dd967969175cc9756
+  languageName: node
+  linkType: hard
+
+"tslint@npm:^5.11.0":
+  version: 5.20.1
+  resolution: "tslint@npm:5.20.1"
+  dependencies:
+    "@babel/code-frame": "npm:^7.0.0"
+    builtin-modules: "npm:^1.1.1"
+    chalk: "npm:^2.3.0"
+    commander: "npm:^2.12.1"
+    diff: "npm:^4.0.1"
+    glob: "npm:^7.1.1"
+    js-yaml: "npm:^3.13.1"
+    minimatch: "npm:^3.0.4"
+    mkdirp: "npm:^0.5.1"
+    resolve: "npm:^1.3.2"
+    semver: "npm:^5.3.0"
+    tslib: "npm:^1.8.0"
+    tsutils: "npm:^2.29.0"
+  peerDependencies:
+    typescript: ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev"
+  bin:
+    tslint: ./bin/tslint
+  checksum: 10/9cfcec0330beeb99ab67b5c6ec40fd182973841a1ebbc6a0ea266d7203efda4db9c615e433282ce6fcd0b8d2a5f1836a821d25a39c5f24f835bfc2a37908543f
+  languageName: node
+  linkType: hard
+
+"tsutils@npm:^2.29.0":
+  version: 2.29.0
+  resolution: "tsutils@npm:2.29.0"
+  dependencies:
+    tslib: "npm:^1.8.1"
+  peerDependencies:
+    typescript: ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev"
+  checksum: 10/9724fee9a21c399e5914f50d888467f6d116f2e466ba77d294de0437ee7bb4a60e0c919a36518845af8c6fa0aabf6b72a4a01d4464db16fa719ff4e0dd45cb82
+  languageName: node
+  linkType: hard
+
+"tsutils@npm:^3.0.0":
+  version: 3.21.0
+  resolution: "tsutils@npm:3.21.0"
+  dependencies:
+    tslib: "npm:^1.8.1"
+  peerDependencies:
+    typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+  checksum: 10/ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2
+  languageName: node
+  linkType: hard
+
 "tsx@npm:^4.11.2":
   version: 4.11.2
   resolution: "tsx@npm:4.11.2"
@@ -33612,6 +38792,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-buffer@npm:1.0.2"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b
+  languageName: node
+  linkType: hard
+
 "typed-array-byte-length@npm:^1.0.0":
   version: 1.0.0
   resolution: "typed-array-byte-length@npm:1.0.0"
@@ -33624,6 +38815,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "typed-array-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/e4a38329736fe6a73b52a09222d4a9e8de14caaa4ff6ad8e55217f6705b017d9815b7284c85065b3b8a7704e226ccff1372a72b78c2a5b6b71b7bf662308c903
+  languageName: node
+  linkType: hard
+
 "typed-array-byte-offset@npm:^1.0.0":
   version: 1.0.0
   resolution: "typed-array-byte-offset@npm:1.0.0"
@@ -33637,6 +38841,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-byte-offset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-byte-offset@npm:1.0.2"
+  dependencies:
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/ac26d720ebb2aacbc45e231347c359e6649f52e0cfe0e76e62005912f8030d68e4cb7b725b1754e8fdd48e433cb68df5a8620a3e420ad1457d666e8b29bf9150
+  languageName: node
+  linkType: hard
+
 "typed-array-length@npm:^1.0.4":
   version: 1.0.4
   resolution: "typed-array-length@npm:1.0.4"
@@ -33648,6 +38866,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-length@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "typed-array-length@npm:1.0.6"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/05e96cf4ff836743ebfc593d86133b8c30e83172cb5d16c56814d7bacfed57ce97e87ada9c4b2156d9aaa59f75cdef01c25bd9081c7826e0b869afbefc3e8c39
+  languageName: node
+  linkType: hard
+
 "typedarray-to-buffer@npm:^3.1.5":
   version: 3.1.5
   resolution: "typedarray-to-buffer@npm:3.1.5"
@@ -33671,6 +38903,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typedoc-default-themes@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "typedoc-default-themes@npm:0.5.0"
+  checksum: 10/575dfe4dab775484bfeeb32e1827c4ae5e4f0bc1f5522657f128d3e05ad0c188dbb2f4a8ec7427effedc5bd454f4aeec3336479b249e14de32e5b36bf7d7b7fb
+  languageName: node
+  linkType: hard
+
+"typedoc@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "typedoc@npm:0.12.0"
+  dependencies:
+    "@types/fs-extra": "npm:^5.0.3"
+    "@types/handlebars": "npm:^4.0.38"
+    "@types/highlight.js": "npm:^9.12.3"
+    "@types/lodash": "npm:^4.14.110"
+    "@types/marked": "npm:^0.4.0"
+    "@types/minimatch": "npm:3.0.3"
+    "@types/shelljs": "npm:^0.8.0"
+    fs-extra: "npm:^7.0.0"
+    handlebars: "npm:^4.0.6"
+    highlight.js: "npm:^9.0.0"
+    lodash: "npm:^4.17.10"
+    marked: "npm:^0.4.0"
+    minimatch: "npm:^3.0.0"
+    progress: "npm:^2.0.0"
+    shelljs: "npm:^0.8.2"
+    typedoc-default-themes: "npm:^0.5.0"
+    typescript: "npm:3.0.x"
+  bin:
+    typedoc: bin/typedoc
+  checksum: 10/05844776e1b148fc5b9bde16f13d6bd03bfd16f8f4985d8a9e79d7c67700ccad48524484f36adcdf520a9071cfe292ceb67721d4717ebfa4e37f6041fad9d731
+  languageName: node
+  linkType: hard
+
 "types-ramda@npm:^0.29.9":
   version: 0.29.9
   resolution: "types-ramda@npm:0.29.9"
@@ -33680,6 +38946,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:3.0.x":
+  version: 3.0.3
+  resolution: "typescript@npm:3.0.3"
+  bin:
+    tsc: ./bin/tsc
+    tsserver: ./bin/tsserver
+  checksum: 10/24e0eebc236f47e03094df146e86e40e1aa9de98c46fac9d9ff04006762d3d1887fb608c8e2349084139224d181fcd263fcf63b7aaa9ff1c18547eec70010ddf
+  languageName: node
+  linkType: hard
+
+"typescript@npm:^3.8.3":
+  version: 3.9.10
+  resolution: "typescript@npm:3.9.10"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/f86a085eea24fdd665850c6be4dd69c7a71fe3d27ecc712be88cdc7a52d866f4f2416ad91c554df60f499dedcf288a24b3d8052e502833d8acc661a9d21bb98f
+  languageName: node
+  linkType: hard
+
 "typescript@npm:^4.0.2, typescript@npm:^4.1.3, typescript@npm:^4.2.3, typescript@npm:^4.4.4, typescript@npm:^4.5.5":
   version: 4.9.5
   resolution: "typescript@npm:4.9.5"
@@ -33710,6 +38996,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@npm%3A3.0.x#optional!builtin<compat/typescript>":
+  version: 3.0.3
+  resolution: "typescript@patch:typescript@npm%3A3.0.3#optional!builtin<compat/typescript>::version=3.0.3&hash=3bafbf"
+  bin:
+    tsc: ./bin/tsc
+    tsserver: ./bin/tsserver
+  checksum: 10/d70fd6871f62154e62e8f7e3728fa6d4f7ca63bbe217f6d342a4150a7dbcbcba4bc4c60ddfc450d2119d3de8ea8dc171011ab6331ac2ef528bf83cf5025f69e4
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A^3.8.3#optional!builtin<compat/typescript>":
+  version: 3.9.10
+  resolution: "typescript@patch:typescript@npm%3A3.9.10#optional!builtin<compat/typescript>::version=3.9.10&hash=3bd3d3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/77024c200e1f80d95185d5a973bcc4b0ecc12a77851390b1382e372195313769373a4b8b1642df4a8d4ae1df5911dcd9bde111cf6755eb4b6091f374e97c6dc5
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@npm%3A^4.0.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.1.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.2.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.4.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.5.5#optional!builtin<compat/typescript>":
   version: 4.9.5
   resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
@@ -33896,6 +39202,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"union-value@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "union-value@npm:1.0.1"
+  dependencies:
+    arr-union: "npm:^3.1.0"
+    get-value: "npm:^2.0.6"
+    is-extendable: "npm:^0.1.1"
+    set-value: "npm:^2.0.1"
+  checksum: 10/a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba
+  languageName: node
+  linkType: hard
+
 "uniq@npm:^1.0.0, uniq@npm:^1.0.1":
   version: 1.0.1
   resolution: "uniq@npm:1.0.1"
@@ -34150,6 +39468,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unset-value@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "unset-value@npm:1.0.0"
+  dependencies:
+    has-value: "npm:^0.3.1"
+    isobject: "npm:^3.0.0"
+  checksum: 10/0ca644870613dece963e4abb762b0da4c1cf6be4ac2f0859a463e4e9520c1ec85e512cfbfd73371ee0bb09ef536a0c4abd6f2c357715a08b43448aedc82acee6
+  languageName: node
+  linkType: hard
+
 "untildify@npm:^4.0.0":
   version: 4.0.0
   resolution: "untildify@npm:4.0.0"
@@ -34214,7 +39542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uri-js@npm:^4.2.2":
+"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
   dependencies:
@@ -34230,6 +39558,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"urix@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "urix@npm:0.1.0"
+  checksum: 10/ebf5df5491c1d40ea88f7529ee9d8fd6501f44c47b8017d168fd1558d40f7d613c6f39869643344e58b71ba2da357a7c26f353a2a54d416492fcdca81f05b338
+  languageName: node
+  linkType: hard
+
 "url-join@npm:^4.0.0, url-join@npm:^4.0.1":
   version: 4.0.1
   resolution: "url-join@npm:4.0.1"
@@ -34246,6 +39581,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-parse-lax@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "url-parse-lax@npm:3.0.0"
+  dependencies:
+    prepend-http: "npm:^2.0.0"
+  checksum: 10/1040e357750451173132228036aff1fd04abbd43eac1fb3e4fca7495a078bcb8d33cb765fe71ad7e473d9c94d98fd67adca63bd2716c815a2da066198dd37217
+  languageName: node
+  linkType: hard
+
 "url-parse@npm:^1.5.10, url-parse@npm:^1.5.3":
   version: 1.5.10
   resolution: "url-parse@npm:1.5.10"
@@ -34397,6 +39741,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "use@npm:3.1.1"
+  checksum: 10/08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33
+  languageName: node
+  linkType: hard
+
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -34420,6 +39771,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"util.promisify@npm:^1.0.0":
+  version: 1.1.2
+  resolution: "util.promisify@npm:1.1.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    for-each: "npm:^0.3.3"
+    has-proto: "npm:^1.0.1"
+    has-symbols: "npm:^1.0.3"
+    object.getownpropertydescriptors: "npm:^2.1.6"
+    safe-array-concat: "npm:^1.0.0"
+  checksum: 10/90c139773aedfe0cda48f2e43fb96bb0b45ab1d9544ed0cc1949d6acda17053dcb60ed1d3d0a1e121f0e2c26ca21e84dc589a5f06ec33059a4c742e7cba4584f
+  languageName: node
+  linkType: hard
+
 "util.promisify@npm:~1.0.0":
   version: 1.0.1
   resolution: "util.promisify@npm:1.0.1"
@@ -34852,7 +40218,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"w3c-hr-time@npm:^1.0.2":
+"w3c-hr-time@npm:^1.0.1, w3c-hr-time@npm:^1.0.2":
   version: 1.0.2
   resolution: "w3c-hr-time@npm:1.0.2"
   dependencies:
@@ -34870,7 +40236,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"walker@npm:^1.0.7":
+"walker@npm:^1.0.7, walker@npm:~1.0.5":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
   dependencies:
@@ -34888,6 +40254,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"watch@npm:~0.18.0":
+  version: 0.18.0
+  resolution: "watch@npm:0.18.0"
+  dependencies:
+    exec-sh: "npm:^0.2.0"
+    minimist: "npm:^1.2.0"
+  bin:
+    watch: ./cli.js
+  checksum: 10/459f10b6d57d836f9ab6cf5f6cd9af13fc196e29edd9c96d718a218a6120fc8975fe0ed7af95ffbc9be7a1f84f321c655acb37771b717f0a2cddc55d3cd558fc
+  languageName: node
+  linkType: hard
+
 "watchpack@npm:^2.2.0, watchpack@npm:^2.4.0":
   version: 2.4.0
   resolution: "watchpack@npm:2.4.0"
@@ -34951,6 +40329,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webidl-conversions@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "webidl-conversions@npm:4.0.2"
+  checksum: 10/594187c36f2d7898f89c0ed3b9248a095fa549ecc1befb10a97bc884b5680dc96677f58df5579334d8e0d1018e5ef075689cfa2a6c459f45a61a9deb512cb59e
+  languageName: node
+  linkType: hard
+
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -35183,7 +40568,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-encoding@npm:^1.0.5":
+"whatwg-encoding@npm:^1.0.1, whatwg-encoding@npm:^1.0.3, whatwg-encoding@npm:^1.0.5":
   version: 1.0.5
   resolution: "whatwg-encoding@npm:1.0.5"
   dependencies:
@@ -35199,7 +40584,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-mimetype@npm:^2.3.0":
+"whatwg-mimetype@npm:^2.1.0, whatwg-mimetype@npm:^2.2.0, whatwg-mimetype@npm:^2.3.0":
   version: 2.3.0
   resolution: "whatwg-mimetype@npm:2.3.0"
   checksum: 10/3582c1d74d708716013433bbab45cb9b31ef52d276adfbe2205d948be1ec9bb1a4ac05ce6d9045f3acc4104489e1344c857b14700002385a4b997a5673ff6416
@@ -35216,6 +40601,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^6.4.1":
+  version: 6.5.0
+  resolution: "whatwg-url@npm:6.5.0"
+  dependencies:
+    lodash.sortby: "npm:^4.7.0"
+    tr46: "npm:^1.0.1"
+    webidl-conversions: "npm:^4.0.2"
+  checksum: 10/fbe8e9d81f8f07343f60bc135962ff346d7d19efc9e2f842f54b5c525837dcf1a36d13be21902311a2922b6342799dd82454e552b4e460d74451794f187ba0a5
+  languageName: node
+  linkType: hard
+
+"whatwg-url@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "whatwg-url@npm:7.1.0"
+  dependencies:
+    lodash.sortby: "npm:^4.7.0"
+    tr46: "npm:^1.0.1"
+    webidl-conversions: "npm:^4.0.2"
+  checksum: 10/769fd35838b4e50536ae08d836472e86adbedda1d5493ea34353c55468147e7868b91d2535b59e01a9e7331ab7e4cdfdf5490c279c045da23c327cf33e32f755
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"
@@ -35259,6 +40666,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-pm-runs@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "which-pm-runs@npm:1.1.0"
+  checksum: 10/39a56ee50886fb33ec710e3b36dc9fe3d0096cac44850d9ca0c6186c4cb824d6c8125f013e0562e7c94744e1e8e4a6ab695592cdb12555777c7a4368143d822c
+  languageName: node
+  linkType: hard
+
 "which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
   version: 1.1.11
   resolution: "which-typed-array@npm:1.1.11"
@@ -35272,7 +40686,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1":
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15":
+  version: 1.1.15
+  resolution: "which-typed-array@npm:1.1.15"
+  dependencies:
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10/c3b6a99beadc971baa53c3ee5b749f2b9bdfa3b3b9a70650dd8511a48b61d877288b498d424712e9991d16019633086bd8b5923369460d93463c5825fa36c448
+  languageName: node
+  linkType: hard
+
+"which@npm:^1.2.10, which@npm:^1.2.12, which@npm:^1.2.14, which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"
   dependencies:
@@ -35342,7 +40769,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"word-wrap@npm:~1.2.3":
+"word-wrap@npm:^1.0.3, word-wrap@npm:~1.2.3":
   version: 1.2.5
   resolution: "word-wrap@npm:1.2.5"
   checksum: 10/1ec6f6089f205f83037be10d0c4b34c9183b0b63fca0834a5b3cee55dd321429d73d40bb44c8fc8471b5203d6e8f8275717f49a8ff4b2b0ab41d7e1b563e0854
@@ -35383,6 +40810,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrap-ansi@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "wrap-ansi@npm:2.1.0"
+  dependencies:
+    string-width: "npm:^1.0.1"
+    strip-ansi: "npm:^3.0.1"
+  checksum: 10/cf66d33f62f2edf0aac52685da98194e47ddf4ceb81d9f98f294b46ffbbf8662caa72a905b343aeab8d6a16cade982be5fc45df99235b07f781ebf68f051ca98
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "wrap-ansi@npm:3.0.1"
+  dependencies:
+    string-width: "npm:^2.1.1"
+    strip-ansi: "npm:^4.0.0"
+  checksum: 10/bdd4248faa2142051ed5802c216076b25ada29778100483bb6f16a52a115bf7cb7e595bdbe9f1ed551dcd4822f3e2ece80c9febedc2b65acb2cc649705d47bc2
+  languageName: node
+  linkType: hard
+
 "wrap-ansi@npm:^5.1.0":
   version: 5.1.0
   resolution: "wrap-ansi@npm:5.1.0"
@@ -35423,7 +40870,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.3":
+"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.1.0, write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.3":
   version: 2.4.3
   resolution: "write-file-atomic@npm:2.4.3"
   dependencies:
@@ -35446,6 +40893,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^5.2.0":
+  version: 5.2.3
+  resolution: "ws@npm:5.2.3"
+  dependencies:
+    async-limiter: "npm:~1.0.0"
+  checksum: 10/5adfa5f636fdae931ac258c5a6d5d2de2d5b7430010625919a429ace4edf59d8de753266acf2410897966ef0391119900779963f5b9a40dd278337736df0f308
+  languageName: node
+  linkType: hard
+
 "ws@npm:^7.4.6":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
@@ -35554,7 +41010,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"y18n@npm:^4.0.0":
+"y18n@npm:^3.2.1":
+  version: 3.2.2
+  resolution: "y18n@npm:3.2.2"
+  checksum: 10/42ee58e321252ac87f85ccc7cee01c2e3e224737531e9e543963264194255132ce406e02993904b84ea974050d53b8959dcf9da695408553c32f2a8b4b59a667
+  languageName: node
+  linkType: hard
+
+"y18n@npm:^3.2.1 || ^4.0.0, y18n@npm:^4.0.0":
   version: 4.0.3
   resolution: "y18n@npm:4.0.3"
   checksum: 10/392870b2a100bbc643bc035fe3a89cef5591b719c7bdc8721bcdb3d27ab39fa4870acdca67b0ee096e146d769f311d68eda6b8195a6d970f227795061923013f
@@ -35605,7 +41068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^10.0.0":
+"yargs-parser@npm:10.x, yargs-parser@npm:^10.0.0":
   version: 10.1.0
   resolution: "yargs-parser@npm:10.1.0"
   dependencies:
@@ -35614,6 +41077,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs-parser@npm:^11.1.1":
+  version: 11.1.1
+  resolution: "yargs-parser@npm:11.1.1"
+  dependencies:
+    camelcase: "npm:^5.0.0"
+    decamelize: "npm:^1.2.0"
+  checksum: 10/986c06d977534f28ddfbccbbb7d9ebe5d0edb1aef9e27d95c44d40307a0e6cd9cfe1698e7d33eb860a92b7a9d2ee44404904bd9e85ebf897ef197f084ea00873
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^13.1.2":
   version: 13.1.2
   resolution: "yargs-parser@npm:13.1.2"
@@ -35651,6 +41124,55 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs-parser@npm:^9.0.2":
+  version: 9.0.2
+  resolution: "yargs-parser@npm:9.0.2"
+  dependencies:
+    camelcase: "npm:^4.1.0"
+  checksum: 10/e9912e00da647bd03eef60759410722fb3a374dd05c33151410637ee6ab67d12c594999ec6ea345a871f9174e732ea27f7c90aa901c59af99d6a816905b4bce6
+  languageName: node
+  linkType: hard
+
+"yargs@npm:^11.0.0":
+  version: 11.1.1
+  resolution: "yargs@npm:11.1.1"
+  dependencies:
+    cliui: "npm:^4.0.0"
+    decamelize: "npm:^1.1.1"
+    find-up: "npm:^2.1.0"
+    get-caller-file: "npm:^1.0.1"
+    os-locale: "npm:^3.1.0"
+    require-directory: "npm:^2.1.1"
+    require-main-filename: "npm:^1.0.1"
+    set-blocking: "npm:^2.0.0"
+    string-width: "npm:^2.0.0"
+    which-module: "npm:^2.0.0"
+    y18n: "npm:^3.2.1"
+    yargs-parser: "npm:^9.0.2"
+  checksum: 10/039bc1abd24b6d484b8ab16f46be3647a5ecdf95654e1f162b96c98be691aceb3aac77279c252f6f26d12e21124aaef5fa1c139eed073d33f8b77495acca3a24
+  languageName: node
+  linkType: hard
+
+"yargs@npm:^12.0.1":
+  version: 12.0.5
+  resolution: "yargs@npm:12.0.5"
+  dependencies:
+    cliui: "npm:^4.0.0"
+    decamelize: "npm:^1.2.0"
+    find-up: "npm:^3.0.0"
+    get-caller-file: "npm:^1.0.1"
+    os-locale: "npm:^3.0.0"
+    require-directory: "npm:^2.1.1"
+    require-main-filename: "npm:^1.0.1"
+    set-blocking: "npm:^2.0.0"
+    string-width: "npm:^2.0.0"
+    which-module: "npm:^2.0.0"
+    y18n: "npm:^3.2.1 || ^4.0.0"
+    yargs-parser: "npm:^11.1.1"
+  checksum: 10/d6e2772870d72da780a21bf7cf47d823e693aad9532bb2e76a696dd16a0873976280686a75f34ebc8eaf900729bfc53a6ea9d4308d98194dcb0eaff872ff7c83
+  languageName: node
+  linkType: hard
+
 "yargs@npm:^13.2.2":
   version: 13.3.2
   resolution: "yargs@npm:13.3.2"
@@ -35729,6 +41251,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yn@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "yn@npm:2.0.0"
+  checksum: 10/9d49527cb3e9a0948cc057223810bf30607bf04b9ff7666cc1681a6501d660b60d90000c16f9e29311b0f28d8a06222ada565ccdca5f1049cdfefb1908217572
+  languageName: node
+  linkType: hard
+
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"
@@ -35736,6 +41265,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yup@npm:^0.27.0":
+  version: 0.27.0
+  resolution: "yup@npm:0.27.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.0.0"
+    fn-name: "npm:~2.0.1"
+    lodash: "npm:^4.17.11"
+    property-expr: "npm:^1.5.0"
+    synchronous-promise: "npm:^2.0.6"
+    toposort: "npm:^2.0.2"
+  checksum: 10/a217125b796b3c8df8c4f414d7f5bf6090f9c5d687e3b93a6bb2d0f0842fabdb1e7ae05d1dbf6ef148c1a5b6f095a5fca7c73c6caf2cd465ea234eac18ed6d3c
+  languageName: node
+  linkType: hard
+
 "zenscroll@npm:^4.0.2":
   version: 4.0.2
   resolution: "zenscroll@npm:4.0.2"

From f5be2549604ee052053b62251e8b4b897fbc4bce Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 12:36:04 -0400
Subject: [PATCH 049/151] added images to background

---
 src/pages/dev/people/+Page.mdx | 141 +++++++++++++++++++++++----------
 src/pages/dev/people/main.styl |  80 ++++++++++++++++---
 2 files changed, 166 insertions(+), 55 deletions(-)

diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index 10634cfd..f22a2ea5 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -1,103 +1,158 @@
-export { ContentPage as default } from "~/layouts";
 import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
 import { Image } from "./index";
 
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="#people">People</a></li>
+    <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+\
+\
+
 [//]: # "People"
 <h1 class="big">People</h1>
 
-<Image className="back-img" src="shanan.jpg"></Image>
-
-<div class="people">
+<div class="people" id="people">
     <div class="left">
         <div class="person-info" id="shanan">
-            <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
-            <t>Professor, Database Developer</t>\
-            <e>peters -at geology.wisc.edu</e>
+            <Image className="back-img" src="shanan.jpg"></Image>
+            <div class="text">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
+                <t>Professor, Database Developer</t>\
+                <e>peters -at geology.wisc.edu</e>
+            </div>
         </div>
 
         <div class="person-info" id="daven">
-            <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
-            <t>Research Scientist, Developer</t> \
-            <e>daven.quinn -at wisc.edu</e> 
+            <Image className="back-img" src="daven.jpg"></Image>
+            <div class="text">
+                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
+                <t>Research Scientist, Developer</t> \
+                <e>daven.quinn -at wisc.edu</e> 
+            </div>
         </div>
 
         <div class="person-info" id="evgeny">
-            <n>Evgeny Mazko</n> \
-            <t>Graduate Student</t> \
-            <e>mazko -at wisc.edu</e> 
+            <Image className="back-img" src="evgeny.jpg"></Image>
+            <div class="text">
+                <n>Evgeny Mazko</n> \
+                <t>Graduate Student</t> \
+                <e>mazko -at wisc.edu</e> 
+            </div>
         </div>
             
         <div class="person-info" id="michael">
-            <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
-            <t>Senior Programmer Analyst</t> \
-            <e>mmcclenn -at- geology.wisc.edu</e> 
+            <Image className="back-img" src="michael.jpg"></Image>
+            <div class="text">
+                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
+                <t>Senior Programmer Analyst</t> \
+                <e>mmcclenn -at- geology.wisc.edu</e> 
+            </div>
         </div>
 
         <div class="person-info" id="casey">
-            <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
-            <t>Research Specialist, Developer (former)</t> 
+        <Image className="back-img" src="casey.jpg"></Image>
+            <div class="text">
+                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
+                <t>Research Specialist, Developer (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="daniel">
-            <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
-            <t>Graduate Student (former)</t> 
+        <Image className="back-img" src="daniel.jpg"></Image>
+            <div class="text">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
+                <t>Graduate Student (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="shan">
-            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
-            <t>Graduate Student (former)</t> 
+        <Image className="back-img" src="shan.jpg"></Image>
+            <div class="text">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
+                <t>Graduate Student (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="ben">
-            <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
-            <t>Postdoctoral Scholar (former)</t> 
+        <Image className="back-img" src="ben.jpg"></Image>
+            <div class="text">
+                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
+                <t>Postdoctoral Scholar (former)</t> 
+            </div>
         </div>
     </div>
 
     <div class="right">
         <div class="person-info" id="afiqah">
-            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
-            <t>Undergrad Student (former)</t> 
+        <Image className="back-img" src="afiqah.jpg"></Image>
+            <div class="text">
+                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
+                <t>Undergrad Student (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="sharon">
-            <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
-            <t>Researcher (former)</t> 
+        <Image className="back-img" src="sharon.jpg"></Image>
+            <div class="text">
+                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
+                <t>Researcher (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="andrew">
-            <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
-            <t>Data Mobilization and Research Scientist</t> \
-            <e>azaffos -at- email.arizona.edu</e> 
+        <Image className="back-img" src="andrew.jpg"></Image>
+            <div class="text">
+                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
+                <t>Data Mobilization and Research Scientist</t> \
+                <e>azaffos -at- email.arizona.edu</e> 
+            </div>
         </div>
 
         <div class="person-info" id="jon">
-            <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
-            <t>Postdoctoral Researcher (former)</t> \
-            <e>jhusson - at - uvic.ca</e> 
+        <Image className="back-img" src="jon.jpg"></Image>
+            <div class="text">
+                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
+                <t>Postdoctoral Researcher (former)</t> \
+                <e>jhusson - at - uvic.ca</e> 
+            </div>
         </div>
 
         <div class="person-info" id="erika">
-            <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
-            <t>Research Intern (former)</t> 
+        <Image className="back-img" src="erika.jpg"></Image>
+            <div class="text">
+                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
+                <t>Research Intern (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="noel">
-            <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
-            <t>Researcher (former)</t> 
+        <Image className="back-img" src="noel.jpg"></Image>
+            <div class="text">
+                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
+                <t>Researcher (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="john">
-            <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
-            <t>Next-level Developer (former)</t> 
+        <Image className="back-img" src="john.jpg"></Image>
+            <div class="text">
+                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
+                <t>Next-level Developer (former)</t> 
+            </div>
         </div>
 
         <div class="person-info" id="puneet">
-            <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
-            <t>Generally Ignored</t> \
-            <e>punkish at eidesis.org</e> 
+        <Image className="back-img" src="puneet.jpg"></Image>
+            <div class="text">
+                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
+                <t>Generally Ignored</t> \
+                <e>punkish at eidesis.org</e> 
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/pages/dev/people/main.styl b/src/pages/dev/people/main.styl
index 342c47e3..801b8cc6 100644
--- a/src/pages/dev/people/main.styl
+++ b/src/pages/dev/people/main.styl
@@ -1,29 +1,85 @@
 .htnl, .body
-    background-color: white
+    background-color: black
+    color: white
+
+a:hover
+    text-decoration: none
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+  top: 0
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
 
-.people
-    z-index: 100
 .big
     color: white
+    text-align: center
+
+.people
+    color: white
 
 .left
     float: left
-    width: 50%
+    width: 30%
     background-color: green
+    margin-left: 20%
 
 .right
-    float: right
-    width: 50%
+    float: left
+    width: 30%
     background-color: red
+    margin-right: 20%
 
 .person-info
-    height: 10vh
-    text-align: right
-    padding: 3px 20px
-    color: blue
-    border: dotted
+    height: 30vh
+    width: 100%
+    position: relative
+
+.text
+    position:absolute
+    padding: 5px 20px
+    z-index: 100
+    background-color: rgba(0, 0, 0, 0.2)
+    bottom:0
+    right: 0
+
+    a
+        color: white
+
+    a:hover
+        color: white
 
 .back-img
     position:absolute
-    z-index:0
+    z-index: 0
+    height: 30vh
     object-fit: cover
+    width: 100%
+
+n
+    font-size: 25px
+    font-weight: 200px
+
+t
+    font-weight: 400px
+
+e 
+    font-size: 14px
+    font-weight: 200px
\ No newline at end of file

From f2a29beb6c2a74582283f4bd002ad3e2f3c7a679 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 12:43:04 -0400
Subject: [PATCH 050/151] added footer

---
 src/pages/dev/people/+Page.mdx | 29 ++++++++++++++++++++++++++
 src/pages/dev/people/main.styl | 37 +++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index f22a2ea5..bb12eeb0 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -155,4 +155,33 @@ import { Image } from "./index";
             </div>
         </div>
     </div>
+</div>
+
+[//]: # "Footer"
+<div class="footer">
+    <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+        <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+        <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+        <ul class="footer-nav">
+        <li><a href="#about">About</a></li>
+        <li><a href="#apps">Apps</a></li>
+        <li><a href="#api">API</a></li>
+        <li><a href="#people">People</a></li>
+        <li><a href="#donate">Donate</a></li>
+        <li><a href="#publications">Publications</a></li>
+        </ul>
+    </div>
+    <div class="col-sm-4 funding">
+        <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+        <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+        </div>
+    </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/src/pages/dev/people/main.styl b/src/pages/dev/people/main.styl
index 801b8cc6..639b45d1 100644
--- a/src/pages/dev/people/main.styl
+++ b/src/pages/dev/people/main.styl
@@ -31,6 +31,8 @@ a:hover
 .big
     color: white
     text-align: center
+    font-size: 75px
+    font-family: "Maven Pro", sans-serif
 
 .people
     color: white
@@ -82,4 +84,37 @@ t
 
 e 
     font-size: 14px
-    font-weight: 200px
\ No newline at end of file
+    font-weight: 200px
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+  margin-top: 250vh
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
\ No newline at end of file

From e2a12c637debaefc3d76475eaae2c6af55652004 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 14:35:35 -0400
Subject: [PATCH 051/151] after pull request

---
 src/pages/dev/+Page.mdx        | 3 ---
 src/pages/dev/people/+Page.mdx | 2 +-
 src/pages/dev/people/main.styl | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/dev/+Page.mdx b/src/pages/dev/+Page.mdx
index 2f8cb98d..24199430 100644
--- a/src/pages/dev/+Page.mdx
+++ b/src/pages/dev/+Page.mdx
@@ -11,8 +11,5 @@ import { PageBreadcrumbs } from "~/renderer";
 - [Feedback](/dev/feedback)
 - [Map filter](/dev/filtering)
 - [Main Page](/dev/main-page)
-<<<<<<< HEAD
 - [People](/dev/people)
-=======
 - [Concept apps](/dev/concepts)
->>>>>>> e9ee49f514a30fe78b7f91204f98f834ac7eaae0
diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index bb12eeb0..b975c360 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -7,7 +7,7 @@ import { Image } from "./index";
 <div class="nav">
   <ul>
     <li><a href="#people">People</a></li>
-    <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 \
diff --git a/src/pages/dev/people/main.styl b/src/pages/dev/people/main.styl
index 639b45d1..9c1a510f 100644
--- a/src/pages/dev/people/main.styl
+++ b/src/pages/dev/people/main.styl
@@ -55,6 +55,7 @@ a:hover
     position: relative
 
 .text
+    text-align: right
     position:absolute
     padding: 5px 20px
     z-index: 100

From 0276542ccc2f4ecfed04296f2d3714d2e06d6069 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 14:41:46 -0400
Subject: [PATCH 052/151] linked people page from main page

---
 src/pages/dev/main-page/+Page.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index b0f9afe1..5cfe3afc 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -9,7 +9,7 @@ import "./main.styl";
     <li><a href="#about">About</a></li>
     <li><a href="#apps">Apps</a></li>
     <li><a href="#api">API</a></li>
-    <li><a href="#people">People</a></li>
+    <li><a href="/dev/people">People</a></li>
     <li><a href="#donate">Donate</a></li>
     <li><a href="#publications">Publications</a></li>
     <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>

From 345c9db97a376bcf20193f6a291148527365c149 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 15:24:49 -0400
Subject: [PATCH 053/151] added built with macrostrat section

---
 src/pages/dev/main-page/+Page.mdx | 657 ++++++++++++++----------------
 src/pages/dev/main-page/main.styl |  32 +-
 2 files changed, 347 insertions(+), 342 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index f1fe6d56..bd91eb8e 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -175,398 +175,373 @@ import "./main.styl";
 
 <Image className="rock-border" src="rocks-border.jpg"></Image>
 
-[//]: # "Built With Macrostrat"
-<div class="row slide" id="apps">
-  <div class="col-xs-12 slide-container">
-    <div class="row">
-      <div class="col-xs-12" id="app-title">
-        <h1 class="title">Built with Macrostrat</h1>
+[//]: # "Apps"
+<div id="apps">
+  <h1 class="big app-header">Built with Macrostrat</h1>
+
+  <a href="/sift">
+    <div class="app-box">
+      <Image className="app-img" src="logo_red.png"></Image>
+      <div class="app-background-text">
+        Sift
+        <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
       </div>
     </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="/sift">
-          <div class="app-background">
-            <div class="app-background-text">
-              Sift
-              <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
+  </a>
+
+  <a href="https://rockd.org">
+    <div class="app-box">
+      <Image className="app-img" src="rockd.jpg"></Image>
+      <div class="app-background-text">
+        Rockd
+        <p class="blurb">A mobile field book, Macrostrat style.</p>
       </div>
     </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://rockd.org">
-          <div class="app-background">
-            <div class="app-background-text">
-              Rockd
-              <p class="blurb">A mobile field book, Macrostrat style.</p>
-            </div>
-          </div>
-        </a>
+  </a>
+
+  <a href="/map">
+    <div class="app-box">
+      <Image className="app-img" src="burwell.png"></Image>
+      <div class="app-background-text">
+        Map
+        <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
       </div>
     </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="/map">
-          <div class="app-background">
-            <div class="app-background-text">
-              Map
-              <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
-            </div>
-          </div>
-        </a>
+  </a>
+
+  <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
+    <div class="app-box">
+      <Image className="app-img" src="mancos.jpg"></Image>
+      <div class="app-background-text">
+        Mancos
+        <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
       </div>
     </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
-          <div class="app-background">
-            <div class="app-background-text">
-              Mancos
-              <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
-            </div>
-          </div>
-        </a>
+  </a>
+
+  <a href="http://fc.umn.edu/" target="_blank">
+    <div class="app-box">
+      <Image className="app-img" src="foc.png"></Image>
+      <div class="app-background-text">
+        FOC
+        <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
       </div>
     </div>
-
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="http://fc.umn.edu/" target="_blank">
-          <div class="app-background">
-            <div class="app-background-text">
-              FOC
-              <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
-            </div>
-          </div>
-        </a>
+  </a>
+
+  <a href="https://github.com/UW-Macrostrat/node-api-template">
+    <div class="app-box">
+      <Image className="app-img" src="api.png"></Image>
+      <div class="app-background-text app-background-text-small">
+        API Template
+        <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
       </div>
     </div>
+  </a>
+</div>
 
-    <div class="row">
-      <div class="col-xs-12 app">
-        <a href="https://github.com/UW-Macrostrat/node-api-template">
-          <div class="app-background">
-            <div class="app-background-text app-background-text-small">
-              API Template
-              <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
-            </div>
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+
+
+[//]: # "API"
+<div class="row slide" id="api">
+  <div class="col-xs-12 slide-container">
+    <div class="slide-content slide-content-padded">
+      <div class="row">
+        <div class="col-sm-6">
+          <div class="page-title-holder api-title">
+            <h1 class="big">API</h1>
           </div>
-        </a>
+        </div>
+        <div class="col-sm-6">
+          <div class="page-info">
+            All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
+          </div>
+        </div>
       </div>
     </div>
-
+  </div>
+</div>
 <Image className="rock-border" src="rocks-border.jpg"></Image>
 
-
-    [//]: # "API"
-    <div class="row slide" id="api">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-sm-6">
-              <div class="page-title-holder api-title">
-                <h1 class="big">API</h1>
-              </div>
-            </div>
-            <div class="col-sm-6">
-              <div class="page-info">
-                All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
-              </div>
-            </div>
+[//]: # "People"
+<div class="row slide" id="people">
+  <div class="col-xs-12 slide-container">
+    <div class="slide-content slide-content-padded">
+      <div class="row">
+        <div class="col-xs-12">
+          <div class="page-title-holder" id="contact-holder">
+            <h1 class="big">People</h1>
           </div>
         </div>
       </div>
-    </div>
-    <Image className="rock-border" src="rocks-border.jpg"></Image>
-
-    [//]: # "People"
-    <div class="row slide" id="people">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder" id="contact-holder">
-                <h1 class="big">People</h1>
-              </div>
-            </div>
+      <div class="row">
+        <div class="col-xs-6 person" id="shanan">
+          <div class="person-info">
+            <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
+            <t>Professor, Database Developer</t>\
+            <e>peters -at geology.wisc.edu</e>
           </div>
-          <div class="row">
-            <div class="col-xs-6 person" id="shanan">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
-                <t>Professor, Database Developer</t>\
-                <e>peters -at geology.wisc.edu</e>
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daven">
-              <div class="person-info">
-                <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
-                <t>Research Scientist, Developer</t> \
-                <e>daven.quinn -at wisc.edu</e> 
-              </div>
-            </div>
+        </div>
+        <div class="col-xs-6 person" id="daven">
+          <div class="person-info">
+            <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
+            <t>Research Scientist, Developer</t> \
+            <e>daven.quinn -at wisc.edu</e> 
           </div>
+        </div>
+      </div>
 
-          <div class="row">
-            <div class="col-xs-6 person" id="evgeny">
-              <div class="person-info">
-                <n>Evgeny Mazko</n> \
-                <t>Graduate Student</t> \
-                <e>mazko -at wisc.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="michael">
-              <div class="person-info">
-                <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
-                <t>Senior Programmer Analyst</t> \
-                <e>mmcclenn -at- geology.wisc.edu</e> 
-              </div>
-            </div>
+      <div class="row">
+        <div class="col-xs-6 person" id="evgeny">
+          <div class="person-info">
+            <n>Evgeny Mazko</n> \
+            <t>Graduate Student</t> \
+            <e>mazko -at wisc.edu</e> 
           </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="casey">
-              <div class="person-info">
-                <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
-                <t>Research Specialist, Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="daniel">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
+        </div>
+        <div class="col-xs-6 person" id="michael">
+          <div class="person-info">
+            <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
+            <t>Senior Programmer Analyst</t> \
+            <e>mmcclenn -at- geology.wisc.edu</e> 
           </div>
+        </div>
+      </div>
 
-          <div class="row">
-            <div class="col-xs-6 person" id="shan">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
-                <t>Graduate Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="ben">
-              <div class="person-info">
-                <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
-                <t>Postdoctoral Scholar (former)</t> 
-              </div>
-            </div>
+      <div class="row">
+        <div class="col-xs-6 person" id="casey">
+          <div class="person-info">
+            <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
+            <t>Research Specialist, Developer (former)</t> 
           </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="afiqah">
-              <div class="person-info">
-                <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
-                <t>Undergrad Student (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="sharon">
-              <div class="person-info">
-                <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
+        </div>
+        <div class="col-xs-6 person" id="daniel">
+          <div class="person-info">
+            <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
+            <t>Graduate Student (former)</t> 
           </div>
+        </div>
+      </div>
 
-          <div class="row">
-            <div class="col-xs-6 person" id="andrew">
-              <div class="person-info">
-                <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
-                <t>Data Mobilization and Research Scientist</t> \
-                <e>azaffos -at- email.arizona.edu</e> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="jon">
-              <div class="person-info">
-                <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
-                <t>Postdoctoral Researcher (former)</t> \
-                <e>jhusson - at - uvic.ca</e> 
-              </div>
-            </div>
+      <div class="row">
+        <div class="col-xs-6 person" id="shan">
+          <div class="person-info">
+            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
+            <t>Graduate Student (former)</t> 
           </div>
-
-          <div class="row">
-            <div class="col-xs-6 person" id="erika">
-              <div class="person-info">
-                <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
-                <t>Research Intern (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="noel">
-              <div class="person-info">
-                <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
-                <t>Researcher (former)</t> 
-              </div>
-            </div>
+        </div>
+        <div class="col-xs-6 person" id="ben">
+          <div class="person-info">
+            <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
+            <t>Postdoctoral Scholar (former)</t> 
           </div>
+        </div>
+      </div>
 
-          <div class="row">
-            <div class="col-xs-6 person" id="john">
-              <div class="person-info">
-                <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
-                <t>Next-level Developer (former)</t> 
-              </div>
-            </div>
-            <div class="col-xs-6 person" id="puneet">
-              <div class="person-info">
-                <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
-                <t>Generally Ignored</t> \
-                <e>punkish at eidesis.org</e> 
-              </div>
-            </div>
+      <div class="row">
+        <div class="col-xs-6 person" id="afiqah">
+          <div class="person-info">
+            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
+            <t>Undergrad Student (former)</t> 
+          </div>
+        </div>
+        <div class="col-xs-6 person" id="sharon">
+          <div class="person-info">
+            <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
+            <t>Researcher (former)</t> 
           </div>
+        </div>
+      </div>
 
+      <div class="row">
+        <div class="col-xs-6 person" id="andrew">
+          <div class="person-info">
+            <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
+            <t>Data Mobilization and Research Scientist</t> \
+            <e>azaffos -at- email.arizona.edu</e> 
+          </div>
+        </div>
+        <div class="col-xs-6 person" id="jon">
+          <div class="person-info">
+            <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
+            <t>Postdoctoral Researcher (former)</t> \
+            <e>jhusson - at - uvic.ca</e> 
+          </div>
         </div>
       </div>
-    </div>
 
-    [//]: # "Donate"
-    <div class="donate-container" id="donate">
-      <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
-      <div class="text">
-        <div class="donate-left">
-          <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
+      <div class="row">
+        <div class="col-xs-6 person" id="erika">
+          <div class="person-info">
+            <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
+            <t>Research Intern (former)</t> 
+          </div>
         </div>
-        <div class="donate-right">
-          <div class="donate-info">
-              Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+        <div class="col-xs-6 person" id="noel">
+          <div class="person-info">
+            <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
+            <t>Researcher (former)</t> 
           </div>
         </div>
       </div>
-    </div>
-    
-    [//]: # "Publications"
-    <div class="row slide" id="publications">
-      <div class="col-xs-12 slide-container">
-        <div class="slide-content slide-content-padded">
-          <div class="row">
-            <div class="col-xs-12">
-              <div class="page-title-holder">
-                <h1 class="big">Publications</h1>
-                <p class="blurb">literature utilizing Macrostrat</p>
-              </div>
-            </div>
+
+      <div class="row">
+        <div class="col-xs-6 person" id="john">
+          <div class="person-info">
+            <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
+            <t>Next-level Developer (former)</t> 
           </div>
-          [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
-          <div class="row">
-            <div class="col-xs-12">
-              <ol class="pub-list" reversed>
-                <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
-                <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
-                <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
-                <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
-                <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
-                <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
-                <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
-                <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
-                <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
-                <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
-                <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
-                <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
-                <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
-                <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
-                <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
-                <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
-                <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
-                <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
-                <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
-                <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
-                <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
-                <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
-                <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
-                <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
-                <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
-                <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
-                <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
-                <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
-                Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
-                <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
-                <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
-                <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
-                <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
-                <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
-                <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
-                <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
-                <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
-                <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
-                <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
-                <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
-                <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
-                <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
-                <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
-                <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
-                <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
-                <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
-                <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
-                <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
-                <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
-                <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
-                <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
-                <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
-                <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
-                <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
-                <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
-                <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
-                <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
-                  <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
-                <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
-                <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
-                <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
-                <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
-                <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
-                <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
-                <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
-                <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
-                <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
-              </ol>
-            </div>
+        </div>
+        <div class="col-xs-6 person" id="puneet">
+          <div class="person-info">
+            <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
+            <t>Generally Ignored</t> \
+            <e>punkish at eidesis.org</e> 
           </div>
         </div>
       </div>
+
     </div>
+  </div>
+</div>
 
-    [//]: # "Footer"
-    <div class="footer">
-      <div class="footer-container">
-        <div class="col-sm-4" id="who-made-it">
-          <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-          <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-        </div>
-        <div class="col-sm-4" id="bottom-nav">
-          <ul class="footer-nav">
-            <li><a href="#about">About</a></li>
-            <li><a href="#apps">Apps</a></li>
-            <li><a href="#api">API</a></li>
-            <li><a href="#people">People</a></li>
-            <li><a href="#donate">Donate</a></li>
-            <li><a href="#publications">Publications</a></li>
-          </ul>
-        </div>
-        <div class="col-sm-4 funding">
-          <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-          <div class="funding-line">
-            Current support: \
-            EAR-1948843 \
-            ICER-1928323 \
-            UW-Madison Dept. Geoscience
+[//]: # "Donate"
+<div class="donate-container" id="donate">
+  <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
+  <div class="text">
+    <div class="donate-left">
+      <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
+    </div>
+    <div class="donate-right">
+      <div class="donate-info">
+          Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+      </div>
+    </div>
+  </div>
+</div>
+    
+[//]: # "Publications"
+<div class="row slide" id="publications">
+  <div class="col-xs-12 slide-container">
+    <div class="slide-content slide-content-padded">
+      <div class="row">
+        <div class="col-xs-12">
+          <div class="page-title-holder">
+            <h1 class="big">Publications</h1>
+            <p class="blurb">literature utilizing Macrostrat</p>
           </div>
         </div>
       </div>
+      [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
+      <div class="row">
+        <div class="col-xs-12">
+          <ol class="pub-list" reversed>
+            <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
+            <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
+            <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
+            <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
+            <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
+            <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
+            <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
+            <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
+            <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
+            <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
+            <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
+            <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
+            <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
+            <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
+            <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
+            <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
+            <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
+            <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
+            <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
+            <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
+            <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
+            <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
+            <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
+            <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
+            <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
+            <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
+            <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
+            <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
+            <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
+            <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
+            Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
+            <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
+            <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
+            <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
+            <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
+            <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
+            <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
+            <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
+            <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
+            <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
+            <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
+            <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
+            <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
+            <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
+            <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
+            <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
+            <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
+            <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
+            <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
+            <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
+            <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
+            <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
+            <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
+            <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
+            <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
+            <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
+            <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
+            <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
+            <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
+            <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
+              <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
+            <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
+            <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
+            <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
+            <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
+            <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
+            <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
+            <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
+            <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
+            <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
+            <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
+            <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
+            <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
+          </ol>
+        </div>
+      </div>
     </div>
+  </div>
+</div>
 
+[//]: # "Footer"
+<div class="footer">
+  <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+      <ul class="footer-nav">
+        <li><a href="#about">About</a></li>
+        <li><a href="#apps">Apps</a></li>
+        <li><a href="#api">API</a></li>
+        <li><a href="#people">People</a></li>
+        <li><a href="#donate">Donate</a></li>
+        <li><a href="#publications">Publications</a></li>
+      </ul>
+    </div>
+    <div class="col-sm-4 funding">
+      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+      <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+      </div>
+    </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index b3cf2e4a..759f76a4 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -317,4 +317,34 @@ a:hover
     color: white
 
 #who-made-it
-  padding-top: 25px
\ No newline at end of file
+  padding-top: 25px
+
+.app-header
+  margin: 0
+  padding: 0
+
+.app-box 
+  height: 15vh
+  display: flex
+  width: 60%
+  margin: 0 20%
+  position: relative
+  color: black
+
+.app-background-text
+  margin: auto
+  padding-right: 20px
+  margin-right: 0
+  text-align: right
+  max-width: 55%
+  font-size: 72px
+
+.blurb
+  font-size: 15px
+
+
+.app-img
+  height: 80%
+  margin: auto
+  margin-left: 6%
+  
\ No newline at end of file

From 6b8e6f0b0640890ebdb1ab0550f9e190b5282205 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 16:59:14 -0400
Subject: [PATCH 054/151] start

---
 src/pages/dev/+Page.mdx           | 1 +
 src/pages/dev/main-page/main.styl | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/dev/+Page.mdx b/src/pages/dev/+Page.mdx
index 8f972262..5b6e2ad1 100644
--- a/src/pages/dev/+Page.mdx
+++ b/src/pages/dev/+Page.mdx
@@ -12,3 +12,4 @@ import { PageBreadcrumbs } from "~/renderer";
 - [Map filter](/dev/filtering)
 - [Main Page](/dev/main-page)
 - [Concept apps](/dev/concepts)
+- [Built with Macrostrat](/dev/apps)
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 759f76a4..44ae44e8 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -342,7 +342,6 @@ a:hover
 .blurb
   font-size: 15px
 
-
 .app-img
   height: 80%
   margin: auto

From 8363d83264439f60022a31507fef017cf746ac67 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 17:03:19 -0400
Subject: [PATCH 055/151] fixed fonts

---
 src/pages/dev/apps/+Page.mdx | 106 ++++++++++++++++++++++++++++++++
 src/pages/dev/apps/index.ts  |   6 ++
 src/pages/dev/apps/main.styl | 114 +++++++++++++++++++++++++++++++++++
 3 files changed, 226 insertions(+)
 create mode 100644 src/pages/dev/apps/+Page.mdx
 create mode 100644 src/pages/dev/apps/index.ts
 create mode 100644 src/pages/dev/apps/main.styl

diff --git a/src/pages/dev/apps/+Page.mdx b/src/pages/dev/apps/+Page.mdx
new file mode 100644
index 00000000..13c9c636
--- /dev/null
+++ b/src/pages/dev/apps/+Page.mdx
@@ -0,0 +1,106 @@
+import { PageHeader } from "~/components";
+import { LinkCard } from "~/components/cards";
+import { Image } from "./index";
+import "./main.styl";
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="#apps">Apps</a></li>
+    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+
+[//]: # "Apps"
+<div id="apps">
+  <h1 class="big app-header">Built with Macrostrat</h1>
+
+  <a href="/sift">
+    <div class="app-box">
+      <Image className="app-img" src="logo_red.png"></Image>
+      <div class="app-background-text">
+        Sift
+        <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="https://rockd.org">
+    <div class="app-box">
+      <Image className="app-img" src="rockd.jpg"></Image>
+      <div class="app-background-text">
+        Rockd
+        <p class="blurb">A mobile field book, Macrostrat style.</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="/map">
+    <div class="app-box">
+      <Image className="app-img" src="burwell.png"></Image>
+      <div class="app-background-text">
+        Map
+        <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
+    <div class="app-box">
+      <Image className="app-img" src="mancos.jpg"></Image>
+      <div class="app-background-text">
+        Mancos
+        <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="http://fc.umn.edu/" target="_blank">
+    <div class="app-box">
+      <Image className="app-img" src="foc.png"></Image>
+      <div class="app-background-text">
+        FOC
+        <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="https://github.com/UW-Macrostrat/node-api-template">
+    <div class="app-box">
+      <Image className="app-img" src="api.png"></Image>
+      <div class="app-background-text app-background-text-small">
+        API Template
+        <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
+      </div>
+    </div>
+  </a>
+</div>
+
+[//]: # "Footer"
+<div class="footer">
+  <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+      <ul class="footer-nav">
+        <li><a href="#about">About</a></li>
+        <li><a href="#apps">Apps</a></li>
+        <li><a href="#api">API</a></li>
+        <li><a href="#people">People</a></li>
+        <li><a href="#donate">Donate</a></li>
+        <li><a href="#publications">Publications</a></li>
+      </ul>
+    </div>
+    <div class="col-sm-4 funding">
+      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+      <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/pages/dev/apps/index.ts b/src/pages/dev/apps/index.ts
new file mode 100644
index 00000000..e3670446
--- /dev/null
+++ b/src/pages/dev/apps/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/dev/apps/main.styl b/src/pages/dev/apps/main.styl
new file mode 100644
index 00000000..36d81f65
--- /dev/null
+++ b/src/pages/dev/apps/main.styl
@@ -0,0 +1,114 @@
+.html, .body, #apps
+    color: black
+    background-color: white
+
+#apps
+    padding: 75px 0
+
+
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
+
+.app-header
+  margin: 0
+  padding: 0
+
+.app-box 
+  height: 15vh
+  display: flex
+  width: 60%
+  margin: 0 20%
+  position: relative
+  color: black
+
+.app-background-text
+  margin: auto
+  padding-right: 20px
+  margin-right: 0
+  text-align: right
+  max-width: 55%
+  font-size: 72px
+
+.blurb
+  font-size: 15px
+
+.app-img
+  height: 80%
+  margin: auto
+  margin-left: 6%
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif
+  text-align: center  
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px

From 964b2a38bece3dc60e889367c667926942af1a5c Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 18:50:13 -0400
Subject: [PATCH 056/151] minor changes

---
 src/pages/dev/apps/+Page.mdx | 3 +++
 src/pages/dev/apps/main.styl | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/dev/apps/+Page.mdx b/src/pages/dev/apps/+Page.mdx
index 13c9c636..5d95beaa 100644
--- a/src/pages/dev/apps/+Page.mdx
+++ b/src/pages/dev/apps/+Page.mdx
@@ -15,6 +15,8 @@ import "./main.styl";
 <div id="apps">
   <h1 class="big app-header">Built with Macrostrat</h1>
 
+
+  <div class="items">
   <a href="/sift">
     <div class="app-box">
       <Image className="app-img" src="logo_red.png"></Image>
@@ -74,6 +76,7 @@ import "./main.styl";
       </div>
     </div>
   </a>
+  </div> 
 </div>
 
 [//]: # "Footer"
diff --git a/src/pages/dev/apps/main.styl b/src/pages/dev/apps/main.styl
index 36d81f65..01c7578a 100644
--- a/src/pages/dev/apps/main.styl
+++ b/src/pages/dev/apps/main.styl
@@ -3,7 +3,7 @@
     background-color: white
 
 #apps
-    padding: 75px 0
+    padding: 75px 0    
 
 
 .nav
@@ -50,7 +50,7 @@
   font-size: 72px
 
 .blurb
-  font-size: 15px
+    font-size: 15px
 
 .app-img
   height: 80%
@@ -61,6 +61,9 @@
   font-size: 72px
   font-family: "Maven Pro", sans-serif
   text-align: center  
+  background-color: rgba(0,0,0,.2)
+  width: 60%
+  margin: 0 20%
 
 .footer 
   width: 100%

From cdce38dc60972922d8b41dd50edd6d19c5cf2789 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 19:01:04 -0400
Subject: [PATCH 057/151] page is broken

---
 src/pages/dev/main-page/+Page.mdx | 21 +++++----------------
 src/pages/dev/main-page/main.styl | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index bd91eb8e..da8b7183 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -238,28 +238,17 @@ import "./main.styl";
       </div>
     </div>
   </a>
+
 </div>
 
 <Image className="rock-border" src="rocks-border.jpg"></Image>
 
 
 [//]: # "API"
-<div class="row slide" id="api">
-  <div class="col-xs-12 slide-container">
-    <div class="slide-content slide-content-padded">
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="page-title-holder api-title">
-            <h1 class="big">API</h1>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="page-info">
-            All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
-          </div>
-        </div>
-      </div>
-    </div>
+<div id="api">
+  <h1 class="big api-header">API</h1>
+  <div class="row">
+  All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
   </div>
 </div>
 <Image className="rock-border" src="rocks-border.jpg"></Image>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 759f76a4..d2072ffb 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -347,4 +347,19 @@ a:hover
   height: 80%
   margin: auto
   margin-left: 6%
-  
\ No newline at end of file
+
+#api 
+  background-color: white
+  color: black
+  
+.api-header
+  padding: 0
+  margin: 0
+
+.row
+  height: 15vh
+  display: flex
+  width: 60%
+  margin: 0 20%
+  position: relative
+  color: black
\ No newline at end of file

From 3e8d491292095bc1fdf9334f352fdffcdf4cdfd2 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 20:07:24 -0400
Subject: [PATCH 058/151] this is messed up

---
 src/pages/dev/main-page/main.styl | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index d2072ffb..b6f709ab 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -354,12 +354,4 @@ a:hover
   
 .api-header
   padding: 0
-  margin: 0
-
-.row
-  height: 15vh
-  display: flex
-  width: 60%
-  margin: 0 20%
-  position: relative
-  color: black
\ No newline at end of file
+  margin: 0
\ No newline at end of file

From 80c18141dda82cd637977a05b2e520541b2e8e50 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Thu, 6 Jun 2024 20:15:46 -0400
Subject: [PATCH 059/151] added api section

---
 src/pages/dev/main-page/+Page.mdx |  9 ++++---
 src/pages/dev/main-page/main.styl | 44 ++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index da8b7183..f693d1bd 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -3,6 +3,7 @@ import { LinkCard } from "~/components/cards";
 import { Image } from "./index";
 import "./main.styl";
 
+<div id="total">
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
@@ -246,11 +247,10 @@ import "./main.styl";
 
 [//]: # "API"
 <div id="api">
-  <h1 class="big api-header">API</h1>
-  <div class="row">
-  All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.
-  </div>
+  <div class="api-circle"><div id="api-circle-text">API</div></div>
+  <div id="api-text">All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.</div>
 </div>
+
 <Image className="rock-border" src="rocks-border.jpg"></Image>
 
 [//]: # "People"
@@ -534,3 +534,4 @@ import "./main.styl";
     </div>
   </div>
 </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index b6f709ab..af473ff2 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -3,6 +3,9 @@ html, body
   background-color: white
   margin: 0
 
+#total
+  background-color: white
+
 a
   color: white
 
@@ -348,10 +351,39 @@ a:hover
   margin: auto
   margin-left: 6%
 
-#api 
+
+#api  
+  position: relative
+  height: 30vh
   background-color: white
-  color: black
-  
-.api-header
-  padding: 0
-  margin: 0
\ No newline at end of file
+
+#api-circle-text
+  display: table-cell;
+  vertical-align: middle;
+  color: #6bbe98;
+  font-size: 72px
+  font-weight: 500
+
+.api-circle
+  float: left
+  margin-left: 15%
+  margin-right: 50px
+  background-color: #fff;
+  height: 200px;
+  width: 200px;
+  border-radius: 50%;
+  text-align: center;
+  display: table;
+  border: 11px solid #6bbe98;
+  color: #4BABBf;
+
+#api-text
+  padding-top: 50px
+  margin-right: 15%
+  color: #4bab7f;
+  font-size: 20px;
+  line-height: 28px;
+  font-weight: 400;
+
+
+

From 845201a898caee27ee0174497a705ef7cb575b14 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 10:37:03 -0400
Subject: [PATCH 060/151] added publications

---
 src/pages/dev/main-page/+Page.mdx | 173 ++++++++++++++----------------
 src/pages/dev/main-page/main.styl |  17 +++
 2 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index f693d1bd..cbccb59a 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -411,99 +411,86 @@ import "./main.styl";
 </div>
     
 [//]: # "Publications"
-<div class="row slide" id="publications">
-  <div class="col-xs-12 slide-container">
-    <div class="slide-content slide-content-padded">
-      <div class="row">
-        <div class="col-xs-12">
-          <div class="page-title-holder">
-            <h1 class="big">Publications</h1>
-            <p class="blurb">literature utilizing Macrostrat</p>
-          </div>
-        </div>
-      </div>
-      [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
-      <div class="row">
-        <div class="col-xs-12">
-          <ol class="pub-list" reversed>
-            <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
-            <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
-            <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
-            <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
-            <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
-            <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
-            <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
-            <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
-            <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
-            <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
-            <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
-            <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
-            <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
-            <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
-            <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
-            <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
-            <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
-            <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
-            <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
-            <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
-            <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
-            <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
-            <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
-            <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
-            <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
-            <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
-            <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
-            <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
-            <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
-            <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
-            Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
-            <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
-            <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
-            <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
-            <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
-            <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
-            <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
-            <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
-            <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
-            <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
-            <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
-            <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
-            <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
-            <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
-            <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
-            <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
-            <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
-            <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
-            <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
-            <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
-            <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
-            <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
-            <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
-            <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
-            <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
-            <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
-            <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
-            <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
-            <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
-            <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
-              <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
-            <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
-            <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
-            <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
-            <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
-            <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
-            <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
-            <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
-            <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
-            <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
-            <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
-            <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
-            <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
-          </ol>
-        </div>
-      </div>
-    </div>
-  </div>
+<div id="publications">
+  <h1 id="pub-title" class="big">Publications</h1>
+  <p class="blurb">literature utilizing Macrostrat</p>
+
+  [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
+  <ol class="pub-list" reversed>
+    <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
+    <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
+    <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
+    <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
+    <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
+    <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
+    <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
+    <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
+    <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
+    <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
+    <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
+    <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
+    <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
+    <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
+    <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
+    <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
+    <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
+    <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
+    <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
+    <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
+    <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
+    <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
+    <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
+    <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
+    <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
+    <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
+    <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
+    <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
+    Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
+    <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
+    <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
+    <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
+    <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
+    <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
+    <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
+    <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
+    <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
+    <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
+    <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
+    <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
+    <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
+    <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
+    <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
+    <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
+    <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
+    <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
+    <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
+    <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
+    <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
+    <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
+    <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
+    <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
+    <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
+    <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
+    <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
+    <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
+      <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
+    <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
+    <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
+    <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
+    <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
+    <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
+    <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
+    <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
+    <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
+  </ol>
 </div>
 
 [//]: # "Footer"
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index af473ff2..d1247a51 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -385,5 +385,22 @@ a:hover
   line-height: 28px;
   font-weight: 400;
 
+#publications 
+  margin: 100px 10%
 
+#pub-title 
+  text-align: left
 
+.pub-list
+  margin-left: 20px
+  counter-reset: pub-counter 70
+  color: black
+
+  li
+    counter-increment: pub-counter -1
+
+  li::marker
+    font-size: 35px;
+    color: #babdc8;
+    content: counter(pub-counter) " "
+    counter-increment: pub-counter

From 02b21035cfdf27cbcaa5c79900eec28b53c9f2db Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 11:08:10 -0400
Subject: [PATCH 061/151] added about section

---
 src/pages/dev/main-page/+Page.mdx | 100 ++++++++++++++----------------
 src/pages/dev/main-page/main.styl |  28 +++++++++
 2 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index cbccb59a..0f52e027 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -113,63 +113,57 @@ import "./main.styl";
 <Image className="rock-border" src="rocks-border.jpg"></Image>
       
 [//]: # "About"
-<div class="row slide" id="about">
-  <div class="col-xs-12 slide-container">
-    <div class="slide-content slide-content-padded">
-      <div class="row">
-        <div class="col-xs-12">
-          <div class="page-title-holder about-title">
-            <h1 class="title about-title">About</h1>
-          </div>
-        </div>
-      </div>
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Summary
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
-        </div>
-      </div>
+<div id="about">
+  <h1 class="big" id="about-title">
+    About
+    <div class="line"></div>
+  </h1>
+  
+  <div class="about-row">
+    <div class="about-body-subtitle">
+      Summary
+    </div>
+    <div class="about-body">
+      Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
+    </div>
+  </div>
 
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          License
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
-        </div>
-      </div>
+  <div class="row about-row">
+    <div class="col-sm-3 about-body-subtitle">
+      License
+    </div>
+    <div class="col-sm-9 about-body page-info">
+      All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
+    </div>
+  </div>
 
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Citation
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
-          \
-          \
-          <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
-        </div>
-      </div>
+  <div class="about-row">
+    <div class="about-body-subtitle">
+      Citation
+    </div>
+    <div class="about-body">
+      <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
+      \
+      \
+      <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
+    </div>
+  </div>
 
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Collaboration
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
-        </div>
-      </div>
+  <div class="row about-row">
+    <div class="col-sm-3 about-body-subtitle">
+      Collaboration
+    </div>
+    <div class="col-sm-9 about-body page-info">
+      Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
+    </div>
+  </div>
 
-      <div class="row about-row">
-        <div class="col-sm-3 about-body-subtitle">
-          Funding
-        </div>
-        <div class="col-sm-9 about-body page-info">
-          Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
-        </div>
-      </div>
+  <div class="row about-row">
+    <div class="col-sm-3 about-body-subtitle">
+      Funding
+    </div>
+    <div class="col-sm-9 about-body page-info">
+      Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
     </div>
   </div>
 </div>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index d1247a51..4e2018a8 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -404,3 +404,31 @@ a:hover
     color: #babdc8;
     content: counter(pub-counter) " "
     counter-increment: pub-counter
+
+#about  
+  margin: 0 10%
+
+.about-row
+  margin: 4%
+  font-size: 18px;
+  line-height: 28px;
+  font-weight: 200;
+
+.about-body-subtitle
+  float: left
+  font-size: 22px;
+  font-weight: 200;
+
+.about-body
+  margin-left: 30%
+
+#about-title
+  text-align: left
+  color: #E0E1E6
+  position: relative
+  padding-bottom: 0
+
+.line
+  width: 100%;
+  border-bottom: 1px solid #E0E1E6;
+  position: absolute;
\ No newline at end of file

From 803e849686362c92f825b6b8bb746396fcdf05de Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 11:36:56 -0400
Subject: [PATCH 062/151] added geological maps section

---
 src/pages/dev/main-page/+Page.mdx | 175 +++---------------------------
 src/pages/dev/main-page/main.styl |  28 ++++-
 2 files changed, 41 insertions(+), 162 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 0f52e027..c911b7d9 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -64,6 +64,21 @@ import "./main.styl";
 
 </div>
 
+[//]: # "Geological Maps"
+<div class="geologic-maps">
+  <Image className="geology-img" src="geology-bgrnd.jpg"></Image>
+  <h1 class="title map-title">Geologic Maps</h1>
+  <div class="map-info">
+    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
+    \
+    \
+    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
+    \
+    \
+    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
+  </div>
+</div>
+
 [//]: # "Locations"
 <div class="country_container">
   <div class="country north-america">
@@ -95,22 +110,6 @@ import "./main.styl";
     </div>
   </div>
 </div>
-
-[//]: # "Geological Maps"
-<div class="geologic-maps">
-  <h1 class="title map-title">Geologic Maps</h1>
-  <div class="map-info">
-    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
-    \
-    \
-    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
-    \
-    \
-    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
-  </div>
-</div>
-
-<Image className="rock-border" src="rocks-border.jpg"></Image>
       
 [//]: # "About"
 <div id="about">
@@ -245,150 +244,6 @@ import "./main.styl";
   <div id="api-text">All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.</div>
 </div>
 
-<Image className="rock-border" src="rocks-border.jpg"></Image>
-
-[//]: # "People"
-<div class="row slide" id="people">
-  <div class="col-xs-12 slide-container">
-    <div class="slide-content slide-content-padded">
-      <div class="row">
-        <div class="col-xs-12">
-          <div class="page-title-holder" id="contact-holder">
-            <h1 class="big">People</h1>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-xs-6 person" id="shanan">
-          <div class="person-info">
-            <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
-            <t>Professor, Database Developer</t>\
-            <e>peters -at geology.wisc.edu</e>
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="daven">
-          <div class="person-info">
-            <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
-            <t>Research Scientist, Developer</t> \
-            <e>daven.quinn -at wisc.edu</e> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="evgeny">
-          <div class="person-info">
-            <n>Evgeny Mazko</n> \
-            <t>Graduate Student</t> \
-            <e>mazko -at wisc.edu</e> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="michael">
-          <div class="person-info">
-            <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
-            <t>Senior Programmer Analyst</t> \
-            <e>mmcclenn -at- geology.wisc.edu</e> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="casey">
-          <div class="person-info">
-            <n><a href="https://idzikowski-casey.github.io/personal-site/" target="_blank">Casey Idzikowski</a></n> \
-            <t>Research Specialist, Developer (former)</t> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="daniel">
-          <div class="person-info">
-            <n><a href="http://strata.geology.wisc.edu" target="_blank">Daniel Segessenmen</a></n> \
-            <t>Graduate Student (former)</t> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="shan">
-          <div class="person-info">
-            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Shan Ye</a></n> \
-            <t>Graduate Student (former)</t> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="ben">
-          <div class="person-info">
-            <n><a href="http://strata.geology.wisc.edu" target="_blank">Ben Linzmeier</a></n> \
-            <t>Postdoctoral Scholar (former)</t> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="afiqah">
-          <div class="person-info">
-            <n><a href="https://www.wisc.edu/directories/person.php?name=Victoria+Khoo&email=vkhoo%40wisc.edu&query=victoria%20khoo" target="_blank">Afiqah Rafi</a></n> \
-            <t>Undergrad Student (former)</t> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="sharon">
-          <div class="person-info">
-            <n><a href="http://geoscience.wisc.edu/geoscience/people/student/?id=1007" target="_blank">Sharon McMullen</a></n> \
-            <t>Researcher (former)</t> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="andrew">
-          <div class="person-info">
-            <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
-            <t>Data Mobilization and Research Scientist</t> \
-            <e>azaffos -at- email.arizona.edu</e> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="jon">
-          <div class="person-info">
-            <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
-            <t>Postdoctoral Researcher (former)</t> \
-            <e>jhusson - at - uvic.ca</e> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="erika">
-          <div class="person-info">
-            <n><a href="https://github.com/ItoErika" target="_blank">Erika Ito</a></n> \
-            <t>Research Intern (former)</t> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="noel">
-          <div class="person-info">
-            <n><a href="http://sedpaleo.org" target="_blank">Noel Heim</a></n> \
-            <t>Researcher (former)</t> 
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-xs-6 person" id="john">
-          <div class="person-info">
-            <n><a href="http://www.johnjcz.com" target="_blank">John Czaplewski</a></n> \
-            <t>Next-level Developer (former)</t> 
-          </div>
-        </div>
-        <div class="col-xs-6 person" id="puneet">
-          <div class="person-info">
-            <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
-            <t>Generally Ignored</t> \
-            <e>punkish at eidesis.org</e> 
-          </div>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</div>
-
 [//]: # "Donate"
 <div class="donate-container" id="donate">
   <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 4e2018a8..15a4437a 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -45,7 +45,8 @@ a:hover
   width: 70%
   display: flex;
   justify-content: center;
-  align-items: center;  height: 100vh
+  align-items: center;  
+  height: 99.6vh
   color: white
 
   li
@@ -431,4 +432,27 @@ a:hover
 .line
   width: 100%;
   border-bottom: 1px solid #E0E1E6;
-  position: absolute;
\ No newline at end of file
+  position: absolute;
+
+.geology-img
+  position:absolute
+  z-index: 0
+  height: 100vh
+  width: 100%
+  object-fit: cover
+
+.map-info
+  position:absolute
+  z-index: 1
+  color: white
+  font-size: 20px
+  margin: 40vh 10%
+  padding: 20px
+  background-color: rgba(0,0,0,.4)
+
+.map-title
+  position:absolute
+  z-index: 1
+  color: white
+  width: 50%
+  margin: 0 25%
\ No newline at end of file

From 5ffe65e43be62bc9b0a59260263074ad9b321419 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 11:49:05 -0400
Subject: [PATCH 063/151] nav bar fix

---
 src/pages/dev/main-page/+Page.mdx | 72 +------------------------------
 src/pages/dev/main-page/main.styl |  2 +-
 2 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index c911b7d9..841ebec9 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -8,12 +8,10 @@ import "./main.styl";
 <div class="nav">
   <ul>
     <li><a href="#about">About</a></li>
-    <li><a href="#apps">Apps</a></li>
     <li><a href="#api">API</a></li>
-    <li><a href="#people">People</a></li>
     <li><a href="#donate">Donate</a></li>
     <li><a href="#publications">Publications</a></li>
-    <a href="/"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 
@@ -169,74 +167,6 @@ import "./main.styl";
 
 <Image className="rock-border" src="rocks-border.jpg"></Image>
 
-[//]: # "Apps"
-<div id="apps">
-  <h1 class="big app-header">Built with Macrostrat</h1>
-
-  <a href="/sift">
-    <div class="app-box">
-      <Image className="app-img" src="logo_red.png"></Image>
-      <div class="app-background-text">
-        Sift
-        <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="https://rockd.org">
-    <div class="app-box">
-      <Image className="app-img" src="rockd.jpg"></Image>
-      <div class="app-background-text">
-        Rockd
-        <p class="blurb">A mobile field book, Macrostrat style.</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="/map">
-    <div class="app-box">
-      <Image className="app-img" src="burwell.png"></Image>
-      <div class="app-background-text">
-        Map
-        <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
-    <div class="app-box">
-      <Image className="app-img" src="mancos.jpg"></Image>
-      <div class="app-background-text">
-        Mancos
-        <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="http://fc.umn.edu/" target="_blank">
-    <div class="app-box">
-      <Image className="app-img" src="foc.png"></Image>
-      <div class="app-background-text">
-        FOC
-        <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="https://github.com/UW-Macrostrat/node-api-template">
-    <div class="app-box">
-      <Image className="app-img" src="api.png"></Image>
-      <div class="app-background-text app-background-text-small">
-        API Template
-        <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
-      </div>
-    </div>
-  </a>
-
-</div>
-
-<Image className="rock-border" src="rocks-border.jpg"></Image>
-
 
 [//]: # "API"
 <div id="api">
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 15a4437a..f9892e41 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -254,7 +254,7 @@ a:hover
   align-items: center;
 
 .donate-info
-  background: rgba(255,255,255,0.5);
+  background: rgba(255,255,255,0.6);
   padding: 25px
   color: black
   width: 80%

From f57b91f5114eea9a028799aab7977ef818ea0dc3 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 11:57:13 -0400
Subject: [PATCH 064/151] fixed header and nav

---
 src/pages/dev/apps/main.styl      | 8 ++++++--
 src/pages/dev/main-page/+Page.mdx | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/dev/apps/main.styl b/src/pages/dev/apps/main.styl
index 01c7578a..67d7fb5a 100644
--- a/src/pages/dev/apps/main.styl
+++ b/src/pages/dev/apps/main.styl
@@ -3,8 +3,10 @@
     background-color: white
 
 #apps
-    padding: 75px 0    
+  padding: 75px 0    
 
+a:hover
+  text-decoration: none
 
 .nav
   position: fixed
@@ -32,6 +34,7 @@
 .app-header
   margin: 0
   padding: 0
+  border: solid grey
 
 .app-box 
   height: 15vh
@@ -61,9 +64,10 @@
   font-size: 72px
   font-family: "Maven Pro", sans-serif
   text-align: center  
-  background-color: rgba(0,0,0,.2)
+  background-color: #4BABBf
   width: 60%
   margin: 0 20%
+  color: white
 
 .footer 
   width: 100%
diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index bd91eb8e..9cd33d09 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -7,7 +7,7 @@ import "./main.styl";
 <div class="nav">
   <ul>
     <li><a href="#about">About</a></li>
-    <li><a href="#apps">Apps</a></li>
+    <li><a href="/dev/apps">Apps</a></li>
     <li><a href="#api">API</a></li>
     <li><a href="#people">People</a></li>
     <li><a href="#donate">Donate</a></li>

From 1f42fc1931b8b3e5f5d3166bf412a2a64325c20d Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 15:15:29 -0400
Subject: [PATCH 065/151] more fixes to nav bar

---
 src/pages/dev/main-page/+Page.mdx |  3 +--
 src/pages/dev/main-page/main.styl | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 841ebec9..e3726720 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -193,6 +193,7 @@ import "./main.styl";
 <div id="publications">
   <h1 id="pub-title" class="big">Publications</h1>
   <p class="blurb">literature utilizing Macrostrat</p>
+  <div class="pub-line"></div>
 
   [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
   <ol class="pub-list" reversed>
@@ -282,9 +283,7 @@ import "./main.styl";
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
         <li><a href="#about">About</a></li>
-        <li><a href="#apps">Apps</a></li>
         <li><a href="#api">API</a></li>
-        <li><a href="#people">People</a></li>
         <li><a href="#donate">Donate</a></li>
         <li><a href="#publications">Publications</a></li>
       </ul>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index f9892e41..fd064d76 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -46,7 +46,7 @@ a:hover
   display: flex;
   justify-content: center;
   align-items: center;  
-  height: 99.6vh
+  height: 95vh
   color: white
 
   li
@@ -391,8 +391,13 @@ a:hover
 
 #pub-title 
   text-align: left
+  color: #E0E1E6
+  position: relative
+  padding-bottom: 0
+  margin-bottom: 0
 
 .pub-list
+  padding-top: 10px
   margin-left: 20px
   counter-reset: pub-counter 70
   color: black
@@ -455,4 +460,9 @@ a:hover
   z-index: 1
   color: white
   width: 50%
-  margin: 0 25%
\ No newline at end of file
+  margin: 0 25%
+
+.pub-line
+  width: 80%;
+  border-bottom: 1px solid #E0E1E6;
+  position: absolute;
\ No newline at end of file

From ffbe9419cdca6a7527d22948f6adf88b61c224dd Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 15:32:16 -0400
Subject: [PATCH 066/151] changed header and spacer

---
 src/pages/dev/people/+Page.mdx | 15 ++++++++-------
 src/pages/dev/people/main.styl | 27 ++++++++++++++++++---------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index b975c360..711c053b 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -3,10 +3,12 @@ import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
 import { Image } from "./index";
 
+<div class="main">
+
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="#people">People</a></li>
+    <li><a href="/dev/people">People</a></li>
     <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
@@ -15,6 +17,8 @@ import { Image } from "./index";
 
 [//]: # "People"
 <h1 class="big">People</h1>
+<p>major contributors to the project </p>
+<div class="line"></div>
 
 <div class="people" id="people">
     <div class="left">
@@ -166,12 +170,7 @@ import { Image } from "./index";
     </div>
     <div class="col-sm-4" id="bottom-nav">
         <ul class="footer-nav">
-        <li><a href="#about">About</a></li>
-        <li><a href="#apps">Apps</a></li>
-        <li><a href="#api">API</a></li>
         <li><a href="#people">People</a></li>
-        <li><a href="#donate">Donate</a></li>
-        <li><a href="#publications">Publications</a></li>
         </ul>
     </div>
     <div class="col-sm-4 funding">
@@ -184,4 +183,6 @@ import { Image } from "./index";
         </div>
     </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+</div>
diff --git a/src/pages/dev/people/main.styl b/src/pages/dev/people/main.styl
index 9c1a510f..27c1f476 100644
--- a/src/pages/dev/people/main.styl
+++ b/src/pages/dev/people/main.styl
@@ -1,6 +1,6 @@
-.htnl, .body
-    background-color: black
-    color: white
+.htnl, .body, .main
+    background-color: white
+    color: black
 
 a:hover
     text-decoration: none
@@ -29,10 +29,19 @@ a:hover
     text-decoration: none
 
 .big
-    color: white
-    text-align: center
+    color: #E0E1E6
+    text-align: left
     font-size: 75px
     font-family: "Maven Pro", sans-serif
+    margin: 0
+    margin-left: 20%
+    margin-top: 30px
+
+.line
+  border-bottom: 3px solid #E0E1E6;
+  width: 60%
+  margin: 20px 20% 
+
 
 .people
     color: white
@@ -40,19 +49,18 @@ a:hover
 .left
     float: left
     width: 30%
-    background-color: green
     margin-left: 20%
 
 .right
     float: left
     width: 30%
-    background-color: red
     margin-right: 20%
 
 .person-info
     height: 30vh
-    width: 100%
+    width: 90%
     position: relative
+    margin: 5%
 
 .text
     text-align: right
@@ -90,7 +98,8 @@ e
 .footer 
   width: 100%
   background-color: #015EAB
-  margin-top: 250vh
+  margin-top: 280vh
+  padding: 25px 0
 
 .footer-container
   display: flex;

From 8c3c21d2e70a79b47c2db87a7499b9165a354279 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 16:31:33 -0400
Subject: [PATCH 067/151] update dev page

---
 src/pages/dev/+Page.mdx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/dev/+Page.mdx b/src/pages/dev/+Page.mdx
index 5c275c48..08c11fac 100644
--- a/src/pages/dev/+Page.mdx
+++ b/src/pages/dev/+Page.mdx
@@ -10,7 +10,8 @@ import { PageBreadcrumbs } from "~/renderer";
 - [User interface tests](/dev/ui-tests)
 - [Feedback](/dev/feedback)
 - [Map filter](/dev/filtering)
-- [Main Page](/dev/main-page)
-- [People](/dev/people)
 - [Concept apps](/dev/concepts)
 - [Built with Macrostrat](/dev/apps)
+- [People](/dev/people)
+- [Main Page](/dev/main-page)
+

From 140b7ae4ac07a171777524ad932f90ab54f87430 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 7 Jun 2024 16:39:00 -0400
Subject: [PATCH 068/151] added links to emails in people page

---
 src/pages/dev/people/+Page.mdx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index 0785b264..69820a9b 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -32,7 +32,7 @@ import { Image } from "./index";
             <div class="text">
                 <n><a href="http://strata.geology.wisc.edu" target="_blank">Shanan Peters</a></n>\
                 <t>Professor, Database Developer</t> \
-                <e>peters -at geology.wisc.edu</e>
+                <a href="mailto: peters@geology.wisc.edu"><e>peters -at geology.wisc.edu</e></a>
             </div>
         </div>
 
@@ -41,7 +41,7 @@ import { Image } from "./index";
             <div class="text">
                 <n><a href="https://davenquinn.com" target="_blank">Daven Quinn</a></n> \
                 <t>Research Scientist, Developer</t> \
-                <e>daven.quinn -at wisc.edu</e> 
+                <a href="mailto: daven.quinn@wisc.edu"><e>daven.quinn -at wisc.edu</e></a>
             </div>
         </div>
 
@@ -50,7 +50,7 @@ import { Image } from "./index";
             <div class="text">
                 <n>Evgeny Mazko</n> \
                 <t>Graduate Student</t> \
-                <e>mazko -at wisc.edu</e> 
+                <a href="mailto: mazko@wisc.edu"><e>mazko -at wisc.edu</e></a>
             </div>
         </div>
             
@@ -59,7 +59,7 @@ import { Image } from "./index";
             <div class="text">
                 <n><a href="https://geoscience.wisc.edu/geoscience/people/staff/name/michael-mcclennen/" target="_blank">Michael McClennen</a></n> \
                 <t>Senior Programmer Analyst</t> \
-                <e>mmcclenn -at- geology.wisc.edu</e> 
+                <a href="mailto: mmcclenn@geology.wisc.edu"><e>mmcclenn -at- geology.wisc.edu</e></a>
             </div>
         </div>
 
@@ -118,7 +118,7 @@ import { Image } from "./index";
             <div class="text">
                 <n><a href="http://www.azstrata.org" target="_blank">Andrew Zaffos</a></n> \
                 <t>Data Mobilization and Research Scientist</t> \
-                <e>azaffos -at- email.arizona.edu</e> 
+                <a href="mailto: azaffos@email.arizona.edu"><e>azaffos -at- email.arizona.edu</e></a>
             </div>
         </div>
 
@@ -127,7 +127,7 @@ import { Image } from "./index";
             <div class="text">
                 <n><a href="http://www.jonhusson.com" target="_blank">Jon Husson</a></n> \
                 <t>Postdoctoral Researcher (former)</t> \
-                <e>jhusson - at - uvic.ca</e> 
+                <a href="mailto: jhusson@uvic.ca"><e>jhusson - at - uvic.ca</e></a>
             </div>
         </div>
 
@@ -160,7 +160,7 @@ import { Image } from "./index";
             <div class="text">
                 <n><a href="http://punkish.org" target="_blank">Puneet Kishor</a></n> \
                 <t>Generally Ignored</t> \
-                <e>punkish at eidesis.org</e> 
+                <a href="mailto: punkish@eidesis.org"><e>punkish at eidesis.org</e> </a>
             </div>
         </div>
     </div>

From 3bd74039f75d37be602c4284f0ccfce4e6f6ea62 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 9 Jun 2024 01:08:48 -0500
Subject: [PATCH 069/151] Adjusted layer management for Paleogeography

---
 src/pages/dev/paleo/+Page.ts     | 455 ++++++++++++++++++++++++++++++-
 src/pages/dev/paleo/paleo-map.ts | 453 ------------------------------
 2 files changed, 449 insertions(+), 459 deletions(-)
 delete mode 100644 src/pages/dev/paleo/paleo-map.ts

diff --git a/src/pages/dev/paleo/+Page.ts b/src/pages/dev/paleo/+Page.ts
index b12363f9..5855e0ae 100644
--- a/src/pages/dev/paleo/+Page.ts
+++ b/src/pages/dev/paleo/+Page.ts
@@ -1,14 +1,457 @@
+import { HTMLSelect, Spinner, Switch } from "@blueprintjs/core";
+import { burwellTileDomain, mapboxAccessToken } from "@macrostrat-web/settings";
 import h from "@macrostrat/hyper";
-import { ClientOnly } from "~/renderer/client-only";
+import {
+  FeaturePanel,
+  FeatureSelectionHandler,
+  FloatingNavbar,
+  LocationPanel,
+  MapAreaContainer,
+  MapLoadingButton,
+  MapMarker,
+  MapView,
+  PanelCard,
+  TileInfo,
+  applyMapPositionToHash,
+  buildInspectorStyle,
+  getMapPositionForHash,
+} from "@macrostrat/map-interface";
+import { buildMacrostratStyle } from "@macrostrat/mapbox-styles";
+import { MapPosition } from "@macrostrat/mapbox-utils";
+import {
+  DarkModeButton,
+  Spacer,
+  getHashString,
+  setHashString,
+  useAPIResult,
+  useDarkMode,
+  useStoredState,
+} from "@macrostrat/ui-components";
+import mapboxgl from "mapbox-gl";
+import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
+import { MacrostratVectorTileset } from "~/pages/map/dev/map-layers";
+import { TimescalePanel } from "./timescale";
 
-const PaleoMap = () => import("./paleo-map");
+import "~/styles/global.styl";
+
+// Import other components
+
+type PaleogeographyState = {
+  model_id: number;
+  age: number;
+  mapPosition: MapPosition;
+  initialized: boolean;
+};
+
+type PaleogeographyAction =
+  | { type: "set-model"; model_id: number }
+  | { type: "set-age"; age: number }
+  | { type: "set-map-position"; mapPosition: MapPosition }
+  | { type: "initialize"; state: PaleogeographyState };
+
+function usePaleogeographyState(
+  defaultState: PaleogeographyState
+): [PaleogeographyState, (s: PaleogeographyAction) => void] {
+  /** Use state synced with hash string for paleogeography layer */
+  const defaultModelID = defaultState.model_id;
+  const defaultAge = defaultState.age;
+
+  const [state, dispatch] = useReducer(
+    (state: PaleogeographyState, action: PaleogeographyAction) => {
+      switch (action.type) {
+        case "set-model":
+          return {
+            ...state,
+            model_id: action.model_id,
+            age: state.age ?? defaultAge,
+          };
+        case "set-age":
+          // Round to nearest 5 Ma
+          const age = Math.round(action.age / 5) * 5;
+          return { ...state, age };
+        case "set-map-position":
+          return { ...state, mapPosition: action.mapPosition };
+        case "initialize":
+          return { ...action.state, initialized: true };
+      }
+    },
+    { model_id: null, age: null, mapPosition: null, initialized: false }
+  );
+
+  const { model_id, age, mapPosition } = state;
+
+  useEffect(() => {
+    if (model_id == null || age == null || mapPosition == null) return;
+    let args: any = { model_id, age };
+    applyMapPositionToHash(args, mapPosition);
+    setHashString(args, { sort: false, arrayFormat: "comma" });
+  }, [model_id, age, mapPosition]);
+
+  useEffect(() => {
+    const hashData = getHashString(window.location.hash) ?? {};
+    const { model_id, age, ...rest } = hashData;
+    const mapPosition = getMapPositionForHash(
+      rest,
+      defaultState.mapPosition.camera
+    );
+
+    if (model_id == null || age == null) return;
+    if (Array.isArray(model_id)) return;
+    if (Array.isArray(age)) return;
+    dispatch({
+      type: "initialize",
+      state: {
+        model_id: parseInt(model_id) ?? defaultModelID,
+        age: parseInt(age) ?? defaultAge,
+        mapPosition,
+        initialized: true,
+      },
+    });
+  }, []);
+
+  return [state, dispatch];
+}
+
+const baseTilesetURL =
+  burwellTileDomain + "/carto-slim-rotated/{z}/{x}/{y}?model_id=3&t_step=0";
+
+const common = {
+  version: 8,
+  sources: {
+    burwell: {
+      type: "vector",
+      tiles: [baseTilesetURL],
+      tileSize: 512,
+    },
+  },
+  glyphs: "mapbox://fonts/mapbox/{fontstack}/{range}.pbf",
+  sprite: "", //mapbox://sprites/mapbox/light-v10",
+  fog: {
+    range: [10, 20],
+    color: "#000000",
+    "high-color": "hsl(207, 23%, 5%)",
+    "space-color": "hsl(207, 23%, 10%)",
+    "horizon-blend": 0.1,
+    "star-intensity": 0,
+  },
+};
+
+const darkStyle = {
+  name: "PaleoLight",
+  ...common,
+  layers: [
+    {
+      id: "background",
+      type: "background",
+      paint: {
+        "background-color": "hsl(207, 18%, 21%)",
+      },
+    },
+    {
+      id: "plates",
+      type: "fill",
+      source: "burwell",
+      "source-layer": "plates",
+      paint: {
+        //"fill-color": "color",
+        "fill-color": "hsl(207, 18%, 30%)",
+        "fill-opacity": 0.8,
+      },
+    },
+  ],
+};
+const lightStyle = {
+  name: "PaleoLight",
+  ...common,
+  layers: [
+    {
+      id: "background",
+      type: "background",
+      paint: {
+        "background-color": "hsl(185, 9%, 81%)",
+      },
+    },
+    {
+      id: "plates",
+      type: "fill",
+      source: "burwell",
+      "source-layer": "plates",
+      paint: {
+        //"fill-color": "color",
+        "fill-color": "hsl(55, 11%, 96%)",
+        "fill-opacity": 0.8,
+      },
+    },
+  ],
+};
+
+export function Page({
+  tileset = MacrostratVectorTileset.CartoSlim,
+  overlayStyle = _macrostratStyle,
+  children,
+}: {
+  headerElement?: React.ReactElement;
+  title?: string;
+  tileset?: MacrostratVectorTileset;
+  overlayStyle?: mapboxgl.Style;
+  children?: React.ReactNode;
+}) {
+  const title = "Paleogeography";
+  const dark = useDarkMode();
+  const isEnabled = dark?.isEnabled;
+  const mapboxToken = mapboxAccessToken;
+  mapboxgl.accessToken = mapboxToken;
+
+  const style = isEnabled ? darkStyle : lightStyle;
+
+  const [isOpen, setOpen] = useState(false);
+
+  const [state, setState] = useStoredState("macrostrat:dev-map-page", {
+    showTileExtent: false,
+    xRay: false,
+  });
+  const { showTileExtent, xRay } = state;
+
+  const [actualStyle, setActualStyle] = useState(style);
+  const [paleoState, dispatch] = usePaleogeographyState({
+    model_id: 3,
+    age: 0,
+    initialized: false,
+    mapPosition: {
+      camera: {
+        lng: -40,
+        lat: 45,
+        altitude: 5000000,
+      },
+    },
+  });
+
+  const { age, model_id, mapPosition } = paleoState;
+  const plateModelId = model_id;
+
+  const models: { id: string; max_age: number; min_age: number }[] =
+    useAPIResult(burwellTileDomain + "/carto/rotation-models");
+
+  useEffect(() => {
+    if (models == null) return;
+    if (plateModelId == null) {
+      dispatch({ type: "set-model", model_id: parseInt(models[0].id) });
+    }
+  }, [models]);
+
+  const model = models?.find((d) => d.id == plateModelId);
+
+  // useEffect(() => {
+  //   console.log("effect", model, age);
+  //   if (model == null) return;
+  //   const { max_age = 4000, min_age = 0 } = model;
+  //   console.log("effect", model, age, max_age, min_age);
+  //   if (age > max_age) {
+  //     dispatch({ type: "set-age", age: max_age });
+  //   } else if (age < min_age) {
+  //     dispatch({ type: "set-age", age: min_age });
+  //   }
+  // }, [model, age]);
+
+  // Manage location hash
+
+  const _overlayStyle = useMemo(() => {
+    if (plateModelId == null || age == null) return overlayStyle;
+    return replaceSourcesForTileset(overlayStyle, plateModelId, age);
+  }, [tileset, overlayStyle, plateModelId, age]) as mapboxgl.Style;
+
+  useEffect(() => {
+    buildInspectorStyle(style, _overlayStyle, {
+      mapboxToken,
+      inDarkMode: isEnabled,
+      xRay,
+    }).then(setActualStyle);
+  }, [style, xRay, mapboxToken, isEnabled, _overlayStyle]);
+
+  const [inspectPosition, setInspectPosition] =
+    useState<mapboxgl.LngLat | null>(null);
+
+  const [data, setData] = useState(null);
+
+  const onSelectPosition = useCallback((position: mapboxgl.LngLat) => {
+    setInspectPosition(position);
+  }, []);
+
+  const onMapMoved = useCallback(
+    (pos) => dispatch({ type: "set-map-position", mapPosition: pos }),
+    []
+  );
+
+  if (age == null || model_id == null) {
+    return h(Spinner);
+  }
+
+  let detailElement = null;
+  if (inspectPosition != null) {
+    detailElement = h(
+      LocationPanel,
+      {
+        onClose() {
+          setInspectPosition(null);
+        },
+        position: inspectPosition,
+      },
+      [
+        h(TileInfo, {
+          feature: data?.[0] ?? null,
+          showExtent: showTileExtent,
+          setShowExtent() {
+            setState({ ...state, showTileExtent: !showTileExtent });
+          },
+        }),
+        h(FeaturePanel, {
+          features: data,
+          focusedSource: "plates",
+          focusedSourceTitle: "Paleogeography",
+        }),
+      ]
+    );
+  }
 
-export function Page() {
   return h(
-    ClientOnly,
+    MapAreaContainer,
     {
-      component: PaleoMap,
+      navbar: h(FloatingNavbar, [
+        h("h2", title),
+        h(Spacer),
+        h(MapLoadingButton, {
+          active: isOpen,
+          onClick() {
+            setOpen(!isOpen);
+          },
+        }),
+      ]),
+      contextPanel: h(PanelCard, [
+        h(PlateModelControls, {
+          models,
+          activeModel: plateModelId,
+          setModel(model_id) {
+            dispatch({ type: "set-model", model_id });
+          },
+          age,
+        }),
+        h(Switch, {
+          checked: xRay,
+          label: "X-ray mode",
+          onChange() {
+            setState({ ...state, xRay: !xRay });
+          },
+        }),
+        h(DarkModeButton),
+        children,
+      ]),
+      detailPanel: detailElement,
+      contextPanelOpen: isOpen,
+      bottomPanel: h(TimescalePanel, {
+        age,
+        setAge(age) {
+          dispatch({ type: "set-age", age });
+        },
+        ageRange: ageRangeForModel(model),
+      }),
     },
-    null
+    h(
+      MapView,
+      {
+        style: actualStyle,
+        mapPosition,
+        projection: { name: "globe" },
+        enableTerrain: false,
+        mapboxToken,
+        onMapMoved,
+      },
+      [
+        h(FeatureSelectionHandler, {
+          selectedLocation: inspectPosition,
+          setFeatures: setData,
+        }),
+        h(MapMarker, {
+          position: inspectPosition,
+          setPosition: onSelectPosition,
+        }),
+      ]
+    )
   );
 }
+
+function ageRangeForModel(model) {
+  if (model == null) return [3500, 0];
+  const { max_age, min_age } = model;
+  return [max_age ?? 3500, min_age ?? 0];
+}
+
+function PlateModelControls({ models, activeModel, age, setModel }) {
+  return h("div.controls", [
+    h("h3", [h("span", "Age:"), " ", h("span.age", age), " ", h("span", "Ma")]),
+    h(PlateModelSelector, { models, activeModel, setModel }),
+  ]);
+}
+
+function PlateModelSelector({ models, activeModel, setModel }) {
+  if (models == null) return null;
+
+  const onChange = (evt) => {
+    const { value } = evt.target;
+    setModel(value);
+  };
+
+  return h(HTMLSelect, {
+    value: activeModel,
+    onChange,
+    options: models
+      .filter((d) => {
+        return d.id != 5;
+      })
+      .map((d) => ({
+        label: d.name,
+        value: d.id,
+      })),
+  });
+}
+
+export function replaceSourcesForTileset(
+  style: mapboxgl.Style,
+  model_id: number = 6,
+  age = 0
+) {
+  const tilesetURL =
+    burwellTileDomain +
+    `/carto-slim-rotated/{z}/{x}/{y}?model_id=${model_id}&t_step=${age}`;
+
+  return {
+    ...style,
+    sources: {
+      ...style.sources,
+      burwell: {
+        type: "vector",
+        tiles: [tilesetURL],
+        tileSize: 512,
+      },
+    },
+  };
+}
+
+const _macrostratStyle = buildMacrostratStyle({
+  tileserverDomain: burwellTileDomain,
+}) as mapboxgl.Style;
+
+function isStateValid(state) {
+  if (state == null) {
+    return false;
+  }
+  if (typeof state != "object") {
+    return false;
+  }
+  // Must have several specific boolean keys
+  for (let k of ["showLineSymbols", "xRay", "showTileExtent", "bypassCache"]) {
+    if (typeof state[k] != "boolean") {
+      return false;
+    }
+  }
+  return true;
+}
diff --git a/src/pages/dev/paleo/paleo-map.ts b/src/pages/dev/paleo/paleo-map.ts
deleted file mode 100644
index 79a41c33..00000000
--- a/src/pages/dev/paleo/paleo-map.ts
+++ /dev/null
@@ -1,453 +0,0 @@
-import { HTMLSelect, Spinner, Switch } from "@blueprintjs/core";
-import { burwellTileDomain, mapboxAccessToken } from "@macrostrat-web/settings";
-import h from "@macrostrat/hyper";
-import {
-  FeaturePanel,
-  FeatureSelectionHandler,
-  FloatingNavbar,
-  LocationPanel,
-  MapAreaContainer,
-  MapLoadingButton,
-  MapMarker,
-  MapView,
-  PanelCard,
-  TileInfo,
-  applyMapPositionToHash,
-  buildInspectorStyle,
-  getMapPositionForHash,
-} from "@macrostrat/map-interface";
-import { buildMacrostratStyle } from "@macrostrat/mapbox-styles";
-import { MapPosition } from "@macrostrat/mapbox-utils";
-import {
-  DarkModeButton,
-  Spacer,
-  getHashString,
-  setHashString,
-  useAPIResult,
-  useDarkMode,
-  useStoredState,
-} from "@macrostrat/ui-components";
-import mapboxgl from "mapbox-gl";
-import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
-import { MacrostratVectorTileset } from "~/pages/map/dev/map-layers";
-import { TimescalePanel } from "./timescale";
-
-import "~/styles/global.styl";
-
-// Import other components
-
-type PaleogeographyState = {
-  model_id: number;
-  age: number;
-  mapPosition: MapPosition;
-  initialized: boolean;
-};
-
-type PaleogeographyAction =
-  | { type: "set-model"; model_id: number }
-  | { type: "set-age"; age: number }
-  | { type: "set-map-position"; mapPosition: MapPosition }
-  | { type: "initialize"; state: PaleogeographyState };
-
-function usePaleogeographyState(
-  defaultState: PaleogeographyState
-): [PaleogeographyState, (s: PaleogeographyAction) => void] {
-  /** Use state synced with hash string for paleogeography layer */
-  const defaultModelID = defaultState.model_id;
-  const defaultAge = defaultState.age;
-
-  const [state, dispatch] = useReducer(
-    (state: PaleogeographyState, action: PaleogeographyAction) => {
-      switch (action.type) {
-        case "set-model":
-          return {
-            ...state,
-            model_id: action.model_id,
-            age: state.age ?? defaultAge,
-          };
-        case "set-age":
-          return { ...state, age: action.age };
-        case "set-map-position":
-          return { ...state, mapPosition: action.mapPosition };
-        case "initialize":
-          return { ...action.state, initialized: true };
-      }
-    },
-    { model_id: null, age: null, mapPosition: null, initialized: false }
-  );
-
-  const { model_id, age, mapPosition } = state;
-
-  useEffect(() => {
-    if (model_id == null || age == null || mapPosition == null) return;
-    let args: any = { model_id, age };
-    applyMapPositionToHash(args, mapPosition);
-    setHashString(args, { sort: false, arrayFormat: "comma" });
-  }, [model_id, age, mapPosition]);
-
-  useEffect(() => {
-    const hashData = getHashString(window.location.hash) ?? {};
-    const { model_id, age, ...rest } = hashData;
-    const mapPosition = getMapPositionForHash(
-      rest,
-      defaultState.mapPosition.camera
-    );
-
-    if (model_id == null || age == null) return;
-    if (Array.isArray(model_id)) return;
-    if (Array.isArray(age)) return;
-    dispatch({
-      type: "initialize",
-      state: {
-        model_id: parseInt(model_id) ?? defaultModelID,
-        age: parseInt(age) ?? defaultAge,
-        mapPosition,
-        initialized: true,
-      },
-    });
-  }, []);
-
-  return [state, dispatch];
-}
-
-const baseTilesetURL =
-  burwellTileDomain + "/carto-slim-rotated/{z}/{x}/{y}?model_id=6&t_step=0";
-
-const common = {
-  version: 8,
-  sources: {
-    burwell: {
-      type: "vector",
-      tiles: [baseTilesetURL],
-      tileSize: 512,
-    },
-  },
-  glyphs: "mapbox://fonts/mapbox/{fontstack}/{range}.pbf",
-  sprite: "mapbox://sprites/mapbox/light-v10",
-};
-
-const darkStyle = {
-  name: "PaleoLight",
-  ...common,
-  layers: [
-    {
-      id: "background",
-      type: "background",
-      paint: {
-        "background-color": "hsl(185, 2%, 10%)",
-      },
-    },
-    {
-      id: "plates",
-      type: "fill",
-      source: "burwell",
-      "source-layer": "plates",
-      paint: {
-        //"fill-color": "color",
-        "fill-color": "hsl(55, 1%, 20%)",
-        "fill-opacity": 0.8,
-      },
-    },
-  ],
-};
-const lightStyle = {
-  name: "PaleoLight",
-  ...common,
-  layers: [
-    {
-      id: "background",
-      type: "background",
-      paint: {
-        "background-color": "hsl(185, 9%, 81%)",
-      },
-    },
-    {
-      id: "plates",
-      type: "fill",
-      source: "burwell",
-      "source-layer": "plates",
-      paint: {
-        //"fill-color": "color",
-        "fill-color": "hsl(55, 11%, 96%)",
-        "fill-opacity": 0.8,
-      },
-    },
-  ],
-};
-
-export default function PaleoMap({
-  tileset = MacrostratVectorTileset.CartoSlim,
-  overlayStyle = _macrostratStyle,
-  children,
-}: {
-  headerElement?: React.ReactElement;
-  title?: string;
-  tileset?: MacrostratVectorTileset;
-  overlayStyle?: mapboxgl.Style;
-  children?: React.ReactNode;
-}) {
-  // A stripped-down page for map development
-
-  /* We apply a custom style to the panel container when we are interacting
-    with the search bar, so that we can block map interactions until search
-    bar focus is lost.
-    We also apply a custom style when the infodrawer is open so we can hide
-    the search bar on mobile platforms
-  */
-  const title = "Paleogeography";
-  const dark = useDarkMode();
-  const isEnabled = dark?.isEnabled;
-  const mapboxToken = mapboxAccessToken;
-  mapboxgl.accessToken = mapboxToken;
-
-  const style = isEnabled ? darkStyle : lightStyle;
-
-  const [isOpen, setOpen] = useState(false);
-
-  const [state, setState] = useStoredState("macrostrat:dev-map-page", {
-    showTileExtent: false,
-    xRay: false,
-  });
-  const { showTileExtent, xRay } = state;
-
-  const [actualStyle, setActualStyle] = useState(style);
-  const [paleoState, dispatch] = usePaleogeographyState({
-    model_id: null,
-    age: 0,
-    initialized: false,
-    mapPosition: {
-      camera: {
-        lng: -40,
-        lat: 45,
-        altitude: 5000000,
-      },
-    },
-  });
-
-  const { age, model_id, mapPosition } = paleoState;
-  const plateModelId = model_id;
-
-  const models: { id: string; max_age: number; min_age: number }[] =
-    useAPIResult(burwellTileDomain + "/carto/rotation-models");
-
-  useEffect(() => {
-    if (models == null) return;
-    if (plateModelId == null) {
-      dispatch({ type: "set-model", model_id: parseInt(models[0].id) });
-    }
-  }, [models]);
-
-  const model = models?.find((d) => d.id == plateModelId);
-
-  // useEffect(() => {
-  //   console.log("effect", model, age);
-  //   if (model == null) return;
-  //   const { max_age = 4000, min_age = 0 } = model;
-  //   console.log("effect", model, age, max_age, min_age);
-  //   if (age > max_age) {
-  //     dispatch({ type: "set-age", age: max_age });
-  //   } else if (age < min_age) {
-  //     dispatch({ type: "set-age", age: min_age });
-  //   }
-  // }, [model, age]);
-
-  // Manage location hash
-
-  const _overlayStyle = useMemo(() => {
-    if (plateModelId == null || age == null) return overlayStyle;
-    return replaceSourcesForTileset(overlayStyle, plateModelId, age);
-  }, [tileset, overlayStyle, plateModelId, age]) as mapboxgl.Style;
-
-  useEffect(() => {
-    buildInspectorStyle(style, _overlayStyle, {
-      mapboxToken,
-      inDarkMode: isEnabled,
-      xRay,
-    }).then(setActualStyle);
-  }, [style, xRay, mapboxToken, isEnabled, _overlayStyle]);
-
-  const [inspectPosition, setInspectPosition] =
-    useState<mapboxgl.LngLat | null>(null);
-
-  const [data, setData] = useState(null);
-
-  const onSelectPosition = useCallback((position: mapboxgl.LngLat) => {
-    setInspectPosition(position);
-  }, []);
-
-  const onMapMoved = useCallback(
-    (pos) => dispatch({ type: "set-map-position", mapPosition: pos }),
-    []
-  );
-
-  if (age == null || model_id == null) {
-    return h(Spinner);
-  }
-
-  let detailElement = null;
-  if (inspectPosition != null) {
-    detailElement = h(
-      LocationPanel,
-      {
-        onClose() {
-          setInspectPosition(null);
-        },
-        position: inspectPosition,
-      },
-      [
-        h(TileInfo, {
-          feature: data?.[0] ?? null,
-          showExtent: showTileExtent,
-          setShowExtent() {
-            setState({ ...state, showTileExtent: !showTileExtent });
-          },
-        }),
-        h(FeaturePanel, {
-          features: data,
-          focusedSource: "plates",
-          focusedSourceTitle: "Paleogeography",
-        }),
-      ]
-    );
-  }
-
-  return h(
-    MapAreaContainer,
-    {
-      navbar: h(FloatingNavbar, [
-        h("h2", title),
-        h(Spacer),
-        h(MapLoadingButton, {
-          active: isOpen,
-          onClick: () => setOpen(!isOpen),
-        }),
-      ]),
-      contextPanel: h(PanelCard, [
-        h(PlateModelControls, {
-          models,
-          activeModel: plateModelId,
-          setModel(model_id) {
-            dispatch({ type: "set-model", model_id });
-          },
-          age,
-        }),
-        h(Switch, {
-          checked: xRay,
-          label: "X-ray mode",
-          onChange() {
-            setState({ ...state, xRay: !xRay });
-          },
-        }),
-        h(DarkModeButton),
-        children,
-      ]),
-      detailPanel: detailElement,
-      contextPanelOpen: isOpen,
-      bottomPanel: h(TimescalePanel, {
-        age,
-        setAge(age) {
-          dispatch({ type: "set-age", age });
-        },
-        ageRange: ageRangeForModel(model),
-      }),
-    },
-    h(
-      MapView,
-      {
-        style: actualStyle,
-        mapPosition,
-        projection: { name: "globe" },
-        enableTerrain: false,
-        mapboxToken,
-        onMapMoved,
-      },
-      [
-        h(FeatureSelectionHandler, {
-          selectedLocation: inspectPosition,
-          setFeatures: setData,
-        }),
-        h(MapMarker, {
-          position: inspectPosition,
-          setPosition: onSelectPosition,
-        }),
-      ]
-    )
-  );
-}
-
-function ageRangeForModel(model) {
-  if (model == null) return [3500, 0];
-  const { max_age, min_age } = model;
-  return [max_age ?? 3500, min_age ?? 0];
-}
-
-function PlateModelControls({ models, activeModel, age, setModel }) {
-  return h("div.controls", [
-    h("h3", [h("span", "Age:"), " ", h("span.age", age), " ", h("span", "Ma")]),
-    h(PlateModelSelector, { models, activeModel, setModel }),
-  ]);
-}
-
-function PlateModelSelector({ models, activeModel, setModel }) {
-  if (models == null) return null;
-
-  const onChange = (evt) => {
-    const { value } = evt.target;
-    setModel(value);
-  };
-
-  return h(HTMLSelect, {
-    value: activeModel,
-    onChange,
-    options: models
-      .filter((d) => {
-        return d.id != 5;
-      })
-      .map((d) => ({
-        label: d.name,
-        value: d.id,
-      })),
-  });
-}
-
-export function replaceSourcesForTileset(
-  style: mapboxgl.Style,
-  model_id: number = 6,
-  age = 0
-) {
-  const tilesetURL =
-    burwellTileDomain +
-    `/carto-slim-rotated/{z}/{x}/{y}?model_id=${model_id}&t_step=${age}`;
-
-  return {
-    ...style,
-    sources: {
-      ...style.sources,
-      burwell: {
-        type: "vector",
-        tiles: [tilesetURL],
-        tileSize: 512,
-      },
-    },
-  };
-}
-
-const _macrostratStyle = buildMacrostratStyle({
-  tileserverDomain: burwellTileDomain,
-}) as mapboxgl.Style;
-
-function isStateValid(state) {
-  if (state == null) {
-    return false;
-  }
-  if (typeof state != "object") {
-    return false;
-  }
-  // Must have several specific boolean keys
-  for (let k of ["showLineSymbols", "xRay", "showTileExtent", "bypassCache"]) {
-    if (typeof state[k] != "boolean") {
-      return false;
-    }
-  }
-  return true;
-}

From 7bd70011aae98512b93502f345873205a974f348 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 9 Jun 2024 03:41:36 -0500
Subject: [PATCH 070/151] Split up styling and state

---
 src/pages/dev/paleo/+Page.ts     | 171 +------------------------------
 src/pages/dev/paleo/map-style.ts | 104 +++++++++++++++++++
 src/pages/dev/paleo/state.ts     |  92 +++++++++++++++++
 3 files changed, 199 insertions(+), 168 deletions(-)
 create mode 100644 src/pages/dev/paleo/map-style.ts
 create mode 100644 src/pages/dev/paleo/state.ts

diff --git a/src/pages/dev/paleo/+Page.ts b/src/pages/dev/paleo/+Page.ts
index 5855e0ae..2e429c82 100644
--- a/src/pages/dev/paleo/+Page.ts
+++ b/src/pages/dev/paleo/+Page.ts
@@ -12,179 +12,28 @@ import {
   MapView,
   PanelCard,
   TileInfo,
-  applyMapPositionToHash,
   buildInspectorStyle,
-  getMapPositionForHash,
 } from "@macrostrat/map-interface";
 import { buildMacrostratStyle } from "@macrostrat/mapbox-styles";
-import { MapPosition } from "@macrostrat/mapbox-utils";
 import {
   DarkModeButton,
   Spacer,
-  getHashString,
-  setHashString,
   useAPIResult,
   useDarkMode,
   useStoredState,
 } from "@macrostrat/ui-components";
 import mapboxgl from "mapbox-gl";
-import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { MacrostratVectorTileset } from "~/pages/map/dev/map-layers";
 import { TimescalePanel } from "./timescale";
-
-import "~/styles/global.styl";
+import { usePaleogeographyState } from "./state";
+import { darkStyle, lightStyle } from "./map-style";
 
 // Import other components
 
-type PaleogeographyState = {
-  model_id: number;
-  age: number;
-  mapPosition: MapPosition;
-  initialized: boolean;
-};
-
-type PaleogeographyAction =
-  | { type: "set-model"; model_id: number }
-  | { type: "set-age"; age: number }
-  | { type: "set-map-position"; mapPosition: MapPosition }
-  | { type: "initialize"; state: PaleogeographyState };
-
-function usePaleogeographyState(
-  defaultState: PaleogeographyState
-): [PaleogeographyState, (s: PaleogeographyAction) => void] {
-  /** Use state synced with hash string for paleogeography layer */
-  const defaultModelID = defaultState.model_id;
-  const defaultAge = defaultState.age;
-
-  const [state, dispatch] = useReducer(
-    (state: PaleogeographyState, action: PaleogeographyAction) => {
-      switch (action.type) {
-        case "set-model":
-          return {
-            ...state,
-            model_id: action.model_id,
-            age: state.age ?? defaultAge,
-          };
-        case "set-age":
-          // Round to nearest 5 Ma
-          const age = Math.round(action.age / 5) * 5;
-          return { ...state, age };
-        case "set-map-position":
-          return { ...state, mapPosition: action.mapPosition };
-        case "initialize":
-          return { ...action.state, initialized: true };
-      }
-    },
-    { model_id: null, age: null, mapPosition: null, initialized: false }
-  );
-
-  const { model_id, age, mapPosition } = state;
-
-  useEffect(() => {
-    if (model_id == null || age == null || mapPosition == null) return;
-    let args: any = { model_id, age };
-    applyMapPositionToHash(args, mapPosition);
-    setHashString(args, { sort: false, arrayFormat: "comma" });
-  }, [model_id, age, mapPosition]);
-
-  useEffect(() => {
-    const hashData = getHashString(window.location.hash) ?? {};
-    const { model_id, age, ...rest } = hashData;
-    const mapPosition = getMapPositionForHash(
-      rest,
-      defaultState.mapPosition.camera
-    );
-
-    if (model_id == null || age == null) return;
-    if (Array.isArray(model_id)) return;
-    if (Array.isArray(age)) return;
-    dispatch({
-      type: "initialize",
-      state: {
-        model_id: parseInt(model_id) ?? defaultModelID,
-        age: parseInt(age) ?? defaultAge,
-        mapPosition,
-        initialized: true,
-      },
-    });
-  }, []);
-
-  return [state, dispatch];
-}
-
 const baseTilesetURL =
   burwellTileDomain + "/carto-slim-rotated/{z}/{x}/{y}?model_id=3&t_step=0";
 
-const common = {
-  version: 8,
-  sources: {
-    burwell: {
-      type: "vector",
-      tiles: [baseTilesetURL],
-      tileSize: 512,
-    },
-  },
-  glyphs: "mapbox://fonts/mapbox/{fontstack}/{range}.pbf",
-  sprite: "", //mapbox://sprites/mapbox/light-v10",
-  fog: {
-    range: [10, 20],
-    color: "#000000",
-    "high-color": "hsl(207, 23%, 5%)",
-    "space-color": "hsl(207, 23%, 10%)",
-    "horizon-blend": 0.1,
-    "star-intensity": 0,
-  },
-};
-
-const darkStyle = {
-  name: "PaleoLight",
-  ...common,
-  layers: [
-    {
-      id: "background",
-      type: "background",
-      paint: {
-        "background-color": "hsl(207, 18%, 21%)",
-      },
-    },
-    {
-      id: "plates",
-      type: "fill",
-      source: "burwell",
-      "source-layer": "plates",
-      paint: {
-        //"fill-color": "color",
-        "fill-color": "hsl(207, 18%, 30%)",
-        "fill-opacity": 0.8,
-      },
-    },
-  ],
-};
-const lightStyle = {
-  name: "PaleoLight",
-  ...common,
-  layers: [
-    {
-      id: "background",
-      type: "background",
-      paint: {
-        "background-color": "hsl(185, 9%, 81%)",
-      },
-    },
-    {
-      id: "plates",
-      type: "fill",
-      source: "burwell",
-      "source-layer": "plates",
-      paint: {
-        //"fill-color": "color",
-        "fill-color": "hsl(55, 11%, 96%)",
-        "fill-opacity": 0.8,
-      },
-    },
-  ],
-};
-
 export function Page({
   tileset = MacrostratVectorTileset.CartoSlim,
   overlayStyle = _macrostratStyle,
@@ -241,20 +90,6 @@ export function Page({
 
   const model = models?.find((d) => d.id == plateModelId);
 
-  // useEffect(() => {
-  //   console.log("effect", model, age);
-  //   if (model == null) return;
-  //   const { max_age = 4000, min_age = 0 } = model;
-  //   console.log("effect", model, age, max_age, min_age);
-  //   if (age > max_age) {
-  //     dispatch({ type: "set-age", age: max_age });
-  //   } else if (age < min_age) {
-  //     dispatch({ type: "set-age", age: min_age });
-  //   }
-  // }, [model, age]);
-
-  // Manage location hash
-
   const _overlayStyle = useMemo(() => {
     if (plateModelId == null || age == null) return overlayStyle;
     return replaceSourcesForTileset(overlayStyle, plateModelId, age);
diff --git a/src/pages/dev/paleo/map-style.ts b/src/pages/dev/paleo/map-style.ts
new file mode 100644
index 00000000..2484d973
--- /dev/null
+++ b/src/pages/dev/paleo/map-style.ts
@@ -0,0 +1,104 @@
+import { burwellTileDomain } from "@macrostrat-web/settings";
+import { buildMacrostratStyle } from "@macrostrat/mapbox-styles";
+
+// Import other components
+
+const baseTilesetURL =
+  burwellTileDomain + "/carto-slim-rotated/{z}/{x}/{y}?model_id=3&t_step=0";
+
+const common = {
+  version: 8,
+  sources: {
+    burwell: {
+      type: "vector",
+      tiles: [baseTilesetURL],
+      tileSize: 512,
+    },
+  },
+  glyphs: "mapbox://fonts/mapbox/{fontstack}/{range}.pbf",
+  sprite: "", //mapbox://sprites/mapbox/light-v10",
+  fog: {
+    range: [10, 20],
+    color: "#000000",
+    "high-color": "hsl(207, 23%, 5%)",
+    "space-color": "hsl(207, 23%, 10%)",
+    "horizon-blend": 0.1,
+    "star-intensity": 0,
+  },
+};
+
+export const darkStyle = {
+  name: "PaleoLight",
+  ...common,
+  layers: [
+    {
+      id: "background",
+      type: "background",
+      paint: {
+        "background-color": "hsl(207, 18%, 21%)",
+      },
+    },
+    {
+      id: "plates",
+      type: "fill",
+      source: "burwell",
+      "source-layer": "plates",
+      paint: {
+        //"fill-color": "color",
+        "fill-color": "hsl(207, 18%, 30%)",
+        "fill-opacity": 0.8,
+      },
+    },
+  ],
+};
+
+export const lightStyle = {
+  name: "PaleoLight",
+  ...common,
+  layers: [
+    {
+      id: "background",
+      type: "background",
+      paint: {
+        "background-color": "hsl(185, 9%, 81%)",
+      },
+    },
+    {
+      id: "plates",
+      type: "fill",
+      source: "burwell",
+      "source-layer": "plates",
+      paint: {
+        //"fill-color": "color",
+        "fill-color": "hsl(55, 11%, 96%)",
+        "fill-opacity": 0.8,
+      },
+    },
+  ],
+};
+
+export function replaceSourcesForTileset(
+  style: mapboxgl.Style,
+  model_id: number = 6,
+  age = 0
+) {
+  const tilesetURL =
+    burwellTileDomain +
+    `/carto-slim-rotated/{z}/{x}/{y}?model_id=${model_id}&t_step=${age}`;
+
+  return {
+    ...style,
+    sources: {
+      ...style.sources,
+      burwell: {
+        type: "vector",
+        tiles: [tilesetURL],
+        tileSize: 512,
+      },
+    },
+  };
+}
+
+const _macrostratStyle = buildMacrostratStyle({
+  tileserverDomain: burwellTileDomain,
+}) as mapboxgl.Style;
diff --git a/src/pages/dev/paleo/state.ts b/src/pages/dev/paleo/state.ts
new file mode 100644
index 00000000..998cd2fb
--- /dev/null
+++ b/src/pages/dev/paleo/state.ts
@@ -0,0 +1,92 @@
+import {
+  applyMapPositionToHash,
+  getMapPositionForHash,
+} from "@macrostrat/map-interface";
+import { MapPosition } from "@macrostrat/mapbox-utils";
+import { getHashString, setHashString } from "@macrostrat/ui-components";
+import { useEffect, useReducer } from "react";
+
+// Import other components
+
+type PaleogeographyState = {
+  model_id: number;
+  age: number;
+  mapPosition: MapPosition;
+  initialized: boolean;
+};
+
+type PaleogeographyAction =
+  | { type: "set-model"; model_id: number }
+  | { type: "set-age"; age: number }
+  | { type: "set-map-position"; mapPosition: MapPosition }
+  | { type: "initialize"; state: PaleogeographyState };
+
+function paleogeographyReducer(
+  state: PaleogeographyState,
+  action: PaleogeographyAction
+): PaleogeographyState {
+  switch (action.type) {
+    case "set-model":
+      return {
+        ...state,
+        model_id: action.model_id,
+        age: state.age ?? defaultAge,
+      };
+    case "set-age":
+      // Round to nearest 5 Ma
+      const age = Math.round(action.age / 5) * 5;
+      return { ...state, age };
+    case "set-map-position":
+      return { ...state, mapPosition: action.mapPosition };
+    case "initialize":
+      return { ...action.state, initialized: true };
+  }
+}
+
+export function usePaleogeographyState(
+  defaultState: PaleogeographyState
+): [PaleogeographyState, (s: PaleogeographyAction) => void] {
+  /** Use state synced with hash string for paleogeography layer */
+  const defaultModelID = defaultState.model_id;
+  const defaultAge = defaultState.age;
+
+  const [state, dispatch] = useReducer(paleogeographyReducer, {
+    model_id: null,
+    age: null,
+    mapPosition: null,
+    initialized: false,
+  });
+
+  const { model_id, age, mapPosition } = state;
+
+  useEffect(() => {
+    if (model_id == null || age == null || mapPosition == null) return;
+    let args: any = { model_id, age };
+    applyMapPositionToHash(args, mapPosition);
+    setHashString(args, { sort: false, arrayFormat: "comma" });
+  }, [model_id, age, mapPosition]);
+
+  useEffect(() => {
+    const hashData = getHashString(window.location.hash) ?? {};
+    const { model_id, age, ...rest } = hashData;
+    const mapPosition = getMapPositionForHash(
+      rest,
+      defaultState.mapPosition.camera
+    );
+
+    if (model_id == null || age == null) return;
+    if (Array.isArray(model_id)) return;
+    if (Array.isArray(age)) return;
+    dispatch({
+      type: "initialize",
+      state: {
+        model_id: parseInt(model_id) ?? defaultModelID,
+        age: parseInt(age) ?? defaultAge,
+        mapPosition,
+        initialized: true,
+      },
+    });
+  }, []);
+
+  return [state, dispatch];
+}

From fe53bb1a89c694ca60280e28b4ddbc5e25afb1b1 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 9 Jun 2024 04:12:58 -0500
Subject: [PATCH 071/151] Simplified map style functions

---
 src/pages/dev/paleo/+Page.ts     | 102 +++++--------------------------
 src/pages/dev/paleo/map-style.ts |  50 ++++++++++-----
 2 files changed, 50 insertions(+), 102 deletions(-)

diff --git a/src/pages/dev/paleo/+Page.ts b/src/pages/dev/paleo/+Page.ts
index 2e429c82..eabb18e8 100644
--- a/src/pages/dev/paleo/+Page.ts
+++ b/src/pages/dev/paleo/+Page.ts
@@ -12,47 +12,25 @@ import {
   MapView,
   PanelCard,
   TileInfo,
-  buildInspectorStyle,
 } from "@macrostrat/map-interface";
-import { buildMacrostratStyle } from "@macrostrat/mapbox-styles";
 import {
   DarkModeButton,
   Spacer,
   useAPIResult,
-  useDarkMode,
   useStoredState,
 } from "@macrostrat/ui-components";
 import mapboxgl from "mapbox-gl";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { MacrostratVectorTileset } from "~/pages/map/dev/map-layers";
+import { useCallback, useEffect, useState } from "react";
 import { TimescalePanel } from "./timescale";
 import { usePaleogeographyState } from "./state";
-import { darkStyle, lightStyle } from "./map-style";
+import { usePaleogeographyStyle } from "./map-style";
 
 // Import other components
 
-const baseTilesetURL =
-  burwellTileDomain + "/carto-slim-rotated/{z}/{x}/{y}?model_id=3&t_step=0";
-
-export function Page({
-  tileset = MacrostratVectorTileset.CartoSlim,
-  overlayStyle = _macrostratStyle,
-  children,
-}: {
-  headerElement?: React.ReactElement;
-  title?: string;
-  tileset?: MacrostratVectorTileset;
-  overlayStyle?: mapboxgl.Style;
-  children?: React.ReactNode;
-}) {
-  const title = "Paleogeography";
-  const dark = useDarkMode();
-  const isEnabled = dark?.isEnabled;
+export function Page() {
   const mapboxToken = mapboxAccessToken;
   mapboxgl.accessToken = mapboxToken;
 
-  const style = isEnabled ? darkStyle : lightStyle;
-
   const [isOpen, setOpen] = useState(false);
 
   const [state, setState] = useStoredState("macrostrat:dev-map-page", {
@@ -61,7 +39,6 @@ export function Page({
   });
   const { showTileExtent, xRay } = state;
 
-  const [actualStyle, setActualStyle] = useState(style);
   const [paleoState, dispatch] = usePaleogeographyState({
     model_id: 3,
     age: 0,
@@ -76,32 +53,24 @@ export function Page({
   });
 
   const { age, model_id, mapPosition } = paleoState;
-  const plateModelId = model_id;
+
+  const style = usePaleogeographyStyle({
+    age,
+    model_id,
+    xRay,
+  });
 
   const models: { id: string; max_age: number; min_age: number }[] =
     useAPIResult(burwellTileDomain + "/carto/rotation-models");
 
   useEffect(() => {
     if (models == null) return;
-    if (plateModelId == null) {
+    if (model_id == null) {
       dispatch({ type: "set-model", model_id: parseInt(models[0].id) });
     }
   }, [models]);
 
-  const model = models?.find((d) => d.id == plateModelId);
-
-  const _overlayStyle = useMemo(() => {
-    if (plateModelId == null || age == null) return overlayStyle;
-    return replaceSourcesForTileset(overlayStyle, plateModelId, age);
-  }, [tileset, overlayStyle, plateModelId, age]) as mapboxgl.Style;
-
-  useEffect(() => {
-    buildInspectorStyle(style, _overlayStyle, {
-      mapboxToken,
-      inDarkMode: isEnabled,
-      xRay,
-    }).then(setActualStyle);
-  }, [style, xRay, mapboxToken, isEnabled, _overlayStyle]);
+  const model = models?.find((d) => d.id == model_id);
 
   const [inspectPosition, setInspectPosition] =
     useState<mapboxgl.LngLat | null>(null);
@@ -152,7 +121,7 @@ export function Page({
     MapAreaContainer,
     {
       navbar: h(FloatingNavbar, [
-        h("h2", title),
+        h("h2", "Paleogeography"),
         h(Spacer),
         h(MapLoadingButton, {
           active: isOpen,
@@ -164,7 +133,7 @@ export function Page({
       contextPanel: h(PanelCard, [
         h(PlateModelControls, {
           models,
-          activeModel: plateModelId,
+          activeModel: model_id,
           setModel(model_id) {
             dispatch({ type: "set-model", model_id });
           },
@@ -178,7 +147,6 @@ export function Page({
           },
         }),
         h(DarkModeButton),
-        children,
       ]),
       detailPanel: detailElement,
       contextPanelOpen: isOpen,
@@ -193,7 +161,7 @@ export function Page({
     h(
       MapView,
       {
-        style: actualStyle,
+        style,
         mapPosition,
         projection: { name: "globe" },
         enableTerrain: false,
@@ -248,45 +216,3 @@ function PlateModelSelector({ models, activeModel, setModel }) {
       })),
   });
 }
-
-export function replaceSourcesForTileset(
-  style: mapboxgl.Style,
-  model_id: number = 6,
-  age = 0
-) {
-  const tilesetURL =
-    burwellTileDomain +
-    `/carto-slim-rotated/{z}/{x}/{y}?model_id=${model_id}&t_step=${age}`;
-
-  return {
-    ...style,
-    sources: {
-      ...style.sources,
-      burwell: {
-        type: "vector",
-        tiles: [tilesetURL],
-        tileSize: 512,
-      },
-    },
-  };
-}
-
-const _macrostratStyle = buildMacrostratStyle({
-  tileserverDomain: burwellTileDomain,
-}) as mapboxgl.Style;
-
-function isStateValid(state) {
-  if (state == null) {
-    return false;
-  }
-  if (typeof state != "object") {
-    return false;
-  }
-  // Must have several specific boolean keys
-  for (let k of ["showLineSymbols", "xRay", "showTileExtent", "bypassCache"]) {
-    if (typeof state[k] != "boolean") {
-      return false;
-    }
-  }
-  return true;
-}
diff --git a/src/pages/dev/paleo/map-style.ts b/src/pages/dev/paleo/map-style.ts
index 2484d973..6cec46a6 100644
--- a/src/pages/dev/paleo/map-style.ts
+++ b/src/pages/dev/paleo/map-style.ts
@@ -1,7 +1,34 @@
-import { burwellTileDomain } from "@macrostrat-web/settings";
+import { burwellTileDomain, mapboxAccessToken } from "@macrostrat-web/settings";
 import { buildMacrostratStyle } from "@macrostrat/mapbox-styles";
+import { buildInspectorStyle } from "@macrostrat/map-interface";
+import { useDarkMode } from "@macrostrat/ui-components";
+import mapboxgl from "mapbox-gl";
+import { useEffect, useState } from "react";
 
-// Import other components
+export function usePaleogeographyStyle({ age, model_id, xRay = false }) {
+  const dark = useDarkMode();
+  const isEnabled = dark?.isEnabled;
+  const baseStyle: mapboxgl.Style = isEnabled ? darkStyle : lightStyle;
+  const [style, setStyle] = useState(baseStyle);
+
+  useEffect(() => {
+    let _overlayStyle: mapboxgl.Style = buildMacrostratStyle({
+      tileserverDomain: burwellTileDomain,
+    }) as mapboxgl.Style;
+
+    if (model_id != null && age != null) {
+      _overlayStyle = replaceSourcesForTileset(_overlayStyle, model_id, age);
+    }
+
+    buildInspectorStyle(baseStyle, _overlayStyle, {
+      mapboxToken: mapboxAccessToken,
+      inDarkMode: isEnabled,
+      xRay,
+    }).then(setStyle);
+  }, [baseStyle, xRay, age, model_id]);
+
+  return style;
+}
 
 const baseTilesetURL =
   burwellTileDomain + "/carto-slim-rotated/{z}/{x}/{y}?model_id=3&t_step=0";
@@ -27,8 +54,8 @@ const common = {
   },
 };
 
-export const darkStyle = {
-  name: "PaleoLight",
+const darkStyle = {
+  name: "PaleoDark",
   ...common,
   layers: [
     {
@@ -50,9 +77,9 @@ export const darkStyle = {
       },
     },
   ],
-};
+} as mapboxgl.Style;
 
-export const lightStyle = {
+const lightStyle = {
   name: "PaleoLight",
   ...common,
   layers: [
@@ -75,13 +102,13 @@ export const lightStyle = {
       },
     },
   ],
-};
+} as mapboxgl.Style;
 
 export function replaceSourcesForTileset(
   style: mapboxgl.Style,
-  model_id: number = 6,
+  model_id: number,
   age = 0
-) {
+): mapboxgl.Style {
   const tilesetURL =
     burwellTileDomain +
     `/carto-slim-rotated/{z}/{x}/{y}?model_id=${model_id}&t_step=${age}`;
@@ -93,12 +120,7 @@ export function replaceSourcesForTileset(
       burwell: {
         type: "vector",
         tiles: [tilesetURL],
-        tileSize: 512,
       },
     },
   };
 }
-
-const _macrostratStyle = buildMacrostratStyle({
-  tileserverDomain: burwellTileDomain,
-}) as mapboxgl.Style;

From 6d700cec2b85c42099c7f201d13606fa521d2d5a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 9 Jun 2024 12:08:10 -0500
Subject: [PATCH 072/151] Starting to do a better job managing state

---
 src/pages/dev/paleo/+Page.ts |  31 ++------
 src/pages/dev/paleo/state.ts | 141 +++++++++++++++++++++++------------
 2 files changed, 98 insertions(+), 74 deletions(-)

diff --git a/src/pages/dev/paleo/+Page.ts b/src/pages/dev/paleo/+Page.ts
index eabb18e8..c10d736e 100644
--- a/src/pages/dev/paleo/+Page.ts
+++ b/src/pages/dev/paleo/+Page.ts
@@ -20,7 +20,7 @@ import {
   useStoredState,
 } from "@macrostrat/ui-components";
 import mapboxgl from "mapbox-gl";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useState } from "react";
 import { TimescalePanel } from "./timescale";
 import { usePaleogeographyState } from "./state";
 import { usePaleogeographyStyle } from "./map-style";
@@ -39,20 +39,11 @@ export function Page() {
   });
   const { showTileExtent, xRay } = state;
 
-  const [paleoState, dispatch] = usePaleogeographyState({
-    model_id: 3,
-    age: 0,
-    initialized: false,
-    mapPosition: {
-      camera: {
-        lng: -40,
-        lat: 45,
-        altitude: 5000000,
-      },
-    },
-  });
+  const [paleoState, dispatch] = usePaleogeographyState();
 
-  const { age, model_id, mapPosition } = paleoState;
+  const { age, mapPosition, allModels: models, activeModel } = paleoState ?? {};
+
+  const model_id = activeModel?.id;
 
   const style = usePaleogeographyStyle({
     age,
@@ -60,17 +51,7 @@ export function Page() {
     xRay,
   });
 
-  const models: { id: string; max_age: number; min_age: number }[] =
-    useAPIResult(burwellTileDomain + "/carto/rotation-models");
-
-  useEffect(() => {
-    if (models == null) return;
-    if (model_id == null) {
-      dispatch({ type: "set-model", model_id: parseInt(models[0].id) });
-    }
-  }, [models]);
-
-  const model = models?.find((d) => d.id == model_id);
+  const model = activeModel;
 
   const [inspectPosition, setInspectPosition] =
     useState<mapboxgl.LngLat | null>(null);
diff --git a/src/pages/dev/paleo/state.ts b/src/pages/dev/paleo/state.ts
index 998cd2fb..e375be59 100644
--- a/src/pages/dev/paleo/state.ts
+++ b/src/pages/dev/paleo/state.ts
@@ -4,89 +4,132 @@ import {
 } from "@macrostrat/map-interface";
 import { MapPosition } from "@macrostrat/mapbox-utils";
 import { getHashString, setHashString } from "@macrostrat/ui-components";
-import { useEffect, useReducer } from "react";
+import { useCallback, useEffect, useReducer } from "react";
+import { burwellTileDomain } from "@macrostrat-web/settings";
 
 // Import other components
 
-type PaleogeographyState = {
+type MapState = {
   model_id: number;
   age: number;
   mapPosition: MapPosition;
+};
+
+type PaleogeographyState = MapState & {
   initialized: boolean;
+  allModels: ModelInfo[];
+  activeModel: ModelInfo | null;
 };
 
-type PaleogeographyAction =
+type ModelInfo = { id: string; max_age: number; min_age: number; name: string };
+
+type PaleogeographySyncAction =
   | { type: "set-model"; model_id: number }
   | { type: "set-age"; age: number }
   | { type: "set-map-position"; mapPosition: MapPosition }
-  | { type: "initialize"; state: PaleogeographyState };
+  | { type: "set-initial-state"; state: PaleogeographyState };
+
+type PaleogeographyAction = PaleogeographySyncAction | { type: "initialize" };
 
 function paleogeographyReducer(
-  state: PaleogeographyState,
-  action: PaleogeographyAction
+  state: PaleogeographyState = defaultState,
+  action: PaleogeographySyncAction
 ): PaleogeographyState {
   switch (action.type) {
     case "set-model":
-      return {
+      return updateHashString({
         ...state,
         model_id: action.model_id,
-        age: state.age ?? defaultAge,
-      };
+      });
     case "set-age":
       // Round to nearest 5 Ma
       const age = Math.round(action.age / 5) * 5;
-      return { ...state, age };
+      return updateHashString({ ...state, age });
     case "set-map-position":
-      return { ...state, mapPosition: action.mapPosition };
+      return updateHashString({ ...state, mapPosition: action.mapPosition });
+    case "set-initial-state":
+      return { ...state, ...action.state, initialized: true };
+  }
+}
+
+async function transformAction(
+  action: PaleogeographyAction
+): Promise<PaleogeographySyncAction> {
+  switch (action.type) {
     case "initialize":
-      return { ...action.state, initialized: true };
+      const hashData = getHashString(window.location.hash);
+      console.log("Hash data", hashData);
+
+      const { model_id, age, ...rest } = hashData;
+      const mapPosition = getMapPositionForHash(
+        rest,
+        defaultState.mapPosition.camera
+      );
+
+      const modelsURL = burwellTileDomain + "/carto/rotation-models";
+      const models: ModelInfo[] = await fetch(modelsURL).then((res) =>
+        res.json()
+      );
+
+      return {
+        type: "set-initial-state",
+        state: {
+          model_id: parseInt(model_id) ?? 3,
+          age: parseInt(age) ?? 0,
+          mapPosition,
+          allModels: models,
+          activeModel: models.find((d) => d.id == model_id),
+          initialized: true,
+        },
+      };
   }
+  return action;
 }
 
-export function usePaleogeographyState(
-  defaultState: PaleogeographyState
-): [PaleogeographyState, (s: PaleogeographyAction) => void] {
-  /** Use state synced with hash string for paleogeography layer */
-  const defaultModelID = defaultState.model_id;
-  const defaultAge = defaultState.age;
+const defaultState: PaleogeographyState = {
+  model_id: 3,
+  age: 0,
+  mapPosition: {
+    camera: {
+      lng: -40,
+      lat: 45,
+      altitude: 5000000,
+    },
+  },
+  initialized: false,
+  allModels: [],
+  activeModel: null,
+};
 
-  const [state, dispatch] = useReducer(paleogeographyReducer, {
-    model_id: null,
-    age: null,
-    mapPosition: null,
-    initialized: false,
-  });
+export function usePaleogeographyState(): [
+  PaleogeographyState,
+  (s: PaleogeographyAction) => void
+] {
+  /** Use state synced with hash string for paleogeography layer */
 
-  const { model_id, age, mapPosition } = state;
+  const [state, dispatch] = useReducer(paleogeographyReducer, defaultState);
 
-  useEffect(() => {
-    if (model_id == null || age == null || mapPosition == null) return;
-    let args: any = { model_id, age };
-    applyMapPositionToHash(args, mapPosition);
-    setHashString(args, { sort: false, arrayFormat: "comma" });
-  }, [model_id, age, mapPosition]);
+  // convert to zustand or something...
+  const actionRunner = useCallback(
+    (action: PaleogeographyAction) => {
+      transformAction(action).then((a) => dispatch(a));
+    },
+    [dispatch]
+  );
 
   useEffect(() => {
-    const hashData = getHashString(window.location.hash) ?? {};
-    const { model_id, age, ...rest } = hashData;
-    const mapPosition = getMapPositionForHash(
-      rest,
-      defaultState.mapPosition.camera
-    );
-
-    if (model_id == null || age == null) return;
-    if (Array.isArray(model_id)) return;
-    if (Array.isArray(age)) return;
-    dispatch({
+    actionRunner({
       type: "initialize",
-      state: {
-        model_id: parseInt(model_id) ?? defaultModelID,
-        age: parseInt(age) ?? defaultAge,
-        mapPosition,
-        initialized: true,
-      },
     });
   }, []);
 
-  return [state, dispatch];
+  return [state, actionRunner];
+}
+
+function updateHashString(state: PaleogeographyState): PaleogeographyState {
+  const { model_id, age, mapPosition } = state;
+  let args: any = { model_id, age };
+  applyMapPositionToHash(args, mapPosition);
+  setHashString(args, { sort: false, arrayFormat: "comma" });
+  return state;
 }

From 53d47fd16fb380192aefaa7a407d016e755ce38f Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 9 Jun 2024 13:26:57 -0500
Subject: [PATCH 073/151] State is correctly set for paleogeography

---
 src/pages/dev/paleo/+Page.ts | 74 +++++++++++++++++++++++-------------
 src/pages/dev/paleo/state.ts | 60 ++++++++++++++++++++++-------
 2 files changed, 93 insertions(+), 41 deletions(-)

diff --git a/src/pages/dev/paleo/+Page.ts b/src/pages/dev/paleo/+Page.ts
index c10d736e..db350a09 100644
--- a/src/pages/dev/paleo/+Page.ts
+++ b/src/pages/dev/paleo/+Page.ts
@@ -1,4 +1,4 @@
-import { HTMLSelect, Spinner, Switch } from "@blueprintjs/core";
+import { HTMLSelect, NonIdealState, Spinner, Switch } from "@blueprintjs/core";
 import { burwellTileDomain, mapboxAccessToken } from "@macrostrat-web/settings";
 import h from "@macrostrat/hyper";
 import {
@@ -41,7 +41,14 @@ export function Page() {
 
   const [paleoState, dispatch] = usePaleogeographyState();
 
-  const { age, mapPosition, allModels: models, activeModel } = paleoState ?? {};
+  const {
+    age,
+    mapPosition,
+    allModels: models,
+    activeModel,
+    initialized,
+    modelName,
+  } = paleoState;
 
   const model_id = activeModel?.id;
 
@@ -67,7 +74,7 @@ export function Page() {
     []
   );
 
-  if (age == null || model_id == null) {
+  if (!initialized) {
     return h(Spinner);
   }
 
@@ -98,6 +105,39 @@ export function Page() {
     );
   }
 
+  let mapView = h(
+    MapView,
+    {
+      style,
+      mapPosition,
+      projection: { name: "globe" },
+      enableTerrain: false,
+      mapboxToken,
+      onMapMoved,
+    },
+    [
+      h(FeatureSelectionHandler, {
+        selectedLocation: inspectPosition,
+        setFeatures: setData,
+      }),
+      h(MapMarker, {
+        position: inspectPosition,
+        setPosition: onSelectPosition,
+      }),
+    ]
+  );
+  if (activeModel == null) {
+    const title =
+      modelName == null
+        ? "No model selected"
+        : h(["Model ", h("code", modelName), " not found"]);
+
+    mapView = h(NonIdealState, {
+      title,
+      description: "Please select a valid model from the control panel",
+    });
+  }
+
   return h(
     MapAreaContainer,
     {
@@ -115,8 +155,8 @@ export function Page() {
         h(PlateModelControls, {
           models,
           activeModel: model_id,
-          setModel(model_id) {
-            dispatch({ type: "set-model", model_id });
+          setModel(modelID) {
+            dispatch({ type: "set-model", modelID });
           },
           age,
         }),
@@ -136,30 +176,10 @@ export function Page() {
         setAge(age) {
           dispatch({ type: "set-age", age });
         },
-        ageRange: ageRangeForModel(model),
+        ageRange: ageRangeForModel(activeModel),
       }),
     },
-    h(
-      MapView,
-      {
-        style,
-        mapPosition,
-        projection: { name: "globe" },
-        enableTerrain: false,
-        mapboxToken,
-        onMapMoved,
-      },
-      [
-        h(FeatureSelectionHandler, {
-          selectedLocation: inspectPosition,
-          setFeatures: setData,
-        }),
-        h(MapMarker, {
-          position: inspectPosition,
-          setPosition: onSelectPosition,
-        }),
-      ]
-    )
+    mapView
   );
 }
 
diff --git a/src/pages/dev/paleo/state.ts b/src/pages/dev/paleo/state.ts
index e375be59..8cf79c69 100644
--- a/src/pages/dev/paleo/state.ts
+++ b/src/pages/dev/paleo/state.ts
@@ -10,7 +10,7 @@ import { burwellTileDomain } from "@macrostrat-web/settings";
 // Import other components
 
 type MapState = {
-  model_id: number;
+  modelName: string;
   age: number;
   mapPosition: MapPosition;
 };
@@ -21,10 +21,10 @@ type PaleogeographyState = MapState & {
   activeModel: ModelInfo | null;
 };
 
-type ModelInfo = { id: string; max_age: number; min_age: number; name: string };
+type ModelInfo = { id: number; max_age: number; min_age: number; name: string };
 
 type PaleogeographySyncAction =
-  | { type: "set-model"; model_id: number }
+  | { type: "set-model"; modelID: number }
   | { type: "set-age"; age: number }
   | { type: "set-map-position"; mapPosition: MapPosition }
   | { type: "set-initial-state"; state: PaleogeographyState };
@@ -37,14 +37,19 @@ function paleogeographyReducer(
 ): PaleogeographyState {
   switch (action.type) {
     case "set-model":
+      const activeModel = state.allModels.find((d) => d.id == action.modelID);
       return updateHashString({
         ...state,
-        model_id: action.model_id,
+        activeModel,
+        modelName: activeModel?.name ?? state.modelName,
+        age: normalizeAge(state.age, activeModel),
       });
     case "set-age":
       // Round to nearest 5 Ma
-      const age = Math.round(action.age / 5) * 5;
-      return updateHashString({ ...state, age });
+      return updateHashString({
+        ...state,
+        age: normalizeAge(action.age, state.activeModel),
+      });
     case "set-map-position":
       return updateHashString({ ...state, mapPosition: action.mapPosition });
     case "set-initial-state":
@@ -58,9 +63,8 @@ async function transformAction(
   switch (action.type) {
     case "initialize":
       const hashData = getHashString(window.location.hash);
-      console.log("Hash data", hashData);
 
-      const { model_id, age, ...rest } = hashData;
+      const { model, age, ...rest } = hashData;
       const mapPosition = getMapPositionForHash(
         rest,
         defaultState.mapPosition.camera
@@ -71,14 +75,34 @@ async function transformAction(
         res.json()
       );
 
+      let modelName: string | null = null;
+      if (Array.isArray(model)) {
+        modelName = model[0];
+      } else if (model != null) {
+        modelName = model;
+      } else {
+        modelName = "Seton2012";
+      }
+
+      let baseAge: number | null = null;
+      if (Array.isArray(age)) {
+        baseAge = parseInt(age[0]);
+      } else if (age != null) {
+        baseAge = parseInt(age);
+      }
+
+      console.log(age, baseAge);
+
+      const activeModel = models.find((d) => d.name == modelName);
+
       return {
         type: "set-initial-state",
         state: {
-          model_id: parseInt(model_id) ?? 3,
-          age: parseInt(age) ?? 0,
+          modelName,
+          age: normalizeAge(baseAge, activeModel),
           mapPosition,
           allModels: models,
-          activeModel: models.find((d) => d.id == model_id),
+          activeModel,
           initialized: true,
         },
       };
@@ -86,8 +110,16 @@ async function transformAction(
   return action;
 }
 
+function normalizeAge(age: number | null, model: ModelInfo | null): number {
+  if (model == null) return age;
+  let age1 = age ?? 0;
+  age1 = Math.max(model.min_age, Math.min(model.max_age, age));
+  // Round age to nearest 5 Ma
+  return Math.round(age1 / 5) * 5;
+}
+
 const defaultState: PaleogeographyState = {
-  model_id: 3,
+  modelName: "Seton2012",
   age: 0,
   mapPosition: {
     camera: {
@@ -127,8 +159,8 @@ export function usePaleogeographyState(): [
 }
 
 function updateHashString(state: PaleogeographyState): PaleogeographyState {
-  const { model_id, age, mapPosition } = state;
-  let args: any = { model_id, age };
+  const { modelName, age, mapPosition } = state;
+  let args: any = { model: modelName, age };
   applyMapPositionToHash(args, mapPosition);
   setHashString(args, { sort: false, arrayFormat: "comma" });
   return state;

From 1ebb5ead8a924f9744c16525f127e6cf2fd791e8 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 9 Jun 2024 13:48:31 -0500
Subject: [PATCH 074/151] Fixed paleogeography on empty hash

---
 src/pages/dev/paleo/state.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/dev/paleo/state.ts b/src/pages/dev/paleo/state.ts
index 8cf79c69..37957d6a 100644
--- a/src/pages/dev/paleo/state.ts
+++ b/src/pages/dev/paleo/state.ts
@@ -64,7 +64,7 @@ async function transformAction(
     case "initialize":
       const hashData = getHashString(window.location.hash);
 
-      const { model, age, ...rest } = hashData;
+      const { model, age, ...rest } = hashData ?? {};
       const mapPosition = getMapPositionForHash(
         rest,
         defaultState.mapPosition.camera

From e0ebe8cd5f841a77c61741b7f6271d14554c318b Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 29 May 2024 22:18:56 -0500
Subject: [PATCH 075/151] Add vite-plugin-inspect

As recommended by https://vitejs.dev/guide/api-plugin for plugin
development.
---
 package.json |   4 +-
 yarn.lock    | 140 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index bf8c0c8d..9d2d35b2 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,7 @@
     "prettier": "^2.7.1",
     "sass": "^1.49.0",
     "stylus": "^0.55.0",
-    "typescript": "^5.1.6",
-    "vite-plugin-rewrite-all": "^1.0.1"
+    "typescript": "^5.1.6"
   },
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
@@ -138,6 +137,7 @@
     "vike-react": "^0.4.11",
     "vite": "^5.2.11",
     "vite-plugin-cesium": "^1.2.22",
+    "vite-plugin-inspect": "^0.8.4",
     "zustand": "^4.5.1"
   },
   "prettier": {},
diff --git a/yarn.lock b/yarn.lock
index 6d7ddd9d..a07d648b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,6 +22,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@antfu/utils@npm:^0.7.7":
+  version: 0.7.8
+  resolution: "@antfu/utils@npm:0.7.8"
+  checksum: 10/9efffb78a9683add047b0e2be96a059c3a29baee1565a2d127500bc433def25a0375c1e84c9479cbb3f1dcec797b2c1f0a24e5d85c830ea64f9a8a6a6ca5b9c3
+  languageName: node
+  linkType: hard
+
 "@arcanis/slice-ansi@npm:^1.1.1":
   version: 1.1.1
   resolution: "@arcanis/slice-ansi@npm:1.1.1"
@@ -6650,7 +6657,7 @@ __metadata:
     vike-react: "npm:^0.4.11"
     vite: "npm:^5.2.11"
     vite-plugin-cesium: "npm:^1.2.22"
-    vite-plugin-rewrite-all: "npm:^1.0.1"
+    vite-plugin-inspect: "npm:^0.8.4"
     zustand: "npm:^4.5.1"
   languageName: unknown
   linkType: soft
@@ -8665,7 +8672,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.0.2":
+"@rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.1.0":
   version: 5.1.0
   resolution: "@rollup/pluginutils@npm:5.1.0"
   dependencies:
@@ -14131,6 +14138,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bundle-name@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "bundle-name@npm:4.1.0"
+  dependencies:
+    run-applescript: "npm:^7.0.0"
+  checksum: 10/1d966c8d2dbf4d9d394e53b724ac756c2414c45c01340b37743621f59cc565a435024b394ddcb62b9b335d1c9a31f4640eb648c3fec7f97ee74dc0694c9beb6c
+  languageName: node
+  linkType: hard
+
 "busboy@npm:^1.6.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
@@ -15211,13 +15227,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"connect-history-api-fallback@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "connect-history-api-fallback@npm:1.6.0"
-  checksum: 10/59f013870e987f2e921218b88ad99e6b469a058ee7dd35561a360968fd4260f236b5523b7387ddec8991f9f9fbddda098f830ddc701f12c1bfb1f49d5f4b13c1
-  languageName: node
-  linkType: hard
-
 "connect-history-api-fallback@npm:^2.0.0":
   version: 2.0.0
   resolution: "connect-history-api-fallback@npm:2.0.0"
@@ -16849,6 +16858,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"default-browser-id@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "default-browser-id@npm:5.0.0"
+  checksum: 10/185bfaecec2c75fa423544af722a3469b20704c8d1942794a86e4364fe7d9e8e9f63241a5b769d61c8151993bc65833a5b959026fa1ccea343b3db0a33aa6deb
+  languageName: node
+  linkType: hard
+
+"default-browser@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "default-browser@npm:5.2.1"
+  dependencies:
+    bundle-name: "npm:^4.1.0"
+    default-browser-id: "npm:^5.0.0"
+  checksum: 10/afab7eff7b7f5f7a94d9114d1ec67273d3fbc539edf8c0f80019879d53aa71e867303c6f6d7cffeb10a6f3cfb59d4f963dba3f9c96830b4540cc7339a1bf9840
+  languageName: node
+  linkType: hard
+
 "default-gateway@npm:^6.0.3":
   version: 6.0.3
   resolution: "default-gateway@npm:6.0.3"
@@ -16903,6 +16929,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"define-lazy-prop@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "define-lazy-prop@npm:3.0.0"
+  checksum: 10/f28421cf9ee86eecaf5f3b8fe875f13d7009c2625e97645bfff7a2a49aca678270b86c39f9c32939e5ca7ab96b551377ed4139558c795e076774287ad3af1aa4
+  languageName: node
+  linkType: hard
+
 "define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
@@ -17696,6 +17729,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"error-stack-parser-es@npm:^0.1.1":
+  version: 0.1.4
+  resolution: "error-stack-parser-es@npm:0.1.4"
+  checksum: 10/5f3364a997489f5ce3f7d814775a32a6b98cacd366b6802c05501e2c4347b7edb3a6869f30b6026398890060e9e67d4865a801f1eee84eb8e4535bd6d423327d
+  languageName: node
+  linkType: hard
+
 "es-abstract@npm:^1.17.2, es-abstract@npm:^1.22.1":
   version: 1.22.2
   resolution: "es-abstract@npm:1.22.2"
@@ -19238,7 +19278,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^11.1.0":
+"fs-extra@npm:^11.1.0, fs-extra@npm:^11.2.0":
   version: 11.2.0
   resolution: "fs-extra@npm:11.2.0"
   dependencies:
@@ -21485,6 +21525,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-docker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-docker@npm:3.0.0"
+  bin:
+    is-docker: cli.js
+  checksum: 10/b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90
+  languageName: node
+  linkType: hard
+
 "is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
@@ -21568,6 +21617,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-inside-container@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-inside-container@npm:1.0.0"
+  dependencies:
+    is-docker: "npm:^3.0.0"
+  bin:
+    is-inside-container: cli.js
+  checksum: 10/c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03
+  languageName: node
+  linkType: hard
+
 "is-installed-globally@npm:^0.1.0":
   version: 0.1.0
   resolution: "is-installed-globally@npm:0.1.0"
@@ -21905,6 +21965,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-wsl@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "is-wsl@npm:3.1.0"
+  dependencies:
+    is-inside-container: "npm:^1.0.0"
+  checksum: 10/f9734c81f2f9cf9877c5db8356bfe1ff61680f1f4c1011e91278a9c0564b395ae796addb4bf33956871041476ec82c3e5260ed57b22ac91794d4ae70a1d2f0a9
+  languageName: node
+  linkType: hard
+
 "isarray@npm:0.0.1":
   version: 0.0.1
   resolution: "isarray@npm:0.0.1"
@@ -26378,6 +26447,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"open@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "open@npm:10.1.0"
+  dependencies:
+    default-browser: "npm:^5.2.1"
+    define-lazy-prop: "npm:^3.0.0"
+    is-inside-container: "npm:^1.0.0"
+    is-wsl: "npm:^3.1.0"
+  checksum: 10/a9c4105243a1b3c5312bf2aeb678f78d31f00618b5100088ee01eed2769963ea1f2dd464ac8d93cef51bba2d911e1a9c0c34a753ec7b91d6b22795903ea6647a
+  languageName: node
+  linkType: hard
+
 "open@npm:^7.4.2":
   version: 7.4.2
   resolution: "open@npm:7.4.2"
@@ -27044,6 +27125,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"perfect-debounce@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "perfect-debounce@npm:1.0.0"
+  checksum: 10/220343acf52976947958fef3599849471605316e924fe19c633ae2772576298e9d38f02cefa8db46f06607505ce7b232cbb35c9bfd477bd0329bd0a2ce37c594
+  languageName: node
+  linkType: hard
+
 "performance-now@npm:^0.2.0":
   version: 0.2.0
   resolution: "performance-now@npm:0.2.0"
@@ -30943,6 +31031,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"run-applescript@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "run-applescript@npm:7.0.0"
+  checksum: 10/b02462454d8b182ad4117e5d4626e9e6782eb2072925c9fac582170b0627ae3c1ea92ee9b2df7daf84b5e9ffe14eb1cf5fb70bc44b15c8a0bfcdb47987e2410c
+  languageName: node
+  linkType: hard
+
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -31568,7 +31663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sirv@npm:^2.0.0":
+"sirv@npm:^2.0.0, sirv@npm:^2.0.4":
   version: 2.0.4
   resolution: "sirv@npm:2.0.4"
   dependencies:
@@ -34663,14 +34758,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-rewrite-all@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "vite-plugin-rewrite-all@npm:1.0.1"
+"vite-plugin-inspect@npm:^0.8.4":
+  version: 0.8.4
+  resolution: "vite-plugin-inspect@npm:0.8.4"
   dependencies:
-    connect-history-api-fallback: "npm:^1.6.0"
+    "@antfu/utils": "npm:^0.7.7"
+    "@rollup/pluginutils": "npm:^5.1.0"
+    debug: "npm:^4.3.4"
+    error-stack-parser-es: "npm:^0.1.1"
+    fs-extra: "npm:^11.2.0"
+    open: "npm:^10.1.0"
+    perfect-debounce: "npm:^1.0.0"
+    picocolors: "npm:^1.0.0"
+    sirv: "npm:^2.0.4"
   peerDependencies:
-    vite: ^2.0.0 || ^3.0.0 || ^4.0.0
-  checksum: 10/480997fa98b9b6a856c9c1fd915a0d830c20fa8017e53de135e03203e89bc1d33561d0a39013a8f4d27d31691d3f71d44ed9901012424ba92fc7bab27829a8b0
+    vite: ^3.1.0 || ^4.0.0 || ^5.0.0-0
+  peerDependenciesMeta:
+    "@nuxt/kit":
+      optional: true
+  checksum: 10/7b8997bef0f39ba4a726b47c546aeb1ecd16d5f039e6ca5d5a1b24963197ce894aee6024b456c158d22c0cf37780e38b69e164d4cc5bc6e0d6e2442c809fb9a0
   languageName: node
   linkType: hard
 

From b2c9dd0eef5807ba2f19362c4ea446a95b880d9f Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Thu, 30 May 2024 00:21:28 -0500
Subject: [PATCH 076/151] Example plugin to add hyperscript capabilities to
 style exports

---
 vite.config.ts | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 4713f27c..62b1a440 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,7 +3,7 @@ import mdx from "@mdx-js/rollup";
 import react from "@vitejs/plugin-react";
 import path from "path";
 import ssr from "vike/plugin";
-import { UserConfig } from "vite";
+import { UserConfig, Plugin } from "vite";
 import cesium from "vite-plugin-cesium";
 import pkg from "./package.json";
 
@@ -33,8 +33,31 @@ const cesiumBuildPath = path.resolve(cesiumRoot, "Cesium");
 
 // Check if we are building for server context
 
+const cssModuleMatcher = /\.module\.(css|scss|sass|styl)$/;
+
+function hyperStyles(): Plugin {
+  return {
+    name: "hyper-styles",
+    enforce: "post",
+    // Post-process the output to add the hyperStyled import
+    transform(code, id) {
+      const code1 = code.replace("export default", "const styles =");
+      if (cssModuleMatcher.test(id)) {
+        //const code2 = code1 + "\nexport default styles\n";
+        const code3 = `import hyper from "@macrostrat/hyper";
+        ${code1}
+        let h = hyper.styled(styles);
+        // Keep backwards compatibility with the existing default style object.
+        Object.assign(h, styles);
+        export default h;`;
+        //console.log(code3, id);
+        return code3;
+      }
+    },
+  };
+}
+
 const config: UserConfig = {
-  cacheDir: ".vite",
   root: path.resolve("./src"),
   resolve: {
     conditions: ["typescript"],
@@ -60,6 +83,7 @@ const config: UserConfig = {
       cesiumBuildPath,
       cesiumBuildRootPath: cesiumRoot,
     }),
+    hyperStyles(),
   ],
   envDir: path.resolve(__dirname),
   build: {

From e4ecb6692257a34442feddbfb84e4e4ed8a9eb50 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Thu, 30 May 2024 00:39:42 -0500
Subject: [PATCH 077/151] Add types for new styling module

---
 src/declaration.d.ts                          | 7 ++++++-
 src/pages/map/map-interface/map-page/index.ts | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/declaration.d.ts b/src/declaration.d.ts
index 24e251da..1fdeea07 100644
--- a/src/declaration.d.ts
+++ b/src/declaration.d.ts
@@ -1,5 +1,10 @@
 // declaration.d.ts
 
+import type { Hyper } from "@macrostrat/hyper";
+
+// Union of hyper and record
+type StyledHyper = Hyper & Record<string, string>;
+
 // Style modules
 declare module "*.module.styl" {
   const classes: { [key: string]: string };
@@ -11,7 +16,7 @@ declare module "*.styl" {
   export default content;
 }
 
-// Style modules
+// Override declarations for sass module
 declare module "*.module.sass" {
   const classes: { [key: string]: string };
   export default classes;
diff --git a/src/pages/map/map-interface/map-page/index.ts b/src/pages/map/map-interface/map-page/index.ts
index 9c9e8bd0..3f31cab6 100644
--- a/src/pages/map/map-interface/map-page/index.ts
+++ b/src/pages/map/map-interface/map-page/index.ts
@@ -16,7 +16,6 @@ import {
   useContextPanelOpen,
 } from "../app-state";
 import Searchbar from "../components/navbar";
-import styles from "./main.module.styl";
 import MapContainer from "./map-view";
 import { MenuPage } from "./menu";
 import { info } from "console";
@@ -25,7 +24,7 @@ const ElevationChart = loadable(() => import("../components/elevation-chart"));
 const InfoDrawer = loadable(() => import("../components/info-drawer"));
 const Menu = loadable(() => import("./menu"));
 
-const h = hyper.styled(styles);
+import h from "./main.module.styl";
 
 function MapView(props) {
   return h(

From 7fb856ac5ba0b7b4269bbda120cbb00dd94e4e75 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Tue, 11 Jun 2024 11:38:07 -0400
Subject: [PATCH 078/151] added about page

---
 src/pages/dev/about/+Page.mdx           | 177 ++++++++++++++++++++++++
 src/pages/dev/{apps => about}/index.ts  |   0
 src/pages/dev/{apps => about}/main.styl |  76 +++++++++-
 src/pages/dev/apps/+Page.mdx            | 114 ---------------
 src/pages/dev/main-page/+Page.mdx       |  73 +---------
 5 files changed, 255 insertions(+), 185 deletions(-)
 create mode 100644 src/pages/dev/about/+Page.mdx
 rename src/pages/dev/{apps => about}/index.ts (100%)
 rename src/pages/dev/{apps => about}/main.styl (60%)
 delete mode 100644 src/pages/dev/apps/+Page.mdx

diff --git a/src/pages/dev/about/+Page.mdx b/src/pages/dev/about/+Page.mdx
new file mode 100644
index 00000000..446e8ce2
--- /dev/null
+++ b/src/pages/dev/about/+Page.mdx
@@ -0,0 +1,177 @@
+import { PageHeader } from "~/components";
+import { LinkCard } from "~/components/cards";
+import { Image } from "./index";
+import "./main.styl";
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="/dev/about">About</a></li>
+    <li><a href="/dev/publications">Publications</a></li>
+    <li><a href="/dev/people">People</a></li>
+    <li><a href="/dev/donate">Donate</a></li>
+    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+
+  
+[//]: # "About"
+<div id="about">
+  <h1 class="big" id="about-title">
+    About
+    <div class="line"></div>
+  </h1>
+  
+  <div class="about-row">
+    <div class="about-body-subtitle">
+      Summary
+    </div>
+    <div class="about-body">
+      Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
+    </div>
+  </div>
+
+  <div class="row about-row">
+    <div class="col-sm-3 about-body-subtitle">
+      License
+    </div>
+    <div class="col-sm-9 about-body page-info">
+      All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
+    </div>
+  </div>
+
+  <div class="about-row">
+    <div class="about-body-subtitle">
+      Citation
+    </div>
+    <div class="about-body">
+      <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
+      \
+      \
+      <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
+    </div>
+  </div>
+
+  <div class="row about-row">
+    <div class="col-sm-3 about-body-subtitle">
+      Collaboration
+    </div>
+    <div class="col-sm-9 about-body page-info">
+      Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
+    </div>
+  </div>
+
+  <div class="row about-row">
+    <div class="col-sm-3 about-body-subtitle">
+      Funding
+    </div>
+    <div class="col-sm-9 about-body page-info">
+      Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
+    </div>
+  </div>
+</div>
+
+[//]: # "API"
+<div id="api">
+  <div class="api-circle"><div id="api-circle-text">API</div></div>
+  <div id="api-text">All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.</div>
+</div>
+
+<Image className="rock-border" src="rocks-border.jpg"></Image>
+
+[//]: # "Apps"
+<div id="apps">
+  <h1 class="big-apps app-header">Built with Macrostrat</h1>
+
+
+  <div class="items">
+  <a href="/sift">
+    <div class="app-box">
+      <Image className="app-img" src="logo_red.png"></Image>
+      <div class="app-background-text">
+        Sift
+        <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="https://rockd.org">
+    <div class="app-box">
+      <Image className="app-img" src="rockd.jpg"></Image>
+      <div class="app-background-text">
+        Rockd
+        <p class="blurb">A mobile field book, Macrostrat style.</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="/map">
+    <div class="app-box">
+      <Image className="app-img" src="burwell.png"></Image>
+      <div class="app-background-text">
+        Map
+        <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
+    <div class="app-box">
+      <Image className="app-img" src="mancos.jpg"></Image>
+      <div class="app-background-text">
+        Mancos
+        <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="http://fc.umn.edu/" target="_blank">
+    <div class="app-box">
+      <Image className="app-img" src="foc.png"></Image>
+      <div class="app-background-text">
+        FOC
+        <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
+      </div>
+    </div>
+  </a>
+
+  <a href="https://github.com/UW-Macrostrat/node-api-template">
+    <div class="app-box">
+      <Image className="app-img" src="api.png"></Image>
+      <div class="app-background-text app-background-text-small">
+        API Template
+        <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
+      </div>
+    </div>
+  </a>
+  </div> 
+</div>
+
+[//]: # "Footer"
+<div class="footer">
+  <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+      <ul class="footer-nav">
+        <li><a href="/dev/main-page#about">About</a></li>
+        <li><a href="/dev/main-page#api">API</a></li>
+        <li><a href="/dev/main-page#donate">Donate</a></li>
+        <li><a href="/dev/main-page#publications">Publications</a></li>
+        <li><a href="/dev/apps">Apps</a></li>
+        <li><a href="/dev/people">People</a></li>
+      </ul>
+    </div>
+    <div class="col-sm-4 funding">
+      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+      <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/pages/dev/apps/index.ts b/src/pages/dev/about/index.ts
similarity index 100%
rename from src/pages/dev/apps/index.ts
rename to src/pages/dev/about/index.ts
diff --git a/src/pages/dev/apps/main.styl b/src/pages/dev/about/main.styl
similarity index 60%
rename from src/pages/dev/apps/main.styl
rename to src/pages/dev/about/main.styl
index 67d7fb5a..0a4ea5a3 100644
--- a/src/pages/dev/apps/main.styl
+++ b/src/pages/dev/about/main.styl
@@ -60,7 +60,7 @@ a:hover
   margin: auto
   margin-left: 6%
 
-.big
+.big-apps
   font-size: 72px
   font-family: "Maven Pro", sans-serif
   text-align: center  
@@ -69,6 +69,12 @@ a:hover
   margin: 0 20%
   color: white
 
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  text-align: center
+
 .footer 
   width: 100%
   background-color: #015EAB
@@ -119,3 +125,71 @@ a:hover
 
 #who-made-it
   padding-top: 25px
+
+#api  
+  position: relative
+  height: 30vh
+  background-color: white
+
+#api-circle-text
+  display: table-cell;
+  vertical-align: middle;
+  color: #6bbe98;
+  font-size: 72px
+  font-weight: 500
+
+.api-circle
+  float: left
+  margin-left: 15%
+  margin-right: 50px
+  background-color: #fff;
+  height: 200px;
+  width: 200px;
+  border-radius: 50%;
+  text-align: center;
+  display: table;
+  border: 11px solid #6bbe98;
+  color: #4BABBf;
+
+#api-text
+  padding-top: 50px
+  margin-right: 15%
+  color: #4bab7f;
+  font-size: 20px;
+  line-height: 28px;
+  font-weight: 400;
+
+
+#about  
+  padding: 75px 0
+  margin: 0 10%
+
+.about-row
+  margin: 4%
+  font-size: 18px;
+  line-height: 28px;
+  font-weight: 200;
+
+.about-body-subtitle
+  float: left
+  font-size: 22px;
+  font-weight: 200;
+
+.about-body
+  margin-left: 30%
+
+#about-title
+  text-align: left
+  color: #E0E1E6
+  position: relative
+  padding-bottom: 0
+
+.line
+  width: 100%;
+  border-bottom: 1px solid #E0E1E6;
+  position: absolute;
+
+.rock-border
+  width: 100%
+  margin: 0
+  padding: 0
diff --git a/src/pages/dev/apps/+Page.mdx b/src/pages/dev/apps/+Page.mdx
deleted file mode 100644
index 2d0b4e51..00000000
--- a/src/pages/dev/apps/+Page.mdx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { PageHeader } from "~/components";
-import { LinkCard } from "~/components/cards";
-import { Image } from "./index";
-import "./main.styl";
-
-[//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="/dev/main-page#about">About</a></li>
-    <li><a href="/dev/main-page#api">API</a></li>
-    <li><a href="/dev/main-page#donate">Donate</a></li>
-    <li><a href="/dev/main-page#publications">Publications</a></li>
-    <li><a href="/dev/apps">Apps</a></li>
-    <li><a href="/dev/people">People</a></li>
-    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
-  </ul>
-</div>
-
-[//]: # "Apps"
-<div id="apps">
-  <h1 class="big app-header">Built with Macrostrat</h1>
-
-
-  <div class="items">
-  <a href="/sift">
-    <div class="app-box">
-      <Image className="app-img" src="logo_red.png"></Image>
-      <div class="app-background-text">
-        Sift
-        <p class="blurb">Explore Macrostrat (by Macrostrat)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="https://rockd.org">
-    <div class="app-box">
-      <Image className="app-img" src="rockd.jpg"></Image>
-      <div class="app-background-text">
-        Rockd
-        <p class="blurb">A mobile field book, Macrostrat style.</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="/map">
-    <div class="app-box">
-      <Image className="app-img" src="burwell.png"></Image>
-      <div class="app-background-text">
-        Map
-        <p class="blurb">Integrating the world's geologic maps (by Macrostrat)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="https://itunes.apple.com/us/app/mancos/id541570878?mt=8" target="_blank">
-    <div class="app-box">
-      <Image className="app-img" src="mancos.jpg"></Image>
-      <div class="app-background-text">
-        Mancos
-        <p class="blurb">Explore Macrostrat and PBDB in iOS (by Hunt Mountain Software)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="http://fc.umn.edu/" target="_blank">
-    <div class="app-box">
-      <Image className="app-img" src="foc.png"></Image>
-      <div class="app-background-text">
-        FOC
-        <p class="blurb">A glass bottom jet (by Amy Myrbo, Shane Loeffler et al.)</p>
-      </div>
-    </div>
-  </a>
-
-  <a href="https://github.com/UW-Macrostrat/node-api-template">
-    <div class="app-box">
-      <Image className="app-img" src="api.png"></Image>
-      <div class="app-background-text app-background-text-small">
-        API Template
-        <p class="blurb">Foundation of all Macrostrat services (by Macrostrat)</p>
-      </div>
-    </div>
-  </a>
-  </div> 
-</div>
-
-[//]: # "Footer"
-<div class="footer">
-  <div class="footer-container">
-    <div class="col-sm-4" id="who-made-it">
-      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-    </div>
-    <div class="col-sm-4" id="bottom-nav">
-      <ul class="footer-nav">
-        <li><a href="/dev/main-page#about">About</a></li>
-        <li><a href="/dev/main-page#api">API</a></li>
-        <li><a href="/dev/main-page#donate">Donate</a></li>
-        <li><a href="/dev/main-page#publications">Publications</a></li>
-        <li><a href="/dev/apps">Apps</a></li>
-        <li><a href="/dev/people">People</a></li>
-      </ul>
-    </div>
-    <div class="col-sm-4 funding">
-      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-      <div class="funding-line">
-        Current support: \
-        EAR-1948843 \
-        ICER-1928323 \
-        UW-Madison Dept. Geoscience
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index e7570cac..8db70b90 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -7,12 +7,10 @@ import "./main.styl";
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="#about">About</a></li>
-    <li><a href="#api">API</a></li>
-    <li><a href="#donate">Donate</a></li>
-    <li><a href="#publications">Publications</a></li>
-    <li><a href="/dev/apps">Apps</a></li>
+    <li><a href="/dev/about">About</a></li>
+    <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
+    <li><a href="/dev/donate">Donate</a></li>
     <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
@@ -110,71 +108,6 @@ import "./main.styl";
     </div>
   </div>
 </div>
-      
-[//]: # "About"
-<div id="about">
-  <h1 class="big" id="about-title">
-    About
-    <div class="line"></div>
-  </h1>
-  
-  <div class="about-row">
-    <div class="about-body-subtitle">
-      Summary
-    </div>
-    <div class="about-body">
-      Macrostrat is a platform for the aggregation and distribution of geological data relevant to the spatial and temporal distribution of sedimentary, igneous, and metamorphic rocks as well as data extracted from them. It is linked to the <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive) digital library and machine reading system, and it aims to become a community resource for the addition, editing, and distribution of new stratigraphic, lithological, environmental, and economic data. Interactive applications built upon Macrostrat are designed for educational and research purposes.
-    </div>
-  </div>
-
-  <div class="row about-row">
-    <div class="col-sm-3 about-body-subtitle">
-      License
-    </div>
-    <div class="col-sm-9 about-body page-info">
-      All data are provided under a Creative Commons Attribution 4.0 International license (<a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a>).
-    </div>
-  </div>
-
-  <div class="about-row">
-    <div class="about-body-subtitle">
-      Citation
-    </div>
-    <div class="about-body">
-      <b>In presentations:</b> Acknowledge Macrostrat by name. You may also include any of the Macrostrat logos accessible on this webpage.
-      \
-      \
-      <b>In publications:</b> Acknowledge Macrostrat as the source of any information or data. In publications, you may cite our most recent infrastructure paper, <a href="https://doi.org/10.1029/2018GC007467" target="_blank">Peters et al. (2018)</a>. In addition, you should also include citations to the original references associated with the data set that was used. These references are accessible from the API. If you would like your paper listed in the official publications, please contact us and we will provide a citation and link.
-    </div>
-  </div>
-
-  <div class="row about-row">
-    <div class="col-sm-3 about-body-subtitle">
-      Collaboration
-    </div>
-    <div class="col-sm-9 about-body page-info">
-      Our small team has worked hard to compile, format, and make data available via Macrostrat. We strongly encourage and welcome active collaborations, both scientific and geoinformatic. All data are provided freely on under a <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC-BY-4.0</a> license.
-    </div>
-  </div>
-
-  <div class="row about-row">
-    <div class="col-sm-3 about-body-subtitle">
-      Funding
-    </div>
-    <div class="col-sm-9 about-body page-info">
-      Major Macrostrat data infrastructure development was supported by the US National Science Foundation (EAR-1150082, ICER-1440312), with ongoing support for data acquisition supported by NSF EAR-1948843 and ICER-1928323. Continuous and ongoing support has also been provided by the UW-Madison <a href="http://geoscience.wisc.edu/geoscience/">Department of Geoscience</a>. If you use Macrostrat and like what we do, please consider helping out with a <a href="#donate">donation</a>. Every contribute helps us to maintain infrastructure and keep improving.
-    </div>
-  </div>
-</div>
-
-<Image className="rock-border" src="rocks-border.jpg"></Image>
-
-
-[//]: # "API"
-<div id="api">
-  <div class="api-circle"><div id="api-circle-text">API</div></div>
-  <div id="api-text">All data contained in the Macrostrat database are freely available via our Application Programming Interface (API), which provides a convinient way to retrieve data for analysis or application creation. For more information head over to the <a href="/api">API root</a> to explore available routes.</div>
-</div>
 
 [//]: # "Donate"
 <div class="donate-container" id="donate">

From eb01d1b7190d79c2604977f4bda1efa949b2498f Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Tue, 11 Jun 2024 11:50:57 -0400
Subject: [PATCH 079/151] added publications page

---
 src/pages/dev/about/+Page.mdx        |   8 +-
 src/pages/dev/publications/+Page.mdx | 126 +++++++++++++++++++++++++++
 src/pages/dev/publications/index.ts  |   6 ++
 src/pages/dev/publications/main.styl | 123 ++++++++++++++++++++++++++
 4 files changed, 258 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/dev/publications/+Page.mdx
 create mode 100644 src/pages/dev/publications/index.ts
 create mode 100644 src/pages/dev/publications/main.styl

diff --git a/src/pages/dev/about/+Page.mdx b/src/pages/dev/about/+Page.mdx
index 446e8ce2..d573809f 100644
--- a/src/pages/dev/about/+Page.mdx
+++ b/src/pages/dev/about/+Page.mdx
@@ -156,12 +156,10 @@ import "./main.styl";
     </div>
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
-        <li><a href="/dev/main-page#about">About</a></li>
-        <li><a href="/dev/main-page#api">API</a></li>
-        <li><a href="/dev/main-page#donate">Donate</a></li>
-        <li><a href="/dev/main-page#publications">Publications</a></li>
-        <li><a href="/dev/apps">Apps</a></li>
+        <li><a href="/dev/about">About</a></li>
+        <li><a href="/dev/publications">Publications</a></li>
         <li><a href="/dev/people">People</a></li>
+        <li><a href="/dev/donate">Donate</a></li>
       </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/publications/+Page.mdx b/src/pages/dev/publications/+Page.mdx
new file mode 100644
index 00000000..236df1bc
--- /dev/null
+++ b/src/pages/dev/publications/+Page.mdx
@@ -0,0 +1,126 @@
+import { PageHeader } from "~/components";
+import { PageBreadcrumbs } from "~/renderer";
+import "./main.styl";
+import { Image } from "./index";
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="/dev/about">About</a></li>
+    <li><a href="/dev/publications">Publications</a></li>
+    <li><a href="/dev/people">People</a></li>
+    <li><a href="/dev/donate">Donate</a></li>
+    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+
+[//]: # "Publications"
+<div id="publications">
+  <h1 id="pub-title" class="big">Publications</h1>
+  <p class="blurb">literature utilizing Macrostrat</p>
+  <div class="pub-line"></div>
+
+  [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
+  <ol class="pub-list" reversed>
+    <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
+    <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
+    <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
+    <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
+    <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
+    <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
+    <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
+    <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
+    <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
+    <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
+    <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
+    <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
+    <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
+    <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
+    <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
+    <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
+    <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
+    <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
+    <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
+    <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
+    <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
+    <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
+    <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
+    <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
+    <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
+    <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
+    <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
+    <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
+    Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
+    <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
+    <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
+    <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
+    <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
+    <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
+    <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
+    <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
+    <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
+    <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
+    <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
+    <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
+    <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
+    <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
+    <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
+    <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
+    <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
+    <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
+    <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
+    <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
+    <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
+    <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
+    <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
+    <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
+    <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
+    <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
+    <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
+    <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
+    <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
+      <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
+    <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
+    <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
+    <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
+    <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
+    <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
+    <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
+    <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
+    <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
+    <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
+  </ol>
+</div>
+
+[//]: # "Footer"
+<div class="footer">
+  <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+      <ul class="footer-nav">
+        <li><a href="/dev/about">About</a></li>
+        <li><a href="/dev/publications">Publications</a></li>
+        <li><a href="/dev/people">People</a></li>
+        <li><a href="/dev/donate">Donate</a></li>
+      </ul>
+    </div>
+    <div class="col-sm-4 funding">
+      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+      <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/dev/publications/index.ts b/src/pages/dev/publications/index.ts
new file mode 100644
index 00000000..e3670446
--- /dev/null
+++ b/src/pages/dev/publications/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/dev/publications/main.styl b/src/pages/dev/publications/main.styl
new file mode 100644
index 00000000..2250a062
--- /dev/null
+++ b/src/pages/dev/publications/main.styl
@@ -0,0 +1,123 @@
+.htnl, .body, .main
+    background-color: white
+    color: black
+
+a:hover
+    text-decoration: none
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+  top: 0
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  text-align: center
+
+p 
+    margin-bottom: 10px;
+    margin-top: 0;
+    color: #E0E1E6
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px
+
+.pub-line
+  width: 80%;
+  border-bottom: 1px solid #E0E1E6;
+  position: absolute;
+
+#publications 
+  margin: 100px 10%
+
+#pub-title 
+  text-align: left
+  color: #E0E1E6
+  position: relative
+  padding-bottom: 0
+  margin-bottom: 0
+
+.pub-list
+  padding-top: 10px
+  margin-left: 20px
+  counter-reset: pub-counter 70
+  color: black
+
+  li
+    counter-increment: pub-counter -1
+
+  li::marker
+    font-size: 35px;
+    color: #babdc8;
+    content: counter(pub-counter) " "
+    counter-increment: pub-counter
+
+.blurb
+  font-size: 15px
\ No newline at end of file

From 52430792d30c6d7406b079c506e419331343b467 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Tue, 11 Jun 2024 11:54:48 -0400
Subject: [PATCH 080/151] officialize formating across pages

---
 src/pages/dev/main-page/+Page.mdx    |  8 +++-----
 src/pages/dev/people/+Page.mdx       | 16 ++++++----------
 src/pages/dev/publications/main.styl |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 8db70b90..b92d6ed1 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -217,12 +217,10 @@ import "./main.styl";
     </div>
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
-        <li><a href="#about">About</a></li>
-        <li><a href="#api">API</a></li>
-        <li><a href="#donate">Donate</a></li>
-        <li><a href="#publications">Publications</a></li>
-        <li><a href="/dev/apps">Apps</a></li>
+        <li><a href="/dev/about">About</a></li>
+        <li><a href="/dev/publications">Publications</a></li>
         <li><a href="/dev/people">People</a></li>
+        <li><a href="/dev/donate">Donate</a></li>
       </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index 69820a9b..ea440abe 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -8,12 +8,10 @@ import { Image } from "./index";
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="/dev/main-page#about">About</a></li>
-    <li><a href="/dev/main-page#api">API</a></li>
-    <li><a href="/dev/main-page#donate">Donate</a></li>
-    <li><a href="/dev/main-page#publications">Publications</a></li>
-    <li><a href="/dev/apps">Apps</a></li>
+    <li><a href="/dev/about">About</a></li>
+    <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
+    <li><a href="/dev/donate">Donate</a></li>
     <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
@@ -175,12 +173,10 @@ import { Image } from "./index";
     </div>
     <div class="col-sm-4" id="bottom-nav">
         <ul class="footer-nav">
-        <li><a href="/dev/main-page#about">About</a></li>
-        <li><a href="/dev/main-page#api">API</a></li>
-        <li><a href="/dev/main-page#donate">Donate</a></li>
-        <li><a href="/dev/main-page#publications">Publications</a></li>
-        <li><a href="/dev/apps">Apps</a></li>
+        <li><a href="/dev/about">About</a></li>
+        <li><a href="/dev/publications">Publications</a></li>
         <li><a href="/dev/people">People</a></li>
+        <li><a href="/dev/donate">Donate</a></li>
         </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/publications/main.styl b/src/pages/dev/publications/main.styl
index 2250a062..635ed9cd 100644
--- a/src/pages/dev/publications/main.styl
+++ b/src/pages/dev/publications/main.styl
@@ -95,7 +95,7 @@ p
   position: absolute;
 
 #publications 
-  margin: 100px 10%
+  margin: 100px 20%
 
 #pub-title 
   text-align: left

From 776b167428134eff8ac85a21e4fc7225a775523b Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Tue, 11 Jun 2024 12:02:01 -0400
Subject: [PATCH 081/151] added donate page

---
 src/pages/dev/donate/+Page.mdx    |  57 +++++++++++
 src/pages/dev/donate/index.ts     |   6 ++
 src/pages/dev/donate/main.styl    | 151 ++++++++++++++++++++++++++++++
 src/pages/dev/main-page/+Page.mdx |  84 -----------------
 4 files changed, 214 insertions(+), 84 deletions(-)
 create mode 100644 src/pages/dev/donate/+Page.mdx
 create mode 100644 src/pages/dev/donate/index.ts
 create mode 100644 src/pages/dev/donate/main.styl

diff --git a/src/pages/dev/donate/+Page.mdx b/src/pages/dev/donate/+Page.mdx
new file mode 100644
index 00000000..6ca663c9
--- /dev/null
+++ b/src/pages/dev/donate/+Page.mdx
@@ -0,0 +1,57 @@
+import { PageHeader } from "~/components";
+import { PageBreadcrumbs } from "~/renderer";
+import "./main.styl";
+import { Image } from "./index";
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="/dev/about">About</a></li>
+    <li><a href="/dev/publications">Publications</a></li>
+    <li><a href="/dev/people">People</a></li>
+    <li><a href="/dev/donate">Donate</a></li>
+    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
+  </ul>
+</div>
+
+[//]: # "Donate"
+<div class="donate-container" id="donate">
+  <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
+  <div class="text">
+    <div class="donate-left">
+      <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
+    </div>
+    <div class="donate-right">
+      <div class="donate-info">
+          Grant funding, principally from the <a href="http://www.nsf.gov" target="_blank">U.S. National Science Foundation</a>, got Macrostrat off the ground and keeps us innovating, but maintaining and growing a free and open digital resource involves ongoing expenses beyond the grant cycle, like annual certificate renewals, cloud server hosting and backup storage that keep your connection safe, domain name registrations that keep us located on the web, and system upgrades to keep us fast and efficient. If you would like to help us continue to grow and provide free resources, you can do so with a one-time or recurring gift to the UW Foundation Paleontology Program Fund in Geology. Thank you!
+      </div>
+    </div>
+  </div>
+</div>
+
+[//]: # "Footer"
+<div class="footer">
+  <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+      <ul class="footer-nav">
+        <li><a href="/dev/about">About</a></li>
+        <li><a href="/dev/publications">Publications</a></li>
+        <li><a href="/dev/people">People</a></li>
+        <li><a href="/dev/donate">Donate</a></li>
+      </ul>
+    </div>
+    <div class="col-sm-4 funding">
+      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+      <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/dev/donate/index.ts b/src/pages/dev/donate/index.ts
new file mode 100644
index 00000000..e3670446
--- /dev/null
+++ b/src/pages/dev/donate/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/dev/donate/main.styl b/src/pages/dev/donate/main.styl
new file mode 100644
index 00000000..466282a6
--- /dev/null
+++ b/src/pages/dev/donate/main.styl
@@ -0,0 +1,151 @@
+.htnl, .body, .main
+    background-color: white
+    color: black
+
+a:hover
+    text-decoration: none
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+  top: 0
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
+
+.big
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  text-align: center
+
+p 
+  margin-bottom: 10px;
+  margin-top: 0;
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px
+
+
+.donate-container
+  height: 80vh
+
+.title
+  margin: 0
+  font-size: 72px
+  font-family: "Maven Pro", sans-serif;
+  padding: 20vh 0
+  text-align: center
+  
+.donate-title
+  a 
+    color:white
+  a:hover
+    text-decoration: none
+
+  color: white
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  font-family: "Maven Pro", sans-serif;
+  padding: 0
+
+.donate-left
+  float: left
+  width: 50%
+  height: 80vh
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+.donate-right
+  float: right
+  width: 50%
+  height: 80vh
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+.donate-info
+  background: rgba(255,255,255,0.6);
+  padding: 25px
+  color: black
+  width: 80%
+  font-size: 18px
+
+  a
+    color: black
+    font-weight: bold
+    text-decoration: none
+
+.donate-img
+  position:absolute
+  z-index:5
+  height: 80vh
+  width: 100%
+  object-fit: cover
+
+.text
+  position:absolute
+  z-index: 100
+  padding: 0 20px
\ No newline at end of file
diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index b92d6ed1..ce293ab0 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -123,90 +123,6 @@ import "./main.styl";
     </div>
   </div>
 </div>
-    
-[//]: # "Publications"
-<div id="publications">
-  <h1 id="pub-title" class="big">Publications</h1>
-  <p class="blurb">literature utilizing Macrostrat</p>
-  <div class="pub-line"></div>
-
-  [//]: # "NB: adding pubs to list requires updating css .pub-list counter"
-  <ol class="pub-list" reversed>
-    <li>Gazdewich, S., T. Hauck, J. Husson. 2024. Authigenic carbonate burial within the Late Devonian western Canada sedimentary bsain and its impact on the global carbon cycle. <em>Geochemistry, Geophysics, Geosystems</em> 10.1029/2023GC011376. <a href='https://doi.org/10.1029/2023GC011376'>[link]</a></li>
-    <li>Segessenman, D.C. and S.E. Peters. 2024. Transgression-regression cycles drive correlations in Ediacaran-Cambrian rock and fossil records. <em>Paleobiology</em> 10.1017/pab.2023.31. <a href='https://doi.org/10.1017/pab.2023.31'>[link]</a></li>
-    <li>Quinn, D.P., C.R. Idzikowski,  S.E. Peters. 2023. Building a multi-scale, collaborative, and time-integrated digital crust: The next stage of the Macrostrat data system. <em>Geoscience Data Journal</em> 10.1002/gdj3.189. <a href='https://doi.org/10.1002/gdj3.189'>[link]</a></li>
-    <li>Tasistro-Hart, A.R. and F.A. Macdonald. 2023. Phanerozoic flooding of North America and the Great Unconformity. <em>Proceedings of the National Academy of Sciences</em> 120(37):e2309084120. <a href='https://www.pnas.org/doi/abs/10.1073/pnas.2309084120'>[link]</a></li>
-    <li>Husson, J.M. and L.A. Coogan. 2023. River chemistry reveals a large decrease in dolomite abundance across the Phanerozoic. <em>Geochemical Perspective Letters</em> 26:1-6. <a href='https://doi.org/10.7185/geochemlet.2316'>[link]</a></li>
-    <li>Walton, C.R., J. Hao, F. Huang, F.E. Jenner, H. Williams, A.L. Zerkle, A. Lipp, R.M. Hazen, S.E. Peters, O. Shorttle. 2023. Evolution of the crustal phosphorus reservoir. <em>Science Advances</em> 9(18):eade6923. <a href='https://doi.org/10.1126/sciadv.ade6923'>[link]</a></li>
-    <li>Balseiro, D. and M.G. Powell. 2023. Relative oversampling of carbonate rocks in the North American marine fossil record. <em>Paleobiology</em> <a href='https://doi.org/10.1017/pab.2023.16'>[link]</a></li>
-    <li>Ye, S., S.E. Peters. 2023. Bedrock geological map predictions for Phanerozoic fossil occurrences. <em>Paleobiology</em> 49(3):394-413. <a href='https://doi.org/10.1017/pab.2022.46'>[link]</a></li>
-    <li>Wang, J., Tarhan, L.G., Jacobson, A.D. et al. 2023. The evolution of the marine carbonate factory. <em>Nature</em>  https://doi.org/10.1038/s41586-022-05654-5 <a href='https://www.nature.com/articles/s41586-022-05654-5'>[link]</a></li>
-    <li>Capel, E., C. Monnet, C.J. Cleal, J. Xue, T. Servais, B. Cascales-Miñana. 2023. The effect of geological biases on our perception of early land plant radiation. <em>Palaeontology</em> 66:e12644 <a href='https://onlinelibrary.wiley.com/doi/epdf/10.1111/pala.12644'>[link]</a></li>
-    <li>Sessa, J.A., A.J. Fraass, LJ. LeVay, K.M. Jamson, S.E. Peters. 2023. The Extending Ocean Drilling Pursuits (eODP) Project: Synthesizing Scientific Ocean Drilling Data. <em>Geochemistry, Geophysics, Geosystems</em> <a href='https://doi.org/10.1029/2022GC010655'>[link]</a></li>
-    <li>Segessenman, D.C. and S.E. Peters. 2023. Macrostratigraphy of the Ediacaran system in North America. In "Laurentia: Turning Points in the Evolution of a Continent." S.J. Whitmeyer, M.L. Williams, D.A. Kellett, B. Tikoff, eds. <em>GSA Memoir.</em> <a href='https://doi.org/10.1130/2022.1220(21)'>[link]</a></li>
-    <li>Boulila, S., S.E. Peters, R.D. Müller, B.U. Haq, N.Hara. 2023. Earth’s interior dynamics drive marine fossil diversity cycles of tens of millions of years. <em>Proceedings of the National Academy of Sciences</em> e2221149120 <a href='https://doi.org/0.1073/pnas.2221149120'>[link]</a></li>
-    <li>Peters, S.E., D. Quinn, J.M. Husson, R.R. Gaines. 2022. Macrostratigraphy: insights into cyclic and secular evolution of the Earth-life system. <em>Ann. Rev. Earth & Planet. Sci.</em> 50:419-449 <a href='https://doi.org/10.1146/annurev-earth-032320-081427'>[link]</a></li>
-    <li>Emmings, J.F., S.W. Poulton, J. Walsh, K.A. Leeming, I. Ross, S.E. Peters. 2022. Pyrite mega-analysis reveals modes of anoxia through geologic time. <em>Science Advances 8(11).</em> <a href='https://doi.org/10.1126/sciadv.abj5687'>[link]</a></li>
-    <li>Chen, G., Q. Cheng, S.E. Peters, C.J. Spencer, M. Zhao. 2022. Feedback between surface and deep processes: insight from time series analysis of sedimentary record. <em>Earth and Planet. Sci. Letters.</em> <a href='https://doi.org/10.1016/j.epsl.2021.117352'>[link]</a></li>
-    <li>Peters, S.E. et al. 2021. Igneous rock area and age in continental crust. <em>Geology.</em> doi:10.1130/G49037.1. <a href="https://doi.org/10.1130/G49037.1">[link]</a></li>
-    <li>Loughney, K.M., C. Badgley, A. Bahadori, W.E. Hold, and E.T. Rasbury. 2021. Tectonic influence on Cenozoic mammal richness and sedimentation history of the Basin and Range, western North America. <em>Science Advances</em> 7(45):p.eabh4470. <a href='https://doi.org/10.1126/sciadv.abh4470'>doi:10.1126/sciadv.abh4470</a></li>
-    <li>Key, M.M. Jr., P.N.W. Jackson, C.M. Reid. 2021. Trepostome bryozoans buck the trend and ignore calcite-aragonite seas. <em>Palaeobiodiversity and Palaeoenvironments.</em> doi:10.1007/s12549-021-00507-x. <a href="https://link.springer.com/article/10.1007/s12549-021-00507-x">[link]</a></li>
-    <li>Lipp, A.G. et al. 2021. The composition and weathering of the continents over geologic time. <em>Geochemical Perspectives Letters.</em> doi:10.7185/geochemlet.2109. <a href="https://doi.org/10.7185/geochemlet.2109">[link]</a></li>
-    <li>Barnes, B.D., J.M. Husson, S.E. Peters. 2020. Authigenic carbonate burial in the Late Devonian–Early Mississippian Bakken Formation (Williston Basin, USA). <em>Sedimentology.</em> doi:10.1111/sed.12695. <a href="https://doi.org/10.1111/sed.12695">[link]</a></li>
-    <li>Close, R.A. et al. 2020. The spatial structure of Phanerozoic marine animal diversity. <em>Science</em> doi:10.1126/science.aay8309. <a href="https://doi.org/10.1126/science.aay8309">[link]</a></li>
-    <li>Balseiro, D. and Powell, M.G. 2019. Carbonate collapse and the Late Paleozoic Ice Age marine biodiversity crisis. <em>Geology</em> doi:10.1130/G46858.1. <a href="https://doi.org/10.1130/G46858.1">[link]</a></li>
-    <li>Keller, C.B., J.M. Husson, R.N. Mitchell, W.F. Bottke, T.M. Gernon, P. Boehnke, E.A. Bell, N.L. Swanson-Hysell, S.E. Peters. 2019. Neoproterozoic glacial origin of the Great Unconformity. <em>Proc. Nat. Acad. of Sci. USA.</em> 116(4):1136-1145. doi:10.1073/pnas.1804350116 <a href="https://doi.org/10.1073/pnas.1804350116" target="_blank">[link]</a></li>
-    <li>Keating-Bitonti, C.R., and S.E. Peters. 2019. Influence of increasing carbonate saturation in Atlantic bottom water during the late Miocene. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em> 518:134-142. doi:10.1016/j.palaeo.2019.01.006<a href="https://doi.org/10.1016/j.palaeo.2019.01.006" target="_blank">[link]</a></li>
-    <li>Cohen, P.A., R. Lockwood, S.E. Peters. 2018. Integrating Macrostrat and Rockd into undergraduate Earth Science Teaching. <em>Elements of Paleontology</em>. doi:10.1017/9781108681445 <a href="https://doi.org/10.1017/9781108681445" target="_blank">[link]</a></li>
-    <li>Isson, T.T., and N.J. Planavsky. 2018. Reverse weathering as a long-term stabilizer of marine pH and planetary climate. <em>Nature</em> 560:571-475. doi:10.1038/s41586-018-0408-4 <a href="https://doi.org/10.1038/s41586-018-0408-4" target="_blank">[link]</a></li>
-    <li>Husson, J.M. and S.E. Peters. 2018. Nature of the sedimentary rock record and its implications for Earth system evolution. <em>Emerging Topics in Life Sciences</em>. doi:10.1042/ETLS20170152 <a href="https://doi.org/10.1042/ETLS20170152" target="_blank">[link]</a></li>
-    <li>Peters, S.E., J.M. Husson. 2018. We need a global comprehensive stratigraphic database: here’s a start. <em>The Sedimentary Record</em> 16(1). doi:10.2110/sedred.2018.1 <a href="https://www.sepm.org/files/161article.l5vs1la4j8g2gxzu.pdf" target="_blank">[link]</a></li>
-    <li>Peters, S.E., J.M. Husson, J. Czaplewski. 2018. Macrostrat: a platform for geological data integration and deep-time Earth crust research. <em>Geochemistry, Geophysics, Geosystems</em>. <a href="https://doi.org/10.1029/2018GC007467" target="_blank">[link]</a> \
-    Preprint available on <em>EarthArXiv</em> 27,Jan18. doi:10.17605/OSF.IO/YNAXW <a href="https://eartharxiv.org/ynaxw" target="_blank">[link]</a></li>
-    <li>Schachat, S.R., C.C. Labandeira, M.R. Saltzman, B.D. Cramer, J.L. Payne, C.K. Boyce. 2018. Phanerozoic pO2 and the early evolution of terrestrial animals. <em>Proc. Roy. Soc. B.</em><a href="http://dx.doi.org/10.1098/rspb.2017.2631" target="_blank">[link]</a></li>
-    <li>Zaffos, A., S. Finnegan, S.E. Peters. 2017. Plate tectonic regulation of global marine animal diversity. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1702297114" target="_blank">[link]</a></li>
-    <li>Peters, S.E., J.M. Husson. J. Wilcots. 2017. Rise and fall of stromatolites in shallow marine environments. <em>Geology</em>. <a href="http://dx.doi.org/10.1130/G38931.1" target="_blank">[link]</a></li>
-    <li>Peters, S.E., J.M. Husson. 2017. Sediment cycling on continental and oceanic crust. <em>Geology</em> 45:323-326. <a href="http://geology.geoscienceworld.org/content/45/4/323.full?ijkey=UZ6cbXCii4p8w&keytype=ref&siteid=gsgeology" target="_blank">[link]</a></li>
-    <li>Husson, J.M., S.E. Peters. 2017. Atmospheric oxygenation driven by unsteady growth of the continental sedimentary reservoir. <em>Earth and Planetary Science Letters</em>. 460:68-75. <a href="http://www.sciencedirect.com/science/article/pii/S0012821X16307129" target="_blank">[link]</a></li>
-    <li>Schott, R. 2017. Rockd: Geology at your fingertips in a mobile world. <em>Bulletin of the Eastern Section of the National Association of Geoscience Teachers</em> 67(2):1-4. <a href="https://www.hcc.edu/Documents/Faculty-Staff/winters-trobaugh%20%27cli-fi%20@%202y%27%20Spring%202017%20NAGT-ES%20Bulletin%20CB.pdf" target="_blank">[link]</a></li>
-    <li>Chan, M.A., S.E. Peters, B. Tikoff. 2016. The future of field geology, open data sharing, and cybertechnology in Earth science. <em>The Sedimentary Record</em> 14:4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord14-1%234.pdf" target="_blank">[link]</a></li>
-    <li>Nelsen, M.P., B.A. DiMichele, S.E. Peters, C.K. Boyce. 2016. Delayed fungal evolution did not cause the Paleozoic peak in coal production. <em>Proc. Nat. Acad. of Sci. USA</em>. <a href="http://www.pnas.org/cgi/doi/10.1073/pnas.1517943113" target="_blank">[link]</a></li>
-    <li>Heavens, N.G. 2015. Injecting climate modeling into deep time studies: ideas for nearly every project. <em>The Sedimentary Record</em> 13:(4)4-10. <a href="http://www.sepm.org/CM_Files/SedimentaryRecord/SedRecord13-4final.pdf" target="_blank">[link]</a></li>
-    <li>Carroll, A.R. 2015. <em>Geofuels: energy and the Earth</em>. Cambridge University Press. <a href="http://www.cambridge.org/us/academic/subjects/earth-and-environmental-science/environmental-science/geofuels-energy-and-earth?format=PB&isbn=9781107401204" target="_blank">[link]</a></li>
-    <li>Thomson, T.J. and M.L. Droser. 2015. Swimming reptiles make their mark in the Early Triassic: delayed ecologic recovery increased the preservation potential of vertebrate swim tracks. <em>Geology</em> 43:215-218. <a href="http://geology.gsapubs.org/content/43/3/215.abstract?sid=8573a247-dfc8-482b-960d-ee8afe846a40" target="_blank">[link]</a></li>
-    <li>Fraass, A.J., D.C. Kelly, S.E. Peters. 2015. Macroevolutionary history of the planktic foraminifera. <em>Annual Review of Earth and Planetary Sciences</em> 43:5.1-5.28. <a href="http://dx.doi.org/10.1146/annurev-earth-060614-105059" target="_blank">[link]</a></li>
-    <li>Fan, Y., S. Richard, R.S. Bristol, S.E. Peters, et al.. 2015. DigitalCrust: A 4D data system of material properties for transforming research on crustal fluid flow. <em>Geofluids</em> 15:372-379. <a href="http://dx.doi.org/10.1111/gfl.12114" target="_blank">[link]</a></li>
-    <li>Peters, S.E., D.C. Kelly, and A. Fraass. 2013. Oceanographic controls on the diversity and extinction of planktonic foraminifera. <em>Nature</em>. 493:398-401.<a href='http://www.nature.com/nature/journal/v493/n7432/full/nature11815.html' target="_blank">[link]</a>.</li>
-    <li>Benson, R.B.J., P.D. Mannion, R.J. Butler, P. Upchurch, A. Goswami, and S.E. Evans. 2012. Cretaceous tetrapod fossil record sampling and faunal turnover: implications for biogeography and the rise of modern clades. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212006116' target="_blank">[link]</a>.</li>
-    <li>Rook, D.L., N.A. Heim, and J. Marcot. 2012.Contrasting patterns and connections of rock and biotic diversity in the marine and non-marine fossil records of North America. <em>Palaeogeography, Palaeoclimatology, Palaeoecology</em>. 372:123-129. <a href='http://www.sciencedirect.com/science/article/pii/S0031018212005718' target="_blank">[link]</a></li>
-    <li>Halevy, I, S.E. Peters, and W.W. Fischer. 2012. Sulfate burial constraints on the Phanerozoic sulfur cycle. <em>Science</em> 337:331-334. doi:10.1126/science.1220224.<a href='http://www.sciencemag.org/content/337/6092/331.abstract' target="_blank">[link]</a>.</li>
-    <li>Peters, S.E. and R.R. Gaines. 2012. Formation of the ‘Great Unconformity’ as a trigger for the Cambrian explosion. <em>Nature</em> 484:363-366. doi:10.1038/nature10969. <a href='http://www.nature.com/nature/journal/v484/n7394/full/nature10969.html' target="_blank">[link]</a>.</li>
-    <li>Finnegan, S., N.A. Heim, S.E. Peters and W.W. Fischer. 2012. Climate change and the selective signature of the late Ordovician mass extinction. <em>PNAS</em> doi:10.1073/pnas.1117039109. <a href='http://www.pnas.org/content/early/2012/04/16/1117039109.abstract' target="_blank">[link]</a>.</li>
-    <li>Hannisdal, B. and S.E. Peters. 2011. Phanerozoic Earth system evolution and marine biodiversity. <em>Science</em> 334:1121-1124. <a href='http://www.sciencemag.org/content/334/6059/1121.short' target="_blank">[link]</a>.</li>
-    <li>Butler, R.J. et al. 2011. Sea level, dinosaur diversity and sampling biases: investigating the ‘common cause’ hypothesis in the terrestrial realm. <em>Proc. Roy. Soc. London B</em> 278:1165-1170. <a href='http://rspb.royalsocietypublishing.org/content/278/1709/1165.abstract' target="_blank">[link]</a>.</li>
-    <li>Melott, A.L. and R.K. Bambach 2011. A ubquitous ~62-Myr periodic fluctuation superimposed on general trends in fossil biodiversity II. Evolutionary dynamics associated with period fluctuation in marine diversity. <em>Paleobiology</em> 37:369-382. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/37/3/383' target="_blank">[link]</a>.</li>
-    <li>Heim, N.A. and S.E. Peters. 2011. Regional environmental breadth predicts geographic range and longevity in fossil marine genera. <em>PLoS One</em> 6:(5) e18946; doi:10.1371/journal.pone.0018946 <a href='http://www.plosone.org/article/fetchObjectAttachment.action?uri=info%3Adoi%2F10.1371%2Fjournal.pone.0018946&representation=PDF' target="_blank">[PDF]</a>.</li>
-    <li>Peters, S.E. and N.A. Heim. 2011. Macrostratigraphy and macroevolution in marine environments: testing the common-cause hypothesis. In, Smith, A.B., and A. McGowan, eds. Comparing the rock and fossil records: implications for biodiversity.
-    <em>Special Publication of the Geological Society of London</em> 358:95-104. doi: 10.1144/SP358.7. <a href='http://sp.lyellcollection.org/content/358/1/95.abstract' target="_blank">[link]</a></li>
-    <li>Peters, S.E. and N.A. Heim. 2011. The stratigraphic distribution of marine fossils in North America. <em>Geology</em> 39:259-262; doi: 10.1130/G31442.1. <a href='http://geology.geoscienceworld.org/cgi/content/full/39/3/259?ijkey=ziaWozfgcb82w&keytype=ref&siteid=gsgeology' target="_blank">[PDF]</a></li>
-    <li>Finnegan, S., S.E. Peters, and W.W. Fischer. 2011. Late Ordovician-Early Silurian selective extinction patterns in Laurentia and their relationship to climate change. In J.C. Gutiérrez-Marco, I. Rábano, and D. Garcia-Bellido, eds. <em>Ordovician of the World.</em> Cuadernos del Museo Geominera 14: 155-159.</li>
-    <li>Meyers, S.R. and S.E. Peters. 2011. A 56 million year rhythm in North American sedimentation during the Phanerozoic. <em>EPSL</em> doi:10.1016/j.epsl.2010.12.044.  <a href='http://dx.doi.org/10.1016/j.epsl.2010.12.044' target="_blank">[PDF]</a></li>
-    <li>Heim, N.A. and S.E. Peters. 2011. Covariation in macrostratigraphic and macroevolutionary patterns in the marine record of North America. <em>GSA Bulletin</em> 123:620-630.
-      <a href='http://bulletin.geoscienceworld.org/cgi/content/full/123/3-4/620?ijkey=PALfAKR8a3Yio&keytype=ref&siteid=gsabull' target="_blank">[PDF]</a></li>
-    <li>Peters, S.E. and N.A. Heim. 2010. The geological completeness of paleontological sampling in North America. <em>Paleobiology</em> 36:61-79. <a href='http://strata.geology.wisc.edu/vita/reprints/PetersHeim2010.pdf' target="_blank">[PDF]</a>.</li>
-    <li>Marx, F.G. 2009. Marine mammals through time: when less is more in studying palaeodiversity. <em>Proceedings of the Royal Society of London B</em> 138:183-196. <a href='http://rspb.royalsocietypublishing.org/content/276/1658/887.abstract' target="_blank">[link]</a></li>
-    <li>McGowan, A.J., and A. Smith. 2008. Are global Phanerozoic marine diversity curves truly global? A study of the relationship between regional rock records and global Phanerozoic marine diversity. <em>Paleobiology</em> 34:80-103. <a href='http://paleobiol.geoscienceworld.org/cgi/content/abstract/34/1/80' target="_blank">[link]</a></li>
-    <li>Mayhew, P.J., G.B. Jenkins, and T.G. Benton. 2008. Long-term association between global temperature and biodiversity, origination and extinction in the fossil record. <em>Proceedings of the Royal Society of London B</em> 275:47-53. <a href='http://rspb.royalsocietypublishing.org/content/275/1630/47' target="_blank">[link]</a></li>
-    <li>Peters, S.E. 2008. Environmental determinants of extinction selectivity in the fossil record. <em>Nature</em> 454:626-629.
-    <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008.pdf' target="_blank">[PDF]</a> <a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008sup.pdf' target="_blank">[supplement]</a></li>
-    <li>Peters, S.E. 2008. Macrostratigraphy and its promise for paleobiology. Pp. 205-232 <em>In</em> P.H. Kelley and R.K. Bambach, eds. From evolution to geobiology: research questions driving paleontology at the start of a new century. The Paleontological Society Papers, Vol. 14. 9.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2008b.pdf' target="_blank">[PDF]</a></li>
-    <li>Peters, S.E. and W.I. Ausich. 2008. A sampling-standardized macroevolutionary history for Ordovician-Early Silurian crinoids. <em>Paleobiology</em> 34:104-116. <a href='http://strata.geology.wisc.edu/vita/reprints/Peters&Ausich2008.pdf' target="_blank">[PDF]</a></li>
-    <li>Smith, A.B. 2007. Marine diversity through the Phanerozoic: problems and prospects. <em>Journal of the Geological Society, London</em> 164:731-745.<a href='http://jgs.geoscienceworld.org/cgi/content/abstract/164/4/731' target="_blank">[link]</a></li>
-    <li>Peters, S.E. 2007. The problem with the Paleozoic. <em>Paleobiology</em> 33:165-181.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2007.pdf' target="_blank">[PDF]</a></li>
-    <li>Peters, S.E. 2006. Macrostratigraphy of North America. <em>Journal of Geology</em> 114:391-412.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2006.pdf' target="_blank">[PDF]</a></li>
-    <li>Peters, S.E. 2005. Geologic constraints on the macroevolutionary history of marine animals. <em>Proceedings of the National Academy of Sciences U.S.A.</em> 102:12326-12331.<a href='http://strata.geology.wisc.edu/vita/reprints/Peters2005.pdf' target="_blank">[PDF]</a></li>
-  </ol>
-</div>
 
 [//]: # "Footer"
 <div class="footer">

From 7ec698efc61ce15917e8f5689cb8d3adb61213d8 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Tue, 11 Jun 2024 15:59:19 -0400
Subject: [PATCH 082/151] added version number

---
 src/pages/dev/main-page/+Page.mdx |  5 ++++-
 src/pages/dev/main-page/main.styl | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index ce293ab0..f8946cab 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -20,7 +20,10 @@ import "./main.styl";
   <div class="left">
     <Image className="back-img cover-image" src="cover_large.jpg"></Image>
     <div class="text">
-      <h1 class="big">Macrostrat</h1>
+      <span class="header">
+        <h1 id="main-title" class="big">Macrostrat</h1>
+        <h2 class="version">v2</h2>
+      </span>
       <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
       <ul class="buttons1">
         <li><a type="button" class="btn" href="/sift/#/">Search</a></li>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 93b0d067..c798d754 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -209,6 +209,17 @@ a:hover
   padding: 20vh 0
   text-align: center
 
+.header 
+  margin: 0 20%
+
+#main-title
+  display: inline-block
+
+.version
+  display: inline-block
+  margin-left: 20px
+  font-size: 40px
+
 #about
   height: 100vh
   background-color: white

From c4742fd5fa754dd35bbac92b0852575d76b90f44 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 11 Jun 2024 16:05:07 -0500
Subject: [PATCH 083/151] Added webstorm configuration

---
 .idea/codeStyles/Project.xml                 | 57 +++++++++++++
 .idea/codeStyles/codeStyleConfig.xml         |  5 ++
 .idea/inspectionProfiles/Project_Default.xml |  6 ++
 .idea/vcs.xml                                | 11 +++
 .idea/workspace.xml                          | 84 ++++++++++++++++++++
 5 files changed, 163 insertions(+)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..3e22f4b7
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,57 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000..79ee123c
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..03d9549e
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..2756e147
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/cesium-martini" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/cesium-martini/martini" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/cesium-viewer" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/web-components" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/web-components/deps/geologic-patterns" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..9c9e6b2b
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/deps/web-components" beforeDir="false" afterPath="$PROJECT_DIR$/deps/web-components" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/deps/web-components" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="jar://$PROJECT_DIR$/.yarn/cache/@types-geojson-npm-7946.0.11-5ec37561c5-93fe7e9c5d.zip!/node_modules/@types/geojson/index.d.ts" root0="SKIP_INSPECTION" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 8
+}</component>
+  <component name="ProjectId" id="2hkSiwgF1sFuWNuJM9IbyRRYIAw" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "correlation-updates",
+    "last_opened_file_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_interpreter_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
+    "nodejs_package_manager_path": "/Users/Daven/Projects/Macrostrat/Software/web/.yarn/releases/yarn-4.2.2.cjs",
+    "prettierjs.PrettierConfiguration.Package": "yarn:package.json:prettier",
+    "settings.editor.selected.configurable": "settings.javascript.prettier",
+    "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="RecentsManager">
+    <key name="es6.move.members.recent.items">
+      <recent name="$PROJECT_DIR$/src/components/_utils/map-layers.ts" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/_utils" />
+    </key>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-WS-241.17890.13" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="" />
+      <created>1718136713081</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1718136713081</updated>
+      <workItem from="1718136714419" duration="240000" />
+      <workItem from="1718136959723" duration="2326000" />
+      <workItem from="1718139297254" duration="367000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+    <option name="exactExcludedFiles">
+      <list>
+        <option value="$PROJECT_DIR$/src/pages/maps/ingestion/@id/components/cells/index.d.ts" />
+        <option value="$PROJECT_DIR$/deps/web-components/packages/column-components/src/notes/index.d.ts" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file

From 05a1c3d6ad5f2f6dd64e338f87220e3638b2444c Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Tue, 11 Jun 2024 17:43:25 -0400
Subject: [PATCH 084/151] added changing logo to nav bar

---
 src/components/page-header.ts        | 26 ++++++++++++++++++++++++++
 src/pages/+Page.mdx                  |  1 -
 src/pages/dev/about/+Page.mdx        |  3 ++-
 src/pages/dev/donate/+Page.mdx       |  3 ++-
 src/pages/dev/main-page/+Page.mdx    |  3 ++-
 src/pages/dev/people/+Page.mdx       |  3 ++-
 src/pages/dev/publications/+Page.mdx |  3 ++-
 7 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/components/page-header.ts b/src/components/page-header.ts
index ae9a0acc..e1e58aa8 100644
--- a/src/components/page-header.ts
+++ b/src/components/page-header.ts
@@ -29,3 +29,29 @@ export function PageHeader(props) {
     children,
   ]);
 }
+
+
+export function Icon(props) {
+  const {
+    title = "",
+    showSiteName = true,
+    children,
+    className,
+  } = props;
+  const siteName = "";
+  let _showSiteName = showSiteName;
+  if (title == siteName) {
+    _showSiteName = false;
+  }
+
+  return h("h1.page-title", { className }, [
+    h(MacrostratIcon, { size: 24 }),
+    h.if(_showSiteName)([
+      h(Link, { href: "/", className: "site-name" }, siteName),
+      " ",
+    ]),
+    h("span.title", title),
+    " ",
+    children,
+  ]);
+}
diff --git a/src/pages/+Page.mdx b/src/pages/+Page.mdx
index 9240a126..f38c4757 100644
--- a/src/pages/+Page.mdx
+++ b/src/pages/+Page.mdx
@@ -3,7 +3,6 @@ import { macrostratInstance } from "@macrostrat-web/settings";
 import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
 
-
 <PageHeader title="Macrostrat">
   <span className="subtitle">
     <span className="secondary">v2</span>{" "}
diff --git a/src/pages/dev/about/+Page.mdx b/src/pages/dev/about/+Page.mdx
index d573809f..96d7f0b4 100644
--- a/src/pages/dev/about/+Page.mdx
+++ b/src/pages/dev/about/+Page.mdx
@@ -2,15 +2,16 @@ import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
 import { Image } from "./index";
 import "./main.styl";
+import { MacrostratIcon } from "~/components";
 
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
+    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
     <li><a href="/dev/about">About</a></li>
     <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
     <li><a href="/dev/donate">Donate</a></li>
-    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 
diff --git a/src/pages/dev/donate/+Page.mdx b/src/pages/dev/donate/+Page.mdx
index 6ca663c9..bb9ff9ab 100644
--- a/src/pages/dev/donate/+Page.mdx
+++ b/src/pages/dev/donate/+Page.mdx
@@ -2,15 +2,16 @@ import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
 import { Image } from "./index";
+import { MacrostratIcon } from "~/components";
 
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
+    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
     <li><a href="/dev/about">About</a></li>
     <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
     <li><a href="/dev/donate">Donate</a></li>
-    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 
diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index f8946cab..c1c0aec8 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -2,16 +2,17 @@ import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
 import { Image } from "./index";
 import "./main.styl";
+import { MacrostratIcon } from "~/components";
 
 <div id="total">
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
+    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
     <li><a href="/dev/about">About</a></li>
     <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
     <li><a href="/dev/donate">Donate</a></li>
-    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 
diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/people/+Page.mdx
index ea440abe..039d939d 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/people/+Page.mdx
@@ -2,17 +2,18 @@ import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
 import { Image } from "./index";
+import { MacrostratIcon } from "~/components";
 
 <div class="main">
 
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
+    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
     <li><a href="/dev/about">About</a></li>
     <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
     <li><a href="/dev/donate">Donate</a></li>
-    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 \
diff --git a/src/pages/dev/publications/+Page.mdx b/src/pages/dev/publications/+Page.mdx
index 236df1bc..e0370463 100644
--- a/src/pages/dev/publications/+Page.mdx
+++ b/src/pages/dev/publications/+Page.mdx
@@ -2,15 +2,16 @@ import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
 import { Image } from "./index";
+import { MacrostratIcon } from "~/components";
 
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
+    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
     <li><a href="/dev/about">About</a></li>
     <li><a href="/dev/publications">Publications</a></li>
     <li><a href="/dev/people">People</a></li>
     <li><a href="/dev/donate">Donate</a></li>
-    <a href="/dev/main-page"><Image className="nav-logo" src="logo_white.png" width="40px"></Image></a>
   </ul>
 </div>
 

From 76d428335912c29de0f80f82536a79803dd17e7b Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 11 Jun 2024 20:07:03 -0500
Subject: [PATCH 085/151] Updated workspace

---
 .idea/workspace.xml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c9e6b2b..77483ffd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/deps/web-components" beforeDir="false" afterPath="$PROJECT_DIR$/deps/web-components" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,7 +13,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/deps/web-components" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="jar://$PROJECT_DIR$/.yarn/cache/@types-geojson-npm-7946.0.11-5ec37561c5-93fe7e9c5d.zip!/node_modules/@types/geojson/index.d.ts" root0="SKIP_INSPECTION" />
@@ -23,13 +23,16 @@
 }</component>
   <component name="ProjectId" id="2hkSiwgF1sFuWNuJM9IbyRRYIAw" />
   <component name="ProjectViewState">
+    <option name="autoscrollToSource" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="openDirectoriesWithSingleClick" value="true" />
+    <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "correlation-updates",
+    "git-widget-placeholder": "main",
     "last_opened_file_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -38,8 +41,8 @@
     "nodejs_interpreter_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
     "nodejs_package_manager_path": "/Users/Daven/Projects/Macrostrat/Software/web/.yarn/releases/yarn-4.2.2.cjs",
     "prettierjs.PrettierConfiguration.Package": "yarn:package.json:prettier",
-    "settings.editor.selected.configurable": "settings.javascript.prettier",
-    "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "settings.editor.selected.configurable": "project.scopes",
+    "ts.external.directory.path": "yarn:deps/web-components/packages/auth-components/package.json:typescript",
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
@@ -68,7 +71,8 @@
       <updated>1718136713081</updated>
       <workItem from="1718136714419" duration="240000" />
       <workItem from="1718136959723" duration="2326000" />
-      <workItem from="1718139297254" duration="367000" />
+      <workItem from="1718139297254" duration="1998000" />
+      <workItem from="1718153407795" duration="985000" />
     </task>
     <servers />
   </component>
@@ -81,4 +85,15 @@
       </list>
     </option>
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="dependencySupport" implementationName="javascript:npm:react" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:prettier" />
+    <option featureType="dependencySupport" implementationName="executable:docker" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:stylus" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:vite" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:webpack" />
+    <option featureType="dependencySupport" implementationName="executable:kubectl" />
+    <option featureType="com.intellij.fileTypeFactory" implementationName=".env" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:postcss" />
+  </component>
 </project>
\ No newline at end of file

From f849643a4250172d8825646b2e6f127e25ddddc1 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 12 Jun 2024 03:13:10 -0500
Subject: [PATCH 086/151] Begin streamlining URL management for map page

---
 .idea/prettier.xml                            |   7 ++
 .idea/workspace.xml                           |  29 ++++-
 deps/web-components                           |   2 +-
 .../map-interface/app-state/handlers/index.ts |  89 ++-------------
 .../app-state/handlers/pathname.ts            |  62 ++++++++++
 .../map-interface/app-state/reducers/index.ts | 108 +++---------------
 .../map-interface/app-state/reducers/types.ts |   1 +
 .../info-drawer/macrostrat-linked.ts          |   2 +
 src/pages/map/map-interface/index.ts          |  25 +++-
 .../map-interface/map-page/settings-panel.ts  |   5 +-
 10 files changed, 152 insertions(+), 178 deletions(-)
 create mode 100644 .idea/prettier.xml
 create mode 100644 src/pages/map/map-interface/app-state/handlers/pathname.ts

diff --git a/.idea/prettier.xml b/.idea/prettier.xml
new file mode 100644
index 00000000..727b8b53
--- /dev/null
+++ b/.idea/prettier.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PrettierConfiguration">
+    <option name="myRunOnSave" value="true" />
+    <option name="myRunOnReformat" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 77483ffd..02542e87 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,12 @@
   <component name="ChangeListManager">
     <list default="true" id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/types.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/types.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,16 +47,18 @@
     "nodejs_interpreter_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
     "nodejs_package_manager_path": "/Users/Daven/Projects/Macrostrat/Software/web/.yarn/releases/yarn-4.2.2.cjs",
     "prettierjs.PrettierConfiguration.Package": "yarn:package.json:prettier",
-    "settings.editor.selected.configurable": "project.scopes",
+    "settings.editor.selected.configurable": "settings.javascript.prettier",
     "ts.external.directory.path": "yarn:deps/web-components/packages/auth-components/package.json:typescript",
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
   <component name="RecentsManager">
     <key name="es6.move.members.recent.items">
+      <recent name="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/pathname.ts" />
       <recent name="$PROJECT_DIR$/src/components/_utils/map-layers.ts" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers" />
       <recent name="$PROJECT_DIR$/src/_utils" />
     </key>
   </component>
@@ -72,7 +80,7 @@
       <workItem from="1718136714419" duration="240000" />
       <workItem from="1718136959723" duration="2326000" />
       <workItem from="1718139297254" duration="1998000" />
-      <workItem from="1718153407795" duration="985000" />
+      <workItem from="1718153407795" duration="16102000" />
     </task>
     <servers />
   </component>
@@ -96,4 +104,21 @@
     <option featureType="com.intellij.fileTypeFactory" implementationName=".env" />
     <option featureType="dependencySupport" implementationName="javascript:npm:postcss" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/types.ts</url>
+          <properties lambdaOrdinal="-1" />
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/src/pages/map/map-interface/index.ts</url>
+          <line>46</line>
+          <properties lambdaOrdinal="-1" />
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>
\ No newline at end of file
diff --git a/deps/web-components b/deps/web-components
index 53dd60b3..5c409881 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 53dd60b3bcb37486e2a186f4ef5a055748c19276
+Subproject commit 5c409881df9a53c68d5e7696d45f89baac3ddf06
diff --git a/src/pages/map/map-interface/app-state/handlers/index.ts b/src/pages/map/map-interface/app-state/handlers/index.ts
index 72822e2e..260c1ce5 100644
--- a/src/pages/map/map-interface/app-state/handlers/index.ts
+++ b/src/pages/map/map-interface/app-state/handlers/index.ts
@@ -1,7 +1,12 @@
 import { push } from "@lagunovsky/redux-react-router";
 import { mapPagePrefix, routerBasename } from "@macrostrat-web/settings";
 import axios from "axios";
-import { AppAction, AppState } from "../reducers";
+import {
+  AppAction,
+  AppState,
+  MenuPage,
+  setInfoMarkerPosition,
+} from "../reducers";
 import {
   base,
   fetchAllColumns,
@@ -13,22 +18,13 @@ import {
 } from "./fetch";
 import { runFilter } from "./filters";
 
-import { formatCoordForZoomLevel } from "@macrostrat/mapbox-utils";
 import { LineString } from "geojson";
-import { matchPath } from "react-router";
 import { currentPageForPathName, isDetailPanelRoute } from "../nav-hooks";
-import { MenuPage, setInfoMarkerPosition } from "../reducers";
 import { MapLayer } from "../reducers/core";
 import { getInitialStateFromHash } from "../reducers/hash-string";
 import { ColumnGeoJSONRecord, findColumnsForLocation } from "./columns";
-
-function routeForActivePage(page: MenuPage) {
-  let newPathname = routerBasename;
-  if (page != null) {
-    newPathname += "/" + page;
-  }
-  return newPathname;
-}
+// TODO: remove this
+import { buildLocationPath } from "./pathname";
 
 async function actionRunner(
   state: AppState,
@@ -36,6 +32,7 @@ async function actionRunner(
   dispatch = null
 ): Promise<AppAction | void> {
   const coreState = state.core;
+
   switch (action.type) {
     case "get-initial-map-state": {
       const { pathname } = state.router.location;
@@ -125,56 +122,17 @@ async function actionRunner(
         dispatch
       );
     }
-    case "set-menu-page": {
-      const { pathname, hash } = state.router.location;
-      if (!isDetailPanelRoute(pathname)) {
-        const newPathname = routeForActivePage(action.page);
-        await dispatch(push({ pathname: newPathname, hash }));
-      }
-      return { type: "set-menu-page", page: action.page };
-    }
-    case "close-infodrawer":
-      // If we are showing a cross-section, we need to go there
-      await dispatch(
-        push({
-          pathname:
-            state.core.crossSectionLine == null
-              ? routeForActivePage(state.menu.activePage)
-              : buildCrossSectionPath(state.core.crossSectionLine),
-          hash: state.router.location.hash,
-        })
-      );
-      return action;
     case "toggle-cross-section": {
-      let line: GeoJSON.LineString | null = null;
+      let line: LineString | null = null;
       if (state.core.crossSectionLine == null) {
         line = { type: "LineString", coordinates: [] };
       }
-      const action = {
+      const action: AppAction = {
         type: "update-cross-section",
         line,
       };
       return actionRunner(state, action, dispatch);
     }
-    case "update-cross-section":
-      if (state.core.crossSectionLine != null) {
-        // Return to the base route
-        let nextPathname = "";
-        const pos = state.core.infoMarkerPosition;
-        if (pos != null) {
-          const z = state.core.mapPosition.target?.zoom ?? 7;
-          nextPathname = buildLocationPath(pos.lng, pos.lat, z);
-        } else {
-          nextPathname = routeForActivePage(state.menu.activePage);
-        }
-        await dispatch(
-          push({
-            pathname: nextPathname,
-            hash: state.router.location.hash,
-          })
-        );
-      }
-      return action;
     case "fetch-search-query":
       const { term } = action;
       let CancelToken = axios.CancelToken;
@@ -218,17 +176,6 @@ async function actionRunner(
       return { type: "add-filter", filter: await runFilter(action.filter) };
     case "get-filtered-columns":
       return await fetchFilteredColumns(coreState.filters);
-    case "set-cross-section-line": {
-      const { line } = action;
-
-      if (state.core.infoMarkerPosition == null) {
-        // If we are showing a marker, that route takes precedence
-        const pathname = buildCrossSectionPath(line);
-        await dispatch(push({ pathname, hash: location.hash }));
-      }
-
-      return { type: "did-set-cross-section-line", line };
-    }
     case "map-query": {
       const { lng, lat, z } = action;
       // Check if matches column detail route
@@ -330,18 +277,4 @@ async function actionRunner(
   }
 }
 
-function buildCrossSectionPath(line: LineString) {
-  const pts = line.coordinates
-    .map((p) => `${p[0].toFixed(4)},${p[1].toFixed(4)}`)
-    .join("/");
-
-  return mapPagePrefix + "/cross-section/" + pts;
-}
-
-function buildLocationPath(lng: number, lat: number, z: number) {
-  const ln = formatCoordForZoomLevel(lng, Number(z));
-  const lt = formatCoordForZoomLevel(lat, Number(z));
-  return mapPagePrefix + `/loc/${ln}/${lt}`;
-}
-
 export default actionRunner;
diff --git a/src/pages/map/map-interface/app-state/handlers/pathname.ts b/src/pages/map/map-interface/app-state/handlers/pathname.ts
new file mode 100644
index 00000000..6914a39e
--- /dev/null
+++ b/src/pages/map/map-interface/app-state/handlers/pathname.ts
@@ -0,0 +1,62 @@
+import {
+  AppState,
+  AppAction,
+  MenuPage,
+} from "~/pages/map/map-interface/app-state";
+import { push, UpdateLocationAction } from "@lagunovsky/redux-react-router";
+import { LineString } from "geojson";
+import { mapPagePrefix, routerBasename } from "@macrostrat-web/settings";
+import { formatCoordForZoomLevel } from "@macrostrat/mapbox-utils";
+
+export function pathNameAction(
+  state: AppState
+): UpdateLocationAction<"push"> | null {
+  /** Set the pathname based on the current state. Only one of a location, cross-section line,
+   * or active page can be selected at a time.
+   * The following priority is applied:
+   * 1. If a location is selected, show that location
+   * 2. If a cross-section line is selected, set the cross-section path
+   * 3. If an active page is selected, show that page
+   */
+
+  // TODO: specialize based on whether column detail page is selected
+
+  const pos = state.core.infoMarkerPosition;
+  let nextPathname: string = state.router.location.pathname;
+  if (pos != null) {
+    const z = state.core.mapPosition.target?.zoom ?? 7;
+    nextPathname = buildLocationPath(pos.lng, pos.lat, z);
+  } else if (state.core.crossSectionLine != null) {
+    nextPathname = buildCrossSectionPath(state.core.crossSectionLine);
+  } else if (state.menu.activePage != null) {
+    nextPathname = routeForActivePage(state.menu.activePage);
+  } else {
+    nextPathname = routerBasename;
+  }
+  if (nextPathname == state.router.location.pathname) {
+    return null;
+  }
+  return push({ pathname: nextPathname, hash: state.router.location.hash });
+}
+
+function buildCrossSectionPath(line: LineString) {
+  const pts = line.coordinates
+    .map((p) => `${p[0].toFixed(4)},${p[1].toFixed(4)}`)
+    .join("/");
+
+  return mapPagePrefix + "/cross-section/" + pts;
+}
+
+export function buildLocationPath(lng: number, lat: number, z: number) {
+  const ln = formatCoordForZoomLevel(lng, Number(z));
+  const lt = formatCoordForZoomLevel(lat, Number(z));
+  return mapPagePrefix + `/loc/${ln}/${lt}`;
+}
+
+function routeForActivePage(page: MenuPage) {
+  let newPathname = routerBasename;
+  if (page != null) {
+    newPathname += "/" + page;
+  }
+  return newPathname;
+}
diff --git a/src/pages/map/map-interface/app-state/reducers/index.ts b/src/pages/map/map-interface/app-state/reducers/index.ts
index 70e1f3d9..70b840c8 100644
--- a/src/pages/map/map-interface/app-state/reducers/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/index.ts
@@ -10,6 +10,8 @@ import { contextPanelIsInitiallyOpen } from "../nav-hooks";
 import { CoreAction, coreReducer } from "./core";
 import { hashStringReducer } from "./hash-string";
 import { AppAction, AppState, MenuAction, MenuState } from "./types";
+import { pathNameAction } from "../handlers/pathname";
+
 export const browserHistory = createBrowserHistory();
 
 const routerReducer = createRouterReducer(browserHistory);
@@ -30,6 +32,7 @@ const defaultState: AppState = {
   core: coreReducer(undefined, { type: "init" }),
   router: routerReducer(undefined, { type: "init" }),
   menu: menuReducer(undefined, { type: "init" }),
+  nextRouterAction: null,
 };
 
 function mainReducer(
@@ -92,15 +95,26 @@ function mainReducer(
         core: coreReducer(state.core, action as CoreAction),
         menu: menuReducer(state.menu, action as MenuAction),
         performance: performanceReducer(state.performance, action),
+        nextRouterAction: state.nextRouterAction,
       };
   }
 }
 
-const appReducer = (state: AppState, action: AppAction) => {
+export default function appReducer(state: AppState, action: AppAction) {
   // This might not be the right way to do hash management, but it
   // centralizes the logic in one place.
-  return hashStringReducer(mainReducer(state, action), action);
-};
+  return applyNextPath(hashStringReducer(mainReducer(state, action), action));
+}
+
+function applyNextPath(state: AppState): AppState {
+  const action = pathNameAction(state);
+  if (action == null) return state;
+  console.log("Applying next path", action);
+  return {
+    ...state,
+    nextRouterAction: action,
+  };
+}
 
 export function setInfoMarkerPosition(
   state: AppState,
@@ -114,27 +128,6 @@ export function setInfoMarkerPosition(
 
   let s1 = state;
 
-  // //If we are on the column route, the column layer must be enabled
-  // let s1 = state;
-  // const colMatch = matchPath(
-  //   mapPagePrefix + "/loc/:lng/:lat/column",
-  //   pathname ?? state.router.location.pathname
-  // );
-  // if (colMatch != null) {
-  //   s1 = update(s1, { core: { mapLayers: { $add: [MapLayer.COLUMNS] } } });
-  // }
-
-  // // If we are disabling the column route, we should remove the column layer
-  // const colMatch2 = matchPath(
-  //   mapPagePrefix + "/loc/:lng/:lat/column",
-  //   state.router.location.pathname
-  // );
-
-  // if (colMatch2 != null && colMatch == null) {
-  //   s1 = update(s1, { core: { mapLayers: { $remove: [MapLayer.COLUMNS] } } });
-  // }
-
-  // Set location
   if (loc != null) {
     const { lng, lat } = loc.params;
     return {
@@ -177,74 +170,7 @@ export function setInfoMarkerPosition(
   return state;
 }
 
-export default appReducer;
 export * from "./core";
 export * from "./hash-string";
 export * from "./map";
 export * from "./types";
-
-/*
-function overallReducer(state: AppState, action: Action): AppState {
-  let pos: MapPosition;
-  if (action.type === "got-initial-map-state") {
-    pos = action.data.mapPosition;
-  } else if (action.type == "map-moved") {
-    pos = action.data;
-  }
-
-  if (pos) {
-    // You can access both app and globe states here
-    const params = flyToParams(translateCameraPosition(pos));
-    //console.log("Set globe position", destination);
-    return {
-      ...state,
-      core: {
-        ...state.core,
-        mapPosition: pos,
-      },
-      globe: {
-        ...state.globe,
-        flyToProps: { ...params, duration: 0, once: true },
-      },
-    };
-  }
-
-  if (action.type == "map-loading" && !state.core.mapIsLoading) {
-    return appReducer(state, {
-      type: "reset-performance-counter",
-      name: "map-loading",
-    });
-  }
-  if (action.type == "map-idle" && state.core.mapIsLoading) {
-    return appReducer(state, { type: "reset-performance-counter" });
-  }
-
-  switch (action.type) {
-    case "@@router/ON_LOCATION_CHANGED":
-      const isOpen = action.payload.location.pathname != "/";
-      return {
-        ...state,
-        core: { ...state.core, menuOpen: isOpen, contextPanelOpen: isOpen },
-      };
-    case "got-initial-map-state":
-    case "map-moved":
-      return {
-        ...state,
-        core: {
-          ...state.core,
-          mapPosition: action.data,
-        },
-      };
-    default:
-      return state;
-  }
-}
-
-const appReducer = reduceReducers(overallReducer, reducers);
-
-export type Action = CoreAction | MapAction | GlobeAction | RouterActions;
-
-export default appReducer;
-export * from "./core";
-export * from "./map";
-*/
diff --git a/src/pages/map/map-interface/app-state/reducers/types.ts b/src/pages/map/map-interface/app-state/reducers/types.ts
index e535329c..363214f5 100644
--- a/src/pages/map/map-interface/app-state/reducers/types.ts
+++ b/src/pages/map/map-interface/app-state/reducers/types.ts
@@ -24,6 +24,7 @@ export type AppState = {
   core: CoreState;
   router: ReduxRouterState;
   menu: MenuState;
+  nextRouterAction: RouterActions | null;
 };
 
 type OverallActions = { type: "replace-state"; state: AppState };
diff --git a/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts b/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts
index b63f9945..21b46048 100644
--- a/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts
+++ b/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts
@@ -280,7 +280,9 @@ function LithTypes(props) {
     "div.lithologies.lithology-types",
     [
       lith_types.map((lithClass, i) => {
+        console.log(lithClass);
         return h(LithologyTag, {
+          key: lithClass.name,
           data: {
             ...lithClass,
           },
diff --git a/src/pages/map/map-interface/index.ts b/src/pages/map/map-interface/index.ts
index 5c36deec..77f3681f 100644
--- a/src/pages/map/map-interface/index.ts
+++ b/src/pages/map/map-interface/index.ts
@@ -1,6 +1,7 @@
 import { ReduxRouter } from "@lagunovsky/redux-react-router";
 import h from "@macrostrat/hyper";
 import { Route, Routes } from "react-router-dom";
+import { useEffect } from "react";
 
 import "~/styles/global.styl";
 import "./searchbar.styl";
@@ -9,7 +10,13 @@ import "./ui-components.styl";
 import { createRouterMiddleware } from "@lagunovsky/redux-react-router";
 import { Provider } from "react-redux";
 import { applyMiddleware, compose, createStore } from "redux";
-import reducerStack, { AppAction, AppState, browserHistory } from "./app-state";
+import reducerStack, {
+  AppAction,
+  AppState,
+  browserHistory,
+  useAppState,
+  useAppActions,
+} from "./app-state";
 
 /** Redux is used only for the main map applicaton. This heavy state-management approach is
  * essentially a legacy approach, and we are moving away from this in favor of more lightweight
@@ -19,6 +26,7 @@ import reducerStack, { AppAction, AppState, browserHistory } from "./app-state";
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
 const routerMiddleware = createRouterMiddleware(browserHistory);
+
 // Create the data store
 let store = createStore<AppState, AppAction, any, any>(
   reducerStack,
@@ -34,11 +42,24 @@ export default function MapApp({ routerBasename }) {
     h(
       ReduxRouter,
       { basename: routerBasename, store, history: browserHistory },
-      [h(Routes, [h(Route, { path: "*", element: h(MapPage) })])]
+      [h(Routes, [h(Route, { path: "*", element: h(MapPage) })]), h(RouterSync)]
     )
   );
 }
 
+function RouterSync() {
+  /** This is a temporary solution to sync the store with the history object. */
+  const nextRouterAction = useAppState((state) => state.nextRouterAction);
+  const runAction = useAppActions();
+  useEffect(() => {
+    if (nextRouterAction != null) {
+      console.log("Dispatching next router action", nextRouterAction);
+      runAction(nextRouterAction);
+    }
+  }, [nextRouterAction]);
+  return null;
+}
+
 // Extend the window type to include the Redux DevTools types
 declare global {
   interface Window {
diff --git a/src/pages/map/map-interface/map-page/settings-panel.ts b/src/pages/map/map-interface/map-page/settings-panel.ts
index 1940b692..4078ccb4 100644
--- a/src/pages/map/map-interface/map-page/settings-panel.ts
+++ b/src/pages/map/map-interface/map-page/settings-panel.ts
@@ -12,7 +12,6 @@ import {
   Switch,
   Tag,
 } from "@blueprintjs/core";
-import hyper from "@macrostrat/hyper";
 import { applyMapPositionToHash } from "@macrostrat/map-interface";
 import {
   DarkModeButton,
@@ -27,9 +26,7 @@ import {
   useAppState,
 } from "~/pages/map/map-interface/app-state";
 
-import styles from "./settings-panel.module.styl";
-
-const h = hyper.styled(styles);
+import h from "./settings-panel.module.styl";
 
 const ExperimentsPanel = (props) => {
   const dispatch = useAppActions();

From 080c843818ea1bf8038e800e376337963bfdc96a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 12 Jun 2024 03:34:21 -0500
Subject: [PATCH 087/151] Eliminated button nesting

---
 .idea/watcherTasks.xml                        |  4 ++
 .idea/workspace.xml                           | 10 ++---
 .../map-page/settings-panel.module.styl       | 19 ++++++++-
 .../map-interface/map-page/settings-panel.ts  | 42 +++++++++----------
 4 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 .idea/watcherTasks.xml

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
new file mode 100644
index 00000000..1389c394
--- /dev/null
+++ b/.idea/watcherTasks.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions" suppressed-tasks="Stylus" />
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 02542e87..435d72bf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,11 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/types.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/types.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.module.styl" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.module.styl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -38,7 +34,7 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
+    "git-widget-placeholder": "streamline-url-functions",
     "last_opened_file_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -80,7 +76,7 @@
       <workItem from="1718136714419" duration="240000" />
       <workItem from="1718136959723" duration="2326000" />
       <workItem from="1718139297254" duration="1998000" />
-      <workItem from="1718153407795" duration="16102000" />
+      <workItem from="1718153407795" duration="17439000" />
     </task>
     <servers />
   </component>
diff --git a/src/pages/map/map-interface/map-page/settings-panel.module.styl b/src/pages/map/map-interface/map-page/settings-panel.module.styl
index 8e6e08f2..1b3c756b 100644
--- a/src/pages/map/map-interface/map-page/settings-panel.module.styl
+++ b/src/pages/map/map-interface/map-page/settings-panel.module.styl
@@ -16,11 +16,22 @@
   font-size: 0.9em
   line-height: 1em
 
+.dark-mode-controls
+  display: flex
+  gap: 0.5em
+  align-items: center
+  &>:first-child
+    flex-grow: 1
+
 .settings
   .auto-button
     font-size: 12px
     font-style: italic
 
+  &>*
+    width: 100%
+    margin: 0.1em 0 0.2em
+
   :global
     .bp5-control
       display: flex
@@ -34,8 +45,6 @@
       position: relative
 
     .bp5-button, .bp5-button-group
-      width: 100%
-      margin: 0.1em 0 0.2em
       justify-content: start
       align-items: center
       //box-shadow: 0 0 0px 1px var(--card-shadow-color)
@@ -52,6 +61,9 @@
 .callout-panel
   border-radius: 3px
   overflow: hidden
+  .callout-header
+    :global(.bp5-button)
+      width: 100%
   &.expanded
     .callout-header
       :global(.bp5-button)
@@ -78,3 +90,6 @@
   gap: 0.5em
   &>*
     flex: 1
+
+
+
diff --git a/src/pages/map/map-interface/map-page/settings-panel.ts b/src/pages/map/map-interface/map-page/settings-panel.ts
index 4078ccb4..57b60bc7 100644
--- a/src/pages/map/map-interface/map-page/settings-panel.ts
+++ b/src/pages/map/map-interface/map-page/settings-panel.ts
@@ -4,6 +4,7 @@
 import {
   AnchorButton,
   Button,
+  ButtonGroup,
   Callout,
   Collapse,
   Icon,
@@ -195,33 +196,30 @@ function ThemeButton() {
   const update = darkModeUpdater();
   const icon = darkMode.isAutoset ? "tick" : "desktop";
 
-  const autoButton = h(
-    Button,
-    {
-      minimal: true,
-      active: darkMode.isAutoset,
-      rightIcon: h(Icon, { icon, size: 12 }),
-      intent: darkMode.isAutoset ? "success" : "primary",
-      className: "auto-button sub-button",
-      small: true,
-      onClick(evt) {
-        if (darkMode.isAutoset) return;
-        evt.stopPropagation();
-        update(null);
-      },
-    },
-
-    "auto"
-  );
-
   const darkModeText = darkMode.isEnabled
     ? "Turn on the lights"
     : "Turn off the lights";
   return h("div.dark-mode-controls", [
+    h(DarkModeButton, { minimal: true, active: false, allowReset: true }, [
+      h("span.text", darkModeText),
+    ]),
     h(
-      DarkModeButton,
-      { minimal: true, active: false, allowReset: true, rightIcon: autoButton },
-      [h("span.text", darkModeText)]
+      Button,
+      {
+        minimal: true,
+        active: darkMode.isAutoset,
+        rightIcon: h(Icon, { icon, size: 12 }),
+        intent: darkMode.isAutoset ? "success" : "primary",
+        className: "auto-button sub-button",
+        small: true,
+        onClick(evt) {
+          if (darkMode.isAutoset) return;
+          evt.stopPropagation();
+          update(null);
+        },
+      },
+
+      "auto"
     ),
   ]);
 }

From 529ac65224be5c1176e2c9c167a1e7635adad6a3 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 12 Jun 2024 04:30:22 -0500
Subject: [PATCH 088/151] Made path management more straightforward

---
 .idea/workspace.xml                           | 11 +++-
 .../map-interface/app-state/handlers/index.ts | 62 +++++++++----------
 .../app-state/handlers/pathname.ts            |  6 +-
 .../map/map-interface/app-state/hooks.ts      | 10 ++-
 .../app-state/reducers/core/types.ts          |  2 +-
 .../map-interface/app-state/reducers/index.ts | 24 +++++--
 .../info-drawer/macrostrat-linked.ts          |  1 -
 src/pages/map/map-interface/index.ts          |  1 -
 src/pages/map/map-interface/map-page/index.ts | 37 +----------
 9 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 435d72bf..ac62bf5b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,8 +6,13 @@
   <component name="ChangeListManager">
     <list default="true" id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.module.styl" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.module.styl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/settings-panel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/pathname.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/pathname.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/core/types.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/core/types.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/index.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -76,7 +81,7 @@
       <workItem from="1718136714419" duration="240000" />
       <workItem from="1718136959723" duration="2326000" />
       <workItem from="1718139297254" duration="1998000" />
-      <workItem from="1718153407795" duration="17439000" />
+      <workItem from="1718153407795" duration="20657000" />
     </task>
     <servers />
   </component>
diff --git a/src/pages/map/map-interface/app-state/handlers/index.ts b/src/pages/map/map-interface/app-state/handlers/index.ts
index 260c1ce5..e14e4f9e 100644
--- a/src/pages/map/map-interface/app-state/handlers/index.ts
+++ b/src/pages/map/map-interface/app-state/handlers/index.ts
@@ -59,22 +59,40 @@ async function actionRunner(
       // Fill out the remainder with defaults
 
       // We always get all columns on initial load, which might be
-      // a bit unnecessary
+      // a bit unnecessary and slow.
       let allColumns: ColumnGeoJSONRecord[] | null = await fetchAllColumns();
 
+      const newState = {
+        ...state,
+        core: {
+          ...coreState1,
+          allColumns,
+          initialLoadComplete: true,
+        },
+        menu: { activePage },
+      };
+
       dispatch({
         type: "replace-state",
-        state: {
-          ...state,
-          core: {
-            ...coreState1,
-            allColumns,
-            initialLoadComplete: true,
-          },
-          menu: { activePage },
-        },
+        state: newState,
       });
 
+      // Set info marker position if it is defined
+      if (newState.core.infoMarkerPosition != null) {
+        const nextAction = await actionRunner(
+          newState,
+          {
+            type: "map-query",
+            z: state.core.mapPosition.target?.zoom ?? 7,
+            ...state.core.infoMarkerPosition,
+            map_id: null,
+            columns: null,
+          },
+          dispatch
+        );
+        dispatch(nextAction);
+      }
+
       // Apply all filters in parallel
       const newFilters = await Promise.all(
         filters.map((f) => {
@@ -176,27 +194,7 @@ async function actionRunner(
       return { type: "add-filter", filter: await runFilter(action.filter) };
     case "get-filtered-columns":
       return await fetchFilteredColumns(coreState.filters);
-    case "map-query": {
-      const { lng, lat, z } = action;
-      // Check if matches column detail route
-      const { pathname } = state.router.location;
-
-      let newPath = buildLocationPath(lng, lat, Number(z));
-      if (
-        pathname.startsWith(mapPagePrefix + "/loc") &&
-        pathname.endsWith("/column")
-      ) {
-        // If so, we want to append columns to the end of the URL
-        newPath += "/column";
-      }
-
-      return push({
-        pathname: newPath,
-        hash: location.hash,
-      });
-      //return { ...action, type: "run-map-query" };
-    }
-    case "run-map-query":
+    case "map-query":
       const { lng, lat, z, map_id } = action;
       // Get column data from the map action if it is provided.
       // This saves us from having to filter the columns more inefficiently
@@ -213,6 +211,8 @@ async function actionRunner(
         lat,
         cancelToken: sourceMapQuery,
       });
+
+      // Run a bunch of async queries in ~parallel
       let mapData = await runMapQuery(
         lng,
         lat,
diff --git a/src/pages/map/map-interface/app-state/handlers/pathname.ts b/src/pages/map/map-interface/app-state/handlers/pathname.ts
index 6914a39e..192de812 100644
--- a/src/pages/map/map-interface/app-state/handlers/pathname.ts
+++ b/src/pages/map/map-interface/app-state/handlers/pathname.ts
@@ -19,13 +19,15 @@ export function pathNameAction(
    * 3. If an active page is selected, show that page
    */
 
-  // TODO: specialize based on whether column detail page is selected
-
   const pos = state.core.infoMarkerPosition;
   let nextPathname: string = state.router.location.pathname;
   if (pos != null) {
     const z = state.core.mapPosition.target?.zoom ?? 7;
     nextPathname = buildLocationPath(pos.lng, pos.lat, z);
+    // TODO: we could probably assign column page based on a flag in the state
+    if (state.router.location.pathname.endsWith("/column")) {
+      nextPathname += "/column";
+    }
   } else if (state.core.crossSectionLine != null) {
     nextPathname = buildCrossSectionPath(state.core.crossSectionLine);
   } else if (state.menu.activePage != null) {
diff --git a/src/pages/map/map-interface/app-state/hooks.ts b/src/pages/map/map-interface/app-state/hooks.ts
index 86656376..639b53ae 100644
--- a/src/pages/map/map-interface/app-state/hooks.ts
+++ b/src/pages/map/map-interface/app-state/hooks.ts
@@ -13,9 +13,13 @@ function useAppActions(): (action: AppAction) => Promise<void> {
   const store = useStore<AppState, AppAction>();
   return async (action) => {
     const appState = store.getState();
-    const newAction = await actionRunner(appState, action, dispatch);
-    if (newAction == undefined || newAction == null) return;
-    dispatch(newAction as AppAction);
+    try {
+      const newAction = await actionRunner(appState, action, dispatch);
+      if (newAction == undefined || newAction == null) return;
+      dispatch(newAction as AppAction);
+    } catch (err) {
+      console.error(err);
+    }
   };
 }
 
diff --git a/src/pages/map/map-interface/app-state/reducers/core/types.ts b/src/pages/map/map-interface/app-state/reducers/core/types.ts
index 5fa7375c..d74a6dc7 100644
--- a/src/pages/map/map-interface/app-state/reducers/core/types.ts
+++ b/src/pages/map/map-interface/app-state/reducers/core/types.ts
@@ -22,7 +22,7 @@ type ASYNC_ADD_FILTER = { type: "async-add-filter"; filter: any };
 type GET_FILTERED_COLUMNS = { type: "get-filtered-columns" };
 type FETCH_XDD = { type: "fetch-xdd" };
 type MAP_QUERY = {
-  type: "map-query" | "run-map-query";
+  type: "map-query";
   z: string | number;
   map_id: any;
   columns: ColumnProperties[] | null | undefined;
diff --git a/src/pages/map/map-interface/app-state/reducers/index.ts b/src/pages/map/map-interface/app-state/reducers/index.ts
index 70b840c8..f22305a5 100644
--- a/src/pages/map/map-interface/app-state/reducers/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/index.ts
@@ -103,16 +103,28 @@ function mainReducer(
 export default function appReducer(state: AppState, action: AppAction) {
   // This might not be the right way to do hash management, but it
   // centralizes the logic in one place.
-  return applyNextPath(hashStringReducer(mainReducer(state, action), action));
+  return applyNextPath(
+    hashStringReducer(mainReducer(state, action), action),
+    action
+  );
 }
 
-function applyNextPath(state: AppState): AppState {
-  const action = pathNameAction(state);
-  if (action == null) return state;
-  console.log("Applying next path", action);
+const pathChangingActions: AppAction["type"][] = [
+  "set-menu-page",
+  "update-cross-section",
+  "update-state",
+  "start-map-query",
+  "close-infodrawer",
+];
+
+function applyNextPath(state: AppState, action: AppAction): AppState {
+  if (!pathChangingActions.includes(action.type)) return state;
+
+  const nextRouterAction = pathNameAction(state);
+  if (nextRouterAction == null) return state;
   return {
     ...state,
-    nextRouterAction: action,
+    nextRouterAction,
   };
 }
 
diff --git a/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts b/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts
index 21b46048..f7cd676f 100644
--- a/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts
+++ b/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts
@@ -280,7 +280,6 @@ function LithTypes(props) {
     "div.lithologies.lithology-types",
     [
       lith_types.map((lithClass, i) => {
-        console.log(lithClass);
         return h(LithologyTag, {
           key: lithClass.name,
           data: {
diff --git a/src/pages/map/map-interface/index.ts b/src/pages/map/map-interface/index.ts
index 77f3681f..6a4d510e 100644
--- a/src/pages/map/map-interface/index.ts
+++ b/src/pages/map/map-interface/index.ts
@@ -53,7 +53,6 @@ function RouterSync() {
   const runAction = useAppActions();
   useEffect(() => {
     if (nextRouterAction != null) {
-      console.log("Dispatching next router action", nextRouterAction);
       runAction(nextRouterAction);
     }
   }, [nextRouterAction]);
diff --git a/src/pages/map/map-interface/map-page/index.ts b/src/pages/map/map-interface/map-page/index.ts
index 3f31cab6..0355a409 100644
--- a/src/pages/map/map-interface/map-page/index.ts
+++ b/src/pages/map/map-interface/map-page/index.ts
@@ -3,11 +3,10 @@ import { Suspense, useCallback, useEffect, useRef } from "react";
 import { Spinner } from "@blueprintjs/core";
 import loadable from "@loadable/component";
 import { mapPagePrefix } from "@macrostrat-web/settings";
-import hyper from "@macrostrat/hyper";
 import { MapAreaContainer } from "@macrostrat/map-interface";
 import classNames from "classnames";
 import { useSelector } from "react-redux";
-import { Route, Routes, useParams } from "react-router-dom";
+import { Route, Routes } from "react-router-dom";
 import { useTransition } from "transition-hook";
 import {
   useAppActions,
@@ -18,14 +17,12 @@ import {
 import Searchbar from "../components/navbar";
 import MapContainer from "./map-view";
 import { MenuPage } from "./menu";
-import { info } from "console";
+import h from "./main.module.styl";
 
 const ElevationChart = loadable(() => import("../components/elevation-chart"));
 const InfoDrawer = loadable(() => import("../components/info-drawer"));
 const Menu = loadable(() => import("./menu"));
 
-import h from "./main.module.styl";
-
 function MapView(props) {
   return h(
     Suspense,
@@ -123,36 +120,8 @@ function InfoDrawerHolder() {
         }),
       }),
     ]),
-    h(InfoDrawerLocationGrabber),
+    //h(InfoDrawerLocationGrabber),
   ]);
 }
 
-function InfoDrawerLocationGrabber() {
-  // We could probably do this in the reducer...
-  const z = Math.round(
-    useAppState((s) => s.core.mapPosition.target?.zoom) ?? 7
-  );
-  const infoMarkerPosition = useAppState((s) => s.core.infoMarkerPosition);
-  const runAction = useAppActions();
-
-  const { lat, lng } = infoMarkerPosition ?? {};
-
-  // Todo: this is a pretty janky way to do state management
-  useEffect(() => {
-    if (lat == null || lng == null) return;
-    runAction({
-      type: "run-map-query",
-      lat: Number(lat),
-      lng: Number(lng),
-      z,
-      // Focused column or map unit from active layers.
-      // This is a bit anachronistic, since we want to be
-      // able to show columns that aren't necessarily shown on the map
-      columns: [],
-      map_id: null,
-    });
-  }, [lat, lng]);
-  return null;
-}
-
 export default MapPageRoutes;

From 3138069d0680653fcf7ab139bec50e2528b87d74 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 12 Jun 2024 10:12:01 -0500
Subject: [PATCH 089/151] Removed some intellij integration

---
 .gitignore                                    |   9 +-
 .idea/workspace.xml                           | 125 ------------------
 .../map-interface/app-state/handlers/index.ts |   3 +-
 3 files changed, 8 insertions(+), 129 deletions(-)
 delete mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 5fad7bdf..5f914c5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,13 @@ docker-compose.yaml
 !.yarn/sdks
 !.yarn/versions
 
+# IntelliJ
+.idea/workspace.xml
+.idea/tasks.xml
+
+
 # For ignoring static files
 *.png
-*.jpg 
+*.jpg
 
-.vite
\ No newline at end of file
+.vite
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index ac62bf5b..00000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/pathname.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers/pathname.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/core/types.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/core/types.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/components/info-drawer/macrostrat-linked.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/map/map-interface/map-page/index.ts" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="jar://$PROJECT_DIR$/.yarn/cache/@types-geojson-npm-7946.0.11-5ec37561c5-93fe7e9c5d.zip!/node_modules/@types/geojson/index.d.ts" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 8
-}</component>
-  <component name="ProjectId" id="2hkSiwgF1sFuWNuJM9IbyRRYIAw" />
-  <component name="ProjectViewState">
-    <option name="autoscrollToSource" value="true" />
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="openDirectoriesWithSingleClick" value="true" />
-    <option name="showExcludedFiles" value="false" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "streamline-url-functions",
-    "last_opened_file_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_interpreter_path": "/Users/Daven/.local/share/mise/installs/node/20.7.0/bin/node",
-    "nodejs_package_manager_path": "/Users/Daven/Projects/Macrostrat/Software/web/.yarn/releases/yarn-4.2.2.cjs",
-    "prettierjs.PrettierConfiguration.Package": "yarn:package.json:prettier",
-    "settings.editor.selected.configurable": "settings.javascript.prettier",
-    "ts.external.directory.path": "yarn:deps/web-components/packages/auth-components/package.json:typescript",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="RecentsManager">
-    <key name="es6.move.members.recent.items">
-      <recent name="$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/pathname.ts" />
-      <recent name="$PROJECT_DIR$/src/components/_utils/map-layers.ts" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/pages/map/map-interface/app-state/handlers" />
-      <recent name="$PROJECT_DIR$/src/_utils" />
-    </key>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-WS-241.17890.13" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="0198d26a-1f96-4e99-bb88-c11fcd2caa82" name="Changes" comment="" />
-      <created>1718136713081</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1718136713081</updated>
-      <workItem from="1718136714419" duration="240000" />
-      <workItem from="1718136959723" duration="2326000" />
-      <workItem from="1718139297254" duration="1998000" />
-      <workItem from="1718153407795" duration="20657000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-    <option name="exactExcludedFiles">
-      <list>
-        <option value="$PROJECT_DIR$/src/pages/maps/ingestion/@id/components/cells/index.d.ts" />
-        <option value="$PROJECT_DIR$/deps/web-components/packages/column-components/src/notes/index.d.ts" />
-      </list>
-    </option>
-  </component>
-  <component name="UnknownFeatures">
-    <option featureType="dependencySupport" implementationName="javascript:npm:react" />
-    <option featureType="dependencySupport" implementationName="javascript:npm:prettier" />
-    <option featureType="dependencySupport" implementationName="executable:docker" />
-    <option featureType="dependencySupport" implementationName="javascript:npm:stylus" />
-    <option featureType="dependencySupport" implementationName="javascript:npm:vite" />
-    <option featureType="dependencySupport" implementationName="javascript:npm:webpack" />
-    <option featureType="dependencySupport" implementationName="executable:kubectl" />
-    <option featureType="com.intellij.fileTypeFactory" implementationName=".env" />
-    <option featureType="dependencySupport" implementationName="javascript:npm:postcss" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/src/pages/map/map-interface/app-state/reducers/types.ts</url>
-          <properties lambdaOrdinal="-1" />
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/src/pages/map/map-interface/index.ts</url>
-          <line>46</line>
-          <properties lambdaOrdinal="-1" />
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/pages/map/map-interface/app-state/handlers/index.ts b/src/pages/map/map-interface/app-state/handlers/index.ts
index e14e4f9e..ac7f5c58 100644
--- a/src/pages/map/map-interface/app-state/handlers/index.ts
+++ b/src/pages/map/map-interface/app-state/handlers/index.ts
@@ -23,8 +23,7 @@ import { currentPageForPathName, isDetailPanelRoute } from "../nav-hooks";
 import { MapLayer } from "../reducers/core";
 import { getInitialStateFromHash } from "../reducers/hash-string";
 import { ColumnGeoJSONRecord, findColumnsForLocation } from "./columns";
-// TODO: remove this
-import { buildLocationPath } from "./pathname";
+import { matchPath } from "react-router";
 
 async function actionRunner(
   state: AppState,

From 1c44dac0195f1bda7dcc822ef2ed3ba42ce4f4ac Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 12 Jun 2024 12:09:55 -0500
Subject: [PATCH 090/151] Reorganization of data loading in main page

---
 .../map-interface/app-state/handlers/fetch.ts |   6 +-
 .../app-state/handlers/filters.ts             |   7 +-
 .../map-interface/app-state/handlers/index.ts | 169 +++++++++++-------
 .../app-state/reducers/core/index.ts          |   4 -
 .../app-state/reducers/core/types.ts          |   2 +-
 src/pages/map/map-interface/map-page/index.ts |   7 +-
 6 files changed, 117 insertions(+), 78 deletions(-)

diff --git a/src/pages/map/map-interface/app-state/handlers/fetch.ts b/src/pages/map/map-interface/app-state/handlers/fetch.ts
index c97d4f2a..14e7288a 100644
--- a/src/pages/map/map-interface/app-state/handlers/fetch.ts
+++ b/src/pages/map/map-interface/app-state/handlers/fetch.ts
@@ -1,8 +1,8 @@
 import { SETTINGS, apiV2Prefix } from "@macrostrat-web/settings";
 import axios from "axios";
 import { joinURL } from "~/pages/map/map-interface/utils";
-import { ColumnGeoJSONRecord } from "../reducers";
-import { UPDATE_FILTERED_COLUMNS } from "../reducers/filtered-columns";
+import { ColumnGeoJSONRecord } from "./columns";
+import { UPDATE_COLUMN_FILTERS } from "../reducers/core/types";
 import { XDDSnippet } from "~/types";
 
 export const base = apiV2Prefix;
@@ -54,7 +54,7 @@ function buildColumnQueryParams(filters) {
 
 export async function fetchFilteredColumns(
   providedFilters
-): Promise<UPDATE_FILTERED_COLUMNS | void> {
+): Promise<UPDATE_COLUMN_FILTERS | void> {
   let queryString = buildColumnQueryParams(providedFilters);
   let url = `${base}/columns`;
   if (Object.keys(queryString).length === 0) {
diff --git a/src/pages/map/map-interface/app-state/handlers/filters.ts b/src/pages/map/map-interface/app-state/handlers/filters.ts
index 6b659fb0..d6b76d26 100644
--- a/src/pages/map/map-interface/app-state/handlers/filters.ts
+++ b/src/pages/map/map-interface/app-state/handlers/filters.ts
@@ -22,7 +22,7 @@ export async function runFilter(filter: Filter): Promise<FilterData> {
       return {
         category: "lithology",
         id: filter.name ?? filter.id,
-        name: filter.name ?? filter.id,
+        name: filter.name ?? filter.id.toString(),
         type: filter.type,
         legend_ids: [],
       };
@@ -169,11 +169,13 @@ export const fetchIntervalFilter = async (
 type LithologyClassFilter = {
   type: FilterType.LithologyClasses;
   name: string;
+  id: number;
 };
 
 type LithologyTypeFilter = {
   type: FilterType.LithologyTypes;
   name: string;
+  id: number;
 };
 
 type LithologyFilter = {
@@ -285,7 +287,8 @@ async function fetchAllLithTypes(
   return {
     category: "lithology",
     id,
-    name: id,
+    // TODO: revisit name/id differences
+    name: id.toString(),
     type,
     legend_ids,
   };
diff --git a/src/pages/map/map-interface/app-state/handlers/index.ts b/src/pages/map/map-interface/app-state/handlers/index.ts
index ac7f5c58..afbccafd 100644
--- a/src/pages/map/map-interface/app-state/handlers/index.ts
+++ b/src/pages/map/map-interface/app-state/handlers/index.ts
@@ -22,10 +22,15 @@ import { LineString } from "geojson";
 import { currentPageForPathName, isDetailPanelRoute } from "../nav-hooks";
 import { MapLayer } from "../reducers/core";
 import { getInitialStateFromHash } from "../reducers/hash-string";
-import { ColumnGeoJSONRecord, findColumnsForLocation } from "./columns";
+import {
+  ColumnGeoJSONRecord,
+  ColumnSummary,
+  ColumnProperties,
+  findColumnsForLocation,
+} from "./columns";
 import { matchPath } from "react-router";
 
-async function actionRunner(
+export default async function actionRunner(
   state: AppState,
   action: AppAction,
   dispatch = null
@@ -46,6 +51,15 @@ async function actionRunner(
         state.router.location.hash
       );
 
+      const newState = {
+        ...state,
+        core: {
+          ...coreState1,
+          initialLoadComplete: true,
+        },
+        menu: { activePage },
+      };
+
       // If we are on the column route, the column layer must be enabled
       // const colMatch = matchPath(
       //   mapPagePrefix + "/loc/:lng/:lat/column",
@@ -59,17 +73,18 @@ async function actionRunner(
 
       // We always get all columns on initial load, which might be
       // a bit unnecessary and slow.
-      let allColumns: ColumnGeoJSONRecord[] | null = await fetchAllColumns();
+      //let allColumns: ColumnGeoJSONRecord[] | null = await fetchAllColumns();
 
-      const newState = {
-        ...state,
-        core: {
-          ...coreState1,
-          allColumns,
-          initialLoadComplete: true,
-        },
-        menu: { activePage },
-      };
+      fetchAllColumns().then((res) => {
+        runAsyncAction(
+          newState,
+          {
+            type: "set-all-columns",
+            columns: res,
+          },
+          dispatch
+        );
+      });
 
       dispatch({
         type: "replace-state",
@@ -78,7 +93,7 @@ async function actionRunner(
 
       // Set info marker position if it is defined
       if (newState.core.infoMarkerPosition != null) {
-        const nextAction = await actionRunner(
+        runAsyncAction(
           newState,
           {
             type: "map-query",
@@ -89,7 +104,6 @@ async function actionRunner(
           },
           dispatch
         );
-        dispatch(nextAction);
       }
 
       // Apply all filters in parallel
@@ -116,6 +130,20 @@ async function actionRunner(
         return null;
       }
     }
+    case "set-all-columns":
+      if (state.core.infoMarkerPosition != null) {
+        fetchColumnInfo(
+          {
+            lng: state.core.infoMarkerPosition.lng,
+            lat: state.core.infoMarkerPosition.lat,
+            columns: [],
+          },
+          action.columns,
+          state.core.columnInfo,
+          dispatch
+        );
+      }
+      return action;
     case "toggle-menu": {
       // Push the menu onto the history stack
       let activePage = state.menu.activePage;
@@ -212,58 +240,17 @@ async function actionRunner(
       });
 
       // Run a bunch of async queries in ~parallel
-      let mapData = await runMapQuery(
-        lng,
-        lat,
-        z,
-        map_id,
-        sourceMapQuery.token
-      );
-
-      let { columns } = action;
-      // If no columns are provided, try to find them from the active column dataset
-      if (
-        (columns == null || columns.length == 0) &&
-        state.core.allColumns != null
-      ) {
-        columns = findColumnsForLocation(state.core.allColumns, {
-          lng,
-          lat,
-        }).map((c) => c.properties);
-      }
-      const firstColumn = columns?.[0];
-      const { columnInfo } = state.core;
-      if (firstColumn != null && columnInfo?.col_id != firstColumn.col_id) {
-        // Get the column units if we don't have them already
-        actionRunner(
-          state,
-          { type: "get-column-units", column: firstColumn },
-          dispatch
-        ).then(dispatch);
-      } else if (firstColumn == null && columnInfo != null) {
-        // Clear the column info if we don't have any columns
-        dispatch({ type: "clear-column-info", data: null, column: null });
-      }
-
-      coreState.infoMarkerPosition = { lng, lat };
-      return {
-        type: "received-map-query",
-        data: mapData,
-      };
-    case "get-column-units":
-      let CancelTokenGetColumn = axios.CancelToken;
-      let sourceGetColumn = CancelTokenGetColumn.source();
-      dispatch({ type: "start-column-query", cancelToken: sourceGetColumn });
+      runMapQuery(lng, lat, z, map_id, sourceMapQuery.token).then((res) => {
+        dispatch({ type: "received-map-query", data: res });
+      });
 
-      let columnData = await runColumnQuery(
-        action.column,
-        sourceGetColumn.token
+      fetchColumnInfo(
+        { lng, lat, columns: action.columns },
+        state.core.allColumns,
+        state.core.columnInfo,
+        dispatch
       );
-      return {
-        type: "received-column-query",
-        data: columnData,
-        column: action.column,
-      };
+      return;
     case "get-pbdb":
       let collection_nos = action.collection_nos;
       dispatch({ type: "start-pdbd-query" });
@@ -276,4 +263,56 @@ async function actionRunner(
   }
 }
 
-export default actionRunner;
+async function runAsyncAction(
+  state: AppState,
+  action: AppAction,
+  dispatch: any
+) {
+  const res = await actionRunner(state, action, dispatch);
+  if (res != null) dispatch(res);
+}
+
+async function getColumnUnits(column: ColumnProperties, dispatch: any) {
+  let CancelTokenGetColumn = axios.CancelToken;
+  let sourceGetColumn = CancelTokenGetColumn.source();
+  dispatch({ type: "start-column-query", cancelToken: sourceGetColumn });
+
+  let columnData = await runColumnQuery(column, sourceGetColumn.token);
+  dispatch({
+    type: "received-column-query",
+    data: columnData,
+    column: column,
+  });
+}
+
+type ColumnFetchParams = {
+  lng: number;
+  lat: number;
+  columns: ColumnProperties[];
+};
+
+function fetchColumnInfo(
+  params: ColumnFetchParams,
+  allColumns: ColumnGeoJSONRecord[] | null,
+  currentColumn: ColumnSummary | null,
+  dispatch: any
+): AppAction | void {
+  const { lng, lat, columns } = params;
+  let providedColumns = columns ?? [];
+
+  if (providedColumns.length == 0) {
+    // We could also just fire off a query using a lat/lon here
+    providedColumns = findColumnsForLocation(allColumns ?? [], {
+      lng,
+      lat,
+    }).map((c) => c.properties);
+  }
+  const nextColumn = providedColumns?.[0];
+  if (nextColumn != null && currentColumn?.col_id != nextColumn.col_id) {
+    // Get the column units if we don't have them already
+    getColumnUnits(nextColumn, dispatch);
+  } else if (nextColumn == null && currentColumn != null) {
+    // Clear the column info if we don't have any columns
+    dispatch({ type: "clear-column-info" });
+  }
+}
diff --git a/src/pages/map/map-interface/app-state/reducers/core/index.ts b/src/pages/map/map-interface/app-state/reducers/core/index.ts
index 3789d692..03800382 100644
--- a/src/pages/map/map-interface/app-state/reducers/core/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/core/index.ts
@@ -253,10 +253,6 @@ export function coreReducer(
       return { ...state, allColumns: action.columns };
 
     case "received-column-query":
-      // summarize units
-      if (state.allColumns == null || state.allColumns.length == 0) {
-        return state;
-      }
       return {
         ...state,
         fetchingColumnInfo: false,
diff --git a/src/pages/map/map-interface/app-state/reducers/core/types.ts b/src/pages/map/map-interface/app-state/reducers/core/types.ts
index d74a6dc7..119009dc 100644
--- a/src/pages/map/map-interface/app-state/reducers/core/types.ts
+++ b/src/pages/map/map-interface/app-state/reducers/core/types.ts
@@ -41,7 +41,7 @@ type CLOSE_INFODRAWER = { type: "close-infodrawer" };
 
 type TOGGLE_FILTERS = { type: "toggle-filters" };
 type REMOVE_FILTER = { type: "remove-filter"; filter: any };
-type UPDATE_COLUMN_FILTERS = {
+export type UPDATE_COLUMN_FILTERS = {
   type: "update-column-filters";
   columns: ColumnGeoJSONRecord[];
 };
diff --git a/src/pages/map/map-interface/map-page/index.ts b/src/pages/map/map-interface/map-page/index.ts
index 0355a409..cb11397e 100644
--- a/src/pages/map/map-interface/map-page/index.ts
+++ b/src/pages/map/map-interface/map-page/index.ts
@@ -31,12 +31,13 @@ function MapView(props) {
   );
 }
 
-export const MapPage = ({
+function MapPage({
   baseRoute = "/",
   menuPage = null,
 }: {
+  baseRoute?: string;
   menuPage?: MenuPage;
-}) => {
+}) {
   const runAction = useAppActions();
   const inputFocus = useAppState((s) => s.core.inputFocus);
   const infoDrawerOpen = useAppState((s) => s.core.infoDrawerOpen);
@@ -89,7 +90,7 @@ export const MapPage = ({
     },
     [h("div.context-underlay", { onClick: onMouseDown }), h(MapView)]
   );
-};
+}
 
 function MapPageRoutes() {
   return h(Routes, [

From 1b70bf0ce2b90bc4c9187d8085c447698fa2639f Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Wed, 12 Jun 2024 15:03:06 -0500
Subject: [PATCH 091/151] Updated basic reducer state

---
 .idea/prettier.xml                            |  1 +
 .../map-interface/app-state/handlers/index.ts | 49 +++----------------
 .../app-state/reducers/core/index.ts          |  9 ++--
 .../app-state/reducers/core/types.ts          | 10 +++-
 .../map-interface/app-state/reducers/index.ts | 25 ++++++++--
 .../map-interface/app-state/reducers/types.ts |  9 +---
 6 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/.idea/prettier.xml b/.idea/prettier.xml
index 727b8b53..ea0f3cf8 100644
--- a/.idea/prettier.xml
+++ b/.idea/prettier.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="MANUAL" />
     <option name="myRunOnSave" value="true" />
     <option name="myRunOnReformat" value="true" />
   </component>
diff --git a/src/pages/map/map-interface/app-state/handlers/index.ts b/src/pages/map/map-interface/app-state/handlers/index.ts
index afbccafd..95844f9a 100644
--- a/src/pages/map/map-interface/app-state/handlers/index.ts
+++ b/src/pages/map/map-interface/app-state/handlers/index.ts
@@ -1,5 +1,3 @@
-import { push } from "@lagunovsky/redux-react-router";
-import { mapPagePrefix, routerBasename } from "@macrostrat-web/settings";
 import axios from "axios";
 import {
   AppAction,
@@ -28,7 +26,6 @@ import {
   ColumnProperties,
   findColumnsForLocation,
 } from "./columns";
-import { matchPath } from "react-router";
 
 export default async function actionRunner(
   state: AppState,
@@ -39,27 +36,7 @@ export default async function actionRunner(
 
   switch (action.type) {
     case "get-initial-map-state": {
-      const { pathname } = state.router.location;
-      let s1 = setInfoMarkerPosition(state);
-      let coreState = s1.core;
-
-      const activePage = currentPageForPathName(pathname);
-
       // Harvest as much information as possible from the hash string
-      let [coreState1, filters] = getInitialStateFromHash(
-        coreState,
-        state.router.location.hash
-      );
-
-      const newState = {
-        ...state,
-        core: {
-          ...coreState1,
-          initialLoadComplete: true,
-        },
-        menu: { activePage },
-      };
-
       // If we are on the column route, the column layer must be enabled
       // const colMatch = matchPath(
       //   mapPagePrefix + "/loc/:lng/:lat/column",
@@ -77,7 +54,7 @@ export default async function actionRunner(
 
       fetchAllColumns().then((res) => {
         runAsyncAction(
-          newState,
+          state,
           {
             type: "set-all-columns",
             columns: res,
@@ -86,15 +63,9 @@ export default async function actionRunner(
         );
       });
 
-      dispatch({
-        type: "replace-state",
-        state: newState,
-      });
-
-      // Set info marker position if it is defined
-      if (newState.core.infoMarkerPosition != null) {
+      if (state.core.infoMarkerPosition != null) {
         runAsyncAction(
-          newState,
+          state,
           {
             type: "map-query",
             z: state.core.mapPosition.target?.zoom ?? 7,
@@ -105,21 +76,13 @@ export default async function actionRunner(
           dispatch
         );
       }
-
       // Apply all filters in parallel
-      const newFilters = await Promise.all(
-        filters.map((f) => {
+      const filters = await Promise.all(
+        state.core.filtersInfo.map((f) => {
           return runFilter(f);
         })
       );
-      await dispatch({ type: "set-filters", filters: newFilters });
-
-      // Then reload the map by faking a layer change event.
-      // There is probably a better way to do this.
-      return {
-        type: "map-layers-changed",
-        mapLayers: coreState1.mapLayers,
-      };
+      return { type: "initial-load-complete", filters };
     }
     case "map-layers-changed": {
       const { mapLayers } = action;
diff --git a/src/pages/map/map-interface/app-state/reducers/core/index.ts b/src/pages/map/map-interface/app-state/reducers/core/index.ts
index 03800382..e32ca62e 100644
--- a/src/pages/map/map-interface/app-state/reducers/core/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/core/index.ts
@@ -60,6 +60,7 @@ const defaultState: CoreState = {
   mapUse3D: false,
   filtersOpen: false,
   filters: [],
+  filtersInfo: [],
   filteredColumns: {},
   data: [],
   showExperimentsPanel: false,
@@ -80,6 +81,8 @@ export function coreReducer(
   action: CoreAction
 ): CoreState {
   switch (action.type) {
+    case "initial-load-complete":
+      return { ...state, initialLoadComplete: true, filters: action.filters };
     case "map-loading":
       if (state.mapIsLoading) return state;
       return { ...state, mapIsLoading: true };
@@ -144,12 +147,6 @@ export function coreReducer(
         ...coreReducer(state, { type: "stop-searching" }),
         filters: buildFilters(state.filters, [action.filter]),
       };
-    case "set-filters":
-      /* Set multiple filters at once, usually on app load. */
-      return {
-        ...state,
-        filters: buildFilters(state.filters, action.filters),
-      };
     case "remove-filter":
       return {
         ...state,
diff --git a/src/pages/map/map-interface/app-state/reducers/core/types.ts b/src/pages/map/map-interface/app-state/reducers/core/types.ts
index 119009dc..2b9b2282 100644
--- a/src/pages/map/map-interface/app-state/reducers/core/types.ts
+++ b/src/pages/map/map-interface/app-state/reducers/core/types.ts
@@ -158,6 +158,11 @@ type SetFocusedMapSource = {
   source_id: number | null;
 };
 
+type InitialLoadComplete = {
+  type: "initial-load-complete";
+  filters: FilterData[];
+};
+
 export type CoreAction =
   | MAP_LAYERS_CHANGED
   | CLEAR_FILTERS
@@ -198,7 +203,6 @@ export type CoreAction =
   | MapAction
   | ToggleHighResolutionTerrain
   | AddFilter
-  | SetFilters
   | SetTimeCursor
   | SetPlateModel
   | StopSearching
@@ -210,7 +214,8 @@ export type CoreAction =
   | ToggleCrossSection
   | SetCrossSectionLine
   | SetFocusedMapSource
-  | ClearColumnInfo;
+  | ClearColumnInfo
+  | InitialLoadComplete;
 
 interface AsyncRequestState {
   // Events and tokens for xhr
@@ -265,6 +270,7 @@ export interface CoreState extends MapState, AsyncRequestState {
   mapCenter: MapCenterInfo;
   mapUse3D: boolean;
   filtersOpen: boolean;
+  filtersInfo: Filter[];
   filters: FilterData[];
   filteredColumns: ColumnGeoJSONRecord[] | null;
   showExperimentsPanel: boolean;
diff --git a/src/pages/map/map-interface/app-state/reducers/index.ts b/src/pages/map/map-interface/app-state/reducers/index.ts
index f22305a5..a4d79dea 100644
--- a/src/pages/map/map-interface/app-state/reducers/index.ts
+++ b/src/pages/map/map-interface/app-state/reducers/index.ts
@@ -6,9 +6,12 @@ import { mapPagePrefix } from "@macrostrat-web/settings";
 import { createBrowserHistory } from "history";
 import { matchPath } from "react-router";
 import { performanceReducer } from "../../performance/core";
-import { contextPanelIsInitiallyOpen } from "../nav-hooks";
+import {
+  contextPanelIsInitiallyOpen,
+  currentPageForPathName,
+} from "../nav-hooks";
 import { CoreAction, coreReducer } from "./core";
-import { hashStringReducer } from "./hash-string";
+import { getInitialStateFromHash, hashStringReducer } from "./hash-string";
 import { AppAction, AppState, MenuAction, MenuState } from "./types";
 import { pathNameAction } from "../handlers/pathname";
 
@@ -43,15 +46,29 @@ function mainReducer(
    * Then, for actions that don't need to affect multiple sections of
    * state, we pass thm to individual reducers.
    */
+
   switch (action.type) {
     case "@@INIT": {
       const route = state.router.location;
       const { pathname } = route;
       const isOpen = contextPanelIsInitiallyOpen(pathname);
+      const activePage = currentPageForPathName(pathname);
       const s1 = setInfoMarkerPosition(state, pathname);
+      const [coreState, filters] = getInitialStateFromHash(
+        s1.core,
+        s1.router.location.hash
+      );
+
       return {
         ...s1,
-        core: { ...s1.core, menuOpen: isOpen, contextPanelOpen: isOpen },
+        core: {
+          ...s1.core,
+          ...coreState,
+          filtersInfo: filters,
+          menuOpen: isOpen,
+          contextPanelOpen: isOpen,
+        },
+        menu: { activePage },
       };
     }
     case "@@router/ON_LOCATION_CHANGED": {
@@ -87,8 +104,6 @@ function mainReducer(
         core: { ...state.core, inputFocus: false },
         menu: menuReducer(state.menu, action),
       };
-    case "replace-state":
-      return action.state;
     default:
       return {
         router: routerReducer(state.router, action as RouterActions),
diff --git a/src/pages/map/map-interface/app-state/reducers/types.ts b/src/pages/map/map-interface/app-state/reducers/types.ts
index 363214f5..4e977be1 100644
--- a/src/pages/map/map-interface/app-state/reducers/types.ts
+++ b/src/pages/map/map-interface/app-state/reducers/types.ts
@@ -27,12 +27,5 @@ export type AppState = {
   nextRouterAction: RouterActions | null;
 };
 
-type OverallActions = { type: "replace-state"; state: AppState };
-
-export type AppAction =
-  | CoreAction
-  | MapAction
-  | RouterActions
-  | MenuAction
-  | OverallActions;
+export type AppAction = CoreAction | MapAction | RouterActions | MenuAction;
 export * from "./types";

From abe41d11520cd2077bd1edf880f4f5b1352686f7 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 3 Jun 2024 22:11:03 -0500
Subject: [PATCH 092/151] Small update to column inspector

---
 src/pages/columns/@column/+Page.ts                  | 2 +-
 src/pages/columns/@column/column-inspector/index.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/columns/@column/+Page.ts b/src/pages/columns/@column/+Page.ts
index 2c93f790..655f7428 100644
--- a/src/pages/columns/@column/+Page.ts
+++ b/src/pages/columns/@column/+Page.ts
@@ -1,4 +1,4 @@
-import ColumnPage from "~/pages/columns/@column/column-inspector";
+import ColumnPage from "./column-inspector";
 import h from "@macrostrat/hyper";
 
 export function Page({ columnInfo, linkPrefix }) {
diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index a66654ce..15e44b8e 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -77,7 +77,9 @@ function ColumnPage({ columnInfo, linkPrefix = "/" }) {
           },
           setCurrentColumn(newColumn) {
             const { col_id } = newColumn.properties;
-            navigate(linkPrefix + `columns/${col_id}`);
+            navigate(linkPrefix + `columns/${col_id}`, {
+              overwriteLastHistoryEntry: true,
+            });
           },
           margin: 10,
           project_id: columnInfo.project_id,

From 50fd739fc8a507ac57120e5661b8807a8d7b70ff Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 00:12:06 -0500
Subject: [PATCH 093/151] Fixed client routing in column inspector

---
 src/layouts/index.ts                          | 15 +++++++++++----
 src/layouts/main.module.sass                  | 19 +++++++++++++++++++
 .../columns/@column/column-inspector/index.ts | 11 +++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/layouts/index.ts b/src/layouts/index.ts
index 69dbb800..38a9b8cd 100644
--- a/src/layouts/index.ts
+++ b/src/layouts/index.ts
@@ -4,6 +4,7 @@ import { Spinner } from "@blueprintjs/core";
 import { usePageTransitionStore } from "~/renderer/transitions";
 import classNames from "classnames";
 import { PageBreadcrumbs } from "~/renderer";
+import { useTransition } from "transition-hook";
 
 const h = hyper.styled(styles);
 
@@ -11,16 +12,22 @@ export function BasePage({ children, className, fitViewport = false }) {
   const inPageTransition = usePageTransitionStore(
     (state) => state.inPageTransition
   );
-  if (inPageTransition) {
-    return h("div.page-transition", [h(Spinner)]);
-  }
+
+  const loadingTransition = useTransition(inPageTransition, 300);
 
   return h(
     "div",
     {
       className: classNames(className, { "fit-viewport": fitViewport }),
     },
-    children
+    [
+      children,
+      h.if(loadingTransition.shouldMount)(
+        "div.page-transition",
+        { className: `page-transition-${loadingTransition.stage}` },
+        h("div.page-transition-content", h(Spinner))
+      ),
+    ]
   );
 }
 
diff --git a/src/layouts/main.module.sass b/src/layouts/main.module.sass
index ab72dec9..6db609c9 100644
--- a/src/layouts/main.module.sass
+++ b/src/layouts/main.module.sass
@@ -22,3 +22,22 @@
 
 .fullscreen-page
   padding: 1em 4em 3em
+
+.page-transition
+  position: fixed
+  width: 100vw
+  height: 100vh
+  top: 0
+  left: 0
+  transition: opacity 0.3s ease-in-out
+  background-color: var(--translucent-panel-background-color)
+  opacity: 0.5
+  z-index: 1000
+  .page-transition-content
+    // Center the content
+    position: absolute
+    top: 50%
+    left: 50%
+    transform: translate(-50%, -50%)
+  &.page-transition-leave
+    opacity: 0
\ No newline at end of file
diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index 15e44b8e..9c9d7a22 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -17,6 +17,13 @@ import { BasePage } from "~/layouts";
 import { PageHeader } from "~/components";
 
 import { navigate } from "vike/client/router";
+import { create } from "zustand";
+
+const useBearStore = create((set) => ({
+  bears: 0,
+  increasePopulation: () => set((state) => ({ bears: state.bears + 1 })),
+  removeAllBears: () => set({ bears: 0 }),
+}));
 
 const h = hyperStyled(styles);
 
@@ -29,6 +36,9 @@ function ColumnPage({ columnInfo, linkPrefix = "/" }) {
   const lat = new Number(columnInfo.lat);
   const zoom = 7;
 
+  const store = useBearStore();
+  console.log("Bear count", store.bears);
+
   return h(BasePage, [
     h(PageHeader, { title: columnInfo.col_name, className: "column-header" }),
     h("div.column-ui", [
@@ -76,6 +86,7 @@ function ColumnPage({ columnInfo, linkPrefix = "/" }) {
             display: selectedUnit == null ? "block" : "none",
           },
           setCurrentColumn(newColumn) {
+            store.increasePopulation();
             const { col_id } = newColumn.properties;
             navigate(linkPrefix + `columns/${col_id}`, {
               overwriteLastHistoryEntry: true,

From 98263c0b599a1cc60173ed64c888787a0e5137f6 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 01:34:33 -0500
Subject: [PATCH 094/151] Adjusted breadcrumbs for column pages

---
 src/pages/columns/@column/+Page.ts            |   4 +-
 src/pages/columns/@column/+config.ts          |   1 +
 src/pages/columns/@column/+onBeforeRender.ts  |  67 ++++++++-
 .../column-inspector.module.styl              |  12 +-
 .../columns/@column/column-inspector/index.ts | 128 +++++++++---------
 .../columns/@column/+onBeforeRender.ts        |  59 +-------
 src/renderer/breadcrumbs.ts                   |  38 +++++-
 7 files changed, 180 insertions(+), 129 deletions(-)

diff --git a/src/pages/columns/@column/+Page.ts b/src/pages/columns/@column/+Page.ts
index 655f7428..0a8f83d9 100644
--- a/src/pages/columns/@column/+Page.ts
+++ b/src/pages/columns/@column/+Page.ts
@@ -1,6 +1,6 @@
 import ColumnPage from "./column-inspector";
 import h from "@macrostrat/hyper";
 
-export function Page({ columnInfo, linkPrefix }) {
-  return h(ColumnPage, { columnInfo, linkPrefix });
+export function Page(props) {
+  return h(ColumnPage, props);
 }
diff --git a/src/pages/columns/@column/+config.ts b/src/pages/columns/@column/+config.ts
index bbb0ee14..ebdb29d8 100644
--- a/src/pages/columns/@column/+config.ts
+++ b/src/pages/columns/@column/+config.ts
@@ -11,4 +11,5 @@ export default {
       },
     },
   },
+  //Page: "import:./column-inspector:ColumnPage",
 };
diff --git a/src/pages/columns/@column/+onBeforeRender.ts b/src/pages/columns/@column/+onBeforeRender.ts
index b5a429cc..5b26948a 100644
--- a/src/pages/columns/@column/+onBeforeRender.ts
+++ b/src/pages/columns/@column/+onBeforeRender.ts
@@ -1 +1,66 @@
-export { onBeforeRender } from "~/pages/projects/@project/columns/@column/+onBeforeRender";
+import { apiV2Prefix } from "@macrostrat-web/settings";
+import { preprocessUnits } from "@macrostrat/column-views/src/helpers";
+import fetch from "node-fetch";
+
+import { ColumnSummary } from "~/pages/map/map-interface/app-state/handlers/columns";
+import { fetchAPIData } from "~/pages/columns/utils";
+
+async function getAndUnwrap<T>(url: string): Promise<T> {
+  const res = await fetch(url);
+  const res1 = await res.json();
+  return res1.success.data;
+}
+
+export async function onBeforeRender(pageContext) {
+  // `.page.server.js` files always run in Node.js; we could use SQL/ORM queries here.
+  const col_id = pageContext.routeParams.column;
+
+  // In cases where we are in a project context, we need to fetch the project data
+  const project_id = pageContext.routeParams.project;
+
+  // https://v2.macrostrat.org/api/v2/columns?col_id=3&response=long
+
+  const baseRoute = project_id == null ? "/columns" : `/defs/columns`;
+  const linkPrefix = project_id == null ? "/" : `/projects/${project_id}/`;
+
+  /** This is a hack to make sure that all requisite data is on the table. */
+  const responses = await Promise.all([
+    project_id == null
+      ? Promise.resolve(null)
+      : getAndUnwrap(apiV2Prefix + `/defs/projects?project_id=${project_id}`),
+    getAndUnwrap(
+      apiV2Prefix +
+        baseRoute +
+        "?format=geojson&response=long&in_process=true&col_id=" +
+        col_id
+    ),
+    fetchAPIData(`/units`, {
+      response: "long",
+      col_id,
+    }),
+  ]);
+
+  const [projectData, column, unitsLong]: [any, any, any] = responses;
+
+  const col = column?.features[0];
+
+  const columnInfo: ColumnSummary = {
+    ...col.properties,
+    geometry: col.geometry,
+    units: preprocessUnits(unitsLong),
+  };
+
+  return {
+    pageContext: {
+      exports: {
+        ...pageContext.exports,
+        title: columnInfo.col_name,
+      },
+      pageProps: {
+        columnInfo,
+        linkPrefix,
+        project: projectData?.[0],
+      },
+    },
+  };
+}
diff --git a/src/pages/columns/@column/column-inspector/column-inspector.module.styl b/src/pages/columns/@column/column-inspector/column-inspector.module.styl
index 9eea998b..5a462c9a 100644
--- a/src/pages/columns/@column/column-inspector/column-inspector.module.styl
+++ b/src/pages/columns/@column/column-inspector/column-inspector.module.styl
@@ -1,6 +1,4 @@
 .column-ui
-  *
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
 
   --column-background-color: var(--background-color)
   --column-stroke-color: var(--text-color)
@@ -26,8 +24,14 @@
   padding 0
 
 .column-header
-  margin-left: 2em
-  margin-right: 2em
+  margin: 1em 4em
+  h1
+    font-size: 1.5em
+    .col-group
+      font-weight: normal
+
+  nav
+    position: sticky
 
 .column-nav
   position sticky
diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index 9c9d7a22..cba6d4e5 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -17,86 +17,90 @@ import { BasePage } from "~/layouts";
 import { PageHeader } from "~/components";
 
 import { navigate } from "vike/client/router";
-import { create } from "zustand";
-
-const useBearStore = create((set) => ({
-  bears: 0,
-  increasePopulation: () => set((state) => ({ bears: state.bears + 1 })),
-  removeAllBears: () => set({ bears: 0 }),
-}));
+import { PageBreadcrumbs } from "~/renderer";
 
 const h = hyperStyled(styles);
 
-function ColumnPage({ columnInfo, linkPrefix = "/" }) {
+function ColumnPage({ columnInfo, linkPrefix = "/", project }) {
   const { units, geometry } = columnInfo;
 
   const selectedUnit = useUnitSelection(units);
 
+  console.log(project, columnInfo);
+
   const lon = new Number(columnInfo.lng);
   const lat = new Number(columnInfo.lat);
   const zoom = 7;
 
-  const store = useBearStore();
-  console.log("Bear count", store.bears);
-
   return h(BasePage, [
-    h(PageHeader, { title: columnInfo.col_name, className: "column-header" }),
-    h("div.column-ui", [
-      h("div.left-column", [
-        h("div.column-view", [
-          h("p.column-details", [
-            h("span.column-id", ["#", columnInfo.col_id]),
-            ", ",
-            h("span.project", ["project ", columnInfo.project_id]),
-            ", ",
-            h(
-              "a",
-              {
-                href: `/map/loc/${lon}/${lat}/column#z=${zoom}&show=columns,geology`,
+    h("div.main", [
+      h("div.column-header", [
+        h("nav", [h(PageBreadcrumbs)]),
+        h("h1.page-title", [
+          h("span.col-name", columnInfo.col_name),
+          h.if(columnInfo.col_group != null)("span.subtitle", [
+            h("span.separator", " – "),
+            h("span.col-group", `${columnInfo.col_group}`),
+          ]),
+        ]),
+      ]),
+      //h(PageHeader, { title: columnInfo.col_name, className: "column-header" }),
+      h("div.column-ui", [
+        h("div.left-column", [
+          h("div.column-view", [
+            h("p.column-details", [
+              h("span.column-id", ["#", columnInfo.col_id]),
+              ", ",
+              h("span.project", ["project ", columnInfo.project_id]),
+              ", ",
+              h(
+                "a",
+                {
+                  href: `/map/loc/${lon}/${lat}/column#z=${zoom}&show=columns,geology`,
+                },
+                "show in map"
+              ),
+              ".",
+            ]),
+            h(Column, {
+              data: units,
+              unconformityLabels: true,
+              columnWidth: 250,
+              width: 500,
+              unitComponentProps: {
+                nColumns: 3,
               },
-              "show in map"
-            ),
-            ".",
+            }),
           ]),
-          h(Column, {
-            data: units,
-            unconformityLabels: true,
-            columnWidth: 250,
-            width: 500,
-            unitComponentProps: {
-              nColumns: 3,
+        ]),
+        h("div.right-column", [
+          h(ColumnNavigatorMap, {
+            className: "column-map",
+            format: "geojson_bare",
+            currentColumn: {
+              geometry,
+              type: "Feature",
+              properties: {
+                col_id: columnInfo.col_id,
+                col_name: columnInfo.col_name,
+                project_id: columnInfo.project_id,
+              },
+            },
+            style: {
+              display: selectedUnit == null ? "block" : "none",
             },
+            setCurrentColumn(newColumn) {
+              const { col_id } = newColumn.properties;
+              navigate(linkPrefix + `columns/${col_id}`, {
+                overwriteLastHistoryEntry: true,
+              });
+            },
+            margin: 10,
+            project_id: columnInfo.project_id,
           }),
+          h(ModalUnitPanel, { unitData: units }),
         ]),
       ]),
-      h("div.right-column", [
-        h(ColumnNavigatorMap, {
-          className: "column-map",
-          format: "geojson_bare",
-          currentColumn: {
-            geometry,
-            type: "Feature",
-            properties: {
-              col_id: columnInfo.col_id,
-              col_name: columnInfo.col_name,
-              project_id: columnInfo.project_id,
-            },
-          },
-          style: {
-            display: selectedUnit == null ? "block" : "none",
-          },
-          setCurrentColumn(newColumn) {
-            store.increasePopulation();
-            const { col_id } = newColumn.properties;
-            navigate(linkPrefix + `columns/${col_id}`, {
-              overwriteLastHistoryEntry: true,
-            });
-          },
-          margin: 10,
-          project_id: columnInfo.project_id,
-        }),
-        h(ModalUnitPanel, { unitData: units }),
-      ]),
     ]),
   ]);
 }
diff --git a/src/pages/projects/@project/columns/@column/+onBeforeRender.ts b/src/pages/projects/@project/columns/@column/+onBeforeRender.ts
index 1d19878b..7e06a7bb 100644
--- a/src/pages/projects/@project/columns/@column/+onBeforeRender.ts
+++ b/src/pages/projects/@project/columns/@column/+onBeforeRender.ts
@@ -1,58 +1 @@
-import { apiV2Prefix } from "@macrostrat-web/settings";
-import { preprocessUnits } from "@macrostrat/column-views/src/helpers";
-import fetch from "node-fetch";
-import { ColumnSummary } from "~/pages/map/map-interface/app-state/handlers/columns";
-import { fetchAPIData } from "~/pages/columns/utils";
-
-async function getAndUnwrap<T>(url: string): Promise<T> {
-  const res = await fetch(url);
-  const res1 = await res.json();
-  return res1.success.data;
-}
-
-export async function onBeforeRender(pageContext) {
-  // `.page.server.js` files always run in Node.js; we could use SQL/ORM queries here.
-  const col_id = pageContext.routeParams.column;
-  const project_id = pageContext.routeParams.project;
-
-  // https://v2.macrostrat.org/api/v2/columns?col_id=3&response=long
-
-  const baseRoute = project_id == null ? "/columns" : `/defs/columns`;
-  const linkPrefix = project_id == null ? "/" : `/projects/${project_id}/`;
-
-  const responses = await Promise.all([
-    getAndUnwrap(
-      apiV2Prefix +
-        baseRoute +
-        "?format=geojson&response=long&in_process=true&col_id=" +
-        col_id
-    ),
-    fetchAPIData(`/units`, {
-      response: "long",
-      col_id,
-    }),
-  ]);
-
-  const [column, unitsLong]: [any, any] = responses;
-
-  const col = column?.features[0];
-
-  const columnInfo: ColumnSummary = {
-    ...col.properties,
-    geometry: col.geometry,
-    units: preprocessUnits(unitsLong),
-  };
-
-  return {
-    pageContext: {
-      exports: {
-        ...pageContext.exports,
-        title: columnInfo.col_name,
-      },
-      pageProps: {
-        columnInfo,
-        linkPrefix,
-      },
-    },
-  };
-}
+export { onBeforeRender } from "~/pages/columns/@column/+onBeforeRender";
diff --git a/src/renderer/breadcrumbs.ts b/src/renderer/breadcrumbs.ts
index c72d2674..5beb6795 100644
--- a/src/renderer/breadcrumbs.ts
+++ b/src/renderer/breadcrumbs.ts
@@ -7,11 +7,11 @@ import React from "react";
 export function PageBreadcrumbs() {
   const ctx = usePageContext();
   return h(Breadcrumbs, {
-    items: buildBreadcrumns(ctx.urlPathname, sitemap, ctx),
+    items: buildBreadcrumbs(ctx.urlPathname, sitemap, ctx),
   });
 }
 
-function buildBreadcrumns(
+function buildBreadcrumbs(
   currentPath: string,
   routes: Routes,
   ctx: PageContext
@@ -51,9 +51,12 @@ function buildBreadcrumns(
       text = h("code", text);
     }
 
+    let disabled = child?.disabled ?? false;
+
     items.push({
       text,
       href: route == currentPath ? undefined : route,
+      disabled,
     });
     children = child?.children;
   }
@@ -64,15 +67,32 @@ interface Item {
   text: string | React.ReactNode;
   href?: string;
   current?: boolean;
+  disabled?: boolean;
 }
 
 interface Routes {
   slug?: string;
   name: string | ((urlPart: string, ctx: PageContext) => React.ReactNode);
   param?: string;
+  disabled?: boolean;
   children?: Routes[];
 }
 
+const columnsSubtree = {
+  slug: "columns",
+  name: "Columns",
+  children: [
+    {
+      param: "@column",
+      name(urlPart, ctx) {
+        return h("span.column-name", [
+          ctx.pageProps?.columnInfo?.col_name ?? urlPart,
+        ]);
+      },
+    },
+  ],
+};
+
 export const sitemap: Routes = {
   slug: "",
   name: "Macrostrat",
@@ -156,5 +176,19 @@ export const sitemap: Routes = {
         },
       ],
     },
+    columnsSubtree,
+    {
+      slug: "projects",
+      name: "Projects",
+      children: [
+        {
+          param: "@project",
+          name(urlPart, ctx) {
+            return ctx.pageProps?.project?.project ?? urlPart;
+          },
+          children: [{ ...columnsSubtree, disabled: true }],
+        },
+      ],
+    },
   ],
 };

From d83606ca86f7cde73b2be4a63ec117ee2a337d07 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 02:17:54 -0500
Subject: [PATCH 095/151] Updated breadcrumbs

---
 src/pages/columns/@column/+onBeforeRender.ts  | 39 +++++++++++++------
 .../column-inspector.module.styl              |  2 +-
 .../columns/@column/column-inspector/index.ts |  2 +-
 src/renderer/breadcrumbs.module.sass          |  5 +++
 src/renderer/breadcrumbs.ts                   | 17 ++++++--
 5 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 src/renderer/breadcrumbs.module.sass

diff --git a/src/pages/columns/@column/+onBeforeRender.ts b/src/pages/columns/@column/+onBeforeRender.ts
index 5b26948a..22e9411f 100644
--- a/src/pages/columns/@column/+onBeforeRender.ts
+++ b/src/pages/columns/@column/+onBeforeRender.ts
@@ -5,10 +5,22 @@ import fetch from "node-fetch";
 import { ColumnSummary } from "~/pages/map/map-interface/app-state/handlers/columns";
 import { fetchAPIData } from "~/pages/columns/utils";
 
-async function getAndUnwrap<T>(url: string): Promise<T> {
-  const res = await fetch(url);
-  const res1 = await res.json();
-  return res1.success.data;
+function assembleColumnURL({
+  col_id,
+  project_id,
+}: {
+  col_id: number;
+  project_id: number;
+}) {
+  const base = apiV2Prefix + "/columns";
+  const params = new URLSearchParams({
+    col_id: col_id.toString(),
+    project_id: project_id.toString(),
+    response: "long",
+    format: "geojson",
+    in_process: "true",
+  });
+  return `${base}?${params}`;
 }
 
 export async function onBeforeRender(pageContext) {
@@ -20,20 +32,16 @@ export async function onBeforeRender(pageContext) {
 
   // https://v2.macrostrat.org/api/v2/columns?col_id=3&response=long
 
-  const baseRoute = project_id == null ? "/columns" : `/defs/columns`;
   const linkPrefix = project_id == null ? "/" : `/projects/${project_id}/`;
+  const columnURL = assembleColumnURL({ col_id, project_id });
+  console.log(columnURL);
 
   /** This is a hack to make sure that all requisite data is on the table. */
   const responses = await Promise.all([
     project_id == null
       ? Promise.resolve(null)
       : getAndUnwrap(apiV2Prefix + `/defs/projects?project_id=${project_id}`),
-    getAndUnwrap(
-      apiV2Prefix +
-        baseRoute +
-        "?format=geojson&response=long&in_process=true&col_id=" +
-        col_id
-    ),
+    getAndUnwrap(columnURL),
     fetchAPIData(`/units`, {
       response: "long",
       col_id,
@@ -42,7 +50,7 @@ export async function onBeforeRender(pageContext) {
 
   const [projectData, column, unitsLong]: [any, any, any] = responses;
 
-  const col = column?.features[0];
+  const col = column?.features?.[0];
 
   const columnInfo: ColumnSummary = {
     ...col.properties,
@@ -64,3 +72,10 @@ export async function onBeforeRender(pageContext) {
     },
   };
 }
+
+async function getAndUnwrap<T>(url: string): Promise<T> {
+  console.log(url);
+  const res = await fetch(url);
+  const res1 = await res.json();
+  return res1.success.data;
+}
diff --git a/src/pages/columns/@column/column-inspector/column-inspector.module.styl b/src/pages/columns/@column/column-inspector/column-inspector.module.styl
index 5a462c9a..5d579361 100644
--- a/src/pages/columns/@column/column-inspector/column-inspector.module.styl
+++ b/src/pages/columns/@column/column-inspector/column-inspector.module.styl
@@ -27,7 +27,7 @@
   margin: 1em 4em
   h1
     font-size: 1.5em
-    .col-group
+    .subtitle
       font-weight: normal
 
   nav
diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index cba6d4e5..e50397a4 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -35,7 +35,7 @@ function ColumnPage({ columnInfo, linkPrefix = "/", project }) {
   return h(BasePage, [
     h("div.main", [
       h("div.column-header", [
-        h("nav", [h(PageBreadcrumbs)]),
+        h("nav", [h(PageBreadcrumbs, { showLogo: true })]),
         h("h1.page-title", [
           h("span.col-name", columnInfo.col_name),
           h.if(columnInfo.col_group != null)("span.subtitle", [
diff --git a/src/renderer/breadcrumbs.module.sass b/src/renderer/breadcrumbs.module.sass
new file mode 100644
index 00000000..0d1d5f7d
--- /dev/null
+++ b/src/renderer/breadcrumbs.module.sass
@@ -0,0 +1,5 @@
+
+.breadcrumbs-root
+  display: inline-flex
+  align-items: center
+  gap: 0.5em
\ No newline at end of file
diff --git a/src/renderer/breadcrumbs.ts b/src/renderer/breadcrumbs.ts
index 5beb6795..2f5a5575 100644
--- a/src/renderer/breadcrumbs.ts
+++ b/src/renderer/breadcrumbs.ts
@@ -1,13 +1,24 @@
-import h from "@macrostrat/hyper";
+import hyper from "@macrostrat/hyper";
 import { usePageContext } from "./page-context";
 import { Breadcrumbs } from "@blueprintjs/core";
 import type { PageContext } from "./types";
 import React from "react";
+import { MacrostratIcon } from "~/components";
+import styles from "./breadcrumbs.module.sass";
+const h = hyper.styled(styles);
 
-export function PageBreadcrumbs() {
+export function PageBreadcrumbs({ showLogo = false }) {
   const ctx = usePageContext();
+  let items = buildBreadcrumbs(ctx.urlPathname, sitemap, ctx);
+  if (showLogo) {
+    items[0].text = h("span.breadcrumbs-root", [
+      h(MacrostratIcon, { size: 16 }),
+      "Macrostrat",
+    ]);
+  }
+
   return h(Breadcrumbs, {
-    items: buildBreadcrumbs(ctx.urlPathname, sitemap, ctx),
+    items,
   });
 }
 

From f93fae9f76b695280dc6e70beb1667493352f453 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 02:20:23 -0500
Subject: [PATCH 096/151] Slightly better render function

---
 src/pages/columns/@column/+onBeforeRender.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/columns/@column/+onBeforeRender.ts b/src/pages/columns/@column/+onBeforeRender.ts
index 22e9411f..6312e974 100644
--- a/src/pages/columns/@column/+onBeforeRender.ts
+++ b/src/pages/columns/@column/+onBeforeRender.ts
@@ -7,12 +7,13 @@ import { fetchAPIData } from "~/pages/columns/utils";
 
 function assembleColumnURL({
   col_id,
-  project_id,
+  project_id = 1,
 }: {
   col_id: number;
   project_id: number;
 }) {
-  const base = apiV2Prefix + "/columns";
+  const base =
+    project_id == 1 ? apiV2Prefix + "/columns" : apiV2Prefix + "/defs/columns";
   const params = new URLSearchParams({
     col_id: col_id.toString(),
     project_id: project_id.toString(),

From 6f298468b05bd3a9c7aa45d2b6204bd24a00822e Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 03:16:04 -0500
Subject: [PATCH 097/151] Partial update to column rendering

---
 src/pages/columns/@column/+onBeforeRender.ts  | 95 +++++++++++++------
 .../columns/@column/column-inspector/index.ts |  3 -
 src/pages/columns/utils.ts                    |  1 +
 3 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/src/pages/columns/@column/+onBeforeRender.ts b/src/pages/columns/@column/+onBeforeRender.ts
index 6312e974..1af9801b 100644
--- a/src/pages/columns/@column/+onBeforeRender.ts
+++ b/src/pages/columns/@column/+onBeforeRender.ts
@@ -5,53 +5,40 @@ import fetch from "node-fetch";
 import { ColumnSummary } from "~/pages/map/map-interface/app-state/handlers/columns";
 import { fetchAPIData } from "~/pages/columns/utils";
 
-function assembleColumnURL({
-  col_id,
-  project_id = 1,
-}: {
-  col_id: number;
-  project_id: number;
-}) {
-  const base =
-    project_id == 1 ? apiV2Prefix + "/columns" : apiV2Prefix + "/defs/columns";
-  const params = new URLSearchParams({
-    col_id: col_id.toString(),
-    project_id: project_id.toString(),
-    response: "long",
-    format: "geojson",
-    in_process: "true",
-  });
-  return `${base}?${params}`;
-}
-
 export async function onBeforeRender(pageContext) {
   // `.page.server.js` files always run in Node.js; we could use SQL/ORM queries here.
   const col_id = pageContext.routeParams.column;
 
   // In cases where we are in a project context, we need to fetch the project data
-  const project_id = pageContext.routeParams.project;
+  const project_id = pageContext.routeParams.project ?? 1;
 
   // https://v2.macrostrat.org/api/v2/columns?col_id=3&response=long
 
   const linkPrefix = project_id == null ? "/" : `/projects/${project_id}/`;
-  const columnURL = assembleColumnURL({ col_id, project_id });
-  console.log(columnURL);
 
   /** This is a hack to make sure that all requisite data is on the table. */
   const responses = await Promise.all([
     project_id == null
       ? Promise.resolve(null)
       : getAndUnwrap(apiV2Prefix + `/defs/projects?project_id=${project_id}`),
-    getAndUnwrap(columnURL),
-    fetchAPIData(`/units`, {
-      response: "long",
-      col_id,
-    }),
+    getData(
+      "columns",
+      { col_id, project_id, format: "geojson" },
+      (res) => res?.features
+    ),
+    getData(
+      `units`,
+      {
+        project_id,
+        col_id,
+      },
+      (res) => res
+    ),
   ]);
 
-  const [projectData, column, unitsLong]: [any, any, any] = responses;
+  const [projectData, columns, unitsLong]: [any, any, any] = responses;
 
-  const col = column?.features?.[0];
+  const col = columns?.[0];
 
   const columnInfo: ColumnSummary = {
     ...col.properties,
@@ -75,8 +62,56 @@ export async function onBeforeRender(pageContext) {
 }
 
 async function getAndUnwrap<T>(url: string): Promise<T> {
-  console.log(url);
   const res = await fetch(url);
   const res1 = await res.json();
   return res1.success.data;
 }
+
+async function getData(
+  entity: string,
+  args: { col_id: number; project_id: number },
+  unwrapResponse: (res: any) => any[]
+) {
+  /** Fetch column data without knowing if it is an 'in process' column, a priori. This
+   * gets around the current limitation that there's no way to request any column data
+   * without knowing the status_code.
+   */
+  let res = await getAndUnwrap(
+    assembleURL(entity, { ...args, status_code: "active" })
+  );
+  let data = unwrapResponse(res);
+
+  if (data.length > 0) {
+    return data;
+  }
+
+  let res2 = await getAndUnwrap(
+    assembleURL(entity, { ...args, status_code: "in process" })
+  );
+  return unwrapResponse(res2);
+}
+
+function assembleURL(
+  entity,
+  {
+    col_id,
+    project_id = 1,
+    status_code = "active",
+    ...rest
+  }: {
+    col_id: number;
+    project_id: number;
+    status_code?: "active" | "in process";
+    [key: string]: string | number;
+  }
+) {
+  const base = apiV2Prefix + "/" + entity;
+  let params = new URLSearchParams({
+    col_id: col_id.toString(),
+    project_id: project_id.toString(),
+    response: "long",
+    status_code,
+    ...rest,
+  });
+  return `${base}?${params}`;
+}
diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index e50397a4..aee7fd79 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -14,7 +14,6 @@ import { PatternProvider } from "~/_providers";
 import styles from "./column-inspector.module.styl";
 import ModalUnitPanel from "./modal-panel";
 import { BasePage } from "~/layouts";
-import { PageHeader } from "~/components";
 
 import { navigate } from "vike/client/router";
 import { PageBreadcrumbs } from "~/renderer";
@@ -26,8 +25,6 @@ function ColumnPage({ columnInfo, linkPrefix = "/", project }) {
 
   const selectedUnit = useUnitSelection(units);
 
-  console.log(project, columnInfo);
-
   const lon = new Number(columnInfo.lng);
   const lat = new Number(columnInfo.lat);
   const zoom = 7;
diff --git a/src/pages/columns/utils.ts b/src/pages/columns/utils.ts
index 8b735344..10a21126 100644
--- a/src/pages/columns/utils.ts
+++ b/src/pages/columns/utils.ts
@@ -6,6 +6,7 @@ export async function fetchAPIData(apiURL: string, params: any) {
   if (params != null) {
     url.search = new URLSearchParams(params).toString();
   }
+  console.log(url.toString());
   const res = await fetch(url.toString());
   const res1 = await res.json();
   return res1?.success?.data;

From d69599378439bdeaa95aac67443ad1f014926111 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 03:28:11 -0500
Subject: [PATCH 098/151] Added the ability to show in-process columns

---
 src/pages/columns/@column/column-inspector/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/columns/@column/column-inspector/index.ts b/src/pages/columns/@column/column-inspector/index.ts
index aee7fd79..fc46aab9 100644
--- a/src/pages/columns/@column/column-inspector/index.ts
+++ b/src/pages/columns/@column/column-inspector/index.ts
@@ -74,6 +74,7 @@ function ColumnPage({ columnInfo, linkPrefix = "/", project }) {
           h(ColumnNavigatorMap, {
             className: "column-map",
             format: "geojson_bare",
+            showInProcessColumns: true,
             currentColumn: {
               geometry,
               type: "Feature",

From 5edb9cd3bfb2aacbbb5c059be2113e9275f173e9 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 03:31:10 -0500
Subject: [PATCH 099/151] Created starting point for correlation diagram

---
 src/pages/correlation/+Page.ts                              | 5 +++++
 src/{ => pages/correlation}/columns/column-data.ts          | 0
 src/{ => pages/correlation}/columns/column-map.ts           | 0
 src/{ => pages/correlation}/columns/column-renderer-demo.ts | 0
 src/{ => pages/correlation}/columns/index.tsx               | 0
 src/{ => pages/correlation}/columns/legend.ts               | 0
 src/{ => pages/correlation}/columns/main.styl               | 0
 src/{ => pages/correlation}/columns/selection-panel.ts      | 0
 src/{ => pages/correlation}/columns/single-column.ts        | 0
 9 files changed, 5 insertions(+)
 create mode 100644 src/pages/correlation/+Page.ts
 rename src/{ => pages/correlation}/columns/column-data.ts (100%)
 rename src/{ => pages/correlation}/columns/column-map.ts (100%)
 rename src/{ => pages/correlation}/columns/column-renderer-demo.ts (100%)
 rename src/{ => pages/correlation}/columns/index.tsx (100%)
 rename src/{ => pages/correlation}/columns/legend.ts (100%)
 rename src/{ => pages/correlation}/columns/main.styl (100%)
 rename src/{ => pages/correlation}/columns/selection-panel.ts (100%)
 rename src/{ => pages/correlation}/columns/single-column.ts (100%)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
new file mode 100644
index 00000000..8f572ff2
--- /dev/null
+++ b/src/pages/correlation/+Page.ts
@@ -0,0 +1,5 @@
+import h from "@macrostrat/hyper";
+
+export function Page(props) {
+  return h("div", "Hello world");
+}
diff --git a/src/columns/column-data.ts b/src/pages/correlation/columns/column-data.ts
similarity index 100%
rename from src/columns/column-data.ts
rename to src/pages/correlation/columns/column-data.ts
diff --git a/src/columns/column-map.ts b/src/pages/correlation/columns/column-map.ts
similarity index 100%
rename from src/columns/column-map.ts
rename to src/pages/correlation/columns/column-map.ts
diff --git a/src/columns/column-renderer-demo.ts b/src/pages/correlation/columns/column-renderer-demo.ts
similarity index 100%
rename from src/columns/column-renderer-demo.ts
rename to src/pages/correlation/columns/column-renderer-demo.ts
diff --git a/src/columns/index.tsx b/src/pages/correlation/columns/index.tsx
similarity index 100%
rename from src/columns/index.tsx
rename to src/pages/correlation/columns/index.tsx
diff --git a/src/columns/legend.ts b/src/pages/correlation/columns/legend.ts
similarity index 100%
rename from src/columns/legend.ts
rename to src/pages/correlation/columns/legend.ts
diff --git a/src/columns/main.styl b/src/pages/correlation/columns/main.styl
similarity index 100%
rename from src/columns/main.styl
rename to src/pages/correlation/columns/main.styl
diff --git a/src/columns/selection-panel.ts b/src/pages/correlation/columns/selection-panel.ts
similarity index 100%
rename from src/columns/selection-panel.ts
rename to src/pages/correlation/columns/selection-panel.ts
diff --git a/src/columns/single-column.ts b/src/pages/correlation/columns/single-column.ts
similarity index 100%
rename from src/columns/single-column.ts
rename to src/pages/correlation/columns/single-column.ts

From 286da687da1d0668a117111d128761153d9d1060 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 20:02:11 -0500
Subject: [PATCH 100/151] Updated compilation somewhat

---
 src/pages/correlation/+Page.ts   | 14 ++++++++++++--
 src/pages/correlation/+config.ts | 13 +++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/correlation/+config.ts

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 8f572ff2..6932c93f 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -1,5 +1,15 @@
 import h from "@macrostrat/hyper";
+import { MapboxMapProvider } from "@macrostrat/mapbox-react";
+import { MapView } from "@macrostrat/map-interface";
+import { FullscreenPage } from "~/layouts";
 
-export function Page(props) {
-  return h("div", "Hello world");
+export function Page() {
+  return h(FullscreenPage, [
+    h("div", "Hello world"),
+    h(MapboxMapProvider, h(InsetMap)),
+  ]);
+}
+
+function InsetMap() {
+  return h("div.column-selection-map", [h(MapView)]);
 }
diff --git a/src/pages/correlation/+config.ts b/src/pages/correlation/+config.ts
new file mode 100644
index 00000000..9826d2b8
--- /dev/null
+++ b/src/pages/correlation/+config.ts
@@ -0,0 +1,13 @@
+export default {
+  meta: {
+    Page: {
+      /* Ideally we'd make it so only the column inset map was rendered client-side,
+      but this will work for now. 
+      */
+      env: {
+        client: true,
+        server: false,
+      },
+    },
+  },
+};

From 74e49b660f0d90b7b51a49fd569c9dc64b166f11 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 20:17:37 -0500
Subject: [PATCH 101/151] Started trying to make correlation work

---
 src/pages/correlation/+Page.ts         | 6 +++---
 src/pages/correlation/main.module.sass | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/correlation/main.module.sass

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 6932c93f..b5f229fe 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -1,12 +1,12 @@
-import h from "@macrostrat/hyper";
 import { MapboxMapProvider } from "@macrostrat/mapbox-react";
-import { MapView } from "@macrostrat/map-interface";
+import { MapAreaContainer, MapView } from "@macrostrat/map-interface";
 import { FullscreenPage } from "~/layouts";
+import h from "./main.module.sass";
 
 export function Page() {
   return h(FullscreenPage, [
     h("div", "Hello world"),
-    h(MapboxMapProvider, h(InsetMap)),
+    h(MapAreaContainer, h(InsetMap)),
   ]);
 }
 
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
new file mode 100644
index 00000000..b72dceb6
--- /dev/null
+++ b/src/pages/correlation/main.module.sass
@@ -0,0 +1,6 @@
+.column-selection-map
+  max-width: 20em
+  height: 20em
+  position: relative
+  :global(.main-view)
+    height: 100%
\ No newline at end of file

From da6a32f1c14fad83f2d4804dec8d725724340af0 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 10 Jun 2024 22:51:44 -0500
Subject: [PATCH 102/151] Started some basics for correlation page

---
 src/pages/correlation/+Page.ts         | 18 ++++++++++++++----
 src/pages/correlation/main.module.sass | 11 ++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index b5f229fe..ee617962 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -1,15 +1,25 @@
+import { MapView } from "@macrostrat/map-interface";
 import { MapboxMapProvider } from "@macrostrat/mapbox-react";
-import { MapAreaContainer, MapView } from "@macrostrat/map-interface";
 import { FullscreenPage } from "~/layouts";
 import h from "./main.module.sass";
+import { baseMapURL, mapboxAccessToken } from "@macrostrat-web/settings";
+import { PageBreadcrumbs } from "~/renderer";
 
 export function Page() {
   return h(FullscreenPage, [
-    h("div", "Hello world"),
-    h(MapAreaContainer, h(InsetMap)),
+    h("header", [h(PageBreadcrumbs)]),
+    h("div.flex.row", [
+      h("div.correlation-diagram.grow"),
+      h("div.assistant", [h(InsetMap)]),
+    ]),
   ]);
 }
 
 function InsetMap() {
-  return h("div.column-selection-map", [h(MapView)]);
+  return h("div.column-selection-map", [
+    h(
+      MapboxMapProvider,
+      h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken })
+    ),
+  ]);
 }
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
index b72dceb6..1dbba48a 100644
--- a/src/pages/correlation/main.module.sass
+++ b/src/pages/correlation/main.module.sass
@@ -1,6 +1,11 @@
 .column-selection-map
-  max-width: 20em
-  height: 20em
+  height: 30em
   position: relative
   :global(.main-view)
-    height: 100%
\ No newline at end of file
+    height: 100%
+
+.assistant
+  width: 30em
+
+.correlation-diagram
+  flex-grow: 1
\ No newline at end of file

From 94a0c208573c196df2744962843a65dddaedb43a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 11 Jun 2024 14:59:25 -0500
Subject: [PATCH 103/151] Updated correlation chart data

---
 deps/web-components                           |   2 +-
 src/pages/correlation/+Page.ts                | 149 +++++++++++++++++-
 .../map-page/map-styles/overlay.ts            |  78 +++++----
 .../map-page/map-view/cross-section.ts        |   2 +-
 4 files changed, 195 insertions(+), 36 deletions(-)

diff --git a/deps/web-components b/deps/web-components
index 5c409881..16e72685 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 5c409881df9a53c68d5e7696d45f89baac3ddf06
+Subproject commit 16e72685c0ab0ad4b4a14c1571251ffc84f50e0a
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index ee617962..84822d17 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -1,15 +1,53 @@
 import { MapView } from "@macrostrat/map-interface";
-import { MapboxMapProvider } from "@macrostrat/mapbox-react";
+import {
+  MapboxMapProvider,
+  useMapStyleOperator,
+  useMapEaseTo,
+} from "@macrostrat/mapbox-react";
+import { LngLatBounds, GeoJSONSource } from "mapbox-gl";
 import { FullscreenPage } from "~/layouts";
 import h from "./main.module.sass";
 import { baseMapURL, mapboxAccessToken } from "@macrostrat-web/settings";
 import { PageBreadcrumbs } from "~/renderer";
+import { FeatureCollection, LineString, Point } from "geojson";
+import { useCallback, useMemo } from "react";
+import { create } from "zustand";
+import { buildCrossSectionLayers } from "../map/map-interface/map-page/map-styles";
+
+interface CorrelationState {
+  focusedLine: LineString | null;
+  onClickMap: (point: Point) => void;
+}
+
+const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
+  focusedLine: null as LineString | null,
+  onClickMap: (point: Point) =>
+    set((state) => {
+      if (
+        state.focusedLine == null ||
+        state.focusedLine.coordinates.length == 2
+      ) {
+        return {
+          ...state,
+          focusedLine: { type: "LineString", coordinates: [point.coordinates] },
+        };
+      } else {
+        return {
+          ...state,
+          focusedLine: {
+            type: "LineString",
+            coordinates: [...state.focusedLine.coordinates, point.coordinates],
+          },
+        };
+      }
+    }),
+}));
 
 export function Page() {
   return h(FullscreenPage, [
     h("header", [h(PageBreadcrumbs)]),
     h("div.flex.row", [
-      h("div.correlation-diagram.grow"),
+      h("div.correlation-diagram"),
       h("div.assistant", [h(InsetMap)]),
     ]),
   ]);
@@ -19,7 +57,112 @@ function InsetMap() {
   return h("div.column-selection-map", [
     h(
       MapboxMapProvider,
-      h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken })
+      h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken }, [
+        h(SectionLineManager),
+      ])
     ),
   ]);
 }
+
+function SectionLine({ focusedLine }: { focusedLine: LineString }) {
+  // Setup focused line
+  useMapStyleOperator(
+    (map) => {
+      if (focusedLine == null) {
+        return;
+      }
+      const data: FeatureCollection = {
+        type: "FeatureCollection",
+        features: [
+          {
+            type: "Feature",
+            geometry: focusedLine,
+            properties: { id: "focusedLine" },
+          },
+        ],
+      };
+
+      setGeoJSON(map, "crossSectionLine", data);
+      setGeoJSON(map, "crossSectionEndpoints", {
+        type: "FeatureCollection",
+        features: focusedLine.coordinates.map((coord) => ({
+          type: "Feature",
+          geometry: { type: "Point", coordinates: coord },
+          properties: {},
+        })),
+      });
+
+      // Add layers
+      const layers = buildCrossSectionLayers();
+      for (let layer of layers) {
+        if (map.getSource(layer.source) == null) {
+          continue;
+        }
+        if (map.getLayer(layer.id) == null) {
+          map.addLayer(layer);
+        }
+      }
+    },
+    [focusedLine]
+  );
+
+  const bounds = useMemo(() => {
+    if (focusedLine == null || focusedLine?.coordinates.length < 2) {
+      return null;
+    }
+    let bounds = new LngLatBounds();
+    for (let coord of focusedLine.coordinates) {
+      bounds.extend(coord);
+    }
+    return bounds;
+  }, [focusedLine]);
+
+  useMapEaseTo({ bounds, padding: 120 });
+
+  return null;
+}
+
+function setGeoJSON(
+  map: mapboxgl.Map,
+  sourceID: string,
+  data: FeatureCollection
+) {
+  let source = map.getSource(sourceID) as GeoJSONSource | null;
+  if (source == null) {
+    map.addSource(sourceID, { type: "geojson", data });
+  } else {
+    source.setData(data);
+  }
+}
+
+function SectionLineManager() {
+  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
+  const onClickMap = useCorrelationDiagramStore((state) => state.onClickMap);
+
+  const clickFn = useCallback(
+    (e) => {
+      onClickMap({ type: "Point", coordinates: e.lngLat.toArray() });
+    },
+    [onClickMap]
+  );
+
+  useMapStyleOperator(
+    (map) => {
+      map.on("click", clickFn);
+      return () => {
+        map.off("click", clickFn);
+      };
+    },
+    [onClickMap]
+  );
+
+  const focusedLineSrc = useMemo(() => {
+    if (focusedLine?.coordinates.length == 1) {
+      return null;
+    } else {
+      return focusedLine;
+    }
+  }, [focusedLine]);
+
+  return h(SectionLine, { focusedLine: focusedLineSrc });
+}
diff --git a/src/pages/map/map-interface/map-page/map-styles/overlay.ts b/src/pages/map/map-interface/map-page/map-styles/overlay.ts
index 41fbdbbc..d528da12 100644
--- a/src/pages/map/map-interface/map-page/map-styles/overlay.ts
+++ b/src/pages/map/map-interface/map-page/map-styles/overlay.ts
@@ -79,7 +79,7 @@ const overlaySources: { [k: string]: SourceExt } = {
   },
 };
 
-export function buildOverlayLayers(): mapboxgl.Layer[] {
+export function buildCrossSectionLayers(): mapboxgl.Layer[] {
   // Get CSS colors from settings
   const ruleColor = getComputedStyle(document.body).getPropertyValue(
     "--panel-background-color"
@@ -106,6 +106,50 @@ export function buildOverlayLayers(): mapboxgl.Layer[] {
     "circle-stroke-color": ruleColor,
   };
 
+  return [
+    {
+      id: "crossSectionLine",
+      type: "line",
+      source: "crossSectionLine",
+      paint: {
+        "line-width": {
+          stops: [
+            [0, 1],
+            [12, 3],
+          ],
+        },
+        "line-color": ruleColor,
+        "line-opacity": 1,
+      },
+    },
+    {
+      id: "crossSectionEndpoint",
+      type: "circle",
+      source: "crossSectionEndpoints",
+      paint: crossSectionPointPaint,
+    },
+    {
+      id: "elevationMarker",
+      type: "circle",
+      source: "elevationMarker",
+      paint: {
+        ...crossSectionPointPaint,
+        "circle-color": "#4bc0c0",
+      },
+    },
+  ];
+}
+
+export function buildOverlayLayers(): mapboxgl.Layer[] {
+  // Get CSS colors from settings
+  const ruleColor = getComputedStyle(document.body).getPropertyValue(
+    "--panel-background-color"
+  );
+
+  const centerColor = getComputedStyle(document.body).getPropertyValue(
+    "--panel-rule-color"
+  );
+
   return [
     {
       id: "column_fill",
@@ -167,36 +211,8 @@ export function buildOverlayLayers(): mapboxgl.Layer[] {
         visibility: "none",
       },
     },
-    {
-      id: "crossSectionLine",
-      type: "line",
-      source: "crossSectionLine",
-      paint: {
-        "line-width": {
-          stops: [
-            [0, 1],
-            [12, 3],
-          ],
-        },
-        "line-color": ruleColor,
-        "line-opacity": 1,
-      },
-    },
-    {
-      id: "crossSectionEndpoint",
-      type: "circle",
-      source: "crossSectionEndpoints",
-      paint: crossSectionPointPaint,
-    },
-    {
-      id: "elevationMarker",
-      type: "circle",
-      source: "elevationMarker",
-      paint: {
-        ...crossSectionPointPaint,
-        "circle-color": "#4bc0c0",
-      },
-    },
+    ...buildCrossSectionLayers(),
+
     // {
     //   "id": "pbdbCollections",
     //   "type": "fill",
diff --git a/src/pages/map/map-interface/map-page/map-view/cross-section.ts b/src/pages/map/map-interface/map-page/map-view/cross-section.ts
index f82210dc..05df828e 100644
--- a/src/pages/map/map-interface/map-page/map-view/cross-section.ts
+++ b/src/pages/map/map-interface/map-page/map-view/cross-section.ts
@@ -15,7 +15,7 @@ export function CrossSectionLine() {
   return null;
 }
 
-function useCrossSectionLine(crossSectionLine) {
+export function useCrossSectionLine(crossSectionLine) {
   const mapRef = useMapRef();
   const previousLine = useRef<LineString | null>(null);
   const { isStyleLoaded } = useMapStatus();

From 9a7aa31292f0f3b099c1b9bd83bfb0878e9c61e6 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 11 Jun 2024 15:33:19 -0500
Subject: [PATCH 104/151] Correlation chart improvements

---
 .idea/.gitignore                              |  5 ++
 .idea/modules.xml                             |  8 +++
 .idea/watcherTasks.xml                        |  1 +
 .idea/web.iml                                 | 12 ++++
 deps/web-components                           |  2 +-
 src/_utils/map-layers.ts                      | 62 ++++++++++++++++++
 src/components/index.ts                       |  1 +
 src/pages/correlation/+Page.ts                | 41 ++++++------
 src/pages/correlation/main.module.sass        |  8 ++-
 .../map-page/map-styles/overlay.ts            | 63 +------------------
 10 files changed, 117 insertions(+), 86 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/web.iml
 create mode 100644 src/_utils/map-layers.ts

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..b58b603f
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..f589ca37
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/web.iml" filepath="$PROJECT_DIR$/.idea/web.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 1389c394..f6f276bf 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectTasksOptions" suppressed-tasks="Stylus" />
+  <component name="ProjectTasksOptions" suppressed-tasks="Sass" />
 </project>
\ No newline at end of file
diff --git a/.idea/web.iml b/.idea/web.iml
new file mode 100644
index 00000000..24643cc3
--- /dev/null
+++ b/.idea/web.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/deps/web-components b/deps/web-components
index 16e72685..91c6ee96 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 16e72685c0ab0ad4b4a14c1571251ffc84f50e0a
+Subproject commit 91c6ee967720b7ed8b9bb55a47303bd76a3b4a95
diff --git a/src/_utils/map-layers.ts b/src/_utils/map-layers.ts
new file mode 100644
index 00000000..c4aa5073
--- /dev/null
+++ b/src/_utils/map-layers.ts
@@ -0,0 +1,62 @@
+/** Functions to apply specific layers to map UIs */
+
+export function buildCrossSectionLayers(): mapboxgl.Layer[] {
+  // Get CSS colors from settings
+  const ruleColor = getComputedStyle(document.body).getPropertyValue(
+    "--panel-background-color"
+  );
+
+  const centerColor = getComputedStyle(document.body).getPropertyValue(
+    "--panel-rule-color"
+  );
+
+  const crossSectionPointPaint = {
+    "circle-radius": {
+      stops: [
+        [0, 3],
+        [12, 5]
+      ]
+    },
+    "circle-color": centerColor,
+    "circle-stroke-width": {
+      stops: [
+        [0, 2],
+        [12, 4]
+      ]
+    },
+    "circle-stroke-color": ruleColor
+  };
+
+  return [
+    {
+      id: "crossSectionLine",
+      type: "line",
+      source: "crossSectionLine",
+      paint: {
+        "line-width": {
+          stops: [
+            [0, 1],
+            [12, 3]
+          ]
+        },
+        "line-color": ruleColor,
+        "line-opacity": 1
+      }
+    },
+    {
+      id: "crossSectionEndpoint",
+      type: "circle",
+      source: "crossSectionEndpoints",
+      paint: crossSectionPointPaint
+    },
+    {
+      id: "elevationMarker",
+      type: "circle",
+      source: "elevationMarker",
+      paint: {
+        ...crossSectionPointPaint,
+        "circle-color": "#4bc0c0"
+      }
+    }
+  ];
+}
diff --git a/src/components/index.ts b/src/components/index.ts
index e4056d6f..60f7fa4f 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -5,3 +5,4 @@ export * from "./tags";
 export * from "./map-info";
 export * from "./lithology";
 export * from "./buttons";
+export { buildCrossSectionLayers } from "~/_utils/map-layers";
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 84822d17..0efd25b9 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -12,7 +12,8 @@ import { PageBreadcrumbs } from "~/renderer";
 import { FeatureCollection, LineString, Point } from "geojson";
 import { useCallback, useMemo } from "react";
 import { create } from "zustand";
-import { buildCrossSectionLayers } from "../map/map-interface/map-page/map-styles";
+
+import {buildCrossSectionLayers} from "~/_utils/map-layers";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -135,17 +136,11 @@ function setGeoJSON(
   }
 }
 
-function SectionLineManager() {
-  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
-  const onClickMap = useCorrelationDiagramStore((state) => state.onClickMap);
-
-  const clickFn = useCallback(
-    (e) => {
-      onClickMap({ type: "Point", coordinates: e.lngLat.toArray() });
-    },
-    [onClickMap]
-  );
-
+function useMapClickHandler(
+  fn: (e: mapboxgl.MapMouseEvent) => void,
+  deps: any[]
+) {
+  const clickFn = useCallback(fn, deps);
   useMapStyleOperator(
     (map) => {
       map.on("click", clickFn);
@@ -153,16 +148,20 @@ function SectionLineManager() {
         map.off("click", clickFn);
       };
     },
-    [onClickMap]
+    [clickFn]
   );
+}
 
-  const focusedLineSrc = useMemo(() => {
-    if (focusedLine?.coordinates.length == 1) {
-      return null;
-    } else {
-      return focusedLine;
-    }
-  }, [focusedLine]);
+function SectionLineManager() {
+  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
+  const onClickMap = useCorrelationDiagramStore((state) => state.onClickMap);
+
+  useMapClickHandler(
+    (e) => {
+      onClickMap({ type: "Point", coordinates: e.lngLat.toArray() });
+    },
+    [onClickMap]
+  );
 
-  return h(SectionLine, { focusedLine: focusedLineSrc });
+  return h(SectionLine, { focusedLine });
 }
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
index 1dbba48a..48871fa2 100644
--- a/src/pages/correlation/main.module.sass
+++ b/src/pages/correlation/main.module.sass
@@ -1,11 +1,13 @@
+$map-size: 40em
+
 .column-selection-map
-  height: 30em
+  height: $map-size
   position: relative
   :global(.main-view)
     height: 100%
 
 .assistant
-  width: 30em
+  width: $map-size
 
 .correlation-diagram
-  flex-grow: 1
\ No newline at end of file
+  flex-grow: 1
diff --git a/src/pages/map/map-interface/map-page/map-styles/overlay.ts b/src/pages/map/map-interface/map-page/map-styles/overlay.ts
index d528da12..88e4b96e 100644
--- a/src/pages/map/map-interface/map-page/map-styles/overlay.ts
+++ b/src/pages/map/map-interface/map-page/map-styles/overlay.ts
@@ -1,3 +1,5 @@
+import { buildCrossSectionLayers } from "~/_utils/map-layers";
+
 /** Add extra types we use in this style... */
 interface SourceExt extends mapboxgl.Source {
   cluster?: boolean;
@@ -79,67 +81,6 @@ const overlaySources: { [k: string]: SourceExt } = {
   },
 };
 
-export function buildCrossSectionLayers(): mapboxgl.Layer[] {
-  // Get CSS colors from settings
-  const ruleColor = getComputedStyle(document.body).getPropertyValue(
-    "--panel-background-color"
-  );
-
-  const centerColor = getComputedStyle(document.body).getPropertyValue(
-    "--panel-rule-color"
-  );
-
-  const crossSectionPointPaint = {
-    "circle-radius": {
-      stops: [
-        [0, 3],
-        [12, 5],
-      ],
-    },
-    "circle-color": centerColor,
-    "circle-stroke-width": {
-      stops: [
-        [0, 2],
-        [12, 4],
-      ],
-    },
-    "circle-stroke-color": ruleColor,
-  };
-
-  return [
-    {
-      id: "crossSectionLine",
-      type: "line",
-      source: "crossSectionLine",
-      paint: {
-        "line-width": {
-          stops: [
-            [0, 1],
-            [12, 3],
-          ],
-        },
-        "line-color": ruleColor,
-        "line-opacity": 1,
-      },
-    },
-    {
-      id: "crossSectionEndpoint",
-      type: "circle",
-      source: "crossSectionEndpoints",
-      paint: crossSectionPointPaint,
-    },
-    {
-      id: "elevationMarker",
-      type: "circle",
-      source: "elevationMarker",
-      paint: {
-        ...crossSectionPointPaint,
-        "circle-color": "#4bc0c0",
-      },
-    },
-  ];
-}
-
 export function buildOverlayLayers(): mapboxgl.Layer[] {
   // Get CSS colors from settings
   const ruleColor = getComputedStyle(document.body).getPropertyValue(

From a60fffc27bdd9beab152efb74c0a493106b7d50a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 11 Jun 2024 15:44:20 -0500
Subject: [PATCH 105/151] Bring more map changes into correlation diagram page

---
 .idea/prettier.xml             |  2 +-
 src/pages/correlation/+Page.ts | 39 ++++++----------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/.idea/prettier.xml b/.idea/prettier.xml
index ea0f3cf8..15e69edb 100644
--- a/.idea/prettier.xml
+++ b/.idea/prettier.xml
@@ -5,4 +5,4 @@
     <option name="myRunOnSave" value="true" />
     <option name="myRunOnReformat" value="true" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 0efd25b9..16c51432 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -1,19 +1,21 @@
 import { MapView } from "@macrostrat/map-interface";
 import {
   MapboxMapProvider,
-  useMapStyleOperator,
+  useMapClickHandler,
   useMapEaseTo,
+  useMapStyleOperator,
 } from "@macrostrat/mapbox-react";
-import { LngLatBounds, GeoJSONSource } from "mapbox-gl";
+import { LngLatBounds } from "mapbox-gl";
 import { FullscreenPage } from "~/layouts";
 import h from "./main.module.sass";
 import { baseMapURL, mapboxAccessToken } from "@macrostrat-web/settings";
 import { PageBreadcrumbs } from "~/renderer";
 import { FeatureCollection, LineString, Point } from "geojson";
-import { useCallback, useMemo } from "react";
+import { useMemo } from "react";
 import { create } from "zustand";
+import { setGeoJSON } from "@macrostrat/mapbox-utils";
 
-import {buildCrossSectionLayers} from "~/_utils/map-layers";
+import { buildCrossSectionLayers } from "~/_utils/map-layers";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -123,35 +125,6 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
   return null;
 }
 
-function setGeoJSON(
-  map: mapboxgl.Map,
-  sourceID: string,
-  data: FeatureCollection
-) {
-  let source = map.getSource(sourceID) as GeoJSONSource | null;
-  if (source == null) {
-    map.addSource(sourceID, { type: "geojson", data });
-  } else {
-    source.setData(data);
-  }
-}
-
-function useMapClickHandler(
-  fn: (e: mapboxgl.MapMouseEvent) => void,
-  deps: any[]
-) {
-  const clickFn = useCallback(fn, deps);
-  useMapStyleOperator(
-    (map) => {
-      map.on("click", clickFn);
-      return () => {
-        map.off("click", clickFn);
-      };
-    },
-    [clickFn]
-  );
-}
-
 function SectionLineManager() {
   const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
   const onClickMap = useCorrelationDiagramStore((state) => state.onClickMap);

From 44d024456cf3cc146965f1312a6d1fab08f9b7ed Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Thu, 13 Jun 2024 01:48:14 -0500
Subject: [PATCH 106/151] Added column data

---
 deps/web-components            |  2 +-
 src/pages/correlation/+Page.ts | 69 +++++++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/deps/web-components b/deps/web-components
index 91c6ee96..d5e91c4a 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 91c6ee967720b7ed8b9bb55a47303bd76a3b4a95
+Subproject commit d5e91c4a80087115f2d9dd7fd3c71eee3080db40
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 16c51432..68dff0d0 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -11,19 +11,24 @@ import h from "./main.module.sass";
 import { baseMapURL, mapboxAccessToken } from "@macrostrat-web/settings";
 import { PageBreadcrumbs } from "~/renderer";
 import { FeatureCollection, LineString, Point } from "geojson";
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 import { create } from "zustand";
 import { setGeoJSON } from "@macrostrat/mapbox-utils";
+import { ColumnGeoJSONRecord } from "~/pages/map/map-interface/app-state/handlers/columns";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
+import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
 
 interface CorrelationState {
   focusedLine: LineString | null;
+  columns: ColumnGeoJSONRecord[];
   onClickMap: (point: Point) => void;
+  startup: () => Promise<void>;
 }
 
 const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
   focusedLine: null as LineString | null,
+  columns: [],
   onClickMap: (point: Point) =>
     set((state) => {
       if (
@@ -44,9 +49,18 @@ const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
         };
       }
     }),
+  async startup() {
+    const columns = await fetchAllColumns();
+    set({ columns });
+  },
 }));
 
 export function Page() {
+  const startup = useCorrelationDiagramStore((state) => state.startup);
+  useEffect(() => {
+    startup();
+  }, []);
+
   return h(FullscreenPage, [
     h("header", [h(PageBreadcrumbs)]),
     h("div.flex.row", [
@@ -62,11 +76,64 @@ function InsetMap() {
       MapboxMapProvider,
       h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken }, [
         h(SectionLineManager),
+        h(ColumnsLayer),
       ])
     ),
   ]);
 }
 
+function ColumnsLayer({ enabled = true }) {
+  const columns = useCorrelationDiagramStore((state) => state.columns);
+
+  useMapStyleOperator(
+    (map) => {
+      if (columns == null) {
+        return;
+      }
+      const data: FeatureCollection = {
+        type: "FeatureCollection",
+        features: columns,
+      };
+      const sourceID = "columns";
+      setGeoJSON(map, sourceID, data);
+
+      const columnLayers = buildColumnLayers(sourceID);
+      for (let layer of columnLayers) {
+        if (map.getSource(layer.source) == null) {
+          continue;
+        }
+        if (map.getLayer(layer.id) == null) {
+          map.addLayer(layer);
+        }
+      }
+    },
+    [columns, enabled]
+  );
+  return null;
+}
+
+function buildColumnLayers(sourceID: string) {
+  return [
+    {
+      id: "columns-fill",
+      type: "fill",
+      source: sourceID,
+      paint: {
+        "fill-color": "rgba(0, 0, 0, 0.1)",
+      },
+    },
+    {
+      id: "columns-line",
+      type: "line",
+      source: sourceID,
+      paint: {
+        "line-color": "rgba(0, 0, 0, 0.5)",
+        "line-width": 1,
+      },
+    },
+  ];
+}
+
 function SectionLine({ focusedLine }: { focusedLine: LineString }) {
   // Setup focused line
   useMapStyleOperator(

From c1bf64b6e63a94ce8ef339dcad45dd0bd2230b7f Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Thu, 13 Jun 2024 18:35:59 -0400
Subject: [PATCH 107/151] changed locations layout

---
 src/pages/dev/main-page/+Page.mdx | 41 ++++++++++++++-----------------
 src/pages/dev/main-page/main.styl | 39 +++++++++++++++++++++--------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index c1c0aec8..4924a0e0 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -22,8 +22,7 @@ import { MacrostratIcon } from "~/components";
     <Image className="back-img cover-image" src="cover_large.jpg"></Image>
     <div class="text">
       <span class="header">
-        <h1 id="main-title" class="big">Macrostrat</h1>
-        <h2 class="version">v2</h2>
+        <h1 id="main-title" class="big">Macrostrat<h2 class="version">v2</h2></h1>
       </span>
       <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
       <ul class="buttons1">
@@ -82,34 +81,30 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Locations"
-<div class="country_container">
-  <div class="country north-america">
-    <Image className="img country-image" src="north_america_med.jpg"></Image>
-    <div class="text">
-      <h1>North America</h1>\
-      <div class="caption">7,239 packages. 24,141 units. 48,696 collections.</div>
+<div id="locations">
+  <div class="location">
+    <Image className="location-img t1" src="north_america_med.jpg"></Image>
+    <div class="location-text">
+      North America
     </div>
   </div>
-  <div class="country caribbean">
-    <Image className="img country-image" src="caribbean_new_medium.jpg"></Image>
-    <div class="text">
-      <h1>Caribbean</h1>\
-      <div class="caption">243 packages. 798 units. 897 collections.</div>
+  <div class="location">
+    <div class="location-text">
+      New Zealand
     </div>
+    <Image className="location-img t2" src="north_america_med.jpg"></Image>
   </div>
-  <div class="country new-zealand">
-    <Image className="img country-image" src="new_zealand_new_medium.jpg"></Image>
-    <div class="text">
-      <h1>New Zealand</h1>\
-      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+  <div class="location">
+    <Image className="location-img t1" src="north_america_med.jpg"></Image>
+    <div class="location-text">
+      Caribbean
     </div>
   </div>
-  <div class="country deep-sea">
-    <Image className="img country-image" src="deep_sea_new_medium.jpg"></Image>
-    <div class="text">
-      <h1>Deep Sea</h1>\
-      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+  <div class="location">
+    <div class="location-text">
+      Deep Sea
     </div>
+    <Image className="location-img t2" src="north_america_med.jpg"></Image>
   </div>
 </div>
 
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index c798d754..ff8bd734 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -163,10 +163,6 @@ a:hover
 
 .country_container 
   height: 100vh
-  display: grid;
-  grid-template-columns: repeat(2, minmax(150px, 2fr));
-  grid-template-rows: repeat(2, minmax(150px, 2fr));
-  background-color: green
 
 .country
   height: 100%
@@ -177,10 +173,7 @@ a:hover
   color: white
 
 .img
-  position:absolute
-  z-index:5
-  height: 100vh
-  width: 100%
+  width: 50%
   object-fit: cover
 
 .country-image
@@ -210,7 +203,8 @@ a:hover
   text-align: center
 
 .header 
-  margin: 0 20%
+  margin: 0 20%  
+  text-shadow: black 1px 0 10px;
 
 #main-title
   display: inline-block
@@ -475,4 +469,29 @@ a:hover
 .pub-line
   width: 80%;
   border-bottom: 1px solid #E0E1E6;
-  position: absolute;
\ No newline at end of file
+  position: absolute;
+
+.location
+  display: grid;
+  grid-template-columns: 50% 50%;
+  grid-template-rows: 40vh;
+
+.t1
+  margin-left: 10%
+
+.t2
+  margin-right: 10%
+
+.location-img
+  width: 300px
+  height: 250px
+  display: flex;
+  margin: auto
+  border: solid black
+
+.location-text
+  color: black
+  display: flex;
+  margin: auto
+  font-size: 45px
+  font-weight: 600
\ No newline at end of file

From 4224fdba70dfcb0685fe9bbd423681c35ece2bd2 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Thu, 13 Jun 2024 19:28:12 -0400
Subject: [PATCH 108/151] changed layout of images

---
 src/pages/dev/main-page/+Page.mdx | 14 +++++---------
 src/pages/dev/main-page/main.styl | 10 +++++-----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 4924a0e0..ba8c7e7c 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -87,24 +87,20 @@ import { MacrostratIcon } from "~/components";
     <div class="location-text">
       North America
     </div>
-  </div>
-  <div class="location">
+    <Image className="location-img t2" src="caribbean_new_medium.jpg"></Image>
     <div class="location-text">
-      New Zealand
+      Carribean
     </div>
-    <Image className="location-img t2" src="north_america_med.jpg"></Image>
   </div>
   <div class="location">
-    <Image className="location-img t1" src="north_america_med.jpg"></Image>
     <div class="location-text">
-      Caribbean
+      New Zealand
     </div>
-  </div>
-  <div class="location">
+    <Image className="location-img t1" src="new_zealand_new_medium.jpg"></Image>
     <div class="location-text">
       Deep Sea
     </div>
-    <Image className="location-img t2" src="north_america_med.jpg"></Image>
+    <Image className="location-img t2" src="deep_sea_new_medium.jpg"></Image>
   </div>
 </div>
 
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index ff8bd734..ec5b0981 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -473,8 +473,8 @@ a:hover
 
 .location
   display: grid;
-  grid-template-columns: 50% 50%;
-  grid-template-rows: 40vh;
+  grid-template-columns: 25% 25% 25% 25%;
+  grid-template-rows: 300px;
 
 .t1
   margin-left: 10%
@@ -483,8 +483,8 @@ a:hover
   margin-right: 10%
 
 .location-img
-  width: 300px
-  height: 250px
+  width: 100%
+  height: 300px
   display: flex;
   margin: auto
   border: solid black
@@ -494,4 +494,4 @@ a:hover
   display: flex;
   margin: auto
   font-size: 45px
-  font-weight: 600
\ No newline at end of file
+  font-weight: 600

From 27702f18b11aee9b51443068c1e7683c8aa7a1cd Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Thu, 13 Jun 2024 19:40:56 -0400
Subject: [PATCH 109/151] added caption to location names

---
 src/pages/dev/main-page/+Page.mdx | 12 ++++++++----
 src/pages/dev/main-page/main.styl | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index ba8c7e7c..2245e552 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -85,20 +85,24 @@ import { MacrostratIcon } from "~/components";
   <div class="location">
     <Image className="location-img t1" src="north_america_med.jpg"></Image>
     <div class="location-text">
-      North America
+      <h1>North America</h1>
+      <div class="caption">243 packages. 798 units. 897 collections.</div>
     </div>
     <Image className="location-img t2" src="caribbean_new_medium.jpg"></Image>
     <div class="location-text">
-      Carribean
+      <h1>Carribean</h1>
+      <div class="caption">243 packages. 798 units. 897 collections.</div>
     </div>
   </div>
   <div class="location">
     <div class="location-text">
-      New Zealand
+      <h1>New Zealand</h1>
+      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
     </div>
     <Image className="location-img t1" src="new_zealand_new_medium.jpg"></Image>
     <div class="location-text">
-      Deep Sea
+      <h1>Deep Sea</h1>
+      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
     </div>
     <Image className="location-img t2" src="deep_sea_new_medium.jpg"></Image>
   </div>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index ec5b0981..627d3f90 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -491,7 +491,18 @@ a:hover
 
 .location-text
   color: black
-  display: flex;
-  margin: auto
-  font-size: 45px
+  display: grid;
+  grid-template-rows: 50% 50%;
+  
+  h1
+    font-size: 45px
+    font-weight: 600
+    display: grid
+    margin: auto
+    margin-top: 25%
+
+.caption
+  font-size: 15px
   font-weight: 600
+  display: grid
+  margin: auto
\ No newline at end of file

From 6349f823920863474fa3d208ed9e8641ed85b93f Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 14 Jun 2024 12:36:12 -0400
Subject: [PATCH 110/151] added lexicon subpage

---
 src/pages/dev/lexicon/+Page.mdx   |  58 ++++++++++++
 src/pages/dev/lexicon/index.ts    |   6 ++
 src/pages/dev/lexicon/main.styl   | 152 ++++++++++++++++++++++++++++++
 src/pages/dev/main-page/+Page.mdx |  15 +++
 4 files changed, 231 insertions(+)
 create mode 100644 src/pages/dev/lexicon/+Page.mdx
 create mode 100644 src/pages/dev/lexicon/index.ts
 create mode 100644 src/pages/dev/lexicon/main.styl

diff --git a/src/pages/dev/lexicon/+Page.mdx b/src/pages/dev/lexicon/+Page.mdx
new file mode 100644
index 00000000..bfbde1c5
--- /dev/null
+++ b/src/pages/dev/lexicon/+Page.mdx
@@ -0,0 +1,58 @@
+import { PageHeader } from "~/components";
+import { PageBreadcrumbs } from "~/renderer";
+import "./main.styl";
+import { Image } from "./index";
+import { MacrostratIcon } from "~/components";
+
+<div class="main">
+
+[//]: # "Nav Bar"
+<div class="nav">
+  <ul>
+    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
+    <li><a href="/dev/about">About</a></li>
+    <li><a href="/dev/publications">Publications</a></li>
+    <li><a href="/dev/people">People</a></li>
+    <li><a href="/dev/donate">Donate</a></li>
+  </ul>
+</div>
+\
+\
+
+[//]: # "Lithologies"
+<div id="lith">
+</div>
+
+[//]: # "Stratigraphic Names"
+<div id="strat">
+</div>
+
+
+[//]: # "Footer"
+<div class="footer">
+    <div class="footer-container">
+    <div class="col-sm-4" id="who-made-it">
+        <Image className="logo_white" src="logo_white.png" width="100px"></Image>
+        <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
+    </div>
+    <div class="col-sm-4" id="bottom-nav">
+        <ul class="footer-nav">
+        <li><a href="/dev/about">About</a></li>
+        <li><a href="/dev/publications">Publications</a></li>
+        <li><a href="/dev/people">People</a></li>
+        <li><a href="/dev/donate">Donate</a></li>
+        </ul>
+    </div>
+    <div class="col-sm-4 funding">
+        <Image className="funding-logo" src="nsf.png" width="100px"></Image>
+        <div class="funding-line">
+        Current support: \
+        EAR-1948843 \
+        ICER-1928323 \
+        UW-Madison Dept. Geoscience
+        </div>
+    </div>
+    </div>
+</div>
+
+</div>
diff --git a/src/pages/dev/lexicon/index.ts b/src/pages/dev/lexicon/index.ts
new file mode 100644
index 00000000..e3670446
--- /dev/null
+++ b/src/pages/dev/lexicon/index.ts
@@ -0,0 +1,6 @@
+import h from "@macrostrat/hyper";
+
+export function Image({ src, className, width, height }) {
+    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
+    return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
\ No newline at end of file
diff --git a/src/pages/dev/lexicon/main.styl b/src/pages/dev/lexicon/main.styl
new file mode 100644
index 00000000..2e546b4f
--- /dev/null
+++ b/src/pages/dev/lexicon/main.styl
@@ -0,0 +1,152 @@
+.htnl, .body, .main
+    background-color: white
+    color: black
+
+a:hover
+    text-decoration: none
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+  top: 0
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
+
+.big
+    color: #E0E1E6
+    text-align: left
+    font-size: 75px
+    font-family: "Maven Pro", sans-serif
+    margin: 0
+    margin-left: 20%
+    margin-top: 30px
+
+.line
+  border-bottom: 3px solid #E0E1E6;
+  width: 60%
+  margin: 20px 20% 
+
+
+.people
+    color: white
+
+.left
+    float: left
+    width: 30%
+    margin-left: 20%
+
+.right
+    float: left
+    width: 30%
+    margin-right: 20%
+
+.person-info
+    height: 30vh
+    width: 90%
+    position: relative
+    margin: 5%
+
+.text
+    text-align: right
+    position:absolute
+    padding: 5px 20px
+    z-index: 100
+    background-color: rgba(0, 0, 0, 0.2)
+    bottom:0
+    right: 0
+
+    a
+        color: white
+
+    a:hover
+        color: white
+
+.back-img
+    position:absolute
+    z-index: 0
+    height: 30vh
+    object-fit: cover
+    width: 100%
+
+n
+    font-size: 25px
+    font-weight: 200px
+
+t
+    font-weight: 400px
+
+e 
+    font-size: 14px
+    font-weight: 200px
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+  margin-top: 280vh
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px
+
+.subtitle
+  margin-left: 20%
+  color: #E0E1E6;
\ No newline at end of file
diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 2245e552..9454849e 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -80,6 +80,21 @@ import { MacrostratIcon } from "~/components";
   </div>
 </div>
 
+[//]: # "Map Interface"
+
+
+[//]: # "Maps"
+
+
+[//]: # "Columns"
+
+
+[//]: # "Geolofic Lexicon"
+
+
+[//]: # "Projects"
+
+
 [//]: # "Locations"
 <div id="locations">
   <div class="location">

From 7112c8e4f98f6b8e1004a054012897492952142e Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 14 Jun 2024 12:43:30 -0400
Subject: [PATCH 111/151] added basic links to pages

---
 src/pages/dev/main-page/+Page.mdx | 32 +++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 9454849e..2fc7465c 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -81,19 +81,39 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Map Interface"
-
+<div id="map">
+  <a href="/map">
+    <h1>Map Interface</h1>
+  </a>
+</div>
 
 [//]: # "Maps"
-
+<div id="maps">
+  <a href="/maps">
+    <h1>Maps</h1>
+  </a>
+</div>
 
 [//]: # "Columns"
+<div id="columns">
+  <a href="/columns">
+    <h1>Columns</h1>
+  </a>
+</div>
 
-
-[//]: # "Geolofic Lexicon"
-
+[//]: # "Geologic Lexicon"
+<div id="lexicon">
+  <a href="/dev/lexicon">
+    <h1>Geologic Lexicon</h1>
+  </a>
+</div>
 
 [//]: # "Projects"
-
+<div id="project">
+  <a href="/projects">
+    <h1>Projects</h1>
+  </a>
+</div>
 
 [//]: # "Locations"
 <div id="locations">

From 7705eade1444a7facb786cff2594cdd696a87076 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 14 Jun 2024 12:53:25 -0400
Subject: [PATCH 112/151] added captions

---
 src/pages/dev/main-page/+Page.mdx | 34 ++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index 2fc7465c..ef29e6df 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -65,11 +65,12 @@ import { MacrostratIcon } from "~/components";
 
 </div>
 
-[//]: # "Geological Maps"
-<div class="geologic-maps">
-  <Image className="geology-img" src="geology-bgrnd.jpg"></Image>
-  <h1 class="title map-title">Geologic Maps</h1>
-  <div class="map-info">
+[//]: # "Map Interface"
+<div id="map">
+  <a href="/map">
+    <h1>Map Interface</h1>
+  </a>
+  <p>
     With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
     \
     \
@@ -77,14 +78,7 @@ import { MacrostratIcon } from "~/components";
     \
     \
     Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
-  </div>
-</div>
-
-[//]: # "Map Interface"
-<div id="map">
-  <a href="/map">
-    <h1>Map Interface</h1>
-  </a>
+  </p>
 </div>
 
 [//]: # "Maps"
@@ -92,6 +86,9 @@ import { MacrostratIcon } from "~/components";
   <a href="/maps">
     <h1>Maps</h1>
   </a>
+  <p>
+    The spatial footprint of rocks on the Earth's surface
+  </p>
 </div>
 
 [//]: # "Columns"
@@ -99,13 +96,19 @@ import { MacrostratIcon } from "~/components";
   <a href="/columns">
     <h1>Columns</h1>
   </a>
+  <p>
+    Stratigraphic and geological columns showing the organization of rocks in time
+  </p>
 </div>
 
 [//]: # "Geologic Lexicon"
 <div id="lexicon">
-  <a href="/dev/lexicon">
+  <a href="/lex">
     <h1>Geologic Lexicon</h1>
   </a>
+  <p>
+    Geologic units and data dictionaries
+  </p>
 </div>
 
 [//]: # "Projects"
@@ -113,6 +116,9 @@ import { MacrostratIcon } from "~/components";
   <a href="/projects">
     <h1>Projects</h1>
   </a>
+  <p>
+    Projects for specific regions or geological problems
+  </p>
 </div>
 
 [//]: # "Locations"

From 2c70324c8f40e5e4b31a80610a7bd93584a4999d Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 14 Jun 2024 12:57:41 -0400
Subject: [PATCH 113/151] changed spacing

---
 src/pages/dev/main-page/main.styl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 627d3f90..501f966a 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -474,7 +474,7 @@ a:hover
 .location
   display: grid;
   grid-template-columns: 25% 25% 25% 25%;
-  grid-template-rows: 300px;
+  grid-template-rows: 40vh;
 
 .t1
   margin-left: 10%
@@ -484,10 +484,11 @@ a:hover
 
 .location-img
   width: 100%
-  height: 300px
+  height: 40vh
   display: flex;
   margin: auto
   border: solid black
+  object-fit: cover
 
 .location-text
   color: black
@@ -499,10 +500,11 @@ a:hover
     font-weight: 600
     display: grid
     margin: auto
-    margin-top: 25%
+    margin-top: 30%
 
 .caption
   font-size: 15px
   font-weight: 600
   display: grid
-  margin: auto
\ No newline at end of file
+  margin: auto
+  margin-top: 0
\ No newline at end of file

From 5251ed6bca5b92f11600349975d246341738ad16 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 14 Jun 2024 13:22:14 -0400
Subject: [PATCH 114/151] nicer formatting

---
 src/pages/dev/main-page/+Page.mdx | 50 +++++++++++++++----------------
 src/pages/dev/main-page/main.styl | 29 +++++++++++++++++-
 2 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index ef29e6df..5f22c6a0 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -66,56 +66,54 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Map Interface"
-<div id="map">
-  <a href="/map">
-    <h1>Map Interface</h1>
-  </a>
-  <p>
-    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
-    \
-    \
-    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
+<div class="temp-class" id="map">
+  <div class="link-title">
+    <a href="/map"><h1>Map Interface</h1></a>
+  </div>
+  <p class="long">
+    <div class="temp">With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).</div>
     \
+    <div class="temp">Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!</div>
     \
-    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
+    <div class="temp"> Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.</div>
   </p>
 </div>
 
 [//]: # "Maps"
-<div id="maps">
-  <a href="/maps">
-    <h1>Maps</h1>
-  </a>
+<div class="temp-class" id="maps">
+  <div class="link-title">
+    <a href="/maps"><h1>Maps</h1></a>
+  </div>
   <p>
     The spatial footprint of rocks on the Earth's surface
   </p>
 </div>
 
 [//]: # "Columns"
-<div id="columns">
-  <a href="/columns">
-    <h1>Columns</h1>
-  </a>
+<div class="temp-class" id="columns">
+  <div class="link-title">
+    <a href="/columns"><h1>Columns</h1></a>
+  </div>
   <p>
     Stratigraphic and geological columns showing the organization of rocks in time
   </p>
 </div>
 
 [//]: # "Geologic Lexicon"
-<div id="lexicon">
-  <a href="/lex">
-    <h1>Geologic Lexicon</h1>
-  </a>
+<div class="temp-class" id="lexicon">
+  <div class="link-title">
+    <a href="/lex"><h1>Geologic Lexicon</h1></a>
+  </div>
   <p>
     Geologic units and data dictionaries
   </p>
 </div>
 
 [//]: # "Projects"
-<div id="project">
-  <a href="/projects">
-    <h1>Projects</h1>
-  </a>
+<div class="temp-class" id="project">
+  <div class="link-title">
+    <a href="/projects"><h1>Projects</h1></a>
+  </div>
   <p>
     Projects for specific regions or geological problems
   </p>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 627d3f90..5539f258 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -505,4 +505,31 @@ a:hover
   font-size: 15px
   font-weight: 600
   display: grid
-  margin: auto
\ No newline at end of file
+  margin: auto
+
+.temp-class
+  display: grid
+  grid-template-columns: 40% 60%
+  grid-template-rows: 30vh
+
+  
+  .link-title
+    display: grid
+    margin: auto
+    margin-left: 20%  
+    font-size: 35px
+    
+    a
+      color: black
+
+  p
+    display: grid
+    margin: auto
+    margin-left: 10% 
+    margin-right: 10%
+    color: black
+    font-size: 16px
+
+
+
+  
\ No newline at end of file

From e3f5c9f3015fd0aa063e89d130d60e8c97583cd2 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Fri, 14 Jun 2024 14:27:07 -0400
Subject: [PATCH 115/151] changed formatting of start page

---
 src/pages/dev/main-page/+Page.mdx | 58 ++++++++++++---------------
 src/pages/dev/main-page/main.styl | 65 ++++++++++++++-----------------
 2 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/main-page/+Page.mdx
index c1c0aec8..f4f70581 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/main-page/+Page.mdx
@@ -17,53 +17,43 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Start Page"
-<div class="parent">
-  <div class="left">
+<div class="start">
     <Image className="back-img cover-image" src="cover_large.jpg"></Image>
     <div class="text">
       <span class="header">
-        <h1 id="main-title" class="big">Macrostrat</h1>
+        <h1 class="big" id="main-title">Macrostrat</h1>
         <h2 class="version">v2</h2>
       </span>
-      <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
-      <ul class="buttons1">
-        <li><a type="button" class="btn" href="/sift/#/">Search</a></li>
-        <li><a type="button" class="btn" href="/map/#3/40.78/-94.13">Geologic Map</a></li>
-        <li><div type="button" class="btn rockd" onclick="window.location='https://rockd.org'">
-          <div class="rockd-button-container">
-            <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
-            <a href="https://rockd.org" target="_blank">Go mobile</a>
-          </div>
-        </div></li>
-      </ul>
-    </div>
-  </div>
-  
-
-  <div class="right">
-    <Image className="back-img sea-image" src="deep_sea_new_medium.jpg"></Image>
-    <div class="text">
-      <ul class="stats-row">
-        <li>
+      <div class="stats">
+        <div class="stat">
           <span class="top-stat" id="n_columns">1,400</span>
           <span class="top-stat-label">Regional Rock Columns</span>
-        </li>
-        <li>
+        </div>
+        <div class="stat">
           <span class="top-stat" id="n_units">33,903</span>
           <span class="top-stat-label">Rock Units</span>
-        </li>
-        <li>
+        </div>
+        <div class="stat">
           <span class="top-stat" id="n_polys">2,500,000</span>
           <span class="top-stat-label">Geologic Map Polygons</span>
-        </li>
-        <li>
+        </div>
+        <div class="stat">
           <span class="top-stat" id="n_names">51,212</span>
           <span class="top-stat-label"><a href="Macrostrat_strat_names.html" target="_blank">Stratigraphic Names</a></span>
-        </li>
-      </ul>
+        </div>
+      </div>
+      <p class="big-text">A platform for geological data exploration, integration, and analysis</p>
+      <div class="buttons1">
+        <a type="button" class="btn" href="/sift/#/">Search</a>
+        <a type="button" class="btn" href="/map/#3/40.78/-94.13">Geologic Map</a>
+        <div type="button" class="btn rockd" onclick="window.location='https://rockd.org'">
+          <div class="rockd-button-container">
+            <Image src="rockd.jpg" width="22px" className="rockd-png"></Image>
+            <a href="https://rockd.org" target="_blank">Go mobile</a>
+          </div>
+        </div>
+      </div>
     </div>
-  </div>
-
 </div>
 
 [//]: # "Geological Maps"
@@ -116,7 +106,7 @@ import { MacrostratIcon } from "~/components";
 [//]: # "Donate"
 <div class="donate-container" id="donate">
   <Image className="back-img donate-img" src="donate_medium.jpg"></Image>
-  <div class="text">
+  <div class="text-donate">
     <div class="donate-left">
       <h1 class="title donate-title"><a href="https://secure.supportuw.org/give/?id=E0A03FA3-B2A0-431C-83EE-A121A04EEB5D" target="_blank">Donate Now</a></h1>
     </div>
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index c798d754..1e336dc3 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -38,11 +38,8 @@ a:hover
     padding: 14px 16px;
     text-decoration: none
 
-.parent
-  height: 100vh
-
-.left
-  width: 70%
+.start
+  width: 100%
   display: flex;
   justify-content: center;
   align-items: center;  
@@ -62,6 +59,8 @@ a:hover
   position:absolute
   z-index: 100
   padding: 0 20px
+  display: grid
+  margin: auto
 
 .cover-image
   position:absolute
@@ -69,7 +68,7 @@ a:hover
   left:0px
   top:0px
   height: 100vh
-  width: 70%
+  width: 100%
   object-fit: cover
 
 .sea-image
@@ -77,23 +76,7 @@ a:hover
   z-index: 6
   height: 100vh
   width: 30%
-  object-fit: cover
-
-.right
-  background-color: blue
-  height: 100vh
-  width: 30%
-
-  ul 
-    list-style-type: none
-    margin-top: 32vh
-
-  li 
-    width: 25%
-    padding-left: 10px
-
-  .buttons1
-    padding-left: 27%      
+  object-fit: cover   
 
 .parent
   display: inline-flex
@@ -108,23 +91,29 @@ a:hover
   font-family: Helvetica, sans-serif
   font-weight: 900
   font-size: 20px
+  text-shadow: black 1px 0 10px
 
 .top-stat, .top-stat-label
-  display: block
+  display: grid
+  margin: auto
   color: white
 
 .top-stat
   font-size: 35px
   font-family: Helvetica, sans-serif
 
-.stats-row
-  margin-top: 20%
+.stats
+  display: grid
+  grid-template-columns: 25% 25% 25% 25%
+  margin-bottom: 3%
+  text-shadow: black 1px 0 10px;
 
-  li
-    padding-top: 10px
-    padding-bottom: 20px
-    color: black
-    width: 100%
+  .stat
+    display: grid
+    margin: auto
+
+  a
+    color: white
     
 .rockd
   background-color: green
@@ -134,11 +123,9 @@ a:hover
   border: none;
   color: white;
   padding: 13px 10px;
-  margin: 10px
+  margin: 5% 15%
   text-align: center;
   text-decoration: none;
-  display: inline-block;
-  float: left
   border-radius: 12px;
 
 .btn:hover 
@@ -147,6 +134,8 @@ a:hover
 .buttons1 
   font-size: 20px
   padding: 0px
+  display: grid
+  grid-template-columns: 33.33% 33.33% 33.33%
 
   a 
     color: white
@@ -211,6 +200,7 @@ a:hover
 
 .header 
   margin: 0 20%
+  text-shadow: black 1px 0 10px
 
 #main-title
   display: inline-block
@@ -475,4 +465,9 @@ a:hover
 .pub-line
   width: 80%;
   border-bottom: 1px solid #E0E1E6;
-  position: absolute;
\ No newline at end of file
+  position: absolute;
+
+.text-donate
+  position:absolute
+  z-index: 100
+  padding: 0 20px
\ No newline at end of file

From 2a9f35c1d9ff137c63b2652a2fa07555169fa413 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Sat, 15 Jun 2024 19:51:03 -0400
Subject: [PATCH 116/151] added test testing files

---
 package.json                        |   6 +-
 src/pages/dev/main-page/sum.js      |   3 +
 src/pages/dev/main-page/sum.test.js |   7 +
 yarn.lock                           | 388 +++++++++++++++++++++++++++-
 4 files changed, 400 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/dev/main-page/sum.js
 create mode 100644 src/pages/dev/main-page/sum.test.js

diff --git a/package.json b/package.json
index bf8c0c8d..8665204a 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "format": "prettier --write src packages",
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
     "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
-    "start": "yarn run build && yarn run server"
+    "start": "yarn run build && yarn run server",
+    "test": "vitest"
   },
   "workspaces": [
     "deps/web-components/packages/*",
@@ -42,7 +43,8 @@
     "sass": "^1.49.0",
     "stylus": "^0.55.0",
     "typescript": "^5.1.6",
-    "vite-plugin-rewrite-all": "^1.0.1"
+    "vite-plugin-rewrite-all": "^1.0.1",
+    "vitest": "^1.6.0"
   },
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
diff --git a/src/pages/dev/main-page/sum.js b/src/pages/dev/main-page/sum.js
new file mode 100644
index 00000000..118bc983
--- /dev/null
+++ b/src/pages/dev/main-page/sum.js
@@ -0,0 +1,3 @@
+export function sum(a, b) {
+    return a + b;
+  }
\ No newline at end of file
diff --git a/src/pages/dev/main-page/sum.test.js b/src/pages/dev/main-page/sum.test.js
new file mode 100644
index 00000000..421674c8
--- /dev/null
+++ b/src/pages/dev/main-page/sum.test.js
@@ -0,0 +1,7 @@
+// sum.test.js
+import { expect, test } from 'vitest'
+import { sum } from './sum'
+
+test('file works', () => {
+  expect(sum(1, 2)).toBe(3)
+})
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index de1dacff..7c5435f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6687,6 +6687,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
+  dependencies:
+    "@sinclair/typebox": "npm:^0.27.8"
+  checksum: 10/910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
+  languageName: node
+  linkType: hard
+
 "@jest/source-map@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/source-map@npm:27.5.1"
@@ -7836,6 +7845,7 @@ __metadata:
     vite: "npm:^5.2.11"
     vite-plugin-cesium: "npm:^1.2.22"
     vite-plugin-rewrite-all: "npm:^1.0.1"
+    vitest: "npm:^1.6.0"
     zustand: "npm:^4.5.1"
   languageName: unknown
   linkType: soft
@@ -10174,6 +10184,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 10/297f95ff77c82c54de8c9907f186076e715ff2621c5222ba50b8d40a170661c0c5242c763cba2a4791f0f91cb1d8ffa53ea1d7294570cf8cd4694c0e383e484d
+  languageName: node
+  linkType: hard
+
 "@sindresorhus/is@npm:^0.14.0":
   version: 0.14.0
   resolution: "@sindresorhus/is@npm:0.14.0"
@@ -13380,6 +13397,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/expect@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/expect@npm:1.6.0"
+  dependencies:
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
+    chai: "npm:^4.3.10"
+  checksum: 10/e82304a12e22b98c1ccea81e8f33c838561deb878588eac463164cc4f8fc0c401ace3a9e6758d9e3a6bcc01313e845e8478aaefb7548eaded04b8de12c1928f6
+  languageName: node
+  linkType: hard
+
+"@vitest/runner@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/runner@npm:1.6.0"
+  dependencies:
+    "@vitest/utils": "npm:1.6.0"
+    p-limit: "npm:^5.0.0"
+    pathe: "npm:^1.1.1"
+  checksum: 10/d83a608be36dace77f91a9d15ab7753f9c5923281188a8d9cb5ccec770df9cc9ba80e5e1e3465328c7605977be0f0708610855abf5f4af037a4ede5f51a83e47
+  languageName: node
+  linkType: hard
+
+"@vitest/snapshot@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/snapshot@npm:1.6.0"
+  dependencies:
+    magic-string: "npm:^0.30.5"
+    pathe: "npm:^1.1.1"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/0bfc26a48b45814604ff0f7276d73a047b79f3618e0b620ff54ea2de548e9603a9770963ba6ebb19f7ea1ed51001cbca58d74aa0271651d4f8e88c6233885eba
+  languageName: node
+  linkType: hard
+
+"@vitest/spy@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/spy@npm:1.6.0"
+  dependencies:
+    tinyspy: "npm:^2.2.0"
+  checksum: 10/1c9698272a58aa47708bb8a1672d655fcec3285b02067cc3f70bfe76f4eda7a756eb379f8c945ccbe61677f5189aeb5ba93c2737a9d7db2de8c4e7bbdffcd372
+  languageName: node
+  linkType: hard
+
+"@vitest/utils@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/utils@npm:1.6.0"
+  dependencies:
+    diff-sequences: "npm:^29.6.3"
+    estree-walker: "npm:^3.0.3"
+    loupe: "npm:^2.3.7"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10/5c5d7295ac13fcea1da039232bcc7c3fc6f070070fe12ba2ad152456af6e216e48a3ae169016cfcd5055706a00dc567b8f62e4a9b1914f069f52b8f0a3c25e60
+  languageName: node
+  linkType: hard
+
 "@vx/axis@npm:0.0.198":
   version: 0.0.198
   resolution: "@vx/axis@npm:0.0.198"
@@ -13981,6 +14052,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-walk@npm:^8.3.2":
+  version: 8.3.3
+  resolution: "acorn-walk@npm:8.3.3"
+  dependencies:
+    acorn: "npm:^8.11.0"
+  checksum: 10/59701dcb7070679622ba8e9c7f37577b4935565747ca0fd7c1c3ad30b3f1b1b008276282664e323b5495eb49f77fa12d3816fd06dc68e18f90fbebe759f71450
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^5.5.3":
   version: 5.7.4
   resolution: "acorn@npm:5.7.4"
@@ -14017,6 +14097,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn@npm:^8.11.0, acorn@npm:^8.11.3":
+  version: 8.12.0
+  resolution: "acorn@npm:8.12.0"
+  bin:
+    acorn: bin/acorn
+  checksum: 10/550cc5033184eb98f7fbe2e9ddadd0f47f065734cc682f25db7a244f52314eb816801b64dec7174effd978045bd1754892731a90b1102b0ede9d17a15cfde138
+  languageName: node
+  linkType: hard
+
 "acorn@npm:^8.11.2":
   version: 8.11.3
   resolution: "acorn@npm:8.11.3"
@@ -14658,6 +14747,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"assertion-error@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "assertion-error@npm:1.1.0"
+  checksum: 10/fd9429d3a3d4fd61782eb3962ae76b6d08aa7383123fca0596020013b3ebd6647891a85b05ce821c47d1471ed1271f00b0545cf6a4326cf2fc91efcc3b0fbecf
+  languageName: node
+  linkType: hard
+
 "assign-symbols@npm:^1.0.0":
   version: 1.0.0
   resolution: "assign-symbols@npm:1.0.0"
@@ -16224,6 +16320,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chai@npm:^4.3.10":
+  version: 4.4.1
+  resolution: "chai@npm:4.4.1"
+  dependencies:
+    assertion-error: "npm:^1.1.0"
+    check-error: "npm:^1.0.3"
+    deep-eql: "npm:^4.1.3"
+    get-func-name: "npm:^2.0.2"
+    loupe: "npm:^2.3.6"
+    pathval: "npm:^1.1.1"
+    type-detect: "npm:^4.0.8"
+  checksum: 10/c6d7aba913a67529c68dbec3673f94eb9c586c5474cc5142bd0b587c9c9ec9e5fbaa937e038ecaa6475aea31433752d5fabdd033b9248bde6ae53befcde774ae
+  languageName: node
+  linkType: hard
+
 "chalk@npm:2.3.1":
   version: 2.3.1
   resolution: "chalk@npm:2.3.1"
@@ -16387,6 +16498,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"check-error@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "check-error@npm:1.0.3"
+  dependencies:
+    get-func-name: "npm:^2.0.2"
+  checksum: 10/e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399
+  languageName: node
+  linkType: hard
+
 "chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.5.3":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
@@ -17075,6 +17195,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"confbox@npm:^0.1.7":
+  version: 0.1.7
+  resolution: "confbox@npm:0.1.7"
+  checksum: 10/3086687b9a2a70d44d4b40a2d376536fe7e1baec4a2a34261b21b8a836026b419cbf89ded6054216631823e7d63c415dad4b4d53591d6edbb202bb9820dfa6fa
+  languageName: node
+  linkType: hard
+
 "config-chain@npm:^1.1.13":
   version: 1.1.13
   resolution: "config-chain@npm:1.1.13"
@@ -18838,6 +18965,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-eql@npm:^4.1.3":
+  version: 4.1.4
+  resolution: "deep-eql@npm:4.1.4"
+  dependencies:
+    type-detect: "npm:^4.0.0"
+  checksum: 10/f04f4d581f044a824a6322fe4f68fbee4d6780e93fc710cd9852cbc82bfc7010df00f0e05894b848abbe14dc3a25acac44f424e181ae64d12f2ab9d0a875a5ef
+  languageName: node
+  linkType: hard
+
 "deep-equal@npm:^2.0.5":
   version: 2.2.2
   resolution: "deep-equal@npm:2.2.2"
@@ -19219,6 +19355,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: 10/179daf9d2f9af5c57ad66d97cb902a538bcf8ed64963fa7aa0c329b3de3665ce2eb6ffdc2f69f29d445fa4af2517e5e55e5b6e00c00a9ae4f43645f97f7078cb
+  languageName: node
+  linkType: hard
+
 "diff@npm:^3.1.0, diff@npm:^3.2.0":
   version: 3.5.0
   resolution: "diff@npm:3.5.0"
@@ -20624,7 +20767,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^3.0.0":
+"estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3":
   version: 3.0.3
   resolution: "estree-walker@npm:3.0.3"
   dependencies:
@@ -22064,6 +22207,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "get-func-name@npm:2.0.2"
+  checksum: 10/3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
+  languageName: node
+  linkType: hard
+
 "get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
   version: 1.2.1
   resolution: "get-intrinsic@npm:1.2.1"
@@ -26198,6 +26348,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-tokens@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "js-tokens@npm:9.0.0"
+  checksum: 10/65e7a55a1a18d61f1cf94bfd7704da870b74337fa08d4c58118e69a8b10225b5ad887ff3ae595d720301b0924811a9b0594c679621a85ecbac6e3aac8533c53b
+  languageName: node
+  linkType: hard
+
 "js-yaml@npm:=4.1.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -27243,6 +27400,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"local-pkg@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "local-pkg@npm:0.5.0"
+  dependencies:
+    mlly: "npm:^1.4.2"
+    pkg-types: "npm:^1.0.3"
+  checksum: 10/20f4caba50dc6fb00ffcc1a78bc94b5acb33995e0aadf4d4edcdeab257e891aa08f50afddf02f3240b2c3d02432bc2078f2a916a280ed716b64753a3d250db70
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^2.0.0":
   version: 2.0.0
   resolution: "locate-path@npm:2.0.0"
@@ -27660,6 +27827,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"loupe@npm:^2.3.6, loupe@npm:^2.3.7":
+  version: 2.3.7
+  resolution: "loupe@npm:2.3.7"
+  dependencies:
+    get-func-name: "npm:^2.0.1"
+  checksum: 10/635c8f0914c2ce7ecfe4e239fbaf0ce1d2c00e4246fafcc4ed000bfdb1b8f89d05db1a220054175cca631ebf3894872a26fffba0124477fcb562f78762848fb1
+  languageName: node
+  linkType: hard
+
 "lower-case@npm:^2.0.2":
   version: 2.0.2
   resolution: "lower-case@npm:2.0.2"
@@ -27796,6 +27972,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.30.5":
+  version: 0.30.10
+  resolution: "magic-string@npm:0.30.10"
+  dependencies:
+    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
+  checksum: 10/9f8bf6363a14c98a9d9f32ef833b194702a5c98fb931b05ac511b76f0b06fd30ed92beda6ca3261d2d52d21e39e891ef1136fbd032023f6cbb02d0b7d5767201
+  languageName: node
+  linkType: hard
+
 "make-dir@npm:^1.0.0":
   version: 1.3.0
   resolution: "make-dir@npm:1.3.0"
@@ -29254,6 +29439,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mlly@npm:^1.4.2, mlly@npm:^1.7.0":
+  version: 1.7.1
+  resolution: "mlly@npm:1.7.1"
+  dependencies:
+    acorn: "npm:^8.11.3"
+    pathe: "npm:^1.1.2"
+    pkg-types: "npm:^1.1.1"
+    ufo: "npm:^1.5.3"
+  checksum: 10/c1ef3989e95fb6c6c27a238330897b01f46507020501f45a681f2cae453f982e38dcb0e45aa65f672ea7280945d4a729d266f17a8acb187956f312b0cafddf61
+  languageName: node
+  linkType: hard
+
 "modify-values@npm:^1.0.0":
   version: 1.0.1
   resolution: "modify-values@npm:1.0.1"
@@ -30749,6 +30946,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-limit@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "p-limit@npm:5.0.0"
+  dependencies:
+    yocto-queue: "npm:^1.0.0"
+  checksum: 10/87bf5837dee6942f0dbeff318436179931d9a97848d1b07dbd86140a477a5d2e6b90d9701b210b4e21fe7beaea2979dfde366e4f576fa644a59bd4d6a6371da7
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^2.0.0":
   version: 2.0.0
   resolution: "p-locate@npm:2.0.0"
@@ -31295,6 +31501,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pathval@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "pathval@npm:1.1.1"
+  checksum: 10/b50a4751068aa3a5428f5a0b480deecedc6f537666a3630a0c2ae2d5e7c0f4bf0ee77b48404441ec1220bef0c91625e6030b3d3cf5a32ab0d9764018d1d9dbb6
+  languageName: node
+  linkType: hard
+
 "pbf@npm:^3.2.1":
   version: 3.2.1
   resolution: "pbf@npm:3.2.1"
@@ -31470,6 +31683,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-types@npm:^1.0.3, pkg-types@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "pkg-types@npm:1.1.1"
+  dependencies:
+    confbox: "npm:^0.1.7"
+    mlly: "npm:^1.7.0"
+    pathe: "npm:^1.1.2"
+  checksum: 10/225eaf7c0339027e176dd0d34a6d9a1384c21e0aab295e57dfbef1f1b7fc132f008671da7e67553e352b80b17ba38c531c720c914061d277410eef1bdd9d9608
+  languageName: node
+  linkType: hard
+
 "please-upgrade-node@npm:^3.0.2, please-upgrade-node@npm:^3.2.0":
   version: 3.2.0
   resolution: "please-upgrade-node@npm:3.2.0"
@@ -32534,6 +32758,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-format@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "pretty-format@npm:29.7.0"
+  dependencies:
+    "@jest/schemas": "npm:^29.6.3"
+    ansi-styles: "npm:^5.0.0"
+    react-is: "npm:^18.0.0"
+  checksum: 10/dea96bc83c83cd91b2bfc55757b6b2747edcaac45b568e46de29deee80742f17bc76fe8898135a70d904f4928eafd8bb693cd1da4896e8bdd3c5e82cadf1d2bb
+  languageName: node
+  linkType: hard
+
 "pretty-hrtime@npm:^1.0.3":
   version: 1.0.3
   resolution: "pretty-hrtime@npm:1.0.3"
@@ -33576,6 +33811,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^18.0.0":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
+  languageName: node
+  linkType: hard
+
 "react-json-tree@npm:^0.15.0":
   version: 0.15.2
   resolution: "react-json-tree@npm:0.15.2"
@@ -36227,6 +36469,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"siginfo@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "siginfo@npm:2.0.0"
+  checksum: 10/e93ff66c6531a079af8fb217240df01f980155b5dc408d2d7bebc398dd284e383eb318153bf8acd4db3c4fe799aa5b9a641e38b0ba3b1975700b1c89547ea4e7
+  languageName: node
+  linkType: hard
+
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
@@ -36815,6 +37064,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stackback@npm:0.0.2":
+  version: 0.0.2
+  resolution: "stackback@npm:0.0.2"
+  checksum: 10/2d4dc4e64e2db796de4a3c856d5943daccdfa3dd092e452a1ce059c81e9a9c29e0b9badba91b43ef0d5ff5c04ee62feb3bcc559a804e16faf447bac2d883aa99
+  languageName: node
+  linkType: hard
+
 "staged-git-files@npm:1.1.2":
   version: 1.1.2
   resolution: "staged-git-files@npm:1.1.2"
@@ -36886,6 +37142,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"std-env@npm:^3.5.0":
+  version: 3.7.0
+  resolution: "std-env@npm:3.7.0"
+  checksum: 10/6ee0cca1add3fd84656b0002cfbc5bfa20340389d9ba4720569840f1caa34bce74322aef4c93f046391583e50649d0cf81a5f8fe1d411e50b659571690a45f12
+  languageName: node
+  linkType: hard
+
 "stealthy-require@npm:^1.1.1":
   version: 1.1.1
   resolution: "stealthy-require@npm:1.1.1"
@@ -37361,6 +37624,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-literal@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "strip-literal@npm:2.1.0"
+  dependencies:
+    js-tokens: "npm:^9.0.0"
+  checksum: 10/21c813aa1e669944e7e2318c8c927939fb90b0c52f53f57282bfc3dd6e19d53f70004f1f1693e33e5e790ad5ef102b0fce2b243808229d1ce07ae71f326c0e82
+  languageName: node
+  linkType: hard
+
 "style-inject@npm:^0.3.0":
   version: 0.3.0
   resolution: "style-inject@npm:0.3.0"
@@ -38010,6 +38282,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinybench@npm:^2.5.1":
+  version: 2.8.0
+  resolution: "tinybench@npm:2.8.0"
+  checksum: 10/9731d070bedee6d44f3bb565862c284776e6adfd70d81a051a5c79b77479408509b448ad8d467d538d18bc0ae857b3ead8168d7e98d7f1355f8a0b01aa2f163b
+  languageName: node
+  linkType: hard
+
 "tinycolor2@npm:^1.4.1":
   version: 1.6.0
   resolution: "tinycolor2@npm:1.6.0"
@@ -38024,6 +38303,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinypool@npm:^0.8.3":
+  version: 0.8.4
+  resolution: "tinypool@npm:0.8.4"
+  checksum: 10/7365944c2532f240111443e7012be31a634faf1a02db08a91db3aa07361c26a374d0be00a0f2ea052c4bee39c107ba67f1f814c108d9d51dfc725c559c1a9c03
+  languageName: node
+  linkType: hard
+
 "tinyqueue@npm:^2.0.3":
   version: 2.0.3
   resolution: "tinyqueue@npm:2.0.3"
@@ -38031,6 +38317,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyspy@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "tinyspy@npm:2.2.1"
+  checksum: 10/170d6232e87f9044f537b50b406a38fbfd6f79a261cd12b92879947bd340939a833a678632ce4f5c4a6feab4477e9c21cd43faac3b90b68b77dd0536c4149736
+  languageName: node
+  linkType: hard
+
 "tmp@npm:^0.0.33":
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
@@ -38708,7 +39001,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-detect@npm:4.0.8":
+"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
   checksum: 10/5179e3b8ebc51fce1b13efb75fdea4595484433f9683bbc2dca6d99789dba4e602ab7922d2656f2ce8383987467f7770131d4a7f06a26287db0615d2f4c4ce7d
@@ -39067,6 +39360,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ufo@npm:^1.5.3":
+  version: 1.5.3
+  resolution: "ufo@npm:1.5.3"
+  checksum: 10/2b30dddd873c643efecdb58cfe457183cd4d95937ccdacca6942c697b87a2c578232c25a5149fda85436696bf0fdbc213bf2b220874712bc3e58c0fb00a2c950
+  languageName: node
+  linkType: hard
+
 "uglify-js@npm:^3.1.4":
   version: 3.17.4
   resolution: "uglify-js@npm:3.17.4"
@@ -40015,6 +40315,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-node@npm:1.6.0":
+  version: 1.6.0
+  resolution: "vite-node@npm:1.6.0"
+  dependencies:
+    cac: "npm:^6.7.14"
+    debug: "npm:^4.3.4"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    vite: "npm:^5.0.0"
+  bin:
+    vite-node: vite-node.mjs
+  checksum: 10/40230598c3c285cf65f407ac50b1c7753ab2dfa960de76ec1a95a0ce0ff963919d065c29ba538d9fb2fba3e0703a051d49d1ad6486001ba2f90616cc706ddc3d
+  languageName: node
+  linkType: hard
+
 "vite-plugin-cesium@npm:^1.2.22":
   version: 1.2.22
   resolution: "vite-plugin-cesium@npm:1.2.22"
@@ -40200,6 +40515,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vitest@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "vitest@npm:1.6.0"
+  dependencies:
+    "@vitest/expect": "npm:1.6.0"
+    "@vitest/runner": "npm:1.6.0"
+    "@vitest/snapshot": "npm:1.6.0"
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
+    acorn-walk: "npm:^8.3.2"
+    chai: "npm:^4.3.10"
+    debug: "npm:^4.3.4"
+    execa: "npm:^8.0.1"
+    local-pkg: "npm:^0.5.0"
+    magic-string: "npm:^0.30.5"
+    pathe: "npm:^1.1.1"
+    picocolors: "npm:^1.0.0"
+    std-env: "npm:^3.5.0"
+    strip-literal: "npm:^2.0.0"
+    tinybench: "npm:^2.5.1"
+    tinypool: "npm:^0.8.3"
+    vite: "npm:^5.0.0"
+    vite-node: "npm:1.6.0"
+    why-is-node-running: "npm:^2.2.2"
+  peerDependencies:
+    "@edge-runtime/vm": "*"
+    "@types/node": ^18.0.0 || >=20.0.0
+    "@vitest/browser": 1.6.0
+    "@vitest/ui": 1.6.0
+    happy-dom: "*"
+    jsdom: "*"
+  peerDependenciesMeta:
+    "@edge-runtime/vm":
+      optional: true
+    "@types/node":
+      optional: true
+    "@vitest/browser":
+      optional: true
+    "@vitest/ui":
+      optional: true
+    happy-dom:
+      optional: true
+    jsdom:
+      optional: true
+  bin:
+    vitest: vitest.mjs
+  checksum: 10/ad921a723ac9438636d37111f0b2ea5afd0ba4a7813fb75382b9f75574e10d533cf950573ebb9332a595ce197cb83593737a6b55a3b6e6eb00bddbcd0920a03e
+  languageName: node
+  linkType: hard
+
 "vlq@npm:^0.2.2":
   version: 0.2.3
   resolution: "vlq@npm:0.2.3"
@@ -40721,6 +41086,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"why-is-node-running@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "why-is-node-running@npm:2.2.2"
+  dependencies:
+    siginfo: "npm:^2.0.0"
+    stackback: "npm:0.0.2"
+  bin:
+    why-is-node-running: cli.js
+  checksum: 10/f3582e0337f4b25537d492b1d40f00b978ce04b1d1eeea8f310bfa8aae8a7d11d118d672e2f0760c164ce3753a620a70aa29ff3620e340197624940cf9c08615
+  languageName: node
+  linkType: hard
+
 "wide-align@npm:^1.1.0, wide-align@npm:^1.1.5":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
@@ -41265,6 +41642,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yocto-queue@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "yocto-queue@npm:1.0.0"
+  checksum: 10/2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
+  languageName: node
+  linkType: hard
+
 "yup@npm:^0.27.0":
   version: 0.27.0
   resolution: "yup@npm:0.27.0"

From 6caa8edea41c7bd5d9c2d02cc1a800731538f7d9 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Sat, 15 Jun 2024 20:15:31 -0400
Subject: [PATCH 117/151] changed links and formalized formatting

---
 src/pages/dev/{ => test-site}/about/+Page.mdx | 21 +++++++++++--------
 src/pages/dev/{ => test-site}/about/index.ts  |  0
 src/pages/dev/{ => test-site}/about/main.styl |  7 +++++--
 .../dev/{ => test-site}/donate/+Page.mdx      | 18 ++++++++--------
 src/pages/dev/{ => test-site}/donate/index.ts |  0
 .../dev/{ => test-site}/donate/main.styl      |  0
 .../dev/{ => test-site}/main-page/+Page.mdx   | 18 ++++++++--------
 .../dev/{ => test-site}/main-page/index.ts    |  0
 .../dev/{ => test-site}/main-page/main.styl   |  0
 .../dev/{ => test-site}/people/+Page.mdx      | 20 ++++++++----------
 src/pages/dev/{ => test-site}/people/index.ts |  0
 .../dev/{ => test-site}/people/main.styl      |  6 +++---
 .../{ => test-site}/publications/+Page.mdx    | 21 +++++++++++--------
 .../dev/{ => test-site}/publications/index.ts |  0
 .../{ => test-site}/publications/main.styl    |  7 +++++--
 15 files changed, 64 insertions(+), 54 deletions(-)
 rename src/pages/dev/{ => test-site}/about/+Page.mdx (91%)
 rename src/pages/dev/{ => test-site}/about/index.ts (100%)
 rename src/pages/dev/{ => test-site}/about/main.styl (97%)
 rename src/pages/dev/{ => test-site}/donate/+Page.mdx (79%)
 rename src/pages/dev/{ => test-site}/donate/index.ts (100%)
 rename src/pages/dev/{ => test-site}/donate/main.styl (100%)
 rename src/pages/dev/{ => test-site}/main-page/+Page.mdx (91%)
 rename src/pages/dev/{ => test-site}/main-page/index.ts (100%)
 rename src/pages/dev/{ => test-site}/main-page/main.styl (100%)
 rename src/pages/dev/{ => test-site}/people/+Page.mdx (92%)
 rename src/pages/dev/{ => test-site}/people/index.ts (100%)
 rename src/pages/dev/{ => test-site}/people/main.styl (96%)
 rename src/pages/dev/{ => test-site}/publications/+Page.mdx (97%)
 rename src/pages/dev/{ => test-site}/publications/index.ts (100%)
 rename src/pages/dev/{ => test-site}/publications/main.styl (96%)

diff --git a/src/pages/dev/about/+Page.mdx b/src/pages/dev/test-site/about/+Page.mdx
similarity index 91%
rename from src/pages/dev/about/+Page.mdx
rename to src/pages/dev/test-site/about/+Page.mdx
index 96d7f0b4..50890562 100644
--- a/src/pages/dev/about/+Page.mdx
+++ b/src/pages/dev/test-site/about/+Page.mdx
@@ -7,14 +7,15 @@ import { MacrostratIcon } from "~/components";
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/about">About</a></li>
-    <li><a href="/dev/publications">Publications</a></li>
-    <li><a href="/dev/people">People</a></li>
-    <li><a href="/dev/donate">Donate</a></li>
+    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
+    <li><a href="/dev/test-site/about">About</a></li>
+    <li><a href="/dev/test-site/publications">Publications</a></li>
+    <li><a href="/dev/test-site/people">People</a></li>
+    <li><a href="/dev/test-site/donate">Donate</a></li>
   </ul>
 </div>
 
+<div id="body">
   
 [//]: # "About"
 <div id="about">
@@ -148,6 +149,8 @@ import { MacrostratIcon } from "~/components";
   </div> 
 </div>
 
+</div>
+
 [//]: # "Footer"
 <div class="footer">
   <div class="footer-container">
@@ -157,10 +160,10 @@ import { MacrostratIcon } from "~/components";
     </div>
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
-        <li><a href="/dev/about">About</a></li>
-        <li><a href="/dev/publications">Publications</a></li>
-        <li><a href="/dev/people">People</a></li>
-        <li><a href="/dev/donate">Donate</a></li>
+        <li><a href="/dev/test-site/about">About</a></li>
+        <li><a href="/dev/test-site/publications">Publications</a></li>
+        <li><a href="/dev/test-site/people">People</a></li>
+        <li><a href="/dev/test-site/donate">Donate</a></li>
       </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/about/index.ts b/src/pages/dev/test-site/about/index.ts
similarity index 100%
rename from src/pages/dev/about/index.ts
rename to src/pages/dev/test-site/about/index.ts
diff --git a/src/pages/dev/about/main.styl b/src/pages/dev/test-site/about/main.styl
similarity index 97%
rename from src/pages/dev/about/main.styl
rename to src/pages/dev/test-site/about/main.styl
index 0a4ea5a3..6c36b4d0 100644
--- a/src/pages/dev/about/main.styl
+++ b/src/pages/dev/test-site/about/main.styl
@@ -2,6 +2,10 @@
     color: black
     background-color: white
 
+#body
+  background-color: white
+  padding: 0 20%
+
 #apps
   padding: 75px 0    
 
@@ -161,8 +165,7 @@ a:hover
 
 
 #about  
-  padding: 75px 0
-  margin: 0 10%
+  padding: 50px 0
 
 .about-row
   margin: 4%
diff --git a/src/pages/dev/donate/+Page.mdx b/src/pages/dev/test-site/donate/+Page.mdx
similarity index 79%
rename from src/pages/dev/donate/+Page.mdx
rename to src/pages/dev/test-site/donate/+Page.mdx
index bb9ff9ab..cbfddc09 100644
--- a/src/pages/dev/donate/+Page.mdx
+++ b/src/pages/dev/test-site/donate/+Page.mdx
@@ -7,11 +7,11 @@ import { MacrostratIcon } from "~/components";
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/about">About</a></li>
-    <li><a href="/dev/publications">Publications</a></li>
-    <li><a href="/dev/people">People</a></li>
-    <li><a href="/dev/donate">Donate</a></li>
+    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
+    <li><a href="/dev/test-site/about">About</a></li>
+    <li><a href="/dev/test-site/publications">Publications</a></li>
+    <li><a href="/dev/test-site/people">People</a></li>
+    <li><a href="/dev/test-site/donate">Donate</a></li>
   </ul>
 </div>
 
@@ -39,10 +39,10 @@ import { MacrostratIcon } from "~/components";
     </div>
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
-        <li><a href="/dev/about">About</a></li>
-        <li><a href="/dev/publications">Publications</a></li>
-        <li><a href="/dev/people">People</a></li>
-        <li><a href="/dev/donate">Donate</a></li>
+        <li><a href="/dev/test-site/about">About</a></li>
+        <li><a href="/dev/test-site/publications">Publications</a></li>
+        <li><a href="/dev/test-site/people">People</a></li>
+        <li><a href="/dev/test-site/donate">Donate</a></li>
       </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/donate/index.ts b/src/pages/dev/test-site/donate/index.ts
similarity index 100%
rename from src/pages/dev/donate/index.ts
rename to src/pages/dev/test-site/donate/index.ts
diff --git a/src/pages/dev/donate/main.styl b/src/pages/dev/test-site/donate/main.styl
similarity index 100%
rename from src/pages/dev/donate/main.styl
rename to src/pages/dev/test-site/donate/main.styl
diff --git a/src/pages/dev/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
similarity index 91%
rename from src/pages/dev/main-page/+Page.mdx
rename to src/pages/dev/test-site/main-page/+Page.mdx
index c1c0aec8..222f6c32 100644
--- a/src/pages/dev/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -8,11 +8,11 @@ import { MacrostratIcon } from "~/components";
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/about">About</a></li>
-    <li><a href="/dev/publications">Publications</a></li>
-    <li><a href="/dev/people">People</a></li>
-    <li><a href="/dev/donate">Donate</a></li>
+    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
+    <li><a href="/dev/test-site/about">About</a></li>
+    <li><a href="/dev/test-site/publications">Publications</a></li>
+    <li><a href="/dev/test-site/people">People</a></li>
+    <li><a href="/dev/test-site/donate">Donate</a></li>
   </ul>
 </div>
 
@@ -137,10 +137,10 @@ import { MacrostratIcon } from "~/components";
     </div>
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
-        <li><a href="/dev/about">About</a></li>
-        <li><a href="/dev/publications">Publications</a></li>
-        <li><a href="/dev/people">People</a></li>
-        <li><a href="/dev/donate">Donate</a></li>
+        <li><a href="/dev/test-site/about">About</a></li>
+        <li><a href="/dev/test-site/publications">Publications</a></li>
+        <li><a href="/dev/test-site/people">People</a></li>
+        <li><a href="/dev/test-site/donate">Donate</a></li>
       </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/main-page/index.ts b/src/pages/dev/test-site/main-page/index.ts
similarity index 100%
rename from src/pages/dev/main-page/index.ts
rename to src/pages/dev/test-site/main-page/index.ts
diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/test-site/main-page/main.styl
similarity index 100%
rename from src/pages/dev/main-page/main.styl
rename to src/pages/dev/test-site/main-page/main.styl
diff --git a/src/pages/dev/people/+Page.mdx b/src/pages/dev/test-site/people/+Page.mdx
similarity index 92%
rename from src/pages/dev/people/+Page.mdx
rename to src/pages/dev/test-site/people/+Page.mdx
index 039d939d..b4c19a9f 100644
--- a/src/pages/dev/people/+Page.mdx
+++ b/src/pages/dev/test-site/people/+Page.mdx
@@ -9,15 +9,13 @@ import { MacrostratIcon } from "~/components";
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/about">About</a></li>
-    <li><a href="/dev/publications">Publications</a></li>
-    <li><a href="/dev/people">People</a></li>
-    <li><a href="/dev/donate">Donate</a></li>
+    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
+    <li><a href="/dev/test-site/about">About</a></li>
+    <li><a href="/dev/test-site/publications">Publications</a></li>
+    <li><a href="/dev/test-site/people">People</a></li>
+    <li><a href="/dev/test-site/donate">Donate</a></li>
   </ul>
 </div>
-\
-\
 
 [//]: # "People"
 <h1 class="big">People</h1>
@@ -174,10 +172,10 @@ import { MacrostratIcon } from "~/components";
     </div>
     <div class="col-sm-4" id="bottom-nav">
         <ul class="footer-nav">
-        <li><a href="/dev/about">About</a></li>
-        <li><a href="/dev/publications">Publications</a></li>
-        <li><a href="/dev/people">People</a></li>
-        <li><a href="/dev/donate">Donate</a></li>
+        <li><a href="/dev/test-site/about">About</a></li>
+        <li><a href="/dev/test-site/publications">Publications</a></li>
+        <li><a href="/dev/test-site/people">People</a></li>
+        <li><a href="/dev/test-site/donate">Donate</a></li>
         </ul>
     </div>
     <div class="col-sm-4 funding">
diff --git a/src/pages/dev/people/index.ts b/src/pages/dev/test-site/people/index.ts
similarity index 100%
rename from src/pages/dev/people/index.ts
rename to src/pages/dev/test-site/people/index.ts
diff --git a/src/pages/dev/people/main.styl b/src/pages/dev/test-site/people/main.styl
similarity index 96%
rename from src/pages/dev/people/main.styl
rename to src/pages/dev/test-site/people/main.styl
index 2e546b4f..7a464701 100644
--- a/src/pages/dev/people/main.styl
+++ b/src/pages/dev/test-site/people/main.styl
@@ -35,12 +35,12 @@ a:hover
     font-family: "Maven Pro", sans-serif
     margin: 0
     margin-left: 20%
-    margin-top: 30px
+    padding-top: 100px
 
 .line
-  border-bottom: 3px solid #E0E1E6;
+  border-bottom: 1px solid #E0E1E6;
   width: 60%
-  margin: 20px 20% 
+  margin: 0 20% 
 
 
 .people
diff --git a/src/pages/dev/publications/+Page.mdx b/src/pages/dev/test-site/publications/+Page.mdx
similarity index 97%
rename from src/pages/dev/publications/+Page.mdx
rename to src/pages/dev/test-site/publications/+Page.mdx
index e0370463..7ce79b41 100644
--- a/src/pages/dev/publications/+Page.mdx
+++ b/src/pages/dev/test-site/publications/+Page.mdx
@@ -4,14 +4,16 @@ import "./main.styl";
 import { Image } from "./index";
 import { MacrostratIcon } from "~/components";
 
+<div id="container">
+
 [//]: # "Nav Bar"
 <div class="nav">
   <ul>
-    <li><a href="/dev/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/about">About</a></li>
-    <li><a href="/dev/publications">Publications</a></li>
-    <li><a href="/dev/people">People</a></li>
-    <li><a href="/dev/donate">Donate</a></li>
+    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
+    <li><a href="/dev/test-site/about">About</a></li>
+    <li><a href="/dev/test-site/publications">Publications</a></li>
+    <li><a href="/dev/test-site/people">People</a></li>
+    <li><a href="/dev/test-site/donate">Donate</a></li>
   </ul>
 </div>
 
@@ -108,10 +110,10 @@ import { MacrostratIcon } from "~/components";
     </div>
     <div class="col-sm-4" id="bottom-nav">
       <ul class="footer-nav">
-        <li><a href="/dev/about">About</a></li>
-        <li><a href="/dev/publications">Publications</a></li>
-        <li><a href="/dev/people">People</a></li>
-        <li><a href="/dev/donate">Donate</a></li>
+        <li><a href="/dev/test-site/about">About</a></li>
+        <li><a href="/dev/test-site/publications">Publications</a></li>
+        <li><a href="/dev/test-site/people">People</a></li>
+        <li><a href="/dev/test-site/donate">Donate</a></li>
       </ul>
     </div>
     <div class="col-sm-4 funding">
@@ -124,4 +126,5 @@ import { MacrostratIcon } from "~/components";
       </div>
     </div>
   </div>
+</div>
 </div>
\ No newline at end of file
diff --git a/src/pages/dev/publications/index.ts b/src/pages/dev/test-site/publications/index.ts
similarity index 100%
rename from src/pages/dev/publications/index.ts
rename to src/pages/dev/test-site/publications/index.ts
diff --git a/src/pages/dev/publications/main.styl b/src/pages/dev/test-site/publications/main.styl
similarity index 96%
rename from src/pages/dev/publications/main.styl
rename to src/pages/dev/test-site/publications/main.styl
index 635ed9cd..2a590d41 100644
--- a/src/pages/dev/publications/main.styl
+++ b/src/pages/dev/test-site/publications/main.styl
@@ -2,6 +2,9 @@
     background-color: white
     color: black
 
+#container
+  background-color: white
+
 a:hover
     text-decoration: none
 .nav
@@ -90,12 +93,12 @@ p
   padding-top: 25px
 
 .pub-line
-  width: 80%;
+  width: 60%;
   border-bottom: 1px solid #E0E1E6;
   position: absolute;
 
 #publications 
-  margin: 100px 20%
+  padding: 50px 20%
 
 #pub-title 
   text-align: left

From 6421ef6fa96af1032c4b130aaec91f53f1c9c414 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Sat, 15 Jun 2024 20:20:04 -0400
Subject: [PATCH 118/151] updated dev homepage

---
 src/pages/dev/+Page.mdx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/dev/+Page.mdx b/src/pages/dev/+Page.mdx
index 08c11fac..c5a16ccb 100644
--- a/src/pages/dev/+Page.mdx
+++ b/src/pages/dev/+Page.mdx
@@ -12,6 +12,5 @@ import { PageBreadcrumbs } from "~/renderer";
 - [Map filter](/dev/filtering)
 - [Concept apps](/dev/concepts)
 - [Built with Macrostrat](/dev/apps)
-- [People](/dev/people)
-- [Main Page](/dev/main-page)
+- [Test Site](/dev/test-site/main-page)
 

From 3663fad54cde33aeeb22de7bdd1edbef249fcf80 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Tue, 25 Jun 2024 13:55:12 -0400
Subject: [PATCH 119/151] no border on images

---
 src/pages/dev/main-page/main.styl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/dev/main-page/main.styl b/src/pages/dev/main-page/main.styl
index 501f966a..e50bf623 100644
--- a/src/pages/dev/main-page/main.styl
+++ b/src/pages/dev/main-page/main.styl
@@ -487,7 +487,6 @@ a:hover
   height: 40vh
   display: flex;
   margin: auto
-  border: solid black
   object-fit: cover
 
 .location-text
@@ -500,11 +499,11 @@ a:hover
     font-weight: 600
     display: grid
     margin: auto
-    margin-top: 30%
+    margin-top: 33%
 
 .caption
   font-size: 15px
   font-weight: 600
   display: grid
   margin: auto
-  margin-top: 0
\ No newline at end of file
+  margin-top: 4%
\ No newline at end of file

From b0e1f47254c8ae849ce5fe90b0564e0df50f63c7 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Tue, 25 Jun 2024 14:02:48 -0400
Subject: [PATCH 120/151] moved ts file

---
 src/pages/dev/test-site/about/+Page.mdx        | 2 +-
 src/pages/dev/test-site/{about => }/index.ts   | 0
 src/pages/dev/test-site/main-page/+Page.mdx    | 2 +-
 src/pages/dev/test-site/main-page/index.ts     | 6 ------
 src/pages/dev/test-site/people/+Page.mdx       | 2 +-
 src/pages/dev/test-site/people/index.ts        | 6 ------
 src/pages/dev/test-site/publications/+Page.mdx | 2 +-
 src/pages/dev/test-site/publications/index.ts  | 6 ------
 8 files changed, 4 insertions(+), 22 deletions(-)
 rename src/pages/dev/test-site/{about => }/index.ts (100%)
 delete mode 100644 src/pages/dev/test-site/main-page/index.ts
 delete mode 100644 src/pages/dev/test-site/people/index.ts
 delete mode 100644 src/pages/dev/test-site/publications/index.ts

diff --git a/src/pages/dev/test-site/about/+Page.mdx b/src/pages/dev/test-site/about/+Page.mdx
index 50890562..98afc338 100644
--- a/src/pages/dev/test-site/about/+Page.mdx
+++ b/src/pages/dev/test-site/about/+Page.mdx
@@ -1,6 +1,6 @@
 import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
-import { Image } from "./index";
+import { Image } from "../index";
 import "./main.styl";
 import { MacrostratIcon } from "~/components";
 
diff --git a/src/pages/dev/test-site/about/index.ts b/src/pages/dev/test-site/index.ts
similarity index 100%
rename from src/pages/dev/test-site/about/index.ts
rename to src/pages/dev/test-site/index.ts
diff --git a/src/pages/dev/test-site/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
index 222f6c32..5c504c9f 100644
--- a/src/pages/dev/test-site/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -1,6 +1,6 @@
 import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
-import { Image } from "./index";
+import { Image } from "../index";
 import "./main.styl";
 import { MacrostratIcon } from "~/components";
 
diff --git a/src/pages/dev/test-site/main-page/index.ts b/src/pages/dev/test-site/main-page/index.ts
deleted file mode 100644
index e3670446..00000000
--- a/src/pages/dev/test-site/main-page/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import h from "@macrostrat/hyper";
-
-export function Image({ src, className, width, height }) {
-    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
-    return h("img", {src: srcWithAddedPrefix, className, width, height})
-}
\ No newline at end of file
diff --git a/src/pages/dev/test-site/people/+Page.mdx b/src/pages/dev/test-site/people/+Page.mdx
index b4c19a9f..56729945 100644
--- a/src/pages/dev/test-site/people/+Page.mdx
+++ b/src/pages/dev/test-site/people/+Page.mdx
@@ -1,7 +1,7 @@
 import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
-import { Image } from "./index";
+import { Image } from "../index";
 import { MacrostratIcon } from "~/components";
 
 <div class="main">
diff --git a/src/pages/dev/test-site/people/index.ts b/src/pages/dev/test-site/people/index.ts
deleted file mode 100644
index e3670446..00000000
--- a/src/pages/dev/test-site/people/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import h from "@macrostrat/hyper";
-
-export function Image({ src, className, width, height }) {
-    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
-    return h("img", {src: srcWithAddedPrefix, className, width, height})
-}
\ No newline at end of file
diff --git a/src/pages/dev/test-site/publications/+Page.mdx b/src/pages/dev/test-site/publications/+Page.mdx
index 7ce79b41..3133408d 100644
--- a/src/pages/dev/test-site/publications/+Page.mdx
+++ b/src/pages/dev/test-site/publications/+Page.mdx
@@ -1,7 +1,7 @@
 import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
 import "./main.styl";
-import { Image } from "./index";
+import { Image } from "../index";
 import { MacrostratIcon } from "~/components";
 
 <div id="container">
diff --git a/src/pages/dev/test-site/publications/index.ts b/src/pages/dev/test-site/publications/index.ts
deleted file mode 100644
index e3670446..00000000
--- a/src/pages/dev/test-site/publications/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import h from "@macrostrat/hyper";
-
-export function Image({ src, className, width, height }) {
-    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
-    return h("img", {src: srcWithAddedPrefix, className, width, height})
-}
\ No newline at end of file

From 957f86a2511b2402ebf1d536e6f90ce6d5deba66 Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Tue, 25 Jun 2024 15:08:12 -0400
Subject: [PATCH 121/151] made navbar function

---
 src/pages/dev/test-site/about/+Page.mdx       | 13 +++--------
 src/pages/dev/test-site/donate/+Page.mdx      | 13 +++--------
 src/pages/dev/test-site/donate/index.ts       |  6 -----
 src/pages/dev/test-site/index.ts              | 17 ++++++++++++++
 src/pages/dev/test-site/main-page/+Page.mdx   | 14 ++++-------
 src/pages/dev/test-site/main-page/main.styl   | 23 -------------------
 src/pages/dev/test-site/main.styl             | 22 ++++++++++++++++++
 src/pages/dev/test-site/people/+Page.mdx      | 14 +++--------
 .../dev/test-site/publications/+Page.mdx      | 13 +++--------
 9 files changed, 55 insertions(+), 80 deletions(-)
 delete mode 100644 src/pages/dev/test-site/donate/index.ts
 create mode 100644 src/pages/dev/test-site/main.styl

diff --git a/src/pages/dev/test-site/about/+Page.mdx b/src/pages/dev/test-site/about/+Page.mdx
index 98afc338..17c6fc3e 100644
--- a/src/pages/dev/test-site/about/+Page.mdx
+++ b/src/pages/dev/test-site/about/+Page.mdx
@@ -1,19 +1,12 @@
 import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
-import { Image } from "../index";
+import { Image, Navbar, Footer } from "../index";
 import "./main.styl";
+import "../main.styl";
 import { MacrostratIcon } from "~/components";
 
 [//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/test-site/about">About</a></li>
-    <li><a href="/dev/test-site/publications">Publications</a></li>
-    <li><a href="/dev/test-site/people">People</a></li>
-    <li><a href="/dev/test-site/donate">Donate</a></li>
-  </ul>
-</div>
+<Navbar></Navbar>
 
 <div id="body">
   
diff --git a/src/pages/dev/test-site/donate/+Page.mdx b/src/pages/dev/test-site/donate/+Page.mdx
index cbfddc09..1cc0fc47 100644
--- a/src/pages/dev/test-site/donate/+Page.mdx
+++ b/src/pages/dev/test-site/donate/+Page.mdx
@@ -1,19 +1,12 @@
 import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
+import { Image, Navbar, Footer } from "../index";
 import "./main.styl";
-import { Image } from "./index";
+import "../main.styl";
 import { MacrostratIcon } from "~/components";
 
 [//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/test-site/about">About</a></li>
-    <li><a href="/dev/test-site/publications">Publications</a></li>
-    <li><a href="/dev/test-site/people">People</a></li>
-    <li><a href="/dev/test-site/donate">Donate</a></li>
-  </ul>
-</div>
+<Navbar></Navbar>
 
 [//]: # "Donate"
 <div class="donate-container" id="donate">
diff --git a/src/pages/dev/test-site/donate/index.ts b/src/pages/dev/test-site/donate/index.ts
deleted file mode 100644
index e3670446..00000000
--- a/src/pages/dev/test-site/donate/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import h from "@macrostrat/hyper";
-
-export function Image({ src, className, width, height }) {
-    const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
-    return h("img", {src: srcWithAddedPrefix, className, width, height})
-}
\ No newline at end of file
diff --git a/src/pages/dev/test-site/index.ts b/src/pages/dev/test-site/index.ts
index e3670446..b07d7137 100644
--- a/src/pages/dev/test-site/index.ts
+++ b/src/pages/dev/test-site/index.ts
@@ -1,6 +1,23 @@
 import h from "@macrostrat/hyper";
+import { MacrostratIcon } from "~/components";
 
 export function Image({ src, className, width, height }) {
     const srcWithAddedPrefix = "https://storage.macrostrat.org/assets/web/main-page/" + src;
     return h("img", {src: srcWithAddedPrefix, className, width, height})
+}
+
+export function Navbar() {
+    return h("div", {className: "nav"}, [
+        h("ul", [
+            h("li", h("a", {href: "/dev/test-site/main-page"}, h(MacrostratIcon))),
+            h("li", h("a", {href: "/dev/test-site/about"}, "About")),
+            h("li", h("a", {href: "/dev/test-site/publications"}, "Publications")),
+            h("li", h("a", {href: "/dev/test-site/people"}, "People")),
+            h("li", h("a", {href: "/dev/test-site/donate"}, "Donate"))
+        ])
+    ]);
+}
+
+export function Footer() {
+    return null;
 }
\ No newline at end of file
diff --git a/src/pages/dev/test-site/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
index 5c504c9f..28b07cf0 100644
--- a/src/pages/dev/test-site/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -1,20 +1,14 @@
 import { PageHeader } from "~/components";
 import { LinkCard } from "~/components/cards";
-import { Image } from "../index";
+import { Image, Navbar, Footer } from "../index";
 import "./main.styl";
+import "../main.styl";
 import { MacrostratIcon } from "~/components";
 
 <div id="total">
+
 [//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/test-site/about">About</a></li>
-    <li><a href="/dev/test-site/publications">Publications</a></li>
-    <li><a href="/dev/test-site/people">People</a></li>
-    <li><a href="/dev/test-site/donate">Donate</a></li>
-  </ul>
-</div>
+<Navbar></Navbar>
 
 [//]: # "Start Page"
 <div class="parent">
diff --git a/src/pages/dev/test-site/main-page/main.styl b/src/pages/dev/test-site/main-page/main.styl
index c798d754..dd5a7fa1 100644
--- a/src/pages/dev/test-site/main-page/main.styl
+++ b/src/pages/dev/test-site/main-page/main.styl
@@ -15,29 +15,6 @@ a:hover
 .nohighlight
   color: white
 
-.nav
-  position: fixed
-  width: 100%
-  z-index: 10000
-
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #015eab;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none
-
 .parent
   height: 100vh
 
diff --git a/src/pages/dev/test-site/main.styl b/src/pages/dev/test-site/main.styl
new file mode 100644
index 00000000..c09a1cc4
--- /dev/null
+++ b/src/pages/dev/test-site/main.styl
@@ -0,0 +1,22 @@
+.nav
+  position: fixed
+  width: 100%
+  z-index: 10000
+
+  ul 
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #015eab;
+
+  li 
+    float: left;
+    font-size: 15px
+
+  li a 
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none
\ No newline at end of file
diff --git a/src/pages/dev/test-site/people/+Page.mdx b/src/pages/dev/test-site/people/+Page.mdx
index 56729945..85ce173f 100644
--- a/src/pages/dev/test-site/people/+Page.mdx
+++ b/src/pages/dev/test-site/people/+Page.mdx
@@ -1,22 +1,14 @@
 import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
+import { Image, Navbar, Footer } from "../index";
 import "./main.styl";
-import { Image } from "../index";
+import "../main.styl";
 import { MacrostratIcon } from "~/components";
 
 <div class="main">
 
 [//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/test-site/about">About</a></li>
-    <li><a href="/dev/test-site/publications">Publications</a></li>
-    <li><a href="/dev/test-site/people">People</a></li>
-    <li><a href="/dev/test-site/donate">Donate</a></li>
-  </ul>
-</div>
-
+<Navbar></Navbar>
 [//]: # "People"
 <h1 class="big">People</h1>
 <p class="subtitle">major contributors to the project </p>
diff --git a/src/pages/dev/test-site/publications/+Page.mdx b/src/pages/dev/test-site/publications/+Page.mdx
index 3133408d..8bdc9469 100644
--- a/src/pages/dev/test-site/publications/+Page.mdx
+++ b/src/pages/dev/test-site/publications/+Page.mdx
@@ -1,21 +1,14 @@
 import { PageHeader } from "~/components";
 import { PageBreadcrumbs } from "~/renderer";
+import { Image, Navbar, Footer } from "../index";
 import "./main.styl";
-import { Image } from "../index";
+import "../main.styl";
 import { MacrostratIcon } from "~/components";
 
 <div id="container">
 
 [//]: # "Nav Bar"
-<div class="nav">
-  <ul>
-    <li><a href="/dev/test-site/main-page"><MacrostratIcon></MacrostratIcon></a></li>
-    <li><a href="/dev/test-site/about">About</a></li>
-    <li><a href="/dev/test-site/publications">Publications</a></li>
-    <li><a href="/dev/test-site/people">People</a></li>
-    <li><a href="/dev/test-site/donate">Donate</a></li>
-  </ul>
-</div>
+<Navbar></Navbar>
 
 [//]: # "Publications"
 <div id="publications">

From 1bbfb9f19821e779ba154ac9d06ab1e368b3c45e Mon Sep 17 00:00:00 2001
From: root <root@DAVIDSLAPTOP>
Date: Tue, 25 Jun 2024 15:49:44 -0400
Subject: [PATCH 122/151] added footer function

---
 src/pages/dev/test-site/about/+Page.mdx       | 26 +------
 src/pages/dev/test-site/about/main.styl       | 74 ------------------
 src/pages/dev/test-site/donate/+Page.mdx      | 26 +------
 src/pages/dev/test-site/donate/main.styl      | 75 -------------------
 src/pages/dev/test-site/index.ts              | 28 ++++++-
 src/pages/dev/test-site/main-page/+Page.mdx   | 27 +------
 src/pages/dev/test-site/main-page/main.styl   | 51 -------------
 src/pages/dev/test-site/main.styl             | 58 +++++++++++++-
 src/pages/dev/test-site/people/+Page.mdx      | 26 +------
 src/pages/dev/test-site/people/main.styl      | 74 +-----------------
 .../dev/test-site/publications/+Page.mdx      | 27 +------
 .../dev/test-site/publications/main.styl      | 74 ------------------
 12 files changed, 92 insertions(+), 474 deletions(-)

diff --git a/src/pages/dev/test-site/about/+Page.mdx b/src/pages/dev/test-site/about/+Page.mdx
index 17c6fc3e..a00f9e88 100644
--- a/src/pages/dev/test-site/about/+Page.mdx
+++ b/src/pages/dev/test-site/about/+Page.mdx
@@ -145,28 +145,4 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Footer"
-<div class="footer">
-  <div class="footer-container">
-    <div class="col-sm-4" id="who-made-it">
-      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-    </div>
-    <div class="col-sm-4" id="bottom-nav">
-      <ul class="footer-nav">
-        <li><a href="/dev/test-site/about">About</a></li>
-        <li><a href="/dev/test-site/publications">Publications</a></li>
-        <li><a href="/dev/test-site/people">People</a></li>
-        <li><a href="/dev/test-site/donate">Donate</a></li>
-      </ul>
-    </div>
-    <div class="col-sm-4 funding">
-      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-      <div class="funding-line">
-        Current support: \
-        EAR-1948843 \
-        ICER-1928323 \
-        UW-Madison Dept. Geoscience
-      </div>
-    </div>
-  </div>
-</div>
+<Footer></Footer>
diff --git a/src/pages/dev/test-site/about/main.styl b/src/pages/dev/test-site/about/main.styl
index 6c36b4d0..f0d36dff 100644
--- a/src/pages/dev/test-site/about/main.styl
+++ b/src/pages/dev/test-site/about/main.styl
@@ -12,29 +12,6 @@
 a:hover
   text-decoration: none
 
-.nav
-  position: fixed
-  width: 100%
-  z-index: 10000
-
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #015eab;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none
-
 .app-header
   margin: 0
   padding: 0
@@ -79,57 +56,6 @@ a:hover
   font-family: "Maven Pro", sans-serif;
   text-align: center
 
-.footer 
-  width: 100%
-  background-color: #015EAB
-
-.footer-container
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 0 auto;
-  width: 60%
-
-.col-sm-4
-  color: white
-  width: 33.333%
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-weight: bold
-
-.nav-logo
-  padding-top: 5px
-
-.funding-logo
-  padding: 10px
-
-.footer-nav
-  list-style-type: none
-  padding-right: 40px
-
-  li
-    padding: 5px 0
-
-  a
-    color: white
-
-  a:hover
-    text-decoration: none
-
-.git_logo
-  vertical-align: sub
-
-.f1-text
-  a
-    color: white
-
-#who-made-it
-  padding-top: 25px
-
 #api  
   position: relative
   height: 30vh
diff --git a/src/pages/dev/test-site/donate/+Page.mdx b/src/pages/dev/test-site/donate/+Page.mdx
index 1cc0fc47..83e71dbb 100644
--- a/src/pages/dev/test-site/donate/+Page.mdx
+++ b/src/pages/dev/test-site/donate/+Page.mdx
@@ -24,28 +24,4 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Footer"
-<div class="footer">
-  <div class="footer-container">
-    <div class="col-sm-4" id="who-made-it">
-      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-    </div>
-    <div class="col-sm-4" id="bottom-nav">
-      <ul class="footer-nav">
-        <li><a href="/dev/test-site/about">About</a></li>
-        <li><a href="/dev/test-site/publications">Publications</a></li>
-        <li><a href="/dev/test-site/people">People</a></li>
-        <li><a href="/dev/test-site/donate">Donate</a></li>
-      </ul>
-    </div>
-    <div class="col-sm-4 funding">
-      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-      <div class="funding-line">
-        Current support: \
-        EAR-1948843 \
-        ICER-1928323 \
-        UW-Madison Dept. Geoscience
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
+<Footer></Footer>
\ No newline at end of file
diff --git a/src/pages/dev/test-site/donate/main.styl b/src/pages/dev/test-site/donate/main.styl
index 466282a6..f2d090bf 100644
--- a/src/pages/dev/test-site/donate/main.styl
+++ b/src/pages/dev/test-site/donate/main.styl
@@ -4,29 +4,6 @@
 
 a:hover
     text-decoration: none
-.nav
-  position: fixed
-  width: 100%
-  z-index: 10000
-  top: 0
-
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #015eab;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none
 
 .big
   font-size: 72px
@@ -37,58 +14,6 @@ p
   margin-bottom: 10px;
   margin-top: 0;
 
-.footer 
-  width: 100%
-  background-color: #015EAB
-
-.footer-container
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 0 auto;
-  width: 60%
-
-.col-sm-4
-  color: white
-  width: 33.333%
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-weight: bold
-
-.nav-logo
-  padding-top: 5px
-
-.funding-logo
-  padding: 10px
-
-.footer-nav
-  list-style-type: none
-  padding-right: 40px
-
-  li
-    padding: 5px 0
-
-  a
-    color: white
-
-  a:hover
-    text-decoration: none
-
-.git_logo
-  vertical-align: sub
-
-.f1-text
-  a
-    color: white
-
-#who-made-it
-  padding-top: 25px
-
-
 .donate-container
   height: 80vh
 
diff --git a/src/pages/dev/test-site/index.ts b/src/pages/dev/test-site/index.ts
index b07d7137..29a075f3 100644
--- a/src/pages/dev/test-site/index.ts
+++ b/src/pages/dev/test-site/index.ts
@@ -19,5 +19,31 @@ export function Navbar() {
 }
 
 export function Footer() {
-    return null;
+    return h("div", {className: "footer"}, [
+        h("div", {className: "footer-container"}, [
+            h("div", {className: "col-sm-4"}, [
+                h(Image, {className: "logo_white", src: "logo_white.png", width: "100px"}),
+                h("p", {className: "f1-text"}, [
+                    "Produced by the ",
+                    h("a", {href: "http://strata.geology.wisc.edu", target: "_blank"}, "UW Macrostrat Lab"),
+                    h("a", {href: "https://github.com/UW-Macrostrat", target: "_blank"}, h(Image, {className: "git_logo", src: "git-logo.png", width: "18px"})),
+                ])
+            ]),
+            h("div", {className: "col-sm-4"}, [
+                h("ul", {className: "footer-nav"}, [
+                    h("li", h("a", {href: "/dev/test-site/about"}, "About")),
+                    h("li", h("a", {href: "/dev/test-site/publications"}, "Publications")),
+                    h("li", h("a", {href: "/dev/test-site/people"}, "People")),
+                    h("li", h("a", {href: "/dev/test-site/donate"}, "Donate"))
+                ])
+            ]),
+            h("div", {className: "col-sm-4"}, [
+                h(Image, {className: "funding-logo", src: "nsf.png", width: "100px"}),
+                h("div", {className: "funding-line"}, "Current support:"),
+                h("div", {className: "funding-line"}, "EAR-1948843"),
+                h("div", {className: "funding-line"}, "ICER-1928323"),
+                h("div", {className: "funding-line"}, "UW-Madison Dept. Geoscience")
+            ])
+        ])
+    ]);
 }
\ No newline at end of file
diff --git a/src/pages/dev/test-site/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
index 28b07cf0..c5b70d0a 100644
--- a/src/pages/dev/test-site/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -123,29 +123,6 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Footer"
-<div class="footer">
-  <div class="footer-container">
-    <div class="col-sm-4" id="who-made-it">
-      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-    </div>
-    <div class="col-sm-4" id="bottom-nav">
-      <ul class="footer-nav">
-        <li><a href="/dev/test-site/about">About</a></li>
-        <li><a href="/dev/test-site/publications">Publications</a></li>
-        <li><a href="/dev/test-site/people">People</a></li>
-        <li><a href="/dev/test-site/donate">Donate</a></li>
-      </ul>
-    </div>
-    <div class="col-sm-4 funding">
-      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-      <div class="funding-line">
-        Current support: \
-        EAR-1948843 \
-        ICER-1928323 \
-        UW-Madison Dept. Geoscience
-      </div>
-    </div>
-  </div>
-</div>
+<Footer></Footer>
+
 </div>
\ No newline at end of file
diff --git a/src/pages/dev/test-site/main-page/main.styl b/src/pages/dev/test-site/main-page/main.styl
index dd5a7fa1..9e404de0 100644
--- a/src/pages/dev/test-site/main-page/main.styl
+++ b/src/pages/dev/test-site/main-page/main.styl
@@ -260,57 +260,6 @@ a:hover
   width: 100%
   object-fit: cover
 
-.footer 
-  width: 100%
-  background-color: #015EAB
-
-.footer-container
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 0 auto;
-  width: 60%
-
-.col-sm-4
-  color: white
-  width: 33.333%
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-weight: bold
-
-.nav-logo
-  padding-top: 5px
-
-.funding-logo
-  padding: 10px
-
-.footer-nav
-  list-style-type: none
-  padding-right: 40px
-
-  li
-    padding: 5px 0
-
-  a
-    color: white
-
-  a:hover
-    text-decoration: none
-
-.git_logo
-  vertical-align: sub
-
-.f1-text
-  a
-    color: white
-
-#who-made-it
-  padding-top: 25px
-
 .app-header
   margin: 0
   padding: 0
diff --git a/src/pages/dev/test-site/main.styl b/src/pages/dev/test-site/main.styl
index c09a1cc4..67dc178e 100644
--- a/src/pages/dev/test-site/main.styl
+++ b/src/pages/dev/test-site/main.styl
@@ -19,4 +19,60 @@
     color: white;
     text-align: center;
     padding: 14px 16px;
-    text-decoration: none
\ No newline at end of file
+    text-decoration: none
+
+
+.footer 
+  width: 100%
+  background-color: #015EAB
+
+.footer-container
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 auto;
+  width: 60%
+
+.col-sm-4
+  color: white
+  width: 33.333%
+  color: #E0E1E6;
+  font-weight: 200;
+  text-align: center;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+  font-weight: bold
+  padding-bottom: 18px
+
+.nav-logo
+  padding-top: 5px
+
+.funding-logo
+  padding: 10px
+
+.footer-nav
+  list-style-type: none
+  padding-right: 40px
+
+  li
+    padding: 5px 0
+
+  a
+    color: white
+
+  a:hover
+    text-decoration: none
+
+.git_logo
+  vertical-align: sub
+
+.f1-text
+  a
+    color: white
+
+#who-made-it
+  padding-top: 25px
+
+.logo_white
+  padding-top: 20px
\ No newline at end of file
diff --git a/src/pages/dev/test-site/people/+Page.mdx b/src/pages/dev/test-site/people/+Page.mdx
index 85ce173f..d7625a5f 100644
--- a/src/pages/dev/test-site/people/+Page.mdx
+++ b/src/pages/dev/test-site/people/+Page.mdx
@@ -156,30 +156,6 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Footer"
-<div class="footer">
-    <div class="footer-container">
-    <div class="col-sm-4" id="who-made-it">
-        <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-        <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-    </div>
-    <div class="col-sm-4" id="bottom-nav">
-        <ul class="footer-nav">
-        <li><a href="/dev/test-site/about">About</a></li>
-        <li><a href="/dev/test-site/publications">Publications</a></li>
-        <li><a href="/dev/test-site/people">People</a></li>
-        <li><a href="/dev/test-site/donate">Donate</a></li>
-        </ul>
-    </div>
-    <div class="col-sm-4 funding">
-        <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-        <div class="funding-line">
-        Current support: \
-        EAR-1948843 \
-        ICER-1928323 \
-        UW-Madison Dept. Geoscience
-        </div>
-    </div>
-    </div>
-</div>
+<Footer></Footer>
 
 </div>
diff --git a/src/pages/dev/test-site/people/main.styl b/src/pages/dev/test-site/people/main.styl
index 7a464701..b83cc223 100644
--- a/src/pages/dev/test-site/people/main.styl
+++ b/src/pages/dev/test-site/people/main.styl
@@ -4,29 +4,6 @@
 
 a:hover
     text-decoration: none
-.nav
-  position: fixed
-  width: 100%
-  z-index: 10000
-  top: 0
-
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #015eab;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none
 
 .big
     color: #E0E1E6
@@ -95,58 +72,9 @@ e
     font-size: 14px
     font-weight: 200px
 
-.footer 
-  width: 100%
-  background-color: #015EAB
+.footer
   margin-top: 280vh
 
-.footer-container
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 0 auto;
-  width: 60%
-
-.col-sm-4
-  color: white
-  width: 33.333%
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-weight: bold
-
-.nav-logo
-  padding-top: 5px
-
-.funding-logo
-  padding: 10px
-
-.footer-nav
-  list-style-type: none
-  padding-right: 40px
-
-  li
-    padding: 5px 0
-
-  a
-    color: white
-
-  a:hover
-    text-decoration: none
-
-.git_logo
-  vertical-align: sub
-
-.f1-text
-  a
-    color: white
-
-#who-made-it
-  padding-top: 25px
-
 .subtitle
   margin-left: 20%
   color: #E0E1E6;
\ No newline at end of file
diff --git a/src/pages/dev/test-site/publications/+Page.mdx b/src/pages/dev/test-site/publications/+Page.mdx
index 8bdc9469..f5bcab55 100644
--- a/src/pages/dev/test-site/publications/+Page.mdx
+++ b/src/pages/dev/test-site/publications/+Page.mdx
@@ -95,29 +95,6 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 [//]: # "Footer"
-<div class="footer">
-  <div class="footer-container">
-    <div class="col-sm-4" id="who-made-it">
-      <Image className="logo_white" src="logo_white.png" width="100px"></Image>
-      <p class="f1-text">Produced by the <a href="http://strata.geology.wisc.edu" target="_blank">UW Macrostrat Lab</a> <a href="https://github.com/UW-Macrostrat" target="_blank"><Image className="git_logo" src="git-logo.png" width="18px"></Image></a></p>
-    </div>
-    <div class="col-sm-4" id="bottom-nav">
-      <ul class="footer-nav">
-        <li><a href="/dev/test-site/about">About</a></li>
-        <li><a href="/dev/test-site/publications">Publications</a></li>
-        <li><a href="/dev/test-site/people">People</a></li>
-        <li><a href="/dev/test-site/donate">Donate</a></li>
-      </ul>
-    </div>
-    <div class="col-sm-4 funding">
-      <Image className="funding-logo" src="nsf.png" width="100px"></Image>
-      <div class="funding-line">
-        Current support: \
-        EAR-1948843 \
-        ICER-1928323 \
-        UW-Madison Dept. Geoscience
-      </div>
-    </div>
-  </div>
-</div>
+<Footer></Footer>
+
 </div>
\ No newline at end of file
diff --git a/src/pages/dev/test-site/publications/main.styl b/src/pages/dev/test-site/publications/main.styl
index 2a590d41..7f2d8942 100644
--- a/src/pages/dev/test-site/publications/main.styl
+++ b/src/pages/dev/test-site/publications/main.styl
@@ -7,29 +7,6 @@
 
 a:hover
     text-decoration: none
-.nav
-  position: fixed
-  width: 100%
-  z-index: 10000
-  top: 0
-
-  ul 
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    background-color: #015eab;
-
-  li 
-    float: left;
-    font-size: 15px
-
-  li a 
-    display: block;
-    color: white;
-    text-align: center;
-    padding: 14px 16px;
-    text-decoration: none
 
 .big
   font-size: 72px
@@ -41,57 +18,6 @@ p
     margin-top: 0;
     color: #E0E1E6
 
-.footer 
-  width: 100%
-  background-color: #015EAB
-
-.footer-container
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin: 0 auto;
-  width: 60%
-
-.col-sm-4
-  color: white
-  width: 33.333%
-  color: #E0E1E6;
-  font-weight: 200;
-  text-align: center;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-  font-weight: bold
-
-.nav-logo
-  padding-top: 5px
-
-.funding-logo
-  padding: 10px
-
-.footer-nav
-  list-style-type: none
-  padding-right: 40px
-
-  li
-    padding: 5px 0
-
-  a
-    color: white
-
-  a:hover
-    text-decoration: none
-
-.git_logo
-  vertical-align: sub
-
-.f1-text
-  a
-    color: white
-
-#who-made-it
-  padding-top: 25px
-
 .pub-line
   width: 60%;
   border-bottom: 1px solid #E0E1E6;

From 404e396f1f6a4852058ad097a1b90176a4ca83d3 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 00:33:40 -0500
Subject: [PATCH 123/151] Added selected columns

---
 package.json                   |   1 +
 src/pages/correlation/+Page.ts |  38 +++++++
 yarn.lock                      | 186 ++++++++++++++++++++++++++++++++-
 3 files changed, 223 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9d2d35b2..da2b3bb0 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "@turf/boolean-contains": "^6.5.0",
     "@turf/buffer": "^6.5.0",
     "@turf/centroid": "^6.5.0",
+    "@turf/line-intersect": "^7.0.0",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.17",
     "@types/geojson": "^7946.0.10",
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 68dff0d0..c94f216d 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -15,6 +15,8 @@ import { useEffect, useMemo } from "react";
 import { create } from "zustand";
 import { setGeoJSON } from "@macrostrat/mapbox-utils";
 import { ColumnGeoJSONRecord } from "~/pages/map/map-interface/app-state/handlers/columns";
+// Turf intersection
+import {lineIntersect} from "@turf/line-intersect";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
@@ -82,6 +84,17 @@ function InsetMap() {
   ]);
 }
 
+function computeIntersectingColumns(
+  columns: ColumnGeoJSONRecord[],
+  line: LineString
+): ColumnGeoJSONRecord[] {
+  return columns.filter((col) => {
+    const poly = col.geometry;
+    const intersection = lineIntersect(line, poly);
+    return intersection.features.length > 0;
+  });
+}
+
 function ColumnsLayer({ enabled = true }) {
   const columns = useCorrelationDiagramStore((state) => state.columns);
 
@@ -97,6 +110,16 @@ function ColumnsLayer({ enabled = true }) {
       const sourceID = "columns";
       setGeoJSON(map, sourceID, data);
 
+      if (map.getSource("selected-columns") == null) {
+        map.addSource("selected-columns", {
+          type: "geojson",
+          data: {
+            type: "FeatureCollection",
+            features: [],
+          },
+        });
+      }
+
       const columnLayers = buildColumnLayers(sourceID);
       for (let layer of columnLayers) {
         if (map.getSource(layer.source) == null) {
@@ -131,6 +154,14 @@ function buildColumnLayers(sourceID: string) {
         "line-width": 1,
       },
     },
+    {
+      id: "selected-columns-fill",
+      type: "fill",
+      source: "selected-columns",
+      paint: {
+        "fill-color": "rgba(255, 0, 0, 0.1)",
+      },
+    }
   ];
 }
 
@@ -161,6 +192,13 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
           properties: {},
         })),
       });
+      setGeoJSON(map, "selected-columns", {
+        type: "FeatureCollection",
+        features: computeIntersectingColumns(
+          useCorrelationDiagramStore.getState().columns,
+          focusedLine
+        ),
+      });
 
       // Add layers
       const layers = buildCrossSectionLayers();
diff --git a/yarn.lock b/yarn.lock
index a07d648b..ac7d13b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6595,6 +6595,8 @@ __metadata:
     "@turf/boolean-contains": "npm:^6.5.0"
     "@turf/buffer": "npm:^6.5.0"
     "@turf/centroid": "npm:^6.5.0"
+    "@turf/line-intersect": "npm:^7.0.0"
+    "@turf/line-slice": "npm:^7.0.0"
     "@types/compression": "npm:^1.7.2"
     "@types/express": "npm:^4.17.17"
     "@types/geojson": "npm:^7946.0.10"
@@ -10493,6 +10495,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/bearing@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/bearing@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    "@turf/invariant": "npm:^7.0.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/afd0328ee6c3e6359c1f2d5d6df535e9d1697dfbeff9f33d96e0f2ba1bca2242b543565e8bb98b3a8ea5c44fce9826214e5fff098717287792bfbb102b00badc
+  languageName: node
+  linkType: hard
+
 "@turf/boolean-contains@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/boolean-contains@npm:6.5.0"
@@ -10570,6 +10583,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/destination@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/destination@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    "@turf/invariant": "npm:^7.0.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/8e14baefa5a82975b9e329a1d5bfa15e588d4ad4a49554e33cf6da08dd682db803485e7278a8c432c7ee6684ff4a3ca91354f924de102bea2074b0392f612ce3
+  languageName: node
+  linkType: hard
+
 "@turf/distance@npm:6.3.0":
   version: 6.3.0
   resolution: "@turf/distance@npm:6.3.0"
@@ -10580,6 +10604,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/distance@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/distance@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    "@turf/invariant": "npm:^7.0.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/e43f316efa42d3570b3e3c9cfe5f7bbc341c776560b5ae131f17b91bd59a5dc13f775ca4dece912db68b7d2f0baad4fa1f3ec89102d95ad33783cb3036c578ed
+  languageName: node
+  linkType: hard
+
 "@turf/helpers@npm:^6.3.0, @turf/helpers@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/helpers@npm:6.5.0"
@@ -10587,6 +10622,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/helpers@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/helpers@npm:7.0.0"
+  dependencies:
+    deep-equal: "npm:^2.2.3"
+    tslib: "npm:^2.6.2"
+  checksum: 10/b356ba499634ff8e13af595c842e2c35efbfe365801848f4395577c402f3336a4e6fb0273dbb9c4dcb447636f29df304eaa68899dbf9368cff970170fe1ce39a
+  languageName: node
+  linkType: hard
+
 "@turf/invariant@npm:^6.3.0, @turf/invariant@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/invariant@npm:6.5.0"
@@ -10596,6 +10641,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/invariant@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/invariant@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/5361c27ab080104e08b44c5b49d69c890f9bcb7713512ae78a01c0dd1f5dac1936704c64bfb45c3a05cc8e5fb3ca0648aa92050c80d22c04a373cf3b7eb94683
+  languageName: node
+  linkType: hard
+
+"@turf/line-intersect@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/line-intersect@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    sweepline-intersections: "npm:^1.5.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/fda3f75f79ba59da1bc974ead94d7a657fce34c2d22d48a1d1685359bccc092e00913b1eb203f95b1a3e51dfc71694b8b0aba0b3b5d24c568dd8ff5bab9dec1c
+  languageName: node
+  linkType: hard
+
+"@turf/line-slice@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/line-slice@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    "@turf/invariant": "npm:^7.0.0"
+    "@turf/nearest-point-on-line": "npm:^7.0.0"
+  checksum: 10/0850da91382e1aa7c24a04ef06de0fae78a7be14329373076f0b5073316e3ae889bdaf9b9bd2216630b9f23660fa0f0abadf0c51fab11e031c6f091769838d2d
+  languageName: node
+  linkType: hard
+
 "@turf/meta@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/meta@npm:6.5.0"
@@ -10605,6 +10682,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/meta@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/meta@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+  checksum: 10/31dbb971f265ed7d33b64934a2ccd1bcd0b949fc303fe11871b786dc92a860815425d6146b7455edfb457c5b51dc54e5490eb34408ccf2239203e9eb1a581770
+  languageName: node
+  linkType: hard
+
+"@turf/nearest-point-on-line@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/nearest-point-on-line@npm:7.0.0"
+  dependencies:
+    "@turf/bearing": "npm:^7.0.0"
+    "@turf/destination": "npm:^7.0.0"
+    "@turf/distance": "npm:^7.0.0"
+    "@turf/helpers": "npm:^7.0.0"
+    "@turf/invariant": "npm:^7.0.0"
+    "@turf/line-intersect": "npm:^7.0.0"
+    "@turf/meta": "npm:^7.0.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/729db8018bb469dec78f06a6a2cd443528f2357bc9122918d939e4cf2406fe314da08a49232e2418bd7e45da709a4037239616d5dce12fb960d9f67463730881
+  languageName: node
+  linkType: hard
+
 "@turf/projection@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/projection@npm:6.5.0"
@@ -13368,6 +13470,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/6c9da3a66caddd83c875010a1ca8ef11eac02ba15fb592dc9418b2b5e7b77b645fa7729380a92d9835c2f05f2ca1b6251f39b993e0feb3f1517c74fa1af02cab
+  languageName: node
+  linkType: hard
+
 "aws-sign2@npm:~0.7.0":
   version: 0.7.0
   resolution: "aws-sign2@npm:0.7.0"
@@ -16827,6 +16938,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-equal@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "deep-equal@npm:2.2.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.0"
+    call-bind: "npm:^1.0.5"
+    es-get-iterator: "npm:^1.1.3"
+    get-intrinsic: "npm:^1.2.2"
+    is-arguments: "npm:^1.1.1"
+    is-array-buffer: "npm:^3.0.2"
+    is-date-object: "npm:^1.0.5"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.2"
+    isarray: "npm:^2.0.5"
+    object-is: "npm:^1.1.5"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.4"
+    regexp.prototype.flags: "npm:^1.5.1"
+    side-channel: "npm:^1.0.4"
+    which-boxed-primitive: "npm:^1.0.2"
+    which-collection: "npm:^1.0.1"
+    which-typed-array: "npm:^1.1.13"
+  checksum: 10/1ce49d0b71d0f14d8ef991a742665eccd488dfc9b3cada069d4d7a86291e591c92d2589c832811dea182b4015736b210acaaebce6184be356c1060d176f5a05f
+  languageName: node
+  linkType: hard
+
 "deep-extend@npm:0.6.0, deep-extend@npm:^0.6.0":
   version: 0.6.0
   resolution: "deep-extend@npm:0.6.0"
@@ -19571,7 +19708,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -20256,6 +20393,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
+  dependencies:
+    has-symbols: "npm:^1.0.3"
+  checksum: 10/c74c5f5ceee3c8a5b8bc37719840dc3749f5b0306d818974141dda2471a1a2ca6c8e46b9d6ac222c5345df7a901c9b6f350b1e6d62763fec877e26609a401bfe
+  languageName: node
+  linkType: hard
+
 "has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1, has-unicode@npm:~2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
@@ -27268,6 +27414,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10/8ed3e96dfeea1c5880c1f4c9cb707e5fb26e8be22f14f82ef92df20fd2004e635c62ba47fbe8f2bb63bfd80dac1474be2fb39798da8c2feba2815435d1f749af
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^7.0.1":
   version: 7.0.5
   resolution: "postcss-calc@npm:7.0.5"
@@ -32816,6 +32969,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sweepline-intersections@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "sweepline-intersections@npm:1.5.0"
+  dependencies:
+    tinyqueue: "npm:^2.0.0"
+  checksum: 10/2782fec085d0a4c90874096d4b18e51d1210cbb9f5834f6122e49441cc0711a0adfda08260da4e03816a43c88293a672e63fab96a06115f2d854fefdeb532ead
+  languageName: node
+  linkType: hard
+
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
@@ -33154,7 +33316,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyqueue@npm:^2.0.3":
+"tinyqueue@npm:^2.0.0, tinyqueue@npm:^2.0.3":
   version: 2.0.3
   resolution: "tinyqueue@npm:2.0.3"
   checksum: 10/b676fdf2050bc9b2b76fe3faa433f3122c623e3f2c32d2a6921487b1e8fb541a85af79ea0eca3618e261b293280db78b02e1f835321783b8c078c507b739017c
@@ -33482,6 +33644,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.6.2":
+  version: 2.6.3
+  resolution: "tslib@npm:2.6.3"
+  checksum: 10/52109bb681f8133a2e58142f11a50e05476de4f075ca906d13b596ae5f7f12d30c482feb0bff167ae01cfc84c5803e575a307d47938999246f5a49d174fc558c
+  languageName: node
+  linkType: hard
+
 "tsx@npm:^4.11.2":
   version: 4.11.2
   resolution: "tsx@npm:4.11.2"
@@ -35378,6 +35547,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-typed-array@npm:^1.1.13":
+  version: 1.1.15
+  resolution: "which-typed-array@npm:1.1.15"
+  dependencies:
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10/c3b6a99beadc971baa53c3ee5b749f2b9bdfa3b3b9a70650dd8511a48b61d877288b498d424712e9991d16019633086bd8b5923369460d93463c5825fa36c448
+  languageName: node
+  linkType: hard
+
 "which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"

From 17a99bb0fe2bdd1f8c8e1c218a1727aca12c064f Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 02:45:43 -0500
Subject: [PATCH 124/151] Improve correlation diagram assistant

---
 .idea/jsLibraryMappings.xml      |  6 +++
 .idea/prettier.xml               |  4 +-
 src/pages/correlation/+Page.ts   | 80 +++++++++++++++++---------------
 src/pages/correlation/+config.ts |  3 +-
 4 files changed, 53 insertions(+), 40 deletions(-)
 create mode 100644 .idea/jsLibraryMappings.xml

diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 00000000..d23208fb
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
index 15e69edb..60c07b5a 100644
--- a/.idea/prettier.xml
+++ b/.idea/prettier.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="MANUAL" />
+    <option name="myConfigurationMode" value="AUTOMATIC" />
     <option name="myRunOnSave" value="true" />
     <option name="myRunOnReformat" value="true" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index c94f216d..4d49a390 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -16,7 +16,7 @@ import { create } from "zustand";
 import { setGeoJSON } from "@macrostrat/mapbox-utils";
 import { ColumnGeoJSONRecord } from "~/pages/map/map-interface/app-state/handlers/columns";
 // Turf intersection
-import {lineIntersect} from "@turf/line-intersect";
+import { lineIntersect } from "@turf/line-intersect";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
@@ -28,6 +28,7 @@ interface CorrelationState {
   startup: () => Promise<void>;
 }
 
+/** Store management with Zustand */
 const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
   focusedLine: null as LineString | null,
   columns: [],
@@ -73,17 +74,35 @@ export function Page() {
 }
 
 function InsetMap() {
+  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
+  const columns = useCorrelationDiagramStore((state) => state.columns);
+
   return h("div.column-selection-map", [
     h(
       MapboxMapProvider,
       h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken }, [
-        h(SectionLineManager),
-        h(ColumnsLayer),
+        h(MapClickHandler),
+        h(SectionLine, { focusedLine }),
+        h(ColumnsLayer, { columns }),
+        h(SelectedColumnsLayer, { columns, focusedLine }),
       ])
     ),
   ]);
 }
 
+function MapClickHandler() {
+  const onClickMap = useCorrelationDiagramStore((state) => state.onClickMap);
+
+  useMapClickHandler(
+    (e) => {
+      onClickMap({ type: "Point", coordinates: e.lngLat.toArray() });
+    },
+    [onClickMap]
+  );
+
+  return null;
+}
+
 function computeIntersectingColumns(
   columns: ColumnGeoJSONRecord[],
   line: LineString
@@ -95,9 +114,27 @@ function computeIntersectingColumns(
   });
 }
 
-function ColumnsLayer({ enabled = true }) {
-  const columns = useCorrelationDiagramStore((state) => state.columns);
+function SelectedColumnsLayer({ columns, focusedLine }) {
+  useMapStyleOperator(
+    (map) => {
+      let features = [];
+      if (columns != null && focusedLine != null) {
+        features = computeIntersectingColumns(columns, focusedLine);
+      }
+
+      const data: FeatureCollection = {
+        type: "FeatureCollection",
+        features,
+      };
 
+      setGeoJSON(map, "selected-columns", data);
+    },
+    [columns, focusedLine]
+  );
+  return null;
+}
+
+function ColumnsLayer({ columns, enabled = true }) {
   useMapStyleOperator(
     (map) => {
       if (columns == null) {
@@ -110,16 +147,6 @@ function ColumnsLayer({ enabled = true }) {
       const sourceID = "columns";
       setGeoJSON(map, sourceID, data);
 
-      if (map.getSource("selected-columns") == null) {
-        map.addSource("selected-columns", {
-          type: "geojson",
-          data: {
-            type: "FeatureCollection",
-            features: [],
-          },
-        });
-      }
-
       const columnLayers = buildColumnLayers(sourceID);
       for (let layer of columnLayers) {
         if (map.getSource(layer.source) == null) {
@@ -161,7 +188,7 @@ function buildColumnLayers(sourceID: string) {
       paint: {
         "fill-color": "rgba(255, 0, 0, 0.1)",
       },
-    }
+    },
   ];
 }
 
@@ -192,13 +219,6 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
           properties: {},
         })),
       });
-      setGeoJSON(map, "selected-columns", {
-        type: "FeatureCollection",
-        features: computeIntersectingColumns(
-          useCorrelationDiagramStore.getState().columns,
-          focusedLine
-        ),
-      });
 
       // Add layers
       const layers = buildCrossSectionLayers();
@@ -229,17 +249,3 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
 
   return null;
 }
-
-function SectionLineManager() {
-  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
-  const onClickMap = useCorrelationDiagramStore((state) => state.onClickMap);
-
-  useMapClickHandler(
-    (e) => {
-      onClickMap({ type: "Point", coordinates: e.lngLat.toArray() });
-    },
-    [onClickMap]
-  );
-
-  return h(SectionLine, { focusedLine });
-}
diff --git a/src/pages/correlation/+config.ts b/src/pages/correlation/+config.ts
index 9826d2b8..6a127bb9 100644
--- a/src/pages/correlation/+config.ts
+++ b/src/pages/correlation/+config.ts
@@ -2,7 +2,7 @@ export default {
   meta: {
     Page: {
       /* Ideally we'd make it so only the column inset map was rendered client-side,
-      but this will work for now. 
+      but this will work for now.
       */
       env: {
         client: true,
@@ -10,4 +10,5 @@ export default {
       },
     },
   },
+  title: "Correlation diagram",
 };

From bb92dde0546a2469a1fdf5a7871c2cdb14d5a916 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 03:26:31 -0500
Subject: [PATCH 125/151] Inset map

---
 package.json                   |  4 +-
 src/pages/correlation/+Page.ts | 87 ++++++++++++++++++++++++++++++----
 yarn.lock                      | 27 ++++++-----
 3 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index da2b3bb0..17af6361 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,10 @@
     "@turf/bbox": "^6.5.0",
     "@turf/boolean-contains": "^6.5.0",
     "@turf/buffer": "^6.5.0",
-    "@turf/centroid": "^6.5.0",
+    "@turf/centroid": "^7.0.0",
+    "@turf/distance": "^7.0.0",
     "@turf/line-intersect": "^7.0.0",
+    "@turf/nearest-point-on-line": "^7.0.0",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.17",
     "@types/geojson": "^7946.0.10",
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 4d49a390..e204a271 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -10,13 +10,16 @@ import { FullscreenPage } from "~/layouts";
 import h from "./main.module.sass";
 import { baseMapURL, mapboxAccessToken } from "@macrostrat-web/settings";
 import { PageBreadcrumbs } from "~/renderer";
-import { FeatureCollection, LineString, Point } from "geojson";
+import { Feature, FeatureCollection, LineString, Point } from "geojson";
 import { useEffect, useMemo } from "react";
 import { create } from "zustand";
 import { setGeoJSON } from "@macrostrat/mapbox-utils";
 import { ColumnGeoJSONRecord } from "~/pages/map/map-interface/app-state/handlers/columns";
 // Turf intersection
 import { lineIntersect } from "@turf/line-intersect";
+import { distance } from "@turf/distance";
+import { nearestPointOnLine } from "@turf/nearest-point-on-line";
+import { centroid } from "@turf/centroid";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
@@ -120,6 +123,7 @@ function SelectedColumnsLayer({ columns, focusedLine }) {
       let features = [];
       if (columns != null && focusedLine != null) {
         features = computeIntersectingColumns(columns, focusedLine);
+        features = orderColumnsByDistance(features, focusedLine);
       }
 
       const data: FeatureCollection = {
@@ -127,13 +131,59 @@ function SelectedColumnsLayer({ columns, focusedLine }) {
         features,
       };
 
+      const columnCentroidLine: Feature = {
+        type: "Feature",
+        geometry: {
+          type: "LineString",
+          coordinates: features.map(
+            (col) => col.properties.centroid.geometry.coordinates
+          ),
+        },
+        properties: {},
+      };
+
       setGeoJSON(map, "selected-columns", data);
+      setGeoJSON(map, "selected-column-centroids", {
+        type: "FeatureCollection",
+        features: [columnCentroidLine],
+      });
     },
     [columns, focusedLine]
   );
   return null;
 }
 
+function orderColumnsByDistance(
+  columns: ColumnGeoJSONRecord[],
+  line: LineString
+): ColumnGeoJSONRecord[] {
+  const centroids = columns.map((col) => centroid(col.geometry));
+  const projectedPoints = centroids.map((point) =>
+    nearestPointOnLine(line, point)
+  );
+  const distances = projectedPoints.map((point) =>
+    distance(point.geometry.coordinates, line.coordinates[0])
+  );
+
+  let newColumns = columns.map((col, i) => {
+    return {
+      ...col,
+      properties: {
+        ...col.properties,
+        centroid: centroids[i],
+        nearestPointOnLine: projectedPoints[i],
+        distanceAlongLine: distances[i],
+      },
+    };
+  });
+
+  return sorted(newColumns, (d) => d.properties.distanceAlongLine);
+}
+
+function sorted(data, accessor: (d) => number) {
+  return data.sort((a, b) => accessor(a) - accessor(b));
+}
+
 function ColumnsLayer({ columns, enabled = true }) {
   useMapStyleOperator(
     (map) => {
@@ -164,6 +214,33 @@ function ColumnsLayer({ columns, enabled = true }) {
 
 function buildColumnLayers(sourceID: string) {
   return [
+    {
+      id: "selected-columns-fill",
+      type: "fill",
+      source: "selected-columns",
+      paint: {
+        "fill-color": "rgba(255, 0, 0, 0.1)",
+      },
+    },
+    {
+      id: "selected-column-centroids-line",
+      type: "line",
+      source: "selected-column-centroids",
+      paint: {
+        "line-color": "rgba(255, 0, 0, 0.8)",
+        "line-width": 2,
+        "line-dasharray": [2, 2],
+      },
+    },
+    {
+      id: "selected-column-centroids-points",
+      type: "circle",
+      source: "selected-column-centroids",
+      paint: {
+        "circle-radius": 4,
+        "circle-color": "rgba(255, 0, 0, 0.8)",
+      },
+    },
     {
       id: "columns-fill",
       type: "fill",
@@ -181,14 +258,6 @@ function buildColumnLayers(sourceID: string) {
         "line-width": 1,
       },
     },
-    {
-      id: "selected-columns-fill",
-      type: "fill",
-      source: "selected-columns",
-      paint: {
-        "fill-color": "rgba(255, 0, 0, 0.1)",
-      },
-    },
   ];
 }
 
diff --git a/yarn.lock b/yarn.lock
index ac7d13b1..593237af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6594,9 +6594,10 @@ __metadata:
     "@turf/bbox": "npm:^6.5.0"
     "@turf/boolean-contains": "npm:^6.5.0"
     "@turf/buffer": "npm:^6.5.0"
-    "@turf/centroid": "npm:^6.5.0"
+    "@turf/centroid": "npm:^7.0.0"
+    "@turf/distance": "npm:^7.0.0"
     "@turf/line-intersect": "npm:^7.0.0"
-    "@turf/line-slice": "npm:^7.0.0"
+    "@turf/nearest-point-on-line": "npm:^7.0.0"
     "@types/compression": "npm:^1.7.2"
     "@types/express": "npm:^4.17.17"
     "@types/geojson": "npm:^7946.0.10"
@@ -10574,6 +10575,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/centroid@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@turf/centroid@npm:7.0.0"
+  dependencies:
+    "@turf/helpers": "npm:^7.0.0"
+    "@turf/meta": "npm:^7.0.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/2375762376dc6378616513799f969daa2deaf596281e1dc14c65cd0daf7e7a415dc35eb9d4786f10741e8dcb02b0cd1cf83c728a406a32c256246e66eb4d532a
+  languageName: node
+  linkType: hard
+
 "@turf/clone@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/clone@npm:6.5.0"
@@ -10662,17 +10674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@turf/line-slice@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@turf/line-slice@npm:7.0.0"
-  dependencies:
-    "@turf/helpers": "npm:^7.0.0"
-    "@turf/invariant": "npm:^7.0.0"
-    "@turf/nearest-point-on-line": "npm:^7.0.0"
-  checksum: 10/0850da91382e1aa7c24a04ef06de0fae78a7be14329373076f0b5073316e3ae889bdaf9b9bd2216630b9f23660fa0f0abadf0c51fab11e031c6f091769838d2d
-  languageName: node
-  linkType: hard
-
 "@turf/meta@npm:^6.5.0":
   version: 6.5.0
   resolution: "@turf/meta@npm:6.5.0"

From 2be6140c9fbcc08d099c48a822c04936b1b9efca Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 04:15:43 -0500
Subject: [PATCH 126/151] Successfully saves correlation state

---
 src/pages/correlation/+Page.ts | 62 +++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index e204a271..f90fa59f 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -23,6 +23,8 @@ import { centroid } from "@turf/centroid";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
+import { getHashString, setHashString } from "@macrostrat/ui-components";
+import { fmt2 } from "~/pages/map/map-interface/utils";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -57,10 +59,52 @@ const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
     }),
   async startup() {
     const columns = await fetchAllColumns();
-    set({ columns });
+    let focusedLine = getFocusedLineFromHashParams();
+    set({ columns, focusedLine });
   },
 }));
 
+function getFocusedLineFromHashParams(): LineString | null {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  let hash = getHashString(window.location.hash);
+
+  if (hash?.line == null) {
+    return null;
+  }
+
+  try {
+    let coords = hash.line;
+
+    console.log("coords", coords);
+
+    if (coords.length < 2) {
+      return null;
+    }
+    if (coords.length % 2 != 0) {
+      console.error("Invalid number of coordinates in hash string");
+      return null;
+    }
+
+    coords = chunk(coords, 2);
+
+    return {
+      type: "LineString",
+      coordinates: coords.map((coord) => coord.map(Number)),
+    };
+  } catch (e) {
+    console.error("Error parsing hash string", e);
+    return null;
+  }
+}
+
+function chunk(arr, size) {
+  return Array.from({ length: Math.ceil(arr.length / size) }, (v, i) =>
+    arr.slice(i * size, i * size + size)
+  );
+}
+
 export function Page() {
   const startup = useCorrelationDiagramStore((state) => state.startup);
   useEffect(() => {
@@ -68,6 +112,7 @@ export function Page() {
   }, []);
 
   return h(FullscreenPage, [
+    h(HashStringManager),
     h("header", [h(PageBreadcrumbs)]),
     h("div.flex.row", [
       h("div.correlation-diagram"),
@@ -76,6 +121,21 @@ export function Page() {
   ]);
 }
 
+function HashStringManager() {
+  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
+  useEffect(() => {
+    if (focusedLine == null || focusedLine.coordinates.length < 2) {
+      return;
+    }
+    let hash = {
+      line: focusedLine.coordinates.flatMap((coord) => coord.map(fmt2)),
+    };
+    setHashString(hash);
+  }, [focusedLine]);
+
+  return null;
+}
+
 function InsetMap() {
   const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
   const columns = useCorrelationDiagramStore((state) => state.columns);

From 713821ba5644dff0c905e08bdc4fc16443a82fa6 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 04:30:45 -0500
Subject: [PATCH 127/151] Refactor

---
 package.json                         |  2 +
 src/pages/correlation/+Page.ts       | 63 ++--------------------------
 src/pages/correlation/hash-string.ts | 54 ++++++++++++++++++++++++
 yarn.lock                            |  9 ++++
 4 files changed, 69 insertions(+), 59 deletions(-)
 create mode 100644 src/pages/correlation/hash-string.ts

diff --git a/package.json b/package.json
index 17af6361..a3bc58e6 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "@macrostrat/revision-info-webpack": "^1.0.0",
     "@macrostrat/storybook": "workspace:*",
     "@mdx-js/rollup": "^2.3.0",
+    "@types/underscore": "^1",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
     "@yarnpkg/sdks": "^3.1.0",
@@ -133,6 +134,7 @@
     "topojson-client": "^3.0.0",
     "transition-hook": "^1.5.2",
     "tsx": "^4.11.2",
+    "underscore": "^1.13.6",
     "use-debounce": "^9.0.4",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index f90fa59f..65898131 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -23,8 +23,7 @@ import { centroid } from "@turf/centroid";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
-import { getHashString, setHashString } from "@macrostrat/ui-components";
-import { fmt2 } from "~/pages/map/map-interface/utils";
+import { getFocusedLineFromHashParams, HashStringManager } from "./hash-string";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -64,55 +63,16 @@ const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
   },
 }));
 
-function getFocusedLineFromHashParams(): LineString | null {
-  if (typeof window === "undefined") {
-    return null;
-  }
-  let hash = getHashString(window.location.hash);
-
-  if (hash?.line == null) {
-    return null;
-  }
-
-  try {
-    let coords = hash.line;
-
-    console.log("coords", coords);
-
-    if (coords.length < 2) {
-      return null;
-    }
-    if (coords.length % 2 != 0) {
-      console.error("Invalid number of coordinates in hash string");
-      return null;
-    }
-
-    coords = chunk(coords, 2);
-
-    return {
-      type: "LineString",
-      coordinates: coords.map((coord) => coord.map(Number)),
-    };
-  } catch (e) {
-    console.error("Error parsing hash string", e);
-    return null;
-  }
-}
-
-function chunk(arr, size) {
-  return Array.from({ length: Math.ceil(arr.length / size) }, (v, i) =>
-    arr.slice(i * size, i * size + size)
-  );
-}
-
 export function Page() {
   const startup = useCorrelationDiagramStore((state) => state.startup);
   useEffect(() => {
     startup();
   }, []);
 
+  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
+
   return h(FullscreenPage, [
-    h(HashStringManager),
+    h(HashStringManager, { focusedLine }),
     h("header", [h(PageBreadcrumbs)]),
     h("div.flex.row", [
       h("div.correlation-diagram"),
@@ -121,21 +81,6 @@ export function Page() {
   ]);
 }
 
-function HashStringManager() {
-  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
-  useEffect(() => {
-    if (focusedLine == null || focusedLine.coordinates.length < 2) {
-      return;
-    }
-    let hash = {
-      line: focusedLine.coordinates.flatMap((coord) => coord.map(fmt2)),
-    };
-    setHashString(hash);
-  }, [focusedLine]);
-
-  return null;
-}
-
 function InsetMap() {
   const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
   const columns = useCorrelationDiagramStore((state) => state.columns);
diff --git a/src/pages/correlation/hash-string.ts b/src/pages/correlation/hash-string.ts
new file mode 100644
index 00000000..cc1a2fba
--- /dev/null
+++ b/src/pages/correlation/hash-string.ts
@@ -0,0 +1,54 @@
+import { LineString } from "geojson";
+import { getHashString, setHashString } from "@macrostrat/ui-components";
+import { chunk } from "underscore";
+import { useEffect } from "react";
+import { fmt2 } from "~/pages/map/map-interface/utils";
+
+export function getFocusedLineFromHashParams(): LineString | null {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  let hash = getHashString(window.location.hash);
+
+  if (hash?.line == null) {
+    return null;
+  }
+
+  try {
+    let coords = hash.line;
+
+    console.log("coords", coords);
+
+    if (coords.length < 2) {
+      return null;
+    }
+    if (coords.length % 2 != 0) {
+      console.error("Invalid number of coordinates in hash string");
+      return null;
+    }
+
+    coords = chunk(coords, 2);
+
+    return {
+      type: "LineString",
+      coordinates: coords.map((coord) => coord.map(Number)),
+    };
+  } catch (e) {
+    console.error("Error parsing hash string", e);
+    return null;
+  }
+}
+
+export function HashStringManager({ focusedLine }) {
+  useEffect(() => {
+    if (focusedLine == null || focusedLine.coordinates.length < 2) {
+      return;
+    }
+    let hash = {
+      line: focusedLine.coordinates.flatMap((coord) => coord.map(fmt2)),
+    };
+    setHashString(hash);
+  }, [focusedLine]);
+
+  return null;
+}
diff --git a/yarn.lock b/yarn.lock
index 593237af..0b0451a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6605,6 +6605,7 @@ __metadata:
     "@types/react": "npm:^18.2.20"
     "@types/react-dom": "npm:^18.2.7"
     "@types/react-redux": "npm:^7.1.7"
+    "@types/underscore": "npm:^1"
     "@typescript-eslint/eslint-plugin": "npm:^6.3.0"
     "@typescript-eslint/parser": "npm:^6.3.0"
     "@universal-middleware/express": "npm:^0.0.2"
@@ -6653,6 +6654,7 @@ __metadata:
     transition-hook: "npm:^1.5.2"
     tsx: "npm:^4.11.2"
     typescript: "npm:^5.1.6"
+    underscore: "npm:^1.13.6"
     use-debounce: "npm:^9.0.4"
     use-react-router-breadcrumbs: "npm:^3.2.1"
     use-resize-observer: "npm:^9.1.0"
@@ -11791,6 +11793,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/underscore@npm:^1":
+  version: 1.11.15
+  resolution: "@types/underscore@npm:1.11.15"
+  checksum: 10/5a9c262566551f61744e066d33578c0fad1139c2d5314ed77a8f867487a6d7dd18616f32df4c605070fbd569b942c6d2c083be9f9ae649f41a562b52812b06be
+  languageName: node
+  linkType: hard
+
 "@types/unist@npm:*, @types/unist@npm:^3.0.0":
   version: 3.0.2
   resolution: "@types/unist@npm:3.0.2"

From 536e04ff316948e7da4feb906b4ba7f4b5ec3297 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 04:48:41 -0500
Subject: [PATCH 128/151] Hoisted some state

---
 src/pages/correlation/+Page.ts       | 62 +++++++++++++++++++++-------
 src/pages/correlation/hash-string.ts | 10 ++---
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 65898131..5fd0e2ad 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -28,14 +28,19 @@ import { getFocusedLineFromHashParams, HashStringManager } from "./hash-string";
 interface CorrelationState {
   focusedLine: LineString | null;
   columns: ColumnGeoJSONRecord[];
+  focusedColumns: FocusedColumnGeoJSONRecord[];
   onClickMap: (point: Point) => void;
   startup: () => Promise<void>;
 }
 
-/** Store management with Zustand */
+/** Store management with Zustand.
+ * This is a newer and somewhat more subtle approach than the Redux store
+ * used in the mapping application.
+ * */
 const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
   focusedLine: null as LineString | null,
   columns: [],
+  focusedColumns: [],
   onClickMap: (point: Point) =>
     set((state) => {
       if (
@@ -45,21 +50,27 @@ const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
         return {
           ...state,
           focusedLine: { type: "LineString", coordinates: [point.coordinates] },
+          focusedColumns: [],
         };
       } else {
+        const focusedLine: LineString = {
+          type: "LineString",
+          coordinates: [...state.focusedLine.coordinates, point.coordinates],
+        };
+
         return {
           ...state,
-          focusedLine: {
-            type: "LineString",
-            coordinates: [...state.focusedLine.coordinates, point.coordinates],
-          },
+          focusedLine,
+          focusedColumns: buildCorrelationColumns(state.columns, focusedLine),
         };
       }
     }),
   async startup() {
     const columns = await fetchAllColumns();
-    let focusedLine = getFocusedLineFromHashParams();
-    set({ columns, focusedLine });
+    const focusedLine = getFocusedLineFromHashParams();
+    const focusedColumns = buildCorrelationColumns(columns, focusedLine);
+
+    set({ columns, focusedLine, focusedColumns });
   },
 }));
 
@@ -92,7 +103,7 @@ function InsetMap() {
         h(MapClickHandler),
         h(SectionLine, { focusedLine }),
         h(ColumnsLayer, { columns }),
-        h(SelectedColumnsLayer, { columns, focusedLine }),
+        h(SelectedColumnsLayer),
       ])
     ),
   ]);
@@ -111,6 +122,20 @@ function MapClickHandler() {
   return null;
 }
 
+function buildCorrelationColumns(
+  columns: ColumnGeoJSONRecord[],
+  line: LineString
+): FocusedColumnGeoJSONRecord[] {
+  let features = [];
+  if (columns == null && line == null) {
+    return [];
+  }
+  return orderColumnsByDistance(
+    computeIntersectingColumns(columns, line),
+    line
+  );
+}
+
 function computeIntersectingColumns(
   columns: ColumnGeoJSONRecord[],
   line: LineString
@@ -123,13 +148,12 @@ function computeIntersectingColumns(
 }
 
 function SelectedColumnsLayer({ columns, focusedLine }) {
+  const focusedColumns = useCorrelationDiagramStore(
+    (state) => state.focusedColumns
+  );
   useMapStyleOperator(
     (map) => {
-      let features = [];
-      if (columns != null && focusedLine != null) {
-        features = computeIntersectingColumns(columns, focusedLine);
-        features = orderColumnsByDistance(features, focusedLine);
-      }
+      let features = focusedColumns;
 
       const data: FeatureCollection = {
         type: "FeatureCollection",
@@ -153,15 +177,23 @@ function SelectedColumnsLayer({ columns, focusedLine }) {
         features: [columnCentroidLine],
       });
     },
-    [columns, focusedLine]
+    [focusedColumns]
   );
   return null;
 }
 
+interface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {
+  properties: {
+    centroid: Point;
+    nearestPointOnLine: Point;
+    distanceAlongLine: number;
+  } & ColumnGeoJSONRecord["properties"];
+}
+
 function orderColumnsByDistance(
   columns: ColumnGeoJSONRecord[],
   line: LineString
-): ColumnGeoJSONRecord[] {
+): FocusedColumnGeoJSONRecord[] {
   const centroids = columns.map((col) => centroid(col.geometry));
   const projectedPoints = centroids.map((point) =>
     nearestPointOnLine(line, point)
diff --git a/src/pages/correlation/hash-string.ts b/src/pages/correlation/hash-string.ts
index cc1a2fba..31dfb370 100644
--- a/src/pages/correlation/hash-string.ts
+++ b/src/pages/correlation/hash-string.ts
@@ -16,8 +16,10 @@ export function getFocusedLineFromHashParams(): LineString | null {
 
   try {
     let coords = hash.line;
-
-    console.log("coords", coords);
+    if (!Array.isArray(coords)) {
+      console.error("Invalid line coordinates in hash string");
+      return null;
+    }
 
     if (coords.length < 2) {
       return null;
@@ -27,11 +29,9 @@ export function getFocusedLineFromHashParams(): LineString | null {
       return null;
     }
 
-    coords = chunk(coords, 2);
-
     return {
       type: "LineString",
-      coordinates: coords.map((coord) => coord.map(Number)),
+      coordinates: chunk(coords.map(Number), 2),
     };
   } catch (e) {
     console.error("Error parsing hash string", e);

From ba0f59a39e1c514a54e72ac6bca1e40177e1068a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 15:01:15 -0500
Subject: [PATCH 129/151] Map expands and contracts

---
 src/pages/correlation/+Page.ts         | 59 +++++++++++++++++++-------
 src/pages/correlation/main.module.sass | 32 +++++++++++---
 2 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 5fd0e2ad..7cf832a6 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -24,12 +24,16 @@ import { centroid } from "@turf/centroid";
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
 import { getFocusedLineFromHashParams, HashStringManager } from "./hash-string";
+import { Button } from "@blueprintjs/core";
+import classNames from "classnames";
 
 interface CorrelationState {
   focusedLine: LineString | null;
   columns: ColumnGeoJSONRecord[];
   focusedColumns: FocusedColumnGeoJSONRecord[];
+  mapExpanded: boolean;
   onClickMap: (point: Point) => void;
+  toggleMapExpanded: () => void;
   startup: () => Promise<void>;
 }
 
@@ -41,6 +45,9 @@ const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
   focusedLine: null as LineString | null,
   columns: [],
   focusedColumns: [],
+  mapExpanded: false,
+  toggleMapExpanded: () =>
+    set((state) => ({ mapExpanded: !state.mapExpanded })),
   onClickMap: (point: Point) =>
     set((state) => {
       if (
@@ -84,10 +91,12 @@ export function Page() {
 
   return h(FullscreenPage, [
     h(HashStringManager, { focusedLine }),
-    h("header", [h(PageBreadcrumbs)]),
-    h("div.flex.row", [
-      h("div.correlation-diagram"),
-      h("div.assistant", [h(InsetMap)]),
+    h("div.main-panel", [
+      h("header", [h(PageBreadcrumbs)]),
+      h("div.flex.row.diagram-container", [
+        h("div.correlation-diagram"),
+        h("div.assistant", [h(InsetMap)]),
+      ]),
     ]),
   ]);
 }
@@ -95,18 +104,38 @@ export function Page() {
 function InsetMap() {
   const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
   const columns = useCorrelationDiagramStore((state) => state.columns);
+  const expanded = useCorrelationDiagramStore((state) => state.mapExpanded);
+
+  return h(
+    "div.column-selection-map",
+    { className: classNames({ expanded }) },
+    [
+      h(MapboxMapProvider, [
+        h(MapExpandedButton),
+        h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken }, [
+          h(MapClickHandler),
+          h(SectionLine, { focusedLine }),
+          h(ColumnsLayer, { columns }),
+          h(SelectedColumnsLayer),
+        ]),
+      ]),
+    ]
+  );
+}
 
-  return h("div.column-selection-map", [
-    h(
-      MapboxMapProvider,
-      h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken }, [
-        h(MapClickHandler),
-        h(SectionLine, { focusedLine }),
-        h(ColumnsLayer, { columns }),
-        h(SelectedColumnsLayer),
-      ])
-    ),
-  ]);
+function MapExpandedButton() {
+  const toggleMapExpanded = useCorrelationDiagramStore(
+    (state) => state.toggleMapExpanded
+  );
+  const mapExpanded = useCorrelationDiagramStore((state) => state.mapExpanded);
+
+  const icon = mapExpanded ? "collapse-all" : "expand-all";
+
+  return h(Button, {
+    className: "map-expanded-button",
+    icon,
+    onClick: toggleMapExpanded,
+  });
 }
 
 function MapClickHandler() {
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
index 48871fa2..25f37454 100644
--- a/src/pages/correlation/main.module.sass
+++ b/src/pages/correlation/main.module.sass
@@ -1,13 +1,35 @@
 $map-size: 40em
+$map-size-inset: 12em
 
 .column-selection-map
-  height: $map-size
-  position: relative
+  box-shadow: 0 0 0.3em 0 rgba(0, 0, 0, 0.5)
+  height: $map-size-inset
+  width: $map-size-inset
+  position: absolute
+  top: 0
+  right: 0
   :global(.main-view)
     height: 100%
-
-.assistant
-  width: $map-size
+  &.expanded
+    height: $map-size
+    width: $map-size
+    position: relative
 
 .correlation-diagram
   flex-grow: 1
+
+.map-expanded-button
+  position: absolute
+  top: 0.5em
+  right: 0.5em
+  z-index: 100
+
+.main-panel
+  position: relative
+  height: 100%
+  display: flex
+  flex-direction: column
+
+.diagram-container
+  flex-grow: 1
+  position: relative

From 24c55dd274d6bdb49d71701738ceca391eee8747 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 15:20:44 -0500
Subject: [PATCH 130/151] List column names

---
 src/pages/correlation/+Page.ts             | 23 +++++++++++++++++++++-
 src/pages/correlation/correlation-chart.ts | 17 ++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/correlation/correlation-chart.ts

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 7cf832a6..5923130b 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -26,6 +26,7 @@ import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fe
 import { getFocusedLineFromHashParams, HashStringManager } from "./hash-string";
 import { Button } from "@blueprintjs/core";
 import classNames from "classnames";
+import { ColumnIdentifier, CorrelationChart } from "./correlation-chart";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -94,13 +95,33 @@ export function Page() {
     h("div.main-panel", [
       h("header", [h(PageBreadcrumbs)]),
       h("div.flex.row.diagram-container", [
-        h("div.correlation-diagram"),
+        h(CorrelationDiagramWrapper),
         h("div.assistant", [h(InsetMap)]),
       ]),
     ]),
   ]);
 }
 
+function CorrelationDiagramWrapper() {
+  const focusedColumns = useCorrelationDiagramStore(
+    (state) => state.focusedColumns
+  );
+
+  const columns = focusedColumns.map(columnGeoJSONRecordToColumnIdentifier);
+
+  return h("div.correlation-diagram", h(CorrelationChart, { columns }));
+}
+
+function columnGeoJSONRecordToColumnIdentifier(
+  col: ColumnGeoJSONRecord
+): ColumnIdentifier {
+  return {
+    col_id: col.properties.col_id,
+    col_name: col.properties.col_name,
+    project_id: col.properties.project_id,
+  };
+}
+
 function InsetMap() {
   const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
   const columns = useCorrelationDiagramStore((state) => state.columns);
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
new file mode 100644
index 00000000..4a2b4281
--- /dev/null
+++ b/src/pages/correlation/correlation-chart.ts
@@ -0,0 +1,17 @@
+/** Correlation chart */
+import h from "@macrostrat/hyper";
+
+export interface ColumnIdentifier {
+  col_id: number;
+  col_name: string;
+  project_id: number;
+}
+
+export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
+  return h(
+    "ul",
+    columns.map((col) =>
+      h("li", h([h("code", col.col_id), " ", h("span.col-name", col.col_name)]))
+    )
+  );
+}

From 40d201ceb7d71d7bc8f9861615440af5d8008839 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Fri, 28 Jun 2024 23:57:19 -0500
Subject: [PATCH 131/151] A list of columns

---
 src/pages/correlation/+Page.ts             |  4 ++
 src/pages/correlation/correlation-chart.ts | 46 ++++++++++++++++++++--
 src/pages/correlation/main.module.sass     | 28 +++++++++++--
 3 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 5923130b..09448a1f 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -190,6 +190,10 @@ function computeIntersectingColumns(
   columns: ColumnGeoJSONRecord[],
   line: LineString
 ): ColumnGeoJSONRecord[] {
+  if (columns == null || line == null) {
+    return [];
+  }
+
   return columns.filter((col) => {
     const poly = col.geometry;
     const intersection = lineIntersect(line, poly);
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 4a2b4281..8b3eab95 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -1,5 +1,11 @@
 /** Correlation chart */
-import h from "@macrostrat/hyper";
+import { Column, preprocessUnits } from "@macrostrat/column-views";
+import { runColumnQuery } from "~/pages/map/map-interface/app-state/handlers/fetch";
+import { useAsyncEffect } from "use-async-effect";
+import { useState } from "react";
+import { PatternProvider } from "~/_providers";
+
+import h from "./main.module.sass";
 
 export interface ColumnIdentifier {
   col_id: number;
@@ -9,9 +15,41 @@ export interface ColumnIdentifier {
 
 export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
   return h(
-    "ul",
-    columns.map((col) =>
-      h("li", h([h("code", col.col_id), " ", h("span.col-name", col.col_name)]))
+    PatternProvider,
+    h(
+      "div.correlation-chart-inner",
+      columns.map((col) => h(SingleColumn, { column: col, key: col.col_id }))
     )
   );
 }
+
+function SingleColumn({ column }: { column: ColumnIdentifier }) {
+  const [unitData, setUnitData] = useState(null);
+
+  useAsyncEffect(async () => {
+    const data = await fetchUnitsForColumn(column.col_id);
+    setUnitData(data);
+  }, [column.col_id]);
+
+  if (unitData == null) {
+    return null;
+  }
+
+  return h("div.column", [
+    h("h2", column.col_name),
+    h("p", `ID: ${column.col_id}`),
+    h(Column, {
+      data: unitData,
+      showLabels: false,
+      targetUnitHeight: 25,
+      unconformityLabels: true,
+      width: 280,
+      columnWidth: 180,
+    }),
+  ]);
+}
+
+async function fetchUnitsForColumn(col_id: number) {
+  const res = await runColumnQuery({ col_id }, null);
+  return preprocessUnits(res);
+}
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
index 25f37454..058ed5e0 100644
--- a/src/pages/correlation/main.module.sass
+++ b/src/pages/correlation/main.module.sass
@@ -6,17 +6,28 @@ $map-size-inset: 12em
   height: $map-size-inset
   width: $map-size-inset
   position: absolute
-  top: 0
-  right: 0
+  top: 1em
+  right: 1em
   :global(.main-view)
     height: 100%
   &.expanded
     height: $map-size
     width: $map-size
     position: relative
+    top: 0
+    right: 0
 
 .correlation-diagram
-  flex-grow: 1
+  flex: 1
+  overflow: scroll
+  min-height: 0
+  height: 100%
+  padding: 1em
+  margin: 0 -2em -2em
+  background-color: var(--panel-secondary-background-color)
+  box-shadow: 0 0 0.3em 0 var(--card-shadow-color)
+  border-radius: 6px
+
 
 .map-expanded-button
   position: absolute
@@ -31,5 +42,14 @@ $map-size-inset: 12em
   flex-direction: column
 
 .diagram-container
-  flex-grow: 1
+  flex: 1
   position: relative
+  min-height: 0
+  align-items: center
+
+
+.correlation-chart-inner
+  display: flex
+  flex-direction: row
+
+

From 1b1cabb3fcbbb5087750fc53afced7f33d701a3f Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 00:23:19 -0500
Subject: [PATCH 132/151] Updated column colors

---
 src/pages/correlation/+Page.ts         | 20 ++++++++++++--------
 src/pages/correlation/main.module.sass |  9 +++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 09448a1f..92d159d9 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -27,6 +27,7 @@ import { getFocusedLineFromHashParams, HashStringManager } from "./hash-string";
 import { Button } from "@blueprintjs/core";
 import classNames from "classnames";
 import { ColumnIdentifier, CorrelationChart } from "./correlation-chart";
+import { DarkModeProvider } from "@macrostrat/ui-components";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -91,14 +92,17 @@ export function Page() {
   const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
 
   return h(FullscreenPage, [
-    h(HashStringManager, { focusedLine }),
-    h("div.main-panel", [
-      h("header", [h(PageBreadcrumbs)]),
-      h("div.flex.row.diagram-container", [
-        h(CorrelationDiagramWrapper),
-        h("div.assistant", [h(InsetMap)]),
-      ]),
-    ]),
+    h(
+      DarkModeProvider,
+      h(HashStringManager, { focusedLine }),
+      h("div.main-panel", [
+        h("header", [h(PageBreadcrumbs)]),
+        h("div.diagram-container", [
+          h(CorrelationDiagramWrapper),
+          h("div.assistant", [h(InsetMap)]),
+        ]),
+      ])
+    ),
   ]);
 }
 
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
index 058ed5e0..29ffdcf2 100644
--- a/src/pages/correlation/main.module.sass
+++ b/src/pages/correlation/main.module.sass
@@ -3,6 +3,8 @@ $map-size-inset: 12em
 
 .column-selection-map
   box-shadow: 0 0 0.3em 0 rgba(0, 0, 0, 0.5)
+  border-radius: 6px
+  overflow: hidden
   height: $map-size-inset
   width: $map-size-inset
   position: absolute
@@ -16,6 +18,7 @@ $map-size-inset: 12em
     position: relative
     top: 0
     right: 0
+    margin-left: 1em
 
 .correlation-diagram
   flex: 1
@@ -23,10 +26,11 @@ $map-size-inset: 12em
   min-height: 0
   height: 100%
   padding: 1em
-  margin: 0 -2em -2em
   background-color: var(--panel-secondary-background-color)
   box-shadow: 0 0 0.3em 0 var(--card-shadow-color)
   border-radius: 6px
+  --column-background-color: var(--background-color)
+  --column-stroke-color: var(--text-color)
 
 
 .map-expanded-button
@@ -45,7 +49,8 @@ $map-size-inset: 12em
   flex: 1
   position: relative
   min-height: 0
-  align-items: center
+  display: flex
+  flex-direction: row
 
 
 .correlation-chart-inner

From 2c1e7ed27ad8562b80d8640e40451aec8a6a53e6 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 00:29:03 -0500
Subject: [PATCH 133/151] Made everything more compact

---
 src/pages/correlation/correlation-chart.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 8b3eab95..2b230b6c 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -36,15 +36,13 @@ function SingleColumn({ column }: { column: ColumnIdentifier }) {
   }
 
   return h("div.column", [
-    h("h2", column.col_name),
-    h("p", `ID: ${column.col_id}`),
     h(Column, {
       data: unitData,
       showLabels: false,
-      targetUnitHeight: 25,
+      targetUnitHeight: 10,
       unconformityLabels: true,
-      width: 280,
-      columnWidth: 180,
+      width: 100,
+      columnWidth: 100,
     }),
   ]);
 }

From 958c264646b41f08c1e4319cbf3adb1986a85ebe Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 00:47:58 -0500
Subject: [PATCH 134/151] Brought column module into the system

---
 .idea/web.iml                              |   3 +-
 deps/web-components                        |   2 +-
 src/pages/correlation/+Page.ts             |   2 +
 src/pages/correlation/column.module.scss   | 104 ++++++++++
 src/pages/correlation/column.ts            | 222 +++++++++++++++++++++
 src/pages/correlation/correlation-chart.ts |   3 +-
 6 files changed, 333 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/correlation/column.module.scss
 create mode 100644 src/pages/correlation/column.ts

diff --git a/.idea/web.iml b/.idea/web.iml
index 24643cc3..dbe413b7 100644
--- a/.idea/web.iml
+++ b/.idea/web.iml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.tmp" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
diff --git a/deps/web-components b/deps/web-components
index d5e91c4a..e2709c9c 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit d5e91c4a80087115f2d9dd7fd3c71eee3080db40
+Subproject commit e2709c9cf0508e983bbf2e3818408c3db8c00ba6
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 92d159d9..780ea3cb 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -374,6 +374,8 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
         ],
       };
 
+      console.log(data);
+
       setGeoJSON(map, "crossSectionLine", data);
       setGeoJSON(map, "crossSectionEndpoints", {
         type: "FeatureCollection",
diff --git a/src/pages/correlation/column.module.scss b/src/pages/correlation/column.module.scss
new file mode 100644
index 00000000..1003b251
--- /dev/null
+++ b/src/pages/correlation/column.module.scss
@@ -0,0 +1,104 @@
+.column-container :global {
+  --background-color: var(--column-background-color, #fff);
+  --stroke-color: var(--column-stroke-color, #000);
+}
+.column-container :global .column {
+  display: flex;
+  flex-direction: row;
+}
+.column-container :global .column .age-axis-label {
+  writing-mode: vertical-lr;
+  transform: rotate(180deg);
+  font-size: 12px;
+  text-align: center;
+  position: sticky;
+  top: 0;
+  max-height: 100vh;
+}
+.column-container :global .column .tick text {
+  text-anchor: middle;
+  font-weight: 400 !important;
+  transform: rotate(-90deg) translate(8px, -12px);
+}
+.column-container :global rect.unit {
+  stroke: var(--stroke-color);
+  stroke-width: 1px;
+}
+.column-container :global g.lithology-column use.frame {
+  stroke: var(--stroke-color);
+  stroke-width: 1.5px !important;
+  pointer-events: none;
+}
+.column-container :global .unit-label {
+  text-align: center;
+}
+.column-container :global .col-note-label {
+  font-size: 10px;
+  margin-top: 3px;
+  padding: 2px;
+  padding-left: 3px;
+  line-height: 9px;
+  border-left: none !important;
+}
+.column-container :global g.height-range {
+  display: none;
+}
+.column-container :global .note-inner {
+  border: none;
+}
+.column-container :global .frame rect {
+  fill: transparent;
+}
+.column-container :global .labeled-unit .unit-overlay {
+  font-size: 10px;
+  font-style: italic;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.column-container :global .labeled-unit .unit-overlay .unit-label {
+  display: block;
+  text-shadow: 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color), 0px 0px 4px var(--background-color);
+}
+.column-container :global .default-buttons {
+  width: 100%;
+  margin: 0 -10px;
+}
+.column-container :global div.section {
+  display: flex;
+  flex-direction: row;
+}
+.column-container :global div.section :global(.timescale) {
+  transform: translateY(0.5);
+}
+.column-container :global .section .divisions .unit {
+  cursor: pointer;
+}
+.column-container :global rect.selection-overlay {
+  fill: rgba(255,0,0,0.5);
+}
+.column-container :global div.timescale {
+  width: calc(6em + 4px);
+  --timescale-level-size: 1.5em;
+}
+.unconformity {
+  height: 0px;
+  font-size: 10px;
+  font-style: italic;
+  text-align: center;
+  margin-left: calc(6em + 4px + 40px);
+}
+.unconformity-text {
+  transform: translateY(-0.5em);
+  width: var(--column-width);
+  color: var(--stroke-color);
+}
+.column-container.dark-mode :global {
+  color: var(--text-color);
+}
+.column-container.dark-mode :global .timescale {
+  color: #000;
+}
+.column-container.dark-mode :global g.inner pattern image {
+  filter: invert(80%);
+}
diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
new file mode 100644
index 00000000..1fe06953
--- /dev/null
+++ b/src/pages/correlation/column.ts
@@ -0,0 +1,222 @@
+import {
+  ColumnLayoutContext,
+  ColumnProvider,
+  ColumnSVG,
+} from "@macrostrat/column-components";
+import { hyperStyled } from "@macrostrat/hyper";
+import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
+import { useDarkMode } from "@macrostrat/ui-components";
+import classNames from "classnames";
+import { group } from "d3-array";
+import { useContext, useMemo } from "react";
+import { AgeAxis } from "@macrostrat/column-views";
+import styles from "./column.module.scss";
+import {
+  CompositeUnitsColumn,
+  TrackedLabeledUnit,
+} from "@macrostrat/column-views";
+import { IUnit } from "@macrostrat/column-views/src/units/types";
+
+import { ColumnAxisType } from "@macrostrat/column-components";
+
+const h = hyperStyled(styles);
+
+export function MacrostratColumnProvider(props) {
+  // A column provider specialized the Macrostrat API
+  return h(ColumnProvider, { axisType: ColumnAxisType.AGE, ...props });
+}
+
+interface IColumnProps {
+  data: IUnit[];
+  pixelScale?: number;
+  range?: [number, number];
+  unitComponent?: React.FunctionComponent<any>;
+  unitComponentProps?: any;
+  showLabels?: boolean;
+  width?: number;
+  columnWidth?: number;
+  targetUnitHeight?: number;
+}
+
+const timescaleLevels = [2, 5];
+
+const Section = (props: IColumnProps) => {
+  // Section with "squishy" time scale
+  const {
+    data,
+    range: _range,
+    pixelScale: _pixelScale,
+    unitComponent,
+    showLabels = true,
+    targetUnitHeight = 20,
+    width = 300,
+    columnWidth = 150,
+    unitComponentProps,
+  } = props;
+
+  const b_age = data[data.length - 1].b_age;
+  const t_age = data[0].t_age;
+
+  const range = useMemo(() => {
+    if (_range == null) {
+      return [b_age, t_age];
+    }
+    return _range;
+  }, [_range, b_age, t_age]);
+
+  const dAge = useMemo(() => range[0] - range[1], [range]);
+
+  const pixelScale = useMemo(() => {
+    if (_pixelScale != null) return _pixelScale;
+    const targetHeight = targetUnitHeight * data.length;
+    return Math.ceil(targetHeight / dAge);
+  }, [_pixelScale, targetUnitHeight, data.length, dAge]);
+
+  const height = useMemo(() => dAge * pixelScale, [dAge, pixelScale]);
+
+  /** Ensure that we can arrange units into the maximum number
+   * of columns defined by unitComponentProps, but that we don't
+   * use more than necessary.
+   */
+  const _unitComponentProps = useMemo(() => {
+    return {
+      ...unitComponentProps,
+      nColumns: Math.min(
+        Math.max(...data.map((d) => d.column)) + 1,
+        unitComponentProps?.nColumns ?? 2
+      ),
+    };
+  }, [data, unitComponentProps]);
+
+  return h(
+    MacrostratColumnProvider,
+    {
+      divisions: data,
+      range,
+      pixelsPerMeter: pixelScale, // Actually pixels per myr
+    },
+    [
+      h(AgeAxis, {
+        width: 20,
+        padding: 0,
+        paddingV: 10,
+        showLabel: false,
+      }),
+      h("div.timescale-container", { style: { marginTop: `10px` } }, [
+        h(Timescale, {
+          orientation: TimescaleOrientation.VERTICAL,
+          length: height,
+          levels: timescaleLevels,
+          absoluteAgeScale: true,
+          showAgeAxis: false,
+          ageRange: range,
+        }),
+      ]),
+      h(
+        ColumnSVG,
+        {
+          innerWidth: showLabels ? width : columnWidth,
+          paddingRight: 1,
+          paddingLeft: 1,
+          paddingV: 10,
+          innerHeight: height,
+        },
+        h(CompositeUnitsColumn, {
+          width: showLabels ? width : columnWidth,
+          columnWidth,
+          gutterWidth: 5,
+          showLabels,
+          unitComponent,
+          unitComponentProps: _unitComponentProps,
+        })
+      ),
+    ]
+  );
+};
+
+export function UnitComponent({ division, nColumns = 2, ...rest }) {
+  const { width } = useContext(ColumnLayoutContext);
+
+  //const nCols = Math.min(nColumns, division.overlappingUnits.length+1)
+  //console.log(division);
+  return h(TrackedLabeledUnit, {
+    division,
+    ...rest,
+    width: division.overlappingUnits.length > 0 ? width / nColumns : width,
+    x: (division.column * width) / nColumns,
+  });
+}
+
+function Unconformity({ upperUnits = [], lowerUnits = [], style }) {
+  if (upperUnits.length == 0 || lowerUnits.length == 0) {
+    return null;
+  }
+
+  const ageGap = lowerUnits[0].t_age - upperUnits[upperUnits.length - 1].b_age;
+
+  return h(
+    "div.unconformity",
+    { style },
+    h("div.unconformity-text", `${ageGap.toFixed(1)} Ma`)
+  );
+}
+
+function Column(
+  props: IColumnProps & { unconformityLabels: boolean; className?: string }
+) {
+  const {
+    data,
+    unitComponent = UnitComponent,
+    unconformityLabels = false,
+    showLabels = true,
+    width = 300,
+    columnWidth = 150,
+    className: baseClassName,
+    ...rest
+  } = props;
+
+  const darkMode = useDarkMode();
+
+  let sectionGroups = useMemo(() => {
+    let groups = Array.from(group(data, (d) => d.section_id));
+    groups.sort((a, b) => a.t_age - b.t_age);
+    return groups;
+  }, [data]);
+
+  const className = classNames(baseClassName, {
+    "dark-mode": darkMode?.isEnabled ?? false,
+  });
+
+  return h(
+    "div.column-container",
+    { className },
+    h("div.column", [
+      h("div.age-axis-label", "Age (Ma)"),
+      h(
+        "div.main-column",
+        sectionGroups.map(([id, data], i) => {
+          const lastGroup = sectionGroups[i - 1]?.[1];
+          return h([
+            h.if(unconformityLabels)(Unconformity, {
+              upperUnits: lastGroup,
+              lowerUnits: data,
+              style: { width: showLabels ? columnWidth : width },
+            }),
+            h(`div.section.section-${id}`, [
+              h(Section, {
+                data,
+                unitComponent,
+                showLabels,
+                width,
+                columnWidth,
+                ...rest,
+              }),
+            ]),
+          ]);
+        })
+      ),
+    ])
+  );
+}
+
+export { AgeAxis, Column, Section };
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 2b230b6c..ad42005a 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -1,9 +1,10 @@
 /** Correlation chart */
-import { Column, preprocessUnits } from "@macrostrat/column-views";
+import { preprocessUnits } from "@macrostrat/column-views";
 import { runColumnQuery } from "~/pages/map/map-interface/app-state/handlers/fetch";
 import { useAsyncEffect } from "use-async-effect";
 import { useState } from "react";
 import { PatternProvider } from "~/_providers";
+import { Column } from "./column";
 
 import h from "./main.module.sass";
 

From 48b0fc54ea5e33dafce2e9517a2abc29231c5f38 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 02:34:57 -0500
Subject: [PATCH 135/151] Updated column types

---
 deps/web-components                      | 2 +-
 src/pages/correlation/column.module.scss | 2 +-
 src/pages/correlation/column.ts          | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/deps/web-components b/deps/web-components
index e2709c9c..29588598 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit e2709c9cf0508e983bbf2e3818408c3db8c00ba6
+Subproject commit 2958859899098d7e4899651f7621e8e17e13ede1
diff --git a/src/pages/correlation/column.module.scss b/src/pages/correlation/column.module.scss
index 1003b251..0d6b53cd 100644
--- a/src/pages/correlation/column.module.scss
+++ b/src/pages/correlation/column.module.scss
@@ -78,7 +78,7 @@
   fill: rgba(255,0,0,0.5);
 }
 .column-container :global div.timescale {
-  width: calc(6em + 4px);
+  width: calc(3em + 2px);
   --timescale-level-size: 1.5em;
 }
 .unconformity {
diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index 1fe06953..4fcae096 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -38,10 +38,10 @@ interface IColumnProps {
   targetUnitHeight?: number;
 }
 
-const timescaleLevels = [2, 5];
+const timescaleLevels: [number, number] = [3, 4];
 
 const Section = (props: IColumnProps) => {
-  // Section with "squishy" time scale
+  // Section with "squishy" timescale
   const {
     data,
     range: _range,
@@ -57,7 +57,7 @@ const Section = (props: IColumnProps) => {
   const b_age = data[data.length - 1].b_age;
   const t_age = data[0].t_age;
 
-  const range = useMemo(() => {
+  const range: [number, number] = useMemo(() => {
     if (_range == null) {
       return [b_age, t_age];
     }
@@ -179,7 +179,8 @@ function Column(
 
   let sectionGroups = useMemo(() => {
     let groups = Array.from(group(data, (d) => d.section_id));
-    groups.sort((a, b) => a.t_age - b.t_age);
+    console.log(groups);
+    groups.sort((a, b) => a[1][0].t_age - b[1][0].t_age);
     return groups;
   }, [data]);
 

From 2f45b2eac73da8817e05d94a358980bc9f5663f5 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 02:53:18 -0500
Subject: [PATCH 136/151] Hoisted some data fetching

---
 src/pages/correlation/column.ts            |  2 ++
 src/pages/correlation/correlation-chart.ts | 38 +++++++++++++---------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index 4fcae096..5acbfae1 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -184,6 +184,8 @@ function Column(
     return groups;
   }, [data]);
 
+  sectionGroups = [[0, data]];
+
   const className = classNames(baseClassName, {
     "dark-mode": darkMode?.isEnabled ?? false,
   });
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index ad42005a..651d45e5 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -2,9 +2,10 @@
 import { preprocessUnits } from "@macrostrat/column-views";
 import { runColumnQuery } from "~/pages/map/map-interface/app-state/handlers/fetch";
 import { useAsyncEffect } from "use-async-effect";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { PatternProvider } from "~/_providers";
 import { Column } from "./column";
+import { UnitLong } from "@macrostrat/api-types";
 
 import h from "./main.module.sass";
 
@@ -15,30 +16,37 @@ export interface ColumnIdentifier {
 }
 
 export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
+  const [unitData, setUnitData] = useState(null);
+
+  useEffect(() => {
+    const promises = columns.map((col) => fetchUnitsForColumn(col.col_id));
+    Promise.all(promises).then((data) => setUnitData(data));
+  }, [columns]);
+
+  if (unitData == null) {
+    return null;
+  }
+
+  console.log(columns, unitData);
+
   return h(
     PatternProvider,
     h(
       "div.correlation-chart-inner",
-      columns.map((col) => h(SingleColumn, { column: col, key: col.col_id }))
+      unitData.map((units, i) => h(SingleColumn, { units: units, key: i }))
     )
   );
 }
 
-function SingleColumn({ column }: { column: ColumnIdentifier }) {
-  const [unitData, setUnitData] = useState(null);
-
-  useAsyncEffect(async () => {
-    const data = await fetchUnitsForColumn(column.col_id);
-    setUnitData(data);
-  }, [column.col_id]);
-
-  if (unitData == null) {
-    return null;
-  }
-
+function SingleColumn({
+  units,
+}: {
+  column: ColumnIdentifier;
+  units: UnitLong[];
+}) {
   return h("div.column", [
     h(Column, {
-      data: unitData,
+      data: units,
       showLabels: false,
       targetUnitHeight: 10,
       unconformityLabels: true,

From bd26678f14567da237cf9cb2607f168f3fa8036a Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 14:51:13 -0500
Subject: [PATCH 137/151] Starting point to separate scale

---
 src/pages/correlation/column.ts            | 19 +++---
 src/pages/correlation/correlation-chart.ts | 74 +++++++++++++++++++---
 2 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index 5acbfae1..05df86ec 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -11,6 +11,7 @@ import { group } from "d3-array";
 import { useContext, useMemo } from "react";
 import { AgeAxis } from "@macrostrat/column-views";
 import styles from "./column.module.scss";
+import { useState, useEffect } from "react";
 import {
   CompositeUnitsColumn,
   TrackedLabeledUnit,
@@ -54,8 +55,8 @@ const Section = (props: IColumnProps) => {
     unitComponentProps,
   } = props;
 
-  const b_age = data[data.length - 1].b_age;
-  const t_age = data[0].t_age;
+  const b_age = data[data.length - 1]?.b_age ?? 4200;
+  const t_age = data[0]?.t_age;
 
   const range: [number, number] = useMemo(() => {
     if (_range == null) {
@@ -177,14 +178,14 @@ function Column(
 
   const darkMode = useDarkMode();
 
-  let sectionGroups = useMemo(() => {
-    let groups = Array.from(group(data, (d) => d.section_id));
-    console.log(groups);
-    groups.sort((a, b) => a[1][0].t_age - b[1][0].t_age);
-    return groups;
-  }, [data]);
+  // let sectionGroups = useMemo(() => {
+  //   let groups = Array.from(group(data, (d) => d.section_id));
+  //   console.log(groups);
+  //   groups.sort((a, b) => a[1][0].t_age - b[1][0].t_age);
+  //   return groups;
+  // }, [data]);
 
-  sectionGroups = [[0, data]];
+  const sectionGroups = [[0, data]];
 
   const className = classNames(baseClassName, {
     "dark-mode": darkMode?.isEnabled ?? false,
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 651d45e5..6a6884d3 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -4,7 +4,7 @@ import { runColumnQuery } from "~/pages/map/map-interface/app-state/handlers/fet
 import { useAsyncEffect } from "use-async-effect";
 import { useState, useEffect } from "react";
 import { PatternProvider } from "~/_providers";
-import { Column } from "./column";
+import { Column, TimescaleColumn } from "./column";
 import { UnitLong } from "@macrostrat/api-types";
 
 import h from "./main.module.sass";
@@ -15,43 +15,86 @@ export interface ColumnIdentifier {
   project_id: number;
 }
 
+export interface CorrelationChartData {
+  t_age: number;
+  b_age: number;
+  units: UnitLong[][]; // Units for each column
+}
+
 export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
-  const [unitData, setUnitData] = useState(null);
+  const [chartData, setChartData] = useState<CorrelationChartData | null>(null);
 
   useEffect(() => {
     const promises = columns.map((col) => fetchUnitsForColumn(col.col_id));
-    Promise.all(promises).then((data) => setUnitData(data));
+    Promise.all(promises).then((data) =>
+      setChartData(preprocessChartData(data))
+    );
   }, [columns]);
 
-  if (unitData == null) {
+  if (chartData == null) {
     return null;
   }
 
-  console.log(columns, unitData);
+  const targetUnitHeight = 20;
+
+  const { t_age, b_age } = chartData;
+  const range = [b_age, t_age];
+
+  const dAge = b_age - t_age;
+  const maxNUnits = Math.max(...chartData.units.map((d) => d.length));
+  const targetHeight = targetUnitHeight * maxNUnits;
+  const pixelScale = Math.ceil(targetHeight / dAge);
+
+  const firstColumn = chartData.units.slice(0, 1);
+
+  console.log(firstColumn);
 
   return h(
     PatternProvider,
-    h(
-      "div.correlation-chart-inner",
-      unitData.map((units, i) => h(SingleColumn, { units: units, key: i }))
-    )
+    h("div.correlation-chart-inner", [
+      h(
+        firstColumn.map((units, i) =>
+          h(SingleColumn, {
+            units: units,
+            range,
+            pixelScale,
+            key: i,
+          })
+        )
+      ),
+      h(
+        chartData.units.map((units, i) =>
+          h(SingleColumn, {
+            units: units,
+            range,
+            pixelScale,
+            key: i,
+          })
+        )
+      ),
+    ])
   );
 }
 
 function SingleColumn({
   units,
+  range,
+  pixelScale,
 }: {
   column: ColumnIdentifier;
   units: UnitLong[];
+  range: [number, number];
+  pixelScale: number;
 }) {
   return h("div.column", [
     h(Column, {
       data: units,
       showLabels: false,
-      targetUnitHeight: 10,
       unconformityLabels: true,
       width: 100,
       columnWidth: 100,
+      range,
+      pixelScale,
     }),
   ]);
 }
@@ -60,3 +103,14 @@ async function fetchUnitsForColumn(col_id: number) {
   const res = await runColumnQuery({ col_id }, null);
   return preprocessUnits(res);
 }
+
+function preprocessChartData(units: UnitLong[][]): CorrelationChartData {
+  const [b_age, t_age] = findEncompassingScaleBounds(units.flat());
+  return { units, b_age, t_age };
+}
+
+function findEncompassingScaleBounds(units: UnitLong[]) {
+  const b_age = Math.max(...units.map((d) => d.b_age));
+  const t_age = Math.min(...units.map((d) => d.t_age));
+  return [b_age, t_age];
+}

From 544cef2f1e3ce442f8f5410cc612c8c7cbb8e7b2 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 14:55:34 -0500
Subject: [PATCH 138/151] Duplicated components for scale

---
 src/pages/correlation/column.ts            | 155 +++++++++++++++++++++
 src/pages/correlation/correlation-chart.ts |  25 +++-
 2 files changed, 179 insertions(+), 1 deletion(-)

diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index 05df86ec..8c261bbc 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -223,4 +223,159 @@ function Column(
   );
 }
 
+function TimescaleSection(props: IColumnProps) {
+  // Section with "squishy" timescale
+  const {
+    data,
+    range: _range,
+    pixelScale: _pixelScale,
+    unitComponent,
+    showLabels = true,
+    targetUnitHeight = 20,
+    width = 300,
+    columnWidth = 150,
+    unitComponentProps,
+  } = props;
+
+  const b_age = data[data.length - 1]?.b_age ?? 4200;
+  const t_age = data[0]?.t_age;
+
+  const range: [number, number] = useMemo(() => {
+    if (_range == null) {
+      return [b_age, t_age];
+    }
+    return _range;
+  }, [_range, b_age, t_age]);
+
+  const dAge = useMemo(() => range[0] - range[1], [range]);
+
+  const pixelScale = useMemo(() => {
+    if (_pixelScale != null) return _pixelScale;
+    const targetHeight = targetUnitHeight * data.length;
+    return Math.ceil(targetHeight / dAge);
+  }, [_pixelScale, targetUnitHeight, data.length, dAge]);
+
+  const height = useMemo(() => dAge * pixelScale, [dAge, pixelScale]);
+
+  /** Ensure that we can arrange units into the maximum number
+   * of columns defined by unitComponentProps, but that we don't
+   * use more than necessary.
+   */
+  const _unitComponentProps = useMemo(() => {
+    return {
+      ...unitComponentProps,
+      nColumns: Math.min(
+        Math.max(...data.map((d) => d.column)) + 1,
+        unitComponentProps?.nColumns ?? 2
+      ),
+    };
+  }, [data, unitComponentProps]);
+
+  return h(
+    MacrostratColumnProvider,
+    {
+      divisions: data,
+      range,
+      pixelsPerMeter: pixelScale, // Actually pixels per myr
+    },
+    [
+      h(AgeAxis, {
+        width: 20,
+        padding: 0,
+        paddingV: 10,
+        showLabel: false,
+      }),
+      h("div.timescale-container", { style: { marginTop: `10px` } }, [
+        h(Timescale, {
+          orientation: TimescaleOrientation.VERTICAL,
+          length: height,
+          levels: timescaleLevels,
+          absoluteAgeScale: true,
+          showAgeAxis: false,
+          ageRange: range,
+        }),
+      ]),
+      h(
+        ColumnSVG,
+        {
+          innerWidth: showLabels ? width : columnWidth,
+          paddingRight: 1,
+          paddingLeft: 1,
+          paddingV: 10,
+          innerHeight: height,
+        },
+        h(CompositeUnitsColumn, {
+          width: showLabels ? width : columnWidth,
+          columnWidth,
+          gutterWidth: 5,
+          showLabels,
+          unitComponent,
+          unitComponentProps: _unitComponentProps,
+        })
+      ),
+    ]
+  );
+}
+
+export function TimescaleColumn(
+  props: IColumnProps & { unconformityLabels: boolean; className?: string }
+) {
+  const {
+    data,
+    unitComponent = UnitComponent,
+    unconformityLabels = false,
+    showLabels = true,
+    width = 300,
+    columnWidth = 150,
+    className: baseClassName,
+    ...rest
+  } = props;
+
+  const darkMode = useDarkMode();
+
+  // let sectionGroups = useMemo(() => {
+  //   let groups = Array.from(group(data, (d) => d.section_id));
+  //   console.log(groups);
+  //   groups.sort((a, b) => a[1][0].t_age - b[1][0].t_age);
+  //   return groups;
+  // }, [data]);
+
+  const sectionGroups = [[0, data]];
+
+  const className = classNames(baseClassName, {
+    "dark-mode": darkMode?.isEnabled ?? false,
+  });
+
+  return h(
+    "div.column-container",
+    { className },
+    h("div.column", [
+      h("div.age-axis-label", "Age (Ma)"),
+      h(
+        "div.main-column",
+        sectionGroups.map(([id, data], i) => {
+          const lastGroup = sectionGroups[i - 1]?.[1];
+          return h([
+            h.if(unconformityLabels)(Unconformity, {
+              upperUnits: lastGroup,
+              lowerUnits: data,
+              style: { width: showLabels ? columnWidth : width },
+            }),
+            h(`div.section.section-${id}`, [
+              h(Section, {
+                data,
+                unitComponent,
+                showLabels,
+                width,
+                columnWidth,
+                ...rest,
+              }),
+            ]),
+          ]);
+        })
+      ),
+    ])
+  );
+}
+
 export { AgeAxis, Column, Section };
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 6a6884d3..3ad0567f 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -54,7 +54,7 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
     h("div.correlation-chart-inner", [
       h(
         firstColumn.map((units, i) =>
-          h(SingleColumn, {
+          h(TimescaleColumnExt, {
             units: units,
             range,
             pixelScale,
@@ -76,6 +76,29 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
   );
 }
 
+function TimescaleColumnExt({
+  units,
+  range,
+  pixelScale,
+}: {
+  column: ColumnIdentifier;
+  units: UnitLong[];
+  range: [number, number];
+  pixelScale: number;
+}) {
+  return h("div.column", [
+    h(TimescaleColumn, {
+      data: units,
+      showLabels: false,
+      unconformityLabels: true,
+      width: 100,
+      columnWidth: 100,
+      range,
+      pixelScale,
+    }),
+  ]);
+}
+
 function SingleColumn({
   units,
   range,

From 665630adb2985b27f22010bf44d6d8327ed97e77 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 14:58:19 -0500
Subject: [PATCH 139/151] Slightly simplified

---
 src/pages/correlation/correlation-chart.ts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 3ad0567f..21f4671f 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -8,6 +8,7 @@ import { Column, TimescaleColumn } from "./column";
 import { UnitLong } from "@macrostrat/api-types";
 
 import h from "./main.module.sass";
+import { first } from "underscore";
 
 export interface ColumnIdentifier {
   col_id: number;
@@ -31,7 +32,7 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
     );
   }, [columns]);
 
-  if (chartData == null) {
+  if (chartData == null || chartData.units.length == 0) {
     return null;
   }
 
@@ -52,16 +53,12 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
   return h(
     PatternProvider,
     h("div.correlation-chart-inner", [
-      h(
-        firstColumn.map((units, i) =>
-          h(TimescaleColumnExt, {
-            units: units,
-            range,
-            pixelScale,
-            key: i,
-          })
-        )
-      ),
+      h(TimescaleColumnExt, {
+        units: firstColumn[0],
+        range,
+        pixelScale,
+        key: "timescale",
+      }),
       h(
         chartData.units.map((units, i) =>
           h(SingleColumn, {

From 91c288d42a10078ee483d7bb3368f2afa21f8d30 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 15:18:57 -0500
Subject: [PATCH 140/151] Removed unused label

---
 src/pages/correlation/column.ts | 91 ++-------------------------------
 1 file changed, 5 insertions(+), 86 deletions(-)

diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index 8c261bbc..f5344cbe 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -97,22 +97,6 @@ const Section = (props: IColumnProps) => {
       pixelsPerMeter: pixelScale, // Actually pixels per myr
     },
     [
-      h(AgeAxis, {
-        width: 20,
-        padding: 0,
-        paddingV: 10,
-        showLabel: false,
-      }),
-      h("div.timescale-container", { style: { marginTop: `10px` } }, [
-        h(Timescale, {
-          orientation: TimescaleOrientation.VERTICAL,
-          length: height,
-          levels: timescaleLevels,
-          absoluteAgeScale: true,
-          showAgeAxis: false,
-          ageRange: range,
-        }),
-      ]),
       h(
         ColumnSVG,
         {
@@ -195,7 +179,6 @@ function Column(
     "div.column-container",
     { className },
     h("div.column", [
-      h("div.age-axis-label", "Age (Ma)"),
       h(
         "div.main-column",
         sectionGroups.map(([id, data], i) => {
@@ -225,56 +208,15 @@ function Column(
 
 function TimescaleSection(props: IColumnProps) {
   // Section with "squishy" timescale
-  const {
-    data,
-    range: _range,
-    pixelScale: _pixelScale,
-    unitComponent,
-    showLabels = true,
-    targetUnitHeight = 20,
-    width = 300,
-    columnWidth = 150,
-    unitComponentProps,
-  } = props;
-
-  const b_age = data[data.length - 1]?.b_age ?? 4200;
-  const t_age = data[0]?.t_age;
-
-  const range: [number, number] = useMemo(() => {
-    if (_range == null) {
-      return [b_age, t_age];
-    }
-    return _range;
-  }, [_range, b_age, t_age]);
-
-  const dAge = useMemo(() => range[0] - range[1], [range]);
-
-  const pixelScale = useMemo(() => {
-    if (_pixelScale != null) return _pixelScale;
-    const targetHeight = targetUnitHeight * data.length;
-    return Math.ceil(targetHeight / dAge);
-  }, [_pixelScale, targetUnitHeight, data.length, dAge]);
+  const { range, pixelScale } = props;
 
-  const height = useMemo(() => dAge * pixelScale, [dAge, pixelScale]);
-
-  /** Ensure that we can arrange units into the maximum number
-   * of columns defined by unitComponentProps, but that we don't
-   * use more than necessary.
-   */
-  const _unitComponentProps = useMemo(() => {
-    return {
-      ...unitComponentProps,
-      nColumns: Math.min(
-        Math.max(...data.map((d) => d.column)) + 1,
-        unitComponentProps?.nColumns ?? 2
-      ),
-    };
-  }, [data, unitComponentProps]);
+  const dAge = range[0] - range[1];
+  const height = dAge * pixelScale;
 
   return h(
     MacrostratColumnProvider,
     {
-      divisions: data,
+      divisions: [],
       range,
       pixelsPerMeter: pixelScale, // Actually pixels per myr
     },
@@ -295,24 +237,6 @@ function TimescaleSection(props: IColumnProps) {
           ageRange: range,
         }),
       ]),
-      h(
-        ColumnSVG,
-        {
-          innerWidth: showLabels ? width : columnWidth,
-          paddingRight: 1,
-          paddingLeft: 1,
-          paddingV: 10,
-          innerHeight: height,
-        },
-        h(CompositeUnitsColumn, {
-          width: showLabels ? width : columnWidth,
-          columnWidth,
-          gutterWidth: 5,
-          showLabels,
-          unitComponent,
-          unitComponentProps: _unitComponentProps,
-        })
-      ),
     ]
   );
 }
@@ -356,13 +280,8 @@ export function TimescaleColumn(
         sectionGroups.map(([id, data], i) => {
           const lastGroup = sectionGroups[i - 1]?.[1];
           return h([
-            h.if(unconformityLabels)(Unconformity, {
-              upperUnits: lastGroup,
-              lowerUnits: data,
-              style: { width: showLabels ? columnWidth : width },
-            }),
             h(`div.section.section-${id}`, [
-              h(Section, {
+              h(TimescaleSection, {
                 data,
                 unitComponent,
                 showLabels,

From 3b5443d42e17b1f83734bd72b5a71ebbe2763824 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sat, 29 Jun 2024 19:51:04 -0500
Subject: [PATCH 141/151] Updated correlation diagram

---
 deps/web-components                        |   2 +-
 src/pages/correlation/column.module.scss   |  17 ++-
 src/pages/correlation/column.ts            | 132 ++++++++-------------
 src/pages/correlation/correlation-chart.ts |   3 -
 4 files changed, 63 insertions(+), 91 deletions(-)

diff --git a/deps/web-components b/deps/web-components
index 29588598..5f8030d5 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 2958859899098d7e4899651f7621e8e17e13ede1
+Subproject commit 5f8030d53c96284f7e685f3c023065737c2e37b3
diff --git a/src/pages/correlation/column.module.scss b/src/pages/correlation/column.module.scss
index 0d6b53cd..592cfa0c 100644
--- a/src/pages/correlation/column.module.scss
+++ b/src/pages/correlation/column.module.scss
@@ -25,8 +25,8 @@
   stroke-width: 1px;
 }
 .column-container :global g.lithology-column use.frame {
-  stroke: var(--stroke-color);
-  stroke-width: 1.5px !important;
+  ///stroke: var(--stroke-color);
+  //stroke-width: 1.5px !important;
   pointer-events: none;
 }
 .column-container :global .unit-label {
@@ -77,10 +77,10 @@
 .column-container :global rect.selection-overlay {
   fill: rgba(255,0,0,0.5);
 }
-.column-container :global div.timescale {
-  width: calc(3em + 2px);
-  --timescale-level-size: 1.5em;
-}
+//.column-container :global div.timescale {
+//  width: calc(3em + 2px);
+//  --timescale-level-size: 1.5em;
+//}
 .unconformity {
   height: 0px;
   font-size: 10px;
@@ -102,3 +102,8 @@
 .column-container.dark-mode :global g.inner pattern image {
   filter: invert(80%);
 }
+
+.column-container :global div.timescale {
+  width: calc(4.5em + 4px);
+  --timescale-level-size: 1.5em;
+}
diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index f5344cbe..81111ee5 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -39,41 +39,22 @@ interface IColumnProps {
   targetUnitHeight?: number;
 }
 
-const timescaleLevels: [number, number] = [3, 4];
-
-const Section = (props: IColumnProps) => {
+function Section(props: IColumnProps) {
   // Section with "squishy" timescale
   const {
     data,
-    range: _range,
-    pixelScale: _pixelScale,
+    range,
+    pixelScale,
     unitComponent,
     showLabels = true,
-    targetUnitHeight = 20,
     width = 300,
     columnWidth = 150,
     unitComponentProps,
   } = props;
 
-  const b_age = data[data.length - 1]?.b_age ?? 4200;
-  const t_age = data[0]?.t_age;
-
-  const range: [number, number] = useMemo(() => {
-    if (_range == null) {
-      return [b_age, t_age];
-    }
-    return _range;
-  }, [_range, b_age, t_age]);
-
-  const dAge = useMemo(() => range[0] - range[1], [range]);
-
-  const pixelScale = useMemo(() => {
-    if (_pixelScale != null) return _pixelScale;
-    const targetHeight = targetUnitHeight * data.length;
-    return Math.ceil(targetHeight / dAge);
-  }, [_pixelScale, targetUnitHeight, data.length, dAge]);
+  const dAge = range[0] - range[1];
 
-  const height = useMemo(() => dAge * pixelScale, [dAge, pixelScale]);
+  const height = dAge * pixelScale;
 
   /** Ensure that we can arrange units into the maximum number
    * of columns defined by unitComponentProps, but that we don't
@@ -107,17 +88,18 @@ const Section = (props: IColumnProps) => {
           innerHeight: height,
         },
         h(CompositeUnitsColumn, {
-          width: showLabels ? width : columnWidth,
+          width: columnWidth,
           columnWidth,
           gutterWidth: 5,
-          showLabels,
+          showLabels: false,
           unitComponent,
           unitComponentProps: _unitComponentProps,
+          clipToFrame: false,
         })
       ),
     ]
   );
-};
+}
 
 export function UnitComponent({ division, nColumns = 2, ...rest }) {
   const { width } = useContext(ColumnLayoutContext);
@@ -146,7 +128,7 @@ function Unconformity({ upperUnits = [], lowerUnits = [], style }) {
   );
 }
 
-function Column(
+export function Column(
   props: IColumnProps & { unconformityLabels: boolean; className?: string }
 ) {
   const {
@@ -206,54 +188,10 @@ function Column(
   );
 }
 
-function TimescaleSection(props: IColumnProps) {
-  // Section with "squishy" timescale
-  const { range, pixelScale } = props;
-
-  const dAge = range[0] - range[1];
-  const height = dAge * pixelScale;
-
-  return h(
-    MacrostratColumnProvider,
-    {
-      divisions: [],
-      range,
-      pixelsPerMeter: pixelScale, // Actually pixels per myr
-    },
-    [
-      h(AgeAxis, {
-        width: 20,
-        padding: 0,
-        paddingV: 10,
-        showLabel: false,
-      }),
-      h("div.timescale-container", { style: { marginTop: `10px` } }, [
-        h(Timescale, {
-          orientation: TimescaleOrientation.VERTICAL,
-          length: height,
-          levels: timescaleLevels,
-          absoluteAgeScale: true,
-          showAgeAxis: false,
-          ageRange: range,
-        }),
-      ]),
-    ]
-  );
-}
-
 export function TimescaleColumn(
   props: IColumnProps & { unconformityLabels: boolean; className?: string }
 ) {
-  const {
-    data,
-    unitComponent = UnitComponent,
-    unconformityLabels = false,
-    showLabels = true,
-    width = 300,
-    columnWidth = 150,
-    className: baseClassName,
-    ...rest
-  } = props;
+  const { className: baseClassName, range, pixelScale } = props;
 
   const darkMode = useDarkMode();
 
@@ -264,7 +202,7 @@ export function TimescaleColumn(
   //   return groups;
   // }, [data]);
 
-  const sectionGroups = [[0, data]];
+  const sectionGroups = [[0, []]];
 
   const className = classNames(baseClassName, {
     "dark-mode": darkMode?.isEnabled ?? false,
@@ -282,12 +220,8 @@ export function TimescaleColumn(
           return h([
             h(`div.section.section-${id}`, [
               h(TimescaleSection, {
-                data,
-                unitComponent,
-                showLabels,
-                width,
-                columnWidth,
-                ...rest,
+                range,
+                pixelScale,
               }),
             ]),
           ]);
@@ -297,4 +231,40 @@ export function TimescaleColumn(
   );
 }
 
-export { AgeAxis, Column, Section };
+function TimescaleSection(props: {
+  range: [number, number];
+  pixelScale: number;
+}) {
+  // Section with "squishy" timescale
+  const { range, pixelScale } = props;
+
+  const dAge = range[0] - range[1];
+  const height = dAge * pixelScale;
+
+  return h(
+    MacrostratColumnProvider,
+    {
+      divisions: [],
+      range,
+      pixelsPerMeter: pixelScale, // Actually pixels per myr
+    },
+    [
+      h(AgeAxis, {
+        width: 20,
+        padding: 0,
+        paddingV: 10,
+        showLabel: false,
+      }),
+      h("div.timescale-container", { style: { marginTop: `10px` } }, [
+        h(Timescale, {
+          orientation: TimescaleOrientation.VERTICAL,
+          length: height,
+          levels: [2, 4],
+          absoluteAgeScale: true,
+          showAgeAxis: false,
+          ageRange: range,
+        }),
+      ]),
+    ]
+  );
+}
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 21f4671f..f218b043 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -48,13 +48,10 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
 
   const firstColumn = chartData.units.slice(0, 1);
 
-  console.log(firstColumn);
-
   return h(
     PatternProvider,
     h("div.correlation-chart-inner", [
       h(TimescaleColumnExt, {
-        units: firstColumn[0],
         range,
         pixelScale,
         key: "timescale",

From f7a3f445c5e3965f19803cabfbeff2e263ecdf16 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 1 Jul 2024 00:24:14 -0500
Subject: [PATCH 142/151] Added gap-bound packages

---
 .../Run_with_Chrome_Debugger.xml              |  15 ++
 deps/web-components                           |   2 +-
 src/pages/correlation/+Page.ts                |  41 +--
 src/pages/correlation/column.ts               |  77 +++---
 src/pages/correlation/correlation-chart.ts    | 233 ++++++++++++++----
 src/pages/correlation/hash-string.ts          |  17 +-
 src/pages/correlation/types.ts                |  25 ++
 7 files changed, 308 insertions(+), 102 deletions(-)
 create mode 100644 .idea/runConfigurations/Run_with_Chrome_Debugger.xml
 create mode 100644 src/pages/correlation/types.ts

diff --git a/.idea/runConfigurations/Run_with_Chrome_Debugger.xml b/.idea/runConfigurations/Run_with_Chrome_Debugger.xml
new file mode 100644
index 00000000..036621be
--- /dev/null
+++ b/.idea/runConfigurations/Run_with_Chrome_Debugger.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run with Chrome Debugger" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <EXTENSION ID="com.intellij.lang.javascript.buildTools.npm.rc.StartBrowserRunConfigurationExtension">
+      <browser name="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" start="true" with-js-debugger="true" url="http://localhost:3000" />
+    </EXTENSION>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/deps/web-components b/deps/web-components
index 5f8030d5..8f5960d2 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 5f8030d53c96284f7e685f3c023065737c2e37b3
+Subproject commit 8f5960d2fc1365e9e999bfb7af4cc9e17a54f15c
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 780ea3cb..59f34e62 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -23,11 +23,15 @@ import { centroid } from "@turf/centroid";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
-import { getFocusedLineFromHashParams, HashStringManager } from "./hash-string";
+import {
+  getFocusedLineFromHashParams,
+  setHashStringForLine,
+} from "./hash-string";
 import { Button } from "@blueprintjs/core";
 import classNames from "classnames";
 import { ColumnIdentifier, CorrelationChart } from "./correlation-chart";
 import { DarkModeProvider } from "@macrostrat/ui-components";
+import { ErrorBoundary } from "@macrostrat/ui-components";
 
 interface CorrelationState {
   focusedLine: LineString | null;
@@ -67,6 +71,8 @@ const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
           coordinates: [...state.focusedLine.coordinates, point.coordinates],
         };
 
+        setHashStringForLine(focusedLine);
+
         return {
           ...state,
           focusedLine,
@@ -89,12 +95,9 @@ export function Page() {
     startup();
   }, []);
 
-  const focusedLine = useCorrelationDiagramStore((state) => state.focusedLine);
-
   return h(FullscreenPage, [
     h(
       DarkModeProvider,
-      h(HashStringManager, { focusedLine }),
       h("div.main-panel", [
         h("header", [h(PageBreadcrumbs)]),
         h("div.diagram-container", [
@@ -113,7 +116,10 @@ function CorrelationDiagramWrapper() {
 
   const columns = focusedColumns.map(columnGeoJSONRecordToColumnIdentifier);
 
-  return h("div.correlation-diagram", h(CorrelationChart, { columns }));
+  return h(
+    "div.correlation-diagram",
+    h(ErrorBoundary, h(CorrelationChart, { columns }))
+  );
 }
 
 function columnGeoJSONRecordToColumnIdentifier(
@@ -131,18 +137,27 @@ function InsetMap() {
   const columns = useCorrelationDiagramStore((state) => state.columns);
   const expanded = useCorrelationDiagramStore((state) => state.mapExpanded);
 
+  const padding = expanded ? 100 : 20;
+
   return h(
     "div.column-selection-map",
     { className: classNames({ expanded }) },
     [
       h(MapboxMapProvider, [
         h(MapExpandedButton),
-        h(MapView, { style: baseMapURL, accessToken: mapboxAccessToken }, [
-          h(MapClickHandler),
-          h(SectionLine, { focusedLine }),
-          h(ColumnsLayer, { columns }),
-          h(SelectedColumnsLayer),
-        ]),
+        h(
+          MapView,
+          {
+            style: baseMapURL,
+            accessToken: mapboxAccessToken,
+          },
+          [
+            h(MapClickHandler),
+            h(SectionLine, { focusedLine, padding }),
+            h(ColumnsLayer, { columns }),
+            h(SelectedColumnsLayer),
+          ]
+        ),
       ]),
     ]
   );
@@ -374,8 +389,6 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
         ],
       };
 
-      console.log(data);
-
       setGeoJSON(map, "crossSectionLine", data);
       setGeoJSON(map, "crossSectionEndpoints", {
         type: "FeatureCollection",
@@ -411,7 +424,7 @@ function SectionLine({ focusedLine }: { focusedLine: LineString }) {
     return bounds;
   }, [focusedLine]);
 
-  useMapEaseTo({ bounds, padding: 120 });
+  useMapEaseTo({ bounds, padding: 50, trackResize: true });
 
   return null;
 }
diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index 81111ee5..e0d1e629 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -7,11 +7,10 @@ import { hyperStyled } from "@macrostrat/hyper";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
 import { useDarkMode } from "@macrostrat/ui-components";
 import classNames from "classnames";
-import { group } from "d3-array";
 import { useContext, useMemo } from "react";
 import { AgeAxis } from "@macrostrat/column-views";
 import styles from "./column.module.scss";
-import { useState, useEffect } from "react";
+import { SectionRenderData } from "./types";
 import {
   CompositeUnitsColumn,
   TrackedLabeledUnit,
@@ -27,10 +26,8 @@ export function MacrostratColumnProvider(props) {
   return h(ColumnProvider, { axisType: ColumnAxisType.AGE, ...props });
 }
 
-interface IColumnProps {
-  data: IUnit[];
-  pixelScale?: number;
-  range?: [number, number];
+interface ISectionProps {
+  data: SectionRenderData;
   unitComponent?: React.FunctionComponent<any>;
   unitComponentProps?: any;
   showLabels?: boolean;
@@ -39,12 +36,10 @@ interface IColumnProps {
   targetUnitHeight?: number;
 }
 
-function Section(props: IColumnProps) {
+function Section(props: ISectionProps) {
   // Section with "squishy" timescale
   const {
     data,
-    range,
-    pixelScale,
     unitComponent,
     showLabels = true,
     width = 300,
@@ -52,6 +47,9 @@ function Section(props: IColumnProps) {
     unitComponentProps,
   } = props;
 
+  const { units, bestPixelScale: pixelScale, t_age, b_age } = data;
+  const range = [b_age, t_age];
+
   const dAge = range[0] - range[1];
 
   const height = dAge * pixelScale;
@@ -64,16 +62,16 @@ function Section(props: IColumnProps) {
     return {
       ...unitComponentProps,
       nColumns: Math.min(
-        Math.max(...data.map((d) => d.column)) + 1,
+        Math.max(...units.map((d) => d.column)) + 1,
         unitComponentProps?.nColumns ?? 2
       ),
     };
-  }, [data, unitComponentProps]);
+  }, [units, unitComponentProps]);
 
   return h(
     MacrostratColumnProvider,
     {
-      divisions: data,
+      divisions: units,
       range,
       pixelsPerMeter: pixelScale, // Actually pixels per myr
     },
@@ -128,9 +126,19 @@ function Unconformity({ upperUnits = [], lowerUnits = [], style }) {
   );
 }
 
-export function Column(
-  props: IColumnProps & { unconformityLabels: boolean; className?: string }
-) {
+interface IColumnProps {
+  data: SectionRenderData[];
+  unitComponent?: React.FunctionComponent<any>;
+  unitComponentProps?: any;
+  showLabels?: boolean;
+  width?: number;
+  columnWidth?: number;
+  targetUnitHeight?: number;
+  unconformityLabels: boolean;
+  className?: string;
+}
+
+export function Column(props: IColumnProps) {
   const {
     data,
     unitComponent = UnitComponent,
@@ -153,6 +161,8 @@ export function Column(
 
   const sectionGroups = [[0, data]];
 
+  console.log(data);
+
   const className = classNames(baseClassName, {
     "dark-mode": darkMode?.isEnabled ?? false,
   });
@@ -163,17 +173,17 @@ export function Column(
     h("div.column", [
       h(
         "div.main-column",
-        sectionGroups.map(([id, data], i) => {
-          const lastGroup = sectionGroups[i - 1]?.[1];
+        data.map((sectionData, i) => {
+          //const lastGroup = sectionGroups[i - 1]?.[1];
           return h([
-            h.if(unconformityLabels)(Unconformity, {
-              upperUnits: lastGroup,
-              lowerUnits: data,
-              style: { width: showLabels ? columnWidth : width },
-            }),
-            h(`div.section.section-${id}`, [
+            // h.if(unconformityLabels)(Unconformity, {
+            //   upperUnits: lastGroup,
+            //   lowerUnits: data,
+            //   style: { width: showLabels ? columnWidth : width },
+            // }),
+            h(`div.section.section-${i}`, [
               h(Section, {
-                data,
+                data: sectionData,
                 unitComponent,
                 showLabels,
                 width,
@@ -188,10 +198,13 @@ export function Column(
   );
 }
 
-export function TimescaleColumn(
-  props: IColumnProps & { unconformityLabels: boolean; className?: string }
-) {
-  const { className: baseClassName, range, pixelScale } = props;
+interface TimescaleColumnProps {
+  packages: SectionRenderData[];
+  className?: string;
+}
+
+export function TimescaleColumn(props: TimescaleColumnProps) {
+  const { className: baseClassName, packages } = props;
 
   const darkMode = useDarkMode();
 
@@ -215,10 +228,12 @@ export function TimescaleColumn(
       h("div.age-axis-label", "Age (Ma)"),
       h(
         "div.main-column",
-        sectionGroups.map(([id, data], i) => {
-          const lastGroup = sectionGroups[i - 1]?.[1];
+        packages.map((data, i) => {
+          const range = [data.b_age, data.t_age];
+          const pixelScale = data.bestPixelScale;
+
           return h([
-            h(`div.section.section-${id}`, [
+            h(`div.section.section-${i}`, [
               h(TimescaleSection, {
                 range,
                 pixelScale,
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index f218b043..48e1a4ba 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -1,14 +1,13 @@
 /** Correlation chart */
 import { preprocessUnits } from "@macrostrat/column-views";
 import { runColumnQuery } from "~/pages/map/map-interface/app-state/handlers/fetch";
-import { useAsyncEffect } from "use-async-effect";
 import { useState, useEffect } from "react";
 import { PatternProvider } from "~/_providers";
 import { Column, TimescaleColumn } from "./column";
 import { UnitLong } from "@macrostrat/api-types";
+import { GapBoundPackage, SectionRenderData, AgeComparable } from "./types";
 
 import h from "./main.module.sass";
-import { first } from "underscore";
 
 export interface ColumnIdentifier {
   col_id: number;
@@ -19,7 +18,7 @@ export interface ColumnIdentifier {
 export interface CorrelationChartData {
   t_age: number;
   b_age: number;
-  units: UnitLong[][]; // Units for each column
+  columnData: SectionRenderData[][]; // Units for each column
 }
 
 export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
@@ -28,40 +27,34 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
   useEffect(() => {
     const promises = columns.map((col) => fetchUnitsForColumn(col.col_id));
     Promise.all(promises).then((data) =>
-      setChartData(preprocessChartData(data))
+      setChartData(buildColumnData(data, AgeScaleMode.Broken))
     );
   }, [columns]);
 
-  if (chartData == null || chartData.units.length == 0) {
+  if (chartData == null || chartData.columnData.length == 0) {
     return null;
   }
 
+  console.log(chartData);
+
   const targetUnitHeight = 20;
 
   const { t_age, b_age } = chartData;
   const range = [b_age, t_age];
 
-  const dAge = b_age - t_age;
-  const maxNUnits = Math.max(...chartData.units.map((d) => d.length));
-  const targetHeight = targetUnitHeight * maxNUnits;
-  const pixelScale = Math.ceil(targetHeight / dAge);
-
-  const firstColumn = chartData.units.slice(0, 1);
+  const firstColumn = chartData.columnData[0];
 
   return h(
     PatternProvider,
     h("div.correlation-chart-inner", [
       h(TimescaleColumnExt, {
-        range,
-        pixelScale,
         key: "timescale",
+        packages: firstColumn,
       }),
       h(
-        chartData.units.map((units, i) =>
+        chartData.columnData.map((packages, i) =>
           h(SingleColumn, {
-            units: units,
-            range,
-            pixelScale,
+            packages,
             key: i,
           })
         )
@@ -70,64 +63,216 @@ export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
   );
 }
 
-function TimescaleColumnExt({
-  units,
-  range,
-  pixelScale,
-}: {
-  column: ColumnIdentifier;
-  units: UnitLong[];
-  range: [number, number];
-  pixelScale: number;
-}) {
+function TimescaleColumnExt({ packages }: { packages: SectionRenderData[] }) {
   return h("div.column", [
     h(TimescaleColumn, {
-      data: units,
       showLabels: false,
       unconformityLabels: true,
       width: 100,
       columnWidth: 100,
-      range,
-      pixelScale,
+      packages,
     }),
   ]);
 }
 
 function SingleColumn({
-  units,
-  range,
-  pixelScale,
+  packages,
 }: {
   column: ColumnIdentifier;
-  units: UnitLong[];
-  range: [number, number];
-  pixelScale: number;
+  packages: SectionRenderData[];
 }) {
   return h("div.column", [
     h(Column, {
-      data: units,
+      data: packages,
       showLabels: false,
       unconformityLabels: true,
       width: 100,
       columnWidth: 100,
-      range,
-      pixelScale,
     }),
   ]);
 }
 
-async function fetchUnitsForColumn(col_id: number) {
+type ColumnData = {
+  units: UnitLong[];
+  columnID: number;
+};
+
+async function fetchUnitsForColumn(col_id: number): Promise<ColumnData> {
   const res = await runColumnQuery({ col_id }, null);
-  return preprocessUnits(res);
+  return { columnID: col_id, units: preprocessUnits(res) };
+}
+
+const targetUnitHeight = 20;
+
+function preprocessChartData(
+  columnData: SectionRenderData[][]
+): CorrelationChartData {
+  const [b_age, t_age] = findEncompassingScaleBounds(columnData.flat());
+  return { columnData, b_age, t_age };
+}
+
+enum AgeScaleMode {
+  Continuous = "continuous",
+  Broken = "broken",
 }
 
-function preprocessChartData(units: UnitLong[][]): CorrelationChartData {
+function buildColumnData(
+  columns: ColumnData[],
+  ageMode: AgeScaleMode = AgeScaleMode.Continuous
+): CorrelationChartData {
+  // Create a single gap-bound package for each column
+  const units = columns.map((d) => d.units);
   const [b_age, t_age] = findEncompassingScaleBounds(units.flat());
-  return { units, b_age, t_age };
+
+  if (ageMode == AgeScaleMode.Continuous) {
+    const dAge = b_age - t_age;
+    const maxNUnits = Math.max(...units.map((d) => d.length));
+    const targetHeight = targetUnitHeight * maxNUnits;
+    const pixelScale = Math.ceil(targetHeight / dAge);
+
+    const columnData: SectionRenderData[][] = columns.map((d) => {
+      return [
+        {
+          b_age,
+          t_age,
+          bestPixelScale: pixelScale,
+          ...d,
+        },
+      ];
+    });
+
+    return { columnData, b_age, t_age };
+  }
+
+  let pkgs: GapBoundPackage[] = [];
+  for (const column of columns) {
+    pkgs.push(...findGapBoundPackages(column));
+  }
+  pkgs = mergeOverlappingGapBoundPackages(pkgs);
+  pkgs.sort((a, b) => a.b_age - b.b_age);
+
+  // Get the best pixel scale for each gap-bound package
+  const pixelScales = pkgs.map(findBestPixelScale);
+  console.log(pixelScales);
+
+  const columnData = columns.map((d, i) => {
+    return pkgs.map((pkg): SectionRenderData => {
+      const { t_age, b_age } = pkg;
+      return {
+        t_age,
+        b_age,
+        columnID: d.columnID,
+        bestPixelScale: pixelScales[i],
+        units: pkg.unitIndex.get(d.columnID) ?? [],
+      };
+    });
+  });
+
+  return { columnData, b_age, t_age };
+
+  // const packages = findGapBoundPackagesSharedByMultipleColumns(units);
+  // console.log(packages);
+  // const columns = units.map((d, i) =>
+  //   recoverGapBoundPackagesForColumn(packages, i)
+  // );
+  // return preprocessChartData(columns);
+}
+
+function findBestPixelScale(pkg: GapBoundPackage) {
+  const dAge = pkg.b_age - pkg.t_age;
+  const maxNUnits = Math.max(
+    ...Array.from(pkg.unitIndex.values()).map((d) => d.length)
+  );
+  const targetHeight = targetUnitHeight * maxNUnits;
+  return targetHeight / dAge;
+}
+
+function mergeOverlappingGapBoundPackages(
+  packages: GapBoundPackage[]
+): GapBoundPackage[] {
+  // Sort by t_age
+  let remainingPackages: GapBoundPackage[] = packages;
+  let newPackages: GapBoundPackage[] = [];
+  while (remainingPackages.length > 0) {
+    const pkg = remainingPackages.pop();
+    const overlapping = findOverlapping(pkg, remainingPackages);
+    newPackages.push(mergePackages(pkg, ...overlapping));
+    remainingPackages = remainingPackages.filter(
+      (d) => !overlapping.includes(d)
+    );
+  }
+  if (newPackages.length < packages.length) {
+    return mergeOverlappingGapBoundPackages(newPackages);
+  } else {
+    return newPackages;
+  }
+  // Chunk by divisions where t_age is less than the next b_age
 }
 
-function findEncompassingScaleBounds(units: UnitLong[]) {
+function findEncompassingScaleBounds(units: AgeComparable[]) {
   const b_age = Math.max(...units.map((d) => d.b_age));
   const t_age = Math.min(...units.map((d) => d.t_age));
   return [b_age, t_age];
 }
+
+function mergePackages(...packages: GapBoundPackage[]): GapBoundPackage {
+  return packages.reduce(
+    (a: GapBoundPackage, b: GapBoundPackage) => {
+      a.b_age = Math.max(a.b_age, b.b_age);
+      a.t_age = Math.min(a.t_age, b.t_age);
+      for (let [columnID, units] of b.unitIndex) {
+        if (a.unitIndex.has(columnID)) {
+          a.unitIndex.set(columnID, a.unitIndex.get(columnID).concat(units));
+        } else {
+          a.unitIndex.set(columnID, units);
+        }
+      }
+      return a;
+    },
+    {
+      b_age: -Infinity,
+      t_age: Infinity,
+      unitIndex: new Map(),
+    }
+  );
+}
+
+function findGapBoundPackages(columnData: ColumnData): GapBoundPackage[] {
+  /** Find chunks of units overlapping in time, separated by unconformities */
+  const { units, columnID } = columnData;
+  let packages: GapBoundPackage[] = [];
+  for (let unit of columnData.units) {
+    const newPackage: GapBoundPackage = {
+      b_age: unit.b_age,
+      t_age: unit.t_age,
+      unitIndex: new Map([[columnID, [unit]]]),
+    };
+
+    const overlappingPackages: GapBoundPackage[] = findOverlapping(
+      newPackage,
+      packages
+    );
+
+    // If the unit overlaps with some packages, remove them.
+    packages = packages.filter((d) => !overlappingPackages.includes(d));
+
+    // Merge the overlapping packages with the new package
+    if (overlappingPackages.length > 0) {
+      packages.push(mergePackages(newPackage, ...overlappingPackages));
+    } else {
+      packages.push(newPackage);
+    }
+  }
+  return packages;
+}
+
+function findOverlapping<T extends AgeComparable>(
+  a: AgeComparable,
+  collection: T[]
+): T[] {
+  return collection.filter((d) => ageOverlaps(a, d));
+}
+
+function ageOverlaps(a: AgeComparable, b: AgeComparable) {
+  return a.t_age <= b.b_age && a.b_age >= b.t_age;
+}
diff --git a/src/pages/correlation/hash-string.ts b/src/pages/correlation/hash-string.ts
index 31dfb370..254477f2 100644
--- a/src/pages/correlation/hash-string.ts
+++ b/src/pages/correlation/hash-string.ts
@@ -39,16 +39,9 @@ export function getFocusedLineFromHashParams(): LineString | null {
   }
 }
 
-export function HashStringManager({ focusedLine }) {
-  useEffect(() => {
-    if (focusedLine == null || focusedLine.coordinates.length < 2) {
-      return;
-    }
-    let hash = {
-      line: focusedLine.coordinates.flatMap((coord) => coord.map(fmt2)),
-    };
-    setHashString(hash);
-  }, [focusedLine]);
-
-  return null;
+export function setHashStringForLine(focusedLine: LineString) {
+  let hash = {
+    line: focusedLine.coordinates.flatMap((coord) => coord.map(fmt2)),
+  };
+  setHashString(hash);
 }
diff --git a/src/pages/correlation/types.ts b/src/pages/correlation/types.ts
new file mode 100644
index 00000000..28408879
--- /dev/null
+++ b/src/pages/correlation/types.ts
@@ -0,0 +1,25 @@
+import { UnitLong } from "@macrostrat/api-types";
+
+export interface AgeComparable {
+  b_age: number;
+  t_age: number;
+}
+
+export interface CorrelatedGapBoundPackage extends AgeComparable {
+  units: UnitLong[][];
+  bestPixelScale: number;
+}
+
+type ColumnID = number;
+
+export type ColumnUnitIndex = Map<ColumnID, UnitLong[]>;
+
+export interface GapBoundPackage extends AgeComparable {
+  unitIndex: ColumnUnitIndex;
+}
+
+export interface SectionRenderData extends AgeComparable {
+  columnID: ColumnID;
+  units: UnitLong[];
+  bestPixelScale: number;
+}

From 0a27f71af6975b2d757aa4bbea818abb62be83bc Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 13:45:00 -0400
Subject: [PATCH 143/151] merged with start

---
 deps/cesium-martini                         |    2 +-
 deps/cesium-viewer                          |    2 +-
 deps/web-components                         |    2 +-
 src/pages/dev/test-site/main-page/main.styl |    7 +-
 yarn.lock                                   | 5811 +------------------
 5 files changed, 139 insertions(+), 5685 deletions(-)

diff --git a/deps/cesium-martini b/deps/cesium-martini
index f94340af..88779c30 160000
--- a/deps/cesium-martini
+++ b/deps/cesium-martini
@@ -1 +1 @@
-Subproject commit f94340af535a9e0ac14d8d8f5e3c73a0a4e5109a
+Subproject commit 88779c309961a49df791d70efe9cc42adccb61e9
diff --git a/deps/cesium-viewer b/deps/cesium-viewer
index cdca09dc..eb405972 160000
--- a/deps/cesium-viewer
+++ b/deps/cesium-viewer
@@ -1 +1 @@
-Subproject commit cdca09dc9a01ba35987582d57b5627bc7bb7b4a6
+Subproject commit eb4059725eb55454626f643179f7f3b189f23353
diff --git a/deps/web-components b/deps/web-components
index 09590e10..5c409881 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 09590e103921ab3f06d11f65e18c91a87e0b4671
+Subproject commit 5c409881df9a53c68d5e7696d45f89baac3ddf06
diff --git a/src/pages/dev/test-site/main-page/main.styl b/src/pages/dev/test-site/main-page/main.styl
index 9c5bc4e5..e89a01e9 100644
--- a/src/pages/dev/test-site/main-page/main.styl
+++ b/src/pages/dev/test-site/main-page/main.styl
@@ -15,11 +15,8 @@ a:hover
 .nohighlight
   color: white
 
-.parent
-  height: 100vh
-
-.left
-  width: 70%
+.start
+  width: 100%
   display: flex;
   justify-content: center;
   align-items: center;  
diff --git a/yarn.lock b/yarn.lock
index de1dacff..6d7ddd9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,16 +52,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0-beta.35, @babel/code-frame@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/code-frame@npm:7.24.7"
-  dependencies:
-    "@babel/highlight": "npm:^7.24.7"
-    picocolors: "npm:^1.0.0"
-  checksum: 10/4812e94885ba7e3213d49583a155fdffb05292330f0a9b2c41b49288da70cf3c746a3fda0bf1074041a6d741c33f8d7be24be5e96f41ef77395eeddc5c9ff624
-  languageName: node
-  linkType: hard
-
 "@babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
@@ -103,36 +93,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/compat-data@npm:7.24.7"
-  checksum: 10/6edc09152ca51a22c33741c441f33f9475598fa59edc53369edb74b49f4ea4bef1281f5b0ed2b9b67fb66faef2da2069e21c4eef83405d8326e524b301f4e7e2
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.0.0":
-  version: 7.24.7
-  resolution: "@babel/core@npm:7.24.7"
-  dependencies:
-    "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helpers": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-    convert-source-map: "npm:^2.0.0"
-    debug: "npm:^4.1.0"
-    gensync: "npm:^1.0.0-beta.2"
-    json5: "npm:^2.2.3"
-    semver: "npm:^6.3.1"
-  checksum: 10/ef8cc1afa3ccecee6d1f5660c487ccc2a3f25106830ea9040e80ef4b2092e053607ee4ddd03493e4f7ef2f9967a956ca53b830d54c5bee738eeb58cce679dd4a
-  languageName: node
-  linkType: hard
-
 "@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.12, @babel/core@npm:^7.19.6, @babel/core@npm:^7.22.9, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
   version: 7.22.20
   resolution: "@babel/core@npm:7.22.20"
@@ -320,18 +280,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/generator@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-    "@jridgewell/gen-mapping": "npm:^0.3.5"
-    "@jridgewell/trace-mapping": "npm:^0.3.25"
-    jsesc: "npm:^2.5.1"
-  checksum: 10/c71d24a4b41b19c10d2f2eb819f27d4cf94220e2322f7c8fed8bfbbb115b2bebbdd6dc1f27dac78a175e90604def58d763af87e0fa81ce4ab1582858162cf768
-  languageName: node
-  linkType: hard
-
 "@babel/helper-annotate-as-pure@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -341,15 +289,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-annotate-as-pure@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/a9017bfc1c4e9f2225b967fbf818004703de7cf29686468b54002ffe8d6b56e0808afa20d636819fcf3a34b89ba72f52c11bdf1d69f303928ee10d92752cad95
-  languageName: node
-  linkType: hard
-
 "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15, @babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
@@ -359,16 +298,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.7"
-  dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/3ddff45d1e086c9c6dcef53ef46521a0c11ddb09fe3ab42dca5af6bb1b1703895a9f4f8056f49fdf53c2dbf6e5cf1ddb4baf17d7e3766c63f051ab8d60a919ee
-  languageName: node
-  linkType: hard
-
 "@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
   version: 7.22.15
   resolution: "@babel/helper-compilation-targets@npm:7.22.15"
@@ -395,19 +324,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
-  dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
-    browserslist: "npm:^4.22.2"
-    lru-cache: "npm:^5.1.1"
-    semver: "npm:^6.3.1"
-  checksum: 10/8f8bc89af70a606ccb208513aa25d83e19b88f91b64a33174f7701a9479e67ddbb0a9c89033265070375cd24e690b93380b3a3ea11e4b3a711d742f0f4699ee7
-  languageName: node
-  linkType: hard
-
 "@babel/helper-create-class-features-plugin@npm:^7.12.1, @babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
@@ -465,25 +381,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
-    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    semver: "npm:^6.3.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/8ecb1c2acc808e1e0c21dccc7ea6899de9a140cb1856946800176b4784de6fccd575661fbff7744bb895d01aa6956ce963446b8577c4c2334293ba5579d5cdb9
-  languageName: node
-  linkType: hard
-
 "@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
@@ -497,19 +394,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    regexpu-core: "npm:^5.3.1"
-    semver: "npm:^6.3.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/dd7238af30ea6b26a627192422822ae810873fd899150dd8d4348eb107045721a849abcfa2bd04f917493784a93724b8caf6994c31afd16f9347a8a9b9862425
-  languageName: node
-  linkType: hard
-
 "@babel/helper-define-polyfill-provider@npm:^0.4.2":
   version: 0.4.2
   resolution: "@babel/helper-define-polyfill-provider@npm:0.4.2"
@@ -562,15 +446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/079d86e65701b29ebc10baf6ed548d17c19b808a07aa6885cc141b690a78581b180ee92b580d755361dc3b16adf975b2d2058b8ce6c86675fcaf43cf22f2f7c6
-  languageName: node
-  linkType: hard
-
 "@babel/helper-function-name@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-function-name@npm:7.22.5"
@@ -591,16 +466,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-function-name@npm:7.24.7"
-  dependencies:
-    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/2ceb3d9b2b35a0fc4100fc06ed7be3bc38f03ff0bf128ff0edbc0cc7dd842967b1496fc70b5c616c747d7711c2b87e7d025c8888f48740631d6148a9d3614f85
-  languageName: node
-  linkType: hard
-
 "@babel/helper-hoist-variables@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-hoist-variables@npm:7.22.5"
@@ -610,15 +475,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/6cfdcf2289cd12185dcdbdf2435fa8d3447b797ac75851166de9fc8503e2fd0021db6baf8dfbecad3753e582c08e6a3f805c8d00cbed756060a877d705bd8d8d
-  languageName: node
-  linkType: hard
-
 "@babel/helper-member-expression-to-functions@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/helper-member-expression-to-functions@npm:7.22.15"
@@ -646,16 +502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.7"
-  dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/d990752aaff311aba0ca61539e1776c5ba2818836403f9bafac849deb4cd24c082cbde5f23e490b7f3614c95ff67f8d75fa5e2f14cb00586a72c96c158e1127b
-  languageName: node
-  linkType: hard
-
 "@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5":
   version: 7.22.15
   resolution: "@babel/helper-module-imports@npm:7.22.15"
@@ -674,16 +520,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-module-imports@npm:7.24.7"
-  dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/df8bfb2bb18413aa151ecd63b7d5deb0eec102f924f9de6bc08022ced7ed8ca7fed914562d2f6fa5b59b74a5d6e255dc35612b2bc3b8abf361e13f61b3704770
-  languageName: node
-  linkType: hard
-
 "@babel/helper-module-transforms@npm:^7.22.15, @babel/helper-module-transforms@npm:^7.22.20, @babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.22.9":
   version: 7.22.20
   resolution: "@babel/helper-module-transforms@npm:7.22.20"
@@ -729,21 +565,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-module-transforms@npm:7.24.7"
-  dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-module-imports": "npm:^7.24.7"
-    "@babel/helper-simple-access": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    "@babel/helper-validator-identifier": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/4f2b232bf6d1be8d3a72b084a2a7ac1b0b93ea85717411a11ae1fb6375d4392019e781d8cc155789e649a2caa7eec378dd1404210603d6d4230f042c5feacffb
-  languageName: node
-  linkType: hard
-
 "@babel/helper-optimise-call-expression@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
@@ -753,15 +574,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-optimise-call-expression@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/da7a7f2d1bb1be4cffd5fa820bd605bc075c7dd014e0458f608bb6f34f450fe9412c8cea93e788227ab396e0e02c162d7b1db3fbcb755a6360e354c485d61df0
-  languageName: node
-  linkType: hard
-
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.22.5
   resolution: "@babel/helper-plugin-utils@npm:7.22.5"
@@ -776,13 +588,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-plugin-utils@npm:7.24.7"
-  checksum: 10/dad51622f0123fdba4e2d40a81a6b7d6ef4b1491b2f92fd9749447a36bde809106cf117358705057a2adc8fd73d5dc090222e0561b1213dae8601c8367f5aac8
-  languageName: node
-  linkType: hard
-
 "@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5, @babel/helper-remap-async-to-generator@npm:^7.22.9":
   version: 7.22.20
   resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
@@ -796,19 +601,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-wrap-function": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/4b7c925e71811902c8aa57904044921027eae10ac9b5b029df491ed4abc1ea18b450a7923fd0feb1248ae37703889e72b6c27f2a0e2d5811103c7655c49ad355
-  languageName: node
-  linkType: hard
-
 "@babel/helper-replace-supers@npm:^7.22.20, @babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
   version: 7.22.20
   resolution: "@babel/helper-replace-supers@npm:7.22.20"
@@ -835,19 +627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-replace-supers@npm:7.24.7"
-  dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
-    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/18b7c3709819d008a14953e885748f3e197537f131d8f7ae095fec245506d854ff40b236edb1754afb6467f795aa90ae42a1d961a89557702249bacfc3fdad19
-  languageName: node
-  linkType: hard
-
 "@babel/helper-simple-access@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-simple-access@npm:7.22.5"
@@ -866,16 +645,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-simple-access@npm:7.24.7"
-  dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/5083e190186028e48fc358a192e4b93ab320bd016103caffcfda81302a13300ccce46c9cd255ae520c25d2a6a9b47671f93e5fe5678954a2329dc0a685465c49
-  languageName: node
-  linkType: hard
-
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0, @babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
@@ -885,16 +654,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.7"
-  dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/784a6fdd251a9a7e42ccd04aca087ecdab83eddc60fda76a2950e00eb239cc937d3c914266f0cc476298b52ac3f44ffd04c358e808bd17552a7e008d75494a77
-  languageName: node
-  linkType: hard
-
 "@babel/helper-split-export-declaration@npm:^7.22.6":
   version: 7.22.6
   resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
@@ -913,15 +672,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/ff04a3071603c87de0d6ee2540b7291ab36305b329bd047cdbb6cbd7db335a12f9a77af1cf708779f75f13c4d9af46093c00b34432e50b2411872c658d1a2e5e
-  languageName: node
-  linkType: hard
-
 "@babel/helper-string-parser@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-string-parser@npm:7.22.5"
@@ -943,13 +693,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-string-parser@npm:7.24.7"
-  checksum: 10/603d8d962bbe89907aa99a8f19a006759ab7b2464615f20a6a22e3e2e8375af37ddd0e5175c9e622e1c4b2d83607ffb41055a59d0ce34404502af30fde573a5c
-  languageName: node
-  linkType: hard
-
 "@babel/helper-validator-identifier@npm:^7.22.19, @babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.22.5":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
@@ -964,13 +707,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
-  checksum: 10/86875063f57361471b531dbc2ea10bbf5406e12b06d249b03827d361db4cad2388c6f00936bcd9dc86479f7e2c69ea21412c2228d4b3672588b754b70a449d4b
-  languageName: node
-  linkType: hard
-
 "@babel/helper-validator-option@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/helper-validator-option@npm:7.22.15"
@@ -985,13 +721,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-option@npm:7.24.7"
-  checksum: 10/9689166bf3f777dd424c026841c8cd651e41b21242dbfd4569a53086179a3e744c8eddd56e9d10b54142270141c91581b53af0d7c00c82d552d2540e2a919f7e
-  languageName: node
-  linkType: hard
-
 "@babel/helper-wrap-function@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-wrap-function@npm:7.22.20"
@@ -1003,18 +732,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-wrap-function@npm:7.24.7"
-  dependencies:
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/1c248accfbb09a891293840506e3fbfc807b524abf16fc32115a6e73f760387d2dc7935282b48caa281c8033bf93dc80eca7649250524cfb95da8643771bca02
-  languageName: node
-  linkType: hard
-
 "@babel/helpers@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/helpers@npm:7.22.15"
@@ -1070,16 +787,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helpers@npm:7.24.7"
-  dependencies:
-    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/f7496f0d7a0b13ea86136ac2053371027125734170328215f8a90eac96fafaaae4e5398c0729bdadf23261c00582a31e14bc70113427653b718220641a917f9d
-  languageName: node
-  linkType: hard
-
 "@babel/highlight@npm:^7.22.13":
   version: 7.22.20
   resolution: "@babel/highlight@npm:7.22.20"
@@ -1114,18 +821,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/highlight@npm:7.24.7"
-  dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.24.7"
-    chalk: "npm:^2.4.2"
-    js-tokens: "npm:^4.0.0"
-    picocolors: "npm:^1.0.0"
-  checksum: 10/69b73f38cdd4f881b09b939a711e76646da34f4834f4ce141d7a49a6bb1926eab1c594148970a8aa9360398dff800f63aade4e81fafdd7c8d8a8489ea93bfec1
-  languageName: node
-  linkType: hard
-
 "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.3.3":
   version: 7.22.16
   resolution: "@babel/parser@npm:7.22.16"
@@ -1189,15 +884,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/parser@npm:7.24.7"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: 10/ef9ebce60e13db560ccc7af9235d460f6726bb7e23ae2d675098c1fc43d5249067be60d4118889dad33b1d4f85162cf66baf554719e1669f29bb20e71322568e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
   version: 7.24.5
   resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
@@ -1210,18 +896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
-  dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/d5091ca6b58c54316c4d3b6e8120a1bb70cfe2e61cb7ec11f5fdc8ba3ff5124de21e527fabc28f239bf6efc0660046aa416e8fc1e3d920d0e57b78edb507ec3f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
@@ -1255,17 +929,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/f0e0e9bdcf5479f8c5b4494353dc64dee37205e5ffd30920e649e75537a8f795cdcf32dfb40a00e908469a5d61cf62806bc359294cb2a6f2e604bf4efe086301
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
@@ -1305,19 +968,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: 10/887f1b8bd0ef61206ece47919fda78a32eef35da31c0d95ab8d7adc8b4722534dc5177c86c8d6d81bcf4343f3c08c6adab2b46cfd2bea8e33c6c04e51306f9cc
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7":
   version: 7.23.7
   resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7"
@@ -1342,18 +992,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
-  dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/ad63317eb72ca7e160394e9223768b1f826287eaf65297f2794d0203510225f20dd9858bce217af4a050754abf94565841617b45b35a2de355c4e2bba546b39c
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-proposal-class-properties@npm:7.12.1":
   version: 7.12.1
   resolution: "@babel/plugin-proposal-class-properties@npm:7.12.1"
@@ -1533,17 +1171,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/bd065cd73ae3dbe69e6f9167aa605da3df77d69bbad2ede95e4aa9e7af7744d5bc1838b928c77338ca62df7691a7adf6e608279be50c18e4b3c70cf77e3013d7
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-syntax-import-attributes@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5"
@@ -1577,17 +1204,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/22fc50bd85a491bb8d22065f330a41f60d66f2f2d7a1deb73e80c8a4b5d7a42a092a03f8da18800650eca0fc14585167cc4e5c9fab351f0d390d1592347162ae
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3":
   version: 7.10.4
   resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
@@ -1787,17 +1403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/6720173645826046878015c579c2ca9d93cdba79a2832f0180f5cf147d9817c85bf9c8338b16d6bdaa71f87809b7a194a6902e6c82ec00b6354aca6b40abe5e6
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-async-generator-functions@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.15"
@@ -1840,20 +1445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
-  dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
-    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/cf0a4b5ffc6d7f3f3bf12d4792535e8a46332714211326fd5058a6e45988891ee402b26cb9cc6c7121b2c8283ebd160e431827f885bdfa51d6127f934bd9ba7f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-async-to-generator@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5"
@@ -1893,19 +1484,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.7"
-  dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/b2041d9d50b09afef983c4f1dece63fdfc5a8e4646e42591db398bc4322958434d60b3cb0f5d0f9f9dbdad8577e8a1a33ba9859aacc3004bf6d25d094d20193f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
@@ -1939,17 +1517,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/33e2fb9f24c11889b2bacbe9c3625f738edafc2136c8206598e0422664267ec5ca9422cb4563cc42039ccfc333fb42ce5f8513382e56c5b02f934005d0d6e8ff
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-block-scoping@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-block-scoping@npm:7.22.15"
@@ -1983,17 +1550,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/9656e7bb0673279e18d9f9408027786f1b20d657e2cc106456e0bd7826bd12d81813299adbef2b2a5837b05740f2295fe8fb62389122d38c9e961b3005270777
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-class-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
@@ -2030,18 +1586,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/1c6f645dd3889257028f27bfbb04526ac7676763a923fc8203aa79aa5232820e0201cb858c73b684b1922327af10304121ac013c7b756876d54560a9c1a7bc79
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-class-static-block@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
@@ -2081,19 +1625,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: 10/00b4d35788bcfefb56b6a1d3506ca23f11dd55d4bb5a34eb70397c06283dc7f596cd9d40995c4a6cb897b45ad220de211f854e7a030a05e26a307c8f56b6ba4b
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-classes@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-classes@npm:7.22.15"
@@ -2149,24 +1680,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-classes@npm:7.24.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    globals: "npm:^11.1.0"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/5d5577fcb0ec9ef33d889358c54720abe462325bed5483d71f9aa0a704f491520777be5411d6fd8a08a8ebe352e2445d46d1e6577a5a2c9333bc37b9ff8b9a74
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-computed-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5"
@@ -2203,18 +1716,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/template": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/fecf3c770b2dd8e70be6da12d4dd0273de9d8ef4d0f46be98d56fddb3a451932cdc9bb81de3057c9acb903e05ece657886cc31886d5762afa7b0a256db0f791e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-destructuring@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-destructuring@npm:7.22.15"
@@ -2248,17 +1749,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/eec43df24a07b3c61f335883e50c6642762fdd3cc5c5f95532cebeb51ea9bf77ca9a38011b678d91549dd75e29e1c58bd6e0ebc34bb763c300bc2cc65801e663
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-dotall-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
@@ -2295,18 +1785,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/51b75638748f6e5adab95b711d3365b8d7757f881c178946618a43b15063ec1160b07f4aa3b116bf3f1e097a88226a01db4cae2c5c4aad4c71fe5568828a03f5
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
@@ -2340,17 +1818,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/4284d8fe058c838f80d594bace1380ce02995fa9a271decbece59c40815bc2f7e715807dcbe4d5da8b444716e6d05cc6d79771f500fb044cd0dd00ce4324b619
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-dynamic-import@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
@@ -2387,18 +1854,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/e949c02aa57098d916eb6edcbef0f3f7d62640f37e1a061b0692523964e081f8182f2c4292173b4dbea4edb8d146e65d6a20ce4b6b5f8c33be34bd846ae114ea
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-exponentiation-operator@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5"
@@ -2435,18 +1890,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.7"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/014b211f73a524ee98441541ddc4f6b067eefcf94d509e99074a45ea8c3f3ad0e36cab6f5f96666ac05b747a21fa6fda949aa25153656bb2821545a4b302e0d4
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
@@ -2483,18 +1926,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/d59d21945d2fd1ead914bb21f909f75b70ebe0e7627c2b1326ce500babca4c8e4a2513af6899d92e06e87186c61ee5087209345f5102fb4ff5a0e47e7b159a2c
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-flow-strip-types@npm:^7.12.10, @babel/plugin-transform-flow-strip-types@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5"
@@ -2554,18 +1985,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-for-of@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/ea471ad1345f1153f7f72f1f084e74f48dc349272ca1b2d8710b841b015c9861d673e12c3c98d42ab3c640cb6ab88bb9a8da1f4ca9c57a8f71f00815fa23ecef
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-function-name@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-function-name@npm:7.22.5"
@@ -2605,19 +2024,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
-  dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/9d4dcffea45acd255fed4a97e372ada234579f9bae01a4d0ced657091f159edf1635ff2a666508a08f8e59390def09ae6ce8372679faad894aa6f3247728ebe1
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-json-strings@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
@@ -2654,18 +2060,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-json-strings@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/5549dc97fc2d429a089d14ccfd51d8b3ba23c39b79edfe6d754e804fb1d50e6a4c070e73550be514a919c4db1553d8e6f7406178d68756b5959afe025a602cb2
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-literals@npm:7.22.5"
@@ -2699,17 +2093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/bf341a5a0ffb5129670ac9a14ea53b67bd1d3d0e13173ce7ac2d4184c4b405d33f67df68c59a2e94a895bf80269ec1df82c011d9ddb686f9f08a40c37b881177
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
@@ -2746,18 +2129,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/e39581cf1f9a43330b8340177c618fdb3232deb03faab1937819ef39327660a1fe94fd0ec2f66d1f5b5f98acba68871a77a9931588011c13dded3d7094ecc9de
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-member-expression-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5"
@@ -2791,17 +2162,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/837b60ea42fc69a430c8f7fb124247ba009ff6d93187a521fe9f83556fe124715bd46533b1684a3e139f272849a14d1d4faf3397bde13714f99ce0938526ea6f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-amd@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-modules-amd@npm:7.22.5"
@@ -2838,18 +2198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.7"
-  dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/66465ffba49af7a7b7a62995eb58f591ecd23ab42b0c67f8a70020177b3789d2a379bd6cbb68cbd09a69fd75c38a91f5a09ea70f5c8347bf4c6ea81caa0f6c6b
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-commonjs@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.15"
@@ -2889,19 +2237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.7"
-  dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-simple-access": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/9bd10cd03cce138a644f4e671025058348d8ff364253122bed60f9a2a32759445b93e8a6501773491cb19906602b18fd26255df0caac425343a1584599b36b24
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-systemjs@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.11"
@@ -2944,20 +2279,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
-  dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-validator-identifier": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/14f0ed1a252a2a04e075cd9051b809e33cd45374a2495dc0a428517893b8e951819acc8343c61d348c51ba54e42660bc93990a77aa3460d16a1c21d52d9c2cf1
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-modules-umd@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5"
@@ -2994,18 +2315,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.7"
-  dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/cef9c8917b3c35c3b6cb424dc2e6f74016122f1d25c196e2c7e51eb080d95e96c5d34966c0d5b9d4e17b8e60d455a97ed271317ed104e0e70bff159830a59678
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
@@ -3018,18 +2327,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/b0ecb1afd22946b21fb8f34e826cfbfea4b5337f7592a5ff8af7937eddec4440149c59d2d134b4f21b2ed91b57611f39b19827729e19d99b7c11eaf614435f83
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-new-target@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
@@ -3063,17 +2360,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-new-target@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/91b6a7439b7622f80dc755ddfb9ab083355bedc0b2af18e7c7a948faed14467599609331c8d59cfab4273640e3fc36e4cd02ad5b6dcb4a428f5a8baefc507acc
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
@@ -3110,18 +2396,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/113cd24b6ce4d0a8e54ad9324428244942ce752a3fd38f8b615c3a786641ec18a00a01b662fe4cbebf369358f5904a975bbde0a977b839f2438b16f0d7d1dd36
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-numeric-separator@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
@@ -3158,18 +2432,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/dc5bb0534889d207b1da125635471c42da61a4a4e9e68855f24b1cd04ccdcf8325b2c29112e719913c2097242e7e62d660e0fea2a46f3a9a983c9d02a0ec7a04
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
@@ -3214,20 +2476,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.7"
-  dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/d586995dc3396bbf8fb75b84f0a3548d923e4c3500bb414641a7fe30762a4ffd82987887fece6381f600d8de2da1e3310fc9a725271724d35f9020fcd5d4b2a3
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-object-super@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-object-super@npm:7.22.5"
@@ -3264,18 +2512,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-object-super@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/382739a017972d7126416b958ea81b4b950b6275414908a54bfef6aeed9b9fcc6c8d247db3a1134b09a3b355a60039670ce41ee41c626f8acec70f49c3c8d2a6
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
@@ -3312,18 +2548,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/605ae3764354e83f73c1e6430bac29e308806abcce8d1369cf69e4921771ff3592e8f60ba60c15990070d79b8d8740f0841069d64b466b3ce8a8c43e9743da7e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-optional-chaining@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.15"
@@ -3363,19 +2587,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/0835caa8fa8561ba5da8edb82aee93aef8e5145eae33e5400569bb4fae879c596cd35d3bfe7519b222261fc370b1291c499870ca6ad9903e1a71cfaaa27a5454
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-parameters@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
@@ -3409,17 +2620,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/41ff6bda926fabfb2e5d90b70621f279330691bed92009297340a8e776cfe9c3f2dda6afbc31dd3cbdccdfa9a5c57f2046e3ccc84f963c3797356df003d1703a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-private-methods@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
@@ -3456,18 +2656,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/5338df2aae53c43e6a7ea0c44f20a1100709778769c7e42d4901a61945c3200ba0e7fca83832f48932423a68528219fbea233cb5b8741a2501fdecbacdc08292
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
@@ -3510,20 +2698,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.7"
-  dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/a23ee18340818e292abfcb98b1086a188c81d640b1045e6809e9a3e8add78f9cb26607774de4ed653cbecd4277965dc4f4f1affc3504682209bb2a65fd4251f8
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-property-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-property-literals@npm:7.22.5"
@@ -3557,17 +2731,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-property-literals@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/71708890fe007d45ad7a130150a2ba1fea0205f575b925ca2e1bb65018730636a68e65c634a474e5b658378d72871c337c953560009c081a645e088769bf168a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-react-display-name@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5"
@@ -3758,18 +2921,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-regenerator@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    regenerator-transform: "npm:^0.15.2"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/70fa2bb36d3e2ce69a25c7227da8ad92307ab7b50cb6dfcc4dc5ce8f1cc79b0fcf997292a1cb3b4ae7cb136f515d1b2c3fb78c927bdba8d719794430403eb0c6
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-reserved-words@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5"
@@ -3803,17 +2954,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/64a2669671bb97c3dee3830a82c3e932fe6e02d56a4053c6ee4453d317b5f436d3d44907fbb0f4fbd8a56ebee34f6aee250e49743b7243d14d00c069215f3113
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-shorthand-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
@@ -3847,17 +2987,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/c68c2be965007e0cb6667daa209bc0af877cab4b327ef2e21b2114c38554243c3f7fdcc5b03679b20f72a26d966aa646af771f3165c882067e85a3887647f028
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-spread@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-spread@npm:7.22.5"
@@ -3894,18 +3023,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-spread@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/76e2c8544129d727d5a698e2a67d74e438bc35df843adb5f769316ec432c5e1bbb4128123a95b2fe8ef0aec7b26d87efe81d64326291c77ad757ff184d38448a
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-sticky-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
@@ -3939,17 +3056,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/3b9a99ae043ef363c81bfb097fa7a553fcf7c7d9fddc13dd2b47b3b2e45cf2741a9ca78cfe55f463983b043b365f0f8452f2d5eaadbdea20e6d6de50c16bed25
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-template-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
@@ -3983,17 +3089,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-template-literals@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/ecf05a8511176d5570cb0d481577a407a4e8a9a430f86522d809e0ac2c823913e854ef9e2a1c83c0bd7c12489d82e1b48fabb52e697e80d6a6962125197593ca
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
@@ -4027,17 +3122,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/c07847a3bcb27509d392de7a59b9836669b90ca508d4b63b36bb73b63413bc0b2571a64410b65999a73abeac99957b31053225877dcbfaf4eb21d8cc0ae4002f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-typescript@npm:^7.11.0, @babel/plugin-transform-typescript@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-typescript@npm:7.22.15"
@@ -4099,17 +3183,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/6b8bca3495acedc89e880942de7b83c263fb5b4c9599594dcf3923e2128ae25f1f4725a295fe101027f75d8ef081ef28319296adf274b5022e57039e42836103
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-unicode-property-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5"
@@ -4146,18 +3219,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/c0c284bbbdead7e17e059d72e1b288f86b0baacc410398ef6c6c703fe4326b069e68515ccb84359601315cd8e888f9226731d00624b7c6959b1c0853f072b61f
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-unicode-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
@@ -4194,18 +3255,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/b545310d0d592d75566b9cd158f4b8951e34d07d839656789d179b39b3fd92b32bd387cdfaf33a93e636609f3bfb9bb03d41f3e43be598116c9c6c80cc3418c4
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5"
@@ -4242,19 +3291,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10/183b72d5987dc93f9971667ce3f26d28b0e1058e71b129733dd9d5282aecba4c062b67c9567526780d2defd2bfbf950ca58d8306dc90b2761fd1e960d867ddb7
-  languageName: node
-  linkType: hard
-
-"@babel/polyfill@npm:^7.0.0, @babel/polyfill@npm:^7.4.4":
+"@babel/polyfill@npm:^7.4.4":
   version: 7.12.1
   resolution: "@babel/polyfill@npm:7.12.1"
   dependencies:
@@ -4264,97 +3301,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:^7.0.0":
-  version: 7.24.7
-  resolution: "@babel/preset-env@npm:7.24.7"
-  dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.7"
-    "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
-    "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
-    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
-    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.24.7"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.24.7"
-    "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
-    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
-    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
-    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
-    "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
-    "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.7"
-    "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.24.7"
-    "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.7"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
-    "@babel/plugin-transform-for-of": "npm:^7.24.7"
-    "@babel/plugin-transform-function-name": "npm:^7.24.7"
-    "@babel/plugin-transform-json-strings": "npm:^7.24.7"
-    "@babel/plugin-transform-literals": "npm:^7.24.7"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
-    "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
-    "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
-    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-new-target": "npm:^7.24.7"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.7"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.24.7"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
-    "@babel/plugin-transform-object-super": "npm:^7.24.7"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
-    "@babel/plugin-transform-parameters": "npm:^7.24.7"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.7"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
-    "@babel/plugin-transform-property-literals": "npm:^7.24.7"
-    "@babel/plugin-transform-regenerator": "npm:^7.24.7"
-    "@babel/plugin-transform-reserved-words": "npm:^7.24.7"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.7"
-    "@babel/plugin-transform-spread": "npm:^7.24.7"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-template-literals": "npm:^7.24.7"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.7"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7"
-    "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
-    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
-    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
-    core-js-compat: "npm:^3.31.0"
-    semver: "npm:^6.3.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/2fd90c46efefadb48dae6d13de190ac48753af187ee394924cf532c79870ebb87658bd31f06649630827a478b17a4adc41717cc6d4c460ff2ed9fafa51e5b515
-  languageName: node
-  linkType: hard
-
 "@babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:^7.16.11, @babel/preset-env@npm:^7.19.4, @babel/preset-env@npm:^7.7.7":
   version: 7.22.20
   resolution: "@babel/preset-env@npm:7.22.20"
@@ -4743,21 +3689,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/register@npm:^7.0.0":
-  version: 7.24.6
-  resolution: "@babel/register@npm:7.24.6"
-  dependencies:
-    clone-deep: "npm:^4.0.1"
-    find-cache-dir: "npm:^2.0.0"
-    make-dir: "npm:^2.1.0"
-    pirates: "npm:^4.0.6"
-    source-map-support: "npm:^0.5.16"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10/94580678ee541218475d605720ea1c3b4a647c504c8a08124373efad24a523f219dd7441de92f09c692c22362ea4422c5f3c51a3b3048b7a64deb1f6daea96b6
-  languageName: node
-  linkType: hard
-
 "@babel/register@npm:^7.22.15":
   version: 7.23.7
   resolution: "@babel/register@npm:7.23.7"
@@ -4859,17 +3790,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/template@npm:7.24.7"
-  dependencies:
-    "@babel/code-frame": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10/5975d404ef51cf379515eb0f80b115981d0b9dff5539e53a47516644abb8c83d7559f5b083eb1d4977b20d8359ebb2f911ccd4f729143f8958fdc465f976d843
-  languageName: node
-  linkType: hard
-
 "@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.9":
   version: 7.23.9
   resolution: "@babel/traverse@npm:7.23.9"
@@ -4960,24 +3880,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/traverse@npm:7.24.7"
-  dependencies:
-    "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-hoist-variables": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-    debug: "npm:^4.3.1"
-    globals: "npm:^11.1.0"
-  checksum: 10/785cf26383a992740e492efba7016de964cd06c05c9d7146fa1b5ead409e054c444f50b36dc37856884a56e32cf9d3105ddf1543486b6df68300bffb117a245a
-  languageName: node
-  linkType: hard
-
 "@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
   version: 7.22.19
   resolution: "@babel/types@npm:7.22.19"
@@ -5044,17 +3946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/types@npm:7.24.7"
-  dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.7"
-    "@babel/helper-validator-identifier": "npm:^7.24.7"
-    to-fast-properties: "npm:^2.0.0"
-  checksum: 10/ad3c8c0d6fb4acb0bb74bb5b4bb849b181bf6185677ef9c59c18856c81e43628d0858253cf232f0eca806f02e08eff85a1d3e636a3e94daea737597796b0b430
-  languageName: node
-  linkType: hard
-
 "@base2/pretty-print-object@npm:1.0.1":
   version: 1.0.1
   resolution: "@base2/pretty-print-object@npm:1.0.1"
@@ -5344,16 +4235,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@commitlint/config-validator@npm:^19.0.3":
-  version: 19.0.3
-  resolution: "@commitlint/config-validator@npm:19.0.3"
-  dependencies:
-    "@commitlint/types": "npm:^19.0.3"
-    ajv: "npm:^8.11.0"
-  checksum: 10/a1a9678e0994d87fa98f0aee1a877dfaf60640b657589260ec958898d51affabba73d6684edafa1cc979e4e94b51f14fbd9b605eae77c2838ee52bcbcc110bef
-  languageName: node
-  linkType: hard
-
 "@commitlint/ensure@npm:^7.6.0":
   version: 7.6.0
   resolution: "@commitlint/ensure@npm:7.6.0"
@@ -5363,13 +4244,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@commitlint/execute-rule@npm:^19.0.0":
-  version: 19.0.0
-  resolution: "@commitlint/execute-rule@npm:19.0.0"
-  checksum: 10/4c5cbf9ab0e2b85b00ceea84e5598b1b3cceaa20a655ee954c45259cca9efc80cf5cf7d9eec04715a100c2da282cbcf6aba960ad53a47178090c0513426ac236
-  languageName: node
-  linkType: hard
-
 "@commitlint/execute-rule@npm:^7.6.0":
   version: 7.6.0
   resolution: "@commitlint/execute-rule@npm:7.6.0"
@@ -5411,24 +4285,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@commitlint/load@npm:>6.1.1":
-  version: 19.2.0
-  resolution: "@commitlint/load@npm:19.2.0"
-  dependencies:
-    "@commitlint/config-validator": "npm:^19.0.3"
-    "@commitlint/execute-rule": "npm:^19.0.0"
-    "@commitlint/resolve-extends": "npm:^19.1.0"
-    "@commitlint/types": "npm:^19.0.3"
-    chalk: "npm:^5.3.0"
-    cosmiconfig: "npm:^9.0.0"
-    cosmiconfig-typescript-loader: "npm:^5.0.0"
-    lodash.isplainobject: "npm:^4.0.6"
-    lodash.merge: "npm:^4.6.2"
-    lodash.uniq: "npm:^4.5.0"
-  checksum: 10/5cd35a0a60064c70c06ab6bd8b1ae02cf6ecc1d0520b76c68cdc7c12094338f04c19e2df5d7ae30d681e858871c4f1963ae39e4969ed61139959cf4b300030fc
-  languageName: node
-  linkType: hard
-
 "@commitlint/load@npm:^7.6.1":
   version: 7.6.2
   resolution: "@commitlint/load@npm:7.6.2"
@@ -5473,20 +4329,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@commitlint/resolve-extends@npm:^19.1.0":
-  version: 19.1.0
-  resolution: "@commitlint/resolve-extends@npm:19.1.0"
-  dependencies:
-    "@commitlint/config-validator": "npm:^19.0.3"
-    "@commitlint/types": "npm:^19.0.3"
-    global-directory: "npm:^4.0.1"
-    import-meta-resolve: "npm:^4.0.0"
-    lodash.mergewith: "npm:^4.6.2"
-    resolve-from: "npm:^5.0.0"
-  checksum: 10/453f8828b091886dc7cb4b13285bf3300be94266c3fc13453ab62fddc524a3969434dcebea3e4c4775621576fa25b41efbc62d773e3c44c1e87d12d7211166de
-  languageName: node
-  linkType: hard
-
 "@commitlint/resolve-extends@npm:^7.6.0":
   version: 7.6.0
   resolution: "@commitlint/resolve-extends@npm:7.6.0"
@@ -5528,16 +4370,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@commitlint/types@npm:^19.0.3":
-  version: 19.0.3
-  resolution: "@commitlint/types@npm:19.0.3"
-  dependencies:
-    "@types/conventional-commits-parser": "npm:^5.0.0"
-    chalk: "npm:^5.3.0"
-  checksum: 10/44e67f4861f9b137f43a441f8ab255676b7a276c82ca46ba7846ca1057d170af92a87d3e2a1378713dc4e33a68c8af513683cb96dcd29544e48e2c825109ea6f
-  languageName: node
-  linkType: hard
-
 "@cspotcode/source-map-support@npm:^0.8.0":
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
@@ -7268,7 +6100,7 @@ __metadata:
     d3-array: "npm:^3.2.1"
     d3-geo-voronoi: "npm:^2.0.1"
   peerDependencies:
-    "@blueprintjs/core": ^3.43.0 || ^4.3.0
+    "@blueprintjs/core": ^3.43.0 || ^4.3.0 || ^5.0.0
     react: ^16.8.6||^17.0.0||^18.0.0
   languageName: unknown
   linkType: soft
@@ -7313,6 +6145,7 @@ __metadata:
     "@testing-library/react": "npm:^12.1.2"
     "@types/jest": "npm:^27.4.0"
     "@types/react": "npm:^17.0.38"
+    "@vx/gradient": "npm:^0.0.199"
     axios: "npm:^0.27.2"
     babel-jest: "npm:^27.4.6"
     identity-obj-proxy: "npm:^3.0.0"
@@ -7470,27 +6303,17 @@ __metadata:
     "@types/jest": "npm:^26.0.10"
     "@types/node": "npm:^14.6.0"
     "@types/react-dom": "npm:^16.9.8"
-    colors: "npm:^1.3.2"
-    commitizen: "npm:^4.1.2"
-    coveralls: "npm:^3.0.2"
-    cross-env: "npm:^7.0.2"
-    cz-conventional-changelog: "npm:^3.2.0"
     d3-array: "npm:^2.5.1"
     d3-drag: "npm:^1.2.5"
     d3-geo: "npm:^1.11.9"
     d3-selection: "npm:^1.4.1"
     d3-zoom: "npm:^1.8.3"
-    husky: "npm:^4.2.5"
-    jest: "npm:^23.6.0"
-    jest-config: "npm:^23.6.0"
     kld-intersections: "npm:^0.7.0"
     kld-path-parser: "npm:^0.2.1"
-    lint-staged: "npm:^8.0.0"
     npm-run-all: "npm:^4.1.5"
     postcss: "npm:^8.3.6"
     prettier: "npm:^2.0.5"
     prompt: "npm:^1.0.0"
-    prop-types: "npm:^15.7.2"
     replace-in-file: "npm:^3.4.2"
     rimraf: "npm:^2.6.2"
     rollup: "npm:^2.26.4"
@@ -7499,14 +6322,6 @@ __metadata:
     semantic-release: "npm:^15.9.16"
     shelljs: "npm:^0.8.3"
     stylus: "npm:^0.59.0"
-    travis-deploy-once: "npm:^5.0.9"
-    ts-jest: "npm:^23.10.2"
-    ts-node: "npm:^7.0.1"
-    tslint: "npm:^5.11.0"
-    tslint-config-prettier: "npm:^1.15.0"
-    tslint-config-standard: "npm:^8.0.1"
-    typedoc: "npm:^0.12.0"
-    typescript: "npm:^3.8.3"
   peerDependencies:
     react: ^16.11.0||^17.0.0||^18.0.0
     react-dom: ^16.11.0||^17.0.0||^18.0.0
@@ -7533,7 +6348,7 @@ __metadata:
     underscore: "npm:^1.13.6"
     use-resize-observer: "npm:^9.1.0"
   peerDependencies:
-    "@blueprintjs/core": ^3.43.0 || ^4.3.0
+    "@blueprintjs/core": ^3.43.0 || ^4.3.0 || ^5.0.0
     react: ^16.8.6||^17.0.0||^18.0.0
     react-dom: ^16.8.6||^17.0.0||^18.0.0
   languageName: unknown
@@ -10069,20 +8884,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@samverschueren/stream-to-observable@npm:^0.3.0":
-  version: 0.3.1
-  resolution: "@samverschueren/stream-to-observable@npm:0.3.1"
-  dependencies:
-    any-observable: "npm:^0.3.0"
-  peerDependenciesMeta:
-    rxjs:
-      optional: true
-    zen-observable:
-      optional: true
-  checksum: 10/2b62bff492d58b4fdc8339ecc29ac3d8e1c37ae920c9d41fcb490a574422c3df1eae26b07103198b97b586c5e7106d47440ce24580a2a919aa5f9359d9914f2c
-  languageName: node
-  linkType: hard
-
 "@semantic-release/commit-analyzer@npm:^6.1.0":
   version: 6.3.3
   resolution: "@semantic-release/commit-analyzer@npm:6.3.3"
@@ -10174,13 +8975,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/is@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@sindresorhus/is@npm:0.14.0"
-  checksum: 10/789cd128f0b43e158e657c4505539c8997905fcb5c06d750b7df778cab2b6887bc1eb8878026a20d84524528786ef69fc3d12a964ae56a478a87bcfc7f8272f3
-  languageName: node
-  linkType: hard
-
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -11594,15 +10388,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@szmarczak/http-timer@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@szmarczak/http-timer@npm:1.1.2"
-  dependencies:
-    defer-to-connect: "npm:^1.0.1"
-  checksum: 10/9b63853bd53bff72c4990ebc9cd3f625bbab757247099af172564da6649a27a1d41b1a70cd849dd65b2a078300029c1c80bf3079e6a91e285da7b259eb147146
-  languageName: node
-  linkType: hard
-
 "@szmarczak/http-timer@npm:^4.0.5":
   version: 4.0.6
   resolution: "@szmarczak/http-timer@npm:4.0.6"
@@ -11985,15 +10770,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/conventional-commits-parser@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@types/conventional-commits-parser@npm:5.0.0"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/0992617c7274e9ddcbdb30cc5b735fa067343c40e16f539615b3ad9213cacbe9a32483bc8e0302d297c6de9cc7fd3794549635761a66bd9dc220d609822d86e7
-  languageName: node
-  linkType: hard
-
 "@types/cookie@npm:^0.3.1":
   version: 0.3.3
   resolution: "@types/cookie@npm:0.3.3"
@@ -12323,15 +11099,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/fs-extra@npm:^5.0.3":
-  version: 5.1.0
-  resolution: "@types/fs-extra@npm:5.1.0"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/091911cf9f7c1e54b40738abd6bed0282e02a8a3c0e08dbbe8b0ea957e8d603bb9af798d0f2c16e2e0f877be6eacb01bb8dd64d4d6023c3cebf1b6855e213656
-  languageName: node
-  linkType: hard
-
 "@types/geojson@npm:*, @types/geojson@npm:^7946.0.10, @types/geojson@npm:^7946.0.8":
   version: 7946.0.11
   resolution: "@types/geojson@npm:7946.0.11"
@@ -12346,7 +11113,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/glob@npm:^7.1.1, @types/glob@npm:^7.1.3, @types/glob@npm:~7.2.0":
+"@types/glob@npm:^7.1.1, @types/glob@npm:^7.1.3":
   version: 7.2.0
   resolution: "@types/glob@npm:7.2.0"
   dependencies:
@@ -12365,13 +11132,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/handlebars@npm:^4.0.38":
-  version: 4.0.40
-  resolution: "@types/handlebars@npm:4.0.40"
-  checksum: 10/1e6dc9ebc17b5691743e8b0784ab124f438bade50ed6ae1ceaa3ae26e3ef9d04c048964a58420b72a7189161d2464f71078bcaaef605ee2e00a6f6cea1a216f3
-  languageName: node
-  linkType: hard
-
 "@types/hast@npm:^2.0.0":
   version: 2.3.6
   resolution: "@types/hast@npm:2.3.6"
@@ -12390,13 +11150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/highlight.js@npm:^9.12.3":
-  version: 9.12.4
-  resolution: "@types/highlight.js@npm:9.12.4"
-  checksum: 10/e409a264da4cf7ff17f4cfe7eecb2d8d028a8cc72f67897b752544aea7c18e17398b5cb35688a34a1e58877b226b17b0026e847ab5584bffe43d3330154774d0
-  languageName: node
-  linkType: hard
-
 "@types/hoist-non-react-statics@npm:^3.0.1, @types/hoist-non-react-statics@npm:^3.3.0":
   version: 3.3.2
   resolution: "@types/hoist-non-react-statics@npm:3.3.2"
@@ -12498,13 +11251,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:^4.14.110":
-  version: 4.17.4
-  resolution: "@types/lodash@npm:4.17.4"
-  checksum: 10/3ec19f9fc48200006e71733e08bcb1478b0398673657fcfb21a8643d41a80bcce09a01000077c3b23a3c6d86b9b314abe0672a8fdfc0fd66b893bd41955cfab8
-  languageName: node
-  linkType: hard
-
 "@types/lodash@npm:^4.14.146, @types/lodash@npm:^4.14.172, @types/lodash@npm:^4.14.178":
   version: 4.14.199
   resolution: "@types/lodash@npm:4.14.199"
@@ -12538,13 +11284,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/marked@npm:^0.4.0":
-  version: 0.4.2
-  resolution: "@types/marked@npm:0.4.2"
-  checksum: 10/76ec88c531cbab2a4a1224c1cbfc10baed3be1d3ef3b5a4573abe5a87e3af331b2d965bf2510e21c6701698adaf2f469cad117aabcbed3f1f228c5ab91d80b2e
-  languageName: node
-  linkType: hard
-
 "@types/mdast@npm:^3.0.0":
   version: 3.0.12
   resolution: "@types/mdast@npm:3.0.12"
@@ -12582,13 +11321,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimatch@npm:3.0.3":
-  version: 3.0.3
-  resolution: "@types/minimatch@npm:3.0.3"
-  checksum: 10/dfb9f8c55342868f9b9d57ebd969ff09f16f8732218178db4da80400bc4f665aa046f71c5f4b1599ef59a2871b1bd74b5fcefc79383fccd878819c8094ca1fa6
-  languageName: node
-  linkType: hard
-
 "@types/minimist@npm:^1.2.0":
   version: 1.2.2
   resolution: "@types/minimist@npm:1.2.2"
@@ -12926,16 +11658,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/shelljs@npm:^0.8.0":
-  version: 0.8.15
-  resolution: "@types/shelljs@npm:0.8.15"
-  dependencies:
-    "@types/glob": "npm:~7.2.0"
-    "@types/node": "npm:*"
-  checksum: 10/1f756acc24441239687a0ffb4de908175380968ded1f9be697374ef09637c999634858a2f212e2f8ff65a48663d54b8b6e3449962dca086e08d1ab725596e802
-  languageName: node
-  linkType: hard
-
 "@types/sockjs@npm:^0.3.33":
   version: 0.3.34
   resolution: "@types/sockjs@npm:0.3.34"
@@ -13408,6 +12130,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vx/gradient@npm:^0.0.199":
+  version: 0.0.199
+  resolution: "@vx/gradient@npm:0.0.199"
+  dependencies:
+    "@types/react": "npm:*"
+    prop-types: "npm:^15.5.7"
+  peerDependencies:
+    react: ^15.0.0-0 || ^16.0.0-0
+  checksum: 10/f5e98c2def87a159af8a0d11eebeea0fb246403dcbc5a752bbb192fc9d8c605bcf04d13510f32ca64c2f8c8184d31adc6804bd3481f9c5b2e6baf9ecec7794d1
+  languageName: node
+  linkType: hard
+
 "@vx/group@npm:0.0.198":
   version: 0.0.198
   resolution: "@vx/group@npm:0.0.198"
@@ -13891,7 +12625,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.0, abab@npm:^2.0.3, abab@npm:^2.0.5":
+"abab@npm:^2.0.3, abab@npm:^2.0.5":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
   checksum: 10/ebe95d7278999e605823fc515a3b05d689bc72e7f825536e73c95ebf621636874c6de1b749b3c4bf866b96ccd4b3a2802efa313d0e45ad51a413c8c73247db20
@@ -13922,16 +12656,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-globals@npm:^4.1.0":
-  version: 4.3.4
-  resolution: "acorn-globals@npm:4.3.4"
-  dependencies:
-    acorn: "npm:^6.0.1"
-    acorn-walk: "npm:^6.0.1"
-  checksum: 10/c31bfde102d8a104835e9591c31dd037ec771449f9c86a6b1d2ac3c7c336694f828cfabba7687525b094f896a854affbf1afe6e1b12c0d998be6bab5d49c9663
-  languageName: node
-  linkType: hard
-
 "acorn-globals@npm:^6.0.0":
   version: 6.0.0
   resolution: "acorn-globals@npm:6.0.0"
@@ -13960,13 +12684,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^6.0.1":
-  version: 6.2.0
-  resolution: "acorn-walk@npm:6.2.0"
-  checksum: 10/163de3239300eb3d11b2d443164d6408655ec2ddafbb1f3ddfcc4ffb4dd9578ee414e4ee561c3cd67e64238d0de4685aa0aea267de100fe40078c639ffb87381
-  languageName: node
-  linkType: hard
-
 "acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
@@ -13981,24 +12698,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^5.5.3":
-  version: 5.7.4
-  resolution: "acorn@npm:5.7.4"
-  bin:
-    acorn: bin/acorn
-  checksum: 10/97f2ae55e99aed81a7aa9039719c60283a66817fadb3152beb323ba6038824770512f807436e99090be38602f23bcbf6021867d86442616da471f1dfaca7c3d9
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^6.0.1":
-  version: 6.4.2
-  resolution: "acorn@npm:6.4.2"
-  bin:
-    acorn: bin/acorn
-  checksum: 10/b430c346813289daf1b4e673333d10c54a7c452a776f097597c7b0bd71c7ff58f0e8f850f334963eac806a52928985ff20c0fa39c67cd5276d10e0ed4370f9c8
-  languageName: node
-  linkType: hard
-
 "acorn@npm:^7.1.1, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
@@ -14162,18 +12861,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.11.0":
-  version: 8.16.0
-  resolution: "ajv@npm:8.16.0"
-  dependencies:
-    fast-deep-equal: "npm:^3.1.3"
-    json-schema-traverse: "npm:^1.0.0"
-    require-from-string: "npm:^2.0.2"
-    uri-js: "npm:^4.4.1"
-  checksum: 10/9b4b380efaf8be2639736d535662bd142a6972b43075b404380165c37ab6ceb72f01c7c987536747ff3e9e21eb5cd2e2a194f1e0fa8355364ea6204b1262fcd1
-  languageName: node
-  linkType: hard
-
 "alphanum-sort@npm:^1.0.0":
   version: 1.0.2
   resolution: "alphanum-sort@npm:1.0.2"
@@ -14197,7 +12884,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^3.0.0, ansi-escapes@npm:^3.1.0":
+"ansi-escapes@npm:^3.1.0":
   version: 3.2.0
   resolution: "ansi-escapes@npm:3.2.0"
   checksum: 10/0f94695b677ea742f7f1eed961f7fd8d05670f744c6ad1f8f635362f6681dcfbc1575cb05b43abc7bb6d67e25a75fb8c7ea8f2a57330eb2c76b33f18cb2cef0a
@@ -14317,23 +13004,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"any-observable@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "any-observable@npm:0.3.0"
-  checksum: 10/21f27ed714c54aac6db4c1200674933f93416b832433cd14e5071db53f7d480de66a4c529181655dee52371be7f73ebeb0880b02a95571d70152fd6b226c11e9
-  languageName: node
-  linkType: hard
-
-"anymatch@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "anymatch@npm:2.0.0"
-  dependencies:
-    micromatch: "npm:^3.1.4"
-    normalize-path: "npm:^2.1.1"
-  checksum: 10/f7bb1929842b4585cdc28edbb385767d499ce7d673f96a8f11348d2b2904592ffffc594fe9229b9a1e9e4dccb9329b7692f9f45e6a11dcefbb76ecdc9ab740f6
-  languageName: node
-  linkType: hard
-
 "anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
   version: 3.1.3
   resolution: "anymatch@npm:3.1.3"
@@ -14351,15 +13021,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"append-transform@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "append-transform@npm:0.4.0"
-  dependencies:
-    default-require-extensions: "npm:^1.0.0"
-  checksum: 10/f5edcf48e3327e8c9594d3ff57ea250401c1cda8dd2460704025fca5ef304b31cdba6e4ad522101ca69bd2245835add4831427bb18a7eb454ec275af08be11d0
-  languageName: node
-  linkType: hard
-
 "aproba@npm:^1.0.3 || ^2.0.0, aproba@npm:^1.1.2 || 2, aproba@npm:^2.0.0":
   version: 2.0.0
   resolution: "aproba@npm:2.0.0"
@@ -14449,36 +13110,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arr-diff@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "arr-diff@npm:2.0.0"
-  dependencies:
-    arr-flatten: "npm:^1.0.1"
-  checksum: 10/b56e8d34e8c8d8dba40de3235c61e3ef4e3626486d6d1c83c34fba4fe6187eff96ffde872100e834e8931e724a96ab9dbd71b0bf0068ba5a3deb7d19cb596892
-  languageName: node
-  linkType: hard
-
-"arr-diff@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "arr-diff@npm:4.0.0"
-  checksum: 10/ea7c8834842ad3869297f7915689bef3494fd5b102ac678c13ffccab672d3d1f35802b79e90c4cfec2f424af3392e44112d1ccf65da34562ed75e049597276a0
-  languageName: node
-  linkType: hard
-
-"arr-flatten@npm:^1.0.1, arr-flatten@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "arr-flatten@npm:1.1.0"
-  checksum: 10/963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22
-  languageName: node
-  linkType: hard
-
-"arr-union@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "arr-union@npm:3.1.0"
-  checksum: 10/b5b0408c6eb7591143c394f3be082fee690ddd21f0fdde0a0a01106799e847f67fcae1b7e56b0a0c173290e29c6aca9562e82b300708a268bc8f88f3d6613cb9
-  languageName: node
-  linkType: hard
-
 "array-buffer-byte-length@npm:^1.0.0":
   version: 1.0.0
   resolution: "array-buffer-byte-length@npm:1.0.0"
@@ -14489,23 +13120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "array-buffer-byte-length@npm:1.0.1"
-  dependencies:
-    call-bind: "npm:^1.0.5"
-    is-array-buffer: "npm:^3.0.4"
-  checksum: 10/53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e
-  languageName: node
-  linkType: hard
-
-"array-equal@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "array-equal@npm:1.0.2"
-  checksum: 10/5c37df0cad330516d1255663dfa4fa761fb0ea63878f535aa70dfefe5499853a8b372faf0a27b91781ca1230f4b4333bbeb751e9b1748527d96df2bee30032ea
-  languageName: node
-  linkType: hard
-
 "array-find-index@npm:^1.0.1":
   version: 1.0.2
   resolution: "array-find-index@npm:1.0.2"
@@ -14534,15 +13148,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-union@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "array-union@npm:1.0.2"
-  dependencies:
-    array-uniq: "npm:^1.0.1"
-  checksum: 10/82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d
-  languageName: node
-  linkType: hard
-
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
@@ -14550,27 +13155,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-uniq@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "array-uniq@npm:1.0.3"
-  checksum: 10/1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e
-  languageName: node
-  linkType: hard
-
-"array-unique@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "array-unique@npm:0.2.1"
-  checksum: 10/899deaf07abedf17ee89a757c7bcc9253fb248a7f6c394a1fec9ec3f3ac244314feb3048efee80ed7fdcb047960e32d7c234291bfd26b78ced668c346d9f4e3c
-  languageName: node
-  linkType: hard
-
-"array-unique@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "array-unique@npm:0.3.2"
-  checksum: 10/da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888
-  languageName: node
-  linkType: hard
-
 "array.prototype.reduce@npm:^1.0.6":
   version: 1.0.6
   resolution: "array.prototype.reduce@npm:1.0.6"
@@ -14599,23 +13183,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
-  dependencies:
-    array-buffer-byte-length: "npm:^1.0.1"
-    call-bind: "npm:^1.0.5"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.3"
-    es-errors: "npm:^1.2.1"
-    get-intrinsic: "npm:^1.2.3"
-    is-array-buffer: "npm:^3.0.4"
-    is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 10/0221f16c1e3ec7b67da870ee0e1f12b825b5f9189835392b59a22990f715827561a4f4cd5330dc7507de272d8df821be6cd4b0cb569babf5ea4be70e365a2f3d
-  languageName: node
-  linkType: hard
-
-"arrify@npm:^1.0.0, arrify@npm:^1.0.1":
+"arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
   checksum: 10/745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7
@@ -14658,13 +13226,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assign-symbols@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "assign-symbols@npm:1.0.0"
-  checksum: 10/c0eb895911d05b6b2d245154f70461c5e42c107457972e5ebba38d48967870dee53bcdf6c7047990586daa80fab8dab3cc6300800fbd47b454247fdedd859a2c
-  languageName: node
-  linkType: hard
-
 "ast-types@npm:^0.16.1":
   version: 0.16.1
   resolution: "ast-types@npm:0.16.1"
@@ -14674,13 +13235,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"astral-regex@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "astral-regex@npm:1.0.0"
-  checksum: 10/93417fc0879531cd95ace2560a54df865c9461a3ac0714c60cbbaa5f1f85d2bee85489e78d82f70b911b71ac25c5f05fc5a36017f44c9bb33c701bee229ff848
-  languageName: node
-  linkType: hard
-
 "astring@npm:^1.8.0":
   version: 1.8.6
   resolution: "astring@npm:1.8.6"
@@ -14690,13 +13244,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async-limiter@npm:~1.0.0":
-  version: 1.0.1
-  resolution: "async-limiter@npm:1.0.1"
-  checksum: 10/2b849695b465d93ad44c116220dee29a5aeb63adac16c1088983c339b0de57d76e82533e8e364a93a9f997f28bbfc6a92948cefc120652bd07f3b59f8d75cf2b
-  languageName: node
-  linkType: hard
-
 "async@npm:3.2.3":
   version: 3.2.3
   resolution: "async@npm:3.2.3"
@@ -14711,7 +13258,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^2.1.4, async@npm:^2.6.4":
+"async@npm:^2.6.4":
   version: 2.6.4
   resolution: "async@npm:2.6.4"
   dependencies:
@@ -14814,15 +13361,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "available-typed-arrays@npm:1.0.7"
-  dependencies:
-    possible-typed-array-names: "npm:^1.0.0"
-  checksum: 10/6c9da3a66caddd83c875010a1ca8ef11eac02ba15fb592dc9418b2b5e7b77b645fa7729380a92d9835c2f05f2ca1b6251f39b993e0feb3f1517c74fa1af02cab
-  languageName: node
-  linkType: hard
-
 "aws-sign2@npm:~0.7.0":
   version: 0.7.0
   resolution: "aws-sign2@npm:0.7.0"
@@ -14867,44 +13405,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-code-frame@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-code-frame@npm:6.26.0"
-  dependencies:
-    chalk: "npm:^1.1.3"
-    esutils: "npm:^2.0.2"
-    js-tokens: "npm:^3.0.2"
-  checksum: 10/9410c3d5a921eb02fa409675d1a758e493323a49e7b9dddb7a2a24d47e61d39ab1129dd29f9175836eac9ce8b1d4c0a0718fcdc57ce0b865b529fd250dbab313
-  languageName: node
-  linkType: hard
-
-"babel-core@npm:^6.0.0, babel-core@npm:^6.26.0":
-  version: 6.26.3
-  resolution: "babel-core@npm:6.26.3"
-  dependencies:
-    babel-code-frame: "npm:^6.26.0"
-    babel-generator: "npm:^6.26.0"
-    babel-helpers: "npm:^6.24.1"
-    babel-messages: "npm:^6.23.0"
-    babel-register: "npm:^6.26.0"
-    babel-runtime: "npm:^6.26.0"
-    babel-template: "npm:^6.26.0"
-    babel-traverse: "npm:^6.26.0"
-    babel-types: "npm:^6.26.0"
-    babylon: "npm:^6.18.0"
-    convert-source-map: "npm:^1.5.1"
-    debug: "npm:^2.6.9"
-    json5: "npm:^0.5.1"
-    lodash: "npm:^4.17.4"
-    minimatch: "npm:^3.0.4"
-    path-is-absolute: "npm:^1.0.1"
-    private: "npm:^0.1.8"
-    slash: "npm:^1.0.0"
-    source-map: "npm:^0.5.7"
-  checksum: 10/35bac77f434ff474234c2db43267949e30fd26c53b251b911632df36241782f4e3351c4361c3db9c22520be8cdc5011da0b13d5788fa4e8e64105b3d41281041
-  languageName: node
-  linkType: hard
-
 "babel-core@npm:^7.0.0-bridge.0":
   version: 7.0.0-bridge.0
   resolution: "babel-core@npm:7.0.0-bridge.0"
@@ -14914,44 +13414,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-generator@npm:^6.18.0, babel-generator@npm:^6.26.0":
-  version: 6.26.1
-  resolution: "babel-generator@npm:6.26.1"
-  dependencies:
-    babel-messages: "npm:^6.23.0"
-    babel-runtime: "npm:^6.26.0"
-    babel-types: "npm:^6.26.0"
-    detect-indent: "npm:^4.0.0"
-    jsesc: "npm:^1.3.0"
-    lodash: "npm:^4.17.4"
-    source-map: "npm:^0.5.7"
-    trim-right: "npm:^1.0.1"
-  checksum: 10/837616810a769a3aadfd1aa4ec01efb803eb5183ef7fa4098caa7ccdf8ed6c7e2866bd68047ee48839bb49d873a8b56d20bf20ee55a2ff430e43d67fcf17dc57
-  languageName: node
-  linkType: hard
-
-"babel-helpers@npm:^6.24.1":
-  version: 6.24.1
-  resolution: "babel-helpers@npm:6.24.1"
-  dependencies:
-    babel-runtime: "npm:^6.22.0"
-    babel-template: "npm:^6.24.1"
-  checksum: 10/0a49a75e1c639aebe6580f64c0dec602eb9ec9c33f9a27250c4981f52def6773b520d71ee3bbad6a91c0788ceadc127ce491e800d2a51f93c2a75f2d403850e3
-  languageName: node
-  linkType: hard
-
-"babel-jest@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "babel-jest@npm:23.6.0"
-  dependencies:
-    babel-plugin-istanbul: "npm:^4.1.6"
-    babel-preset-jest: "npm:^23.2.0"
-  peerDependencies:
-    babel-core: ^6.0.0 || ^7.0.0-0
-  checksum: 10/c22e3342efa5f1aef6cdd9e404f13a111bad8235e73d3c5eba5159f2e0e0ded1d1d012334f4c2f27323d9802aafc440c375f586f9c3adabfac248fcaa1b6be3a
-  languageName: node
-  linkType: hard
-
 "babel-jest@npm:^27.4.6, babel-jest@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-jest@npm:27.5.1"
@@ -14985,15 +13447,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-messages@npm:^6.23.0":
-  version: 6.23.0
-  resolution: "babel-messages@npm:6.23.0"
-  dependencies:
-    babel-runtime: "npm:^6.22.0"
-  checksum: 10/c8075c17587a33869e1a5bd0a5b73bbe395b68188362dacd5418debbc7c8fd784bcd3295e81ee7e410dc2c2655755add6af03698c522209f6a68334c15e6d6ca
-  languageName: node
-  linkType: hard
-
 "babel-plugin-emotion@npm:^10.0.27":
   version: 10.2.2
   resolution: "babel-plugin-emotion@npm:10.2.2"
@@ -15012,18 +13465,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-istanbul@npm:^4.1.6":
-  version: 4.1.6
-  resolution: "babel-plugin-istanbul@npm:4.1.6"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread: "npm:^6.13.0"
-    find-up: "npm:^2.1.0"
-    istanbul-lib-instrument: "npm:^1.10.1"
-    test-exclude: "npm:^4.2.1"
-  checksum: 10/4776b3a5bb90dd92483249d879ef33805d0e23a58da6c68eda510fa89b2cee81c715ac3a2ad5375768c146c80ad418f7f019e633ffa5a5ab694fc083d32231d9
-  languageName: node
-  linkType: hard
-
 "babel-plugin-istanbul@npm:^6.1.1":
   version: 6.1.1
   resolution: "babel-plugin-istanbul@npm:6.1.1"
@@ -15037,13 +13478,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^23.2.0":
-  version: 23.2.0
-  resolution: "babel-plugin-jest-hoist@npm:23.2.0"
-  checksum: 10/d608911e52f2edd987ba9d12d8e335d61fe7aed5d531db860d23db3bcc828daf948c405f7590c5690612a8178d47159a055e11842be9c20f2908adb8b3691845
-  languageName: node
-  linkType: hard
-
 "babel-plugin-jest-hoist@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-plugin-jest-hoist@npm:27.5.1"
@@ -15193,13 +13627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-syntax-object-rest-spread@npm:^6.13.0":
-  version: 6.13.0
-  resolution: "babel-plugin-syntax-object-rest-spread@npm:6.13.0"
-  checksum: 10/14083f2783c760f5f199160f48e42ad4505fd35fc7cf9c4530812b176705259562b77db6d3ddc5e3cbce9e9b2b61ec9db3065941f0949b68e77cae3e395a6eef
-  languageName: node
-  linkType: hard
-
 "babel-plugin-transform-async-to-promises@npm:^0.8.15":
   version: 0.8.18
   resolution: "babel-plugin-transform-async-to-promises@npm:0.8.18"
@@ -15251,16 +13678,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^23.2.0":
-  version: 23.2.0
-  resolution: "babel-preset-jest@npm:23.2.0"
-  dependencies:
-    babel-plugin-jest-hoist: "npm:^23.2.0"
-    babel-plugin-syntax-object-rest-spread: "npm:^6.13.0"
-  checksum: 10/aa17dc7607612554fc8f42ba2200f446e1c3e78ba9632286093d109aa70bd273e76567484033dc5acbd608a0081a6b92afd540311d28da395606c7fd609713db
-  languageName: node
-  linkType: hard
-
 "babel-preset-jest@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-preset-jest@npm:27.5.1"
@@ -15273,22 +13690,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-register@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-register@npm:6.26.0"
-  dependencies:
-    babel-core: "npm:^6.26.0"
-    babel-runtime: "npm:^6.26.0"
-    core-js: "npm:^2.5.0"
-    home-or-tmp: "npm:^2.0.0"
-    lodash: "npm:^4.17.4"
-    mkdirp: "npm:^0.5.1"
-    source-map-support: "npm:^0.4.15"
-  checksum: 10/5fb5502167f18534247c7777d1859b48e17d29799a84223c3a9163816cb7ad9f89d0b78d408c25c60822fd7bda66103cf02a4fc328beaea3c55bbfec3d369075
-  languageName: node
-  linkType: hard
-
-"babel-runtime@npm:6.26.0, babel-runtime@npm:^6.22.0, babel-runtime@npm:^6.23.0, babel-runtime@npm:^6.26.0":
+"babel-runtime@npm:6.26.0, babel-runtime@npm:^6.23.0, babel-runtime@npm:^6.26.0":
   version: 6.26.0
   resolution: "babel-runtime@npm:6.26.0"
   dependencies:
@@ -15298,57 +13700,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-template@npm:^6.16.0, babel-template@npm:^6.24.1, babel-template@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-template@npm:6.26.0"
-  dependencies:
-    babel-runtime: "npm:^6.26.0"
-    babel-traverse: "npm:^6.26.0"
-    babel-types: "npm:^6.26.0"
-    babylon: "npm:^6.18.0"
-    lodash: "npm:^4.17.4"
-  checksum: 10/028dd57380f09b5641b74874a19073c53c4fb3f1696e849575aae18f8c80eaf21db75209057db862f3b893ce2cd9b795d539efa591b58f4a0fb011df0a56fbed
-  languageName: node
-  linkType: hard
-
-"babel-traverse@npm:^6.0.0, babel-traverse@npm:^6.18.0, babel-traverse@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-traverse@npm:6.26.0"
-  dependencies:
-    babel-code-frame: "npm:^6.26.0"
-    babel-messages: "npm:^6.23.0"
-    babel-runtime: "npm:^6.26.0"
-    babel-types: "npm:^6.26.0"
-    babylon: "npm:^6.18.0"
-    debug: "npm:^2.6.8"
-    globals: "npm:^9.18.0"
-    invariant: "npm:^2.2.2"
-    lodash: "npm:^4.17.4"
-  checksum: 10/0a81da7fe59a5198503983acfdbcb1d02048ea486890cba0308e6620b24e46b2b95dd7dc2237dfc5f69941197370ff8f16f55eda0f17108f70ddb98b25ecc592
-  languageName: node
-  linkType: hard
-
-"babel-types@npm:^6.0.0, babel-types@npm:^6.18.0, babel-types@npm:^6.26.0":
-  version: 6.26.0
-  resolution: "babel-types@npm:6.26.0"
-  dependencies:
-    babel-runtime: "npm:^6.26.0"
-    esutils: "npm:^2.0.2"
-    lodash: "npm:^4.17.4"
-    to-fast-properties: "npm:^1.0.3"
-  checksum: 10/7ddab92e0dfbda4ddb69d2dbf5825ef4df18d47a609b6dbc452229a40291286aeaec7b2241e6c6755868a5840eca2e6cddcc0a7f571bb004d27b85d246c3d4d6
-  languageName: node
-  linkType: hard
-
-"babylon@npm:^6.18.0":
-  version: 6.18.0
-  resolution: "babylon@npm:6.18.0"
-  bin:
-    babylon: ./bin/babylon.js
-  checksum: 10/b35e415886a012545305eede2fd3cbd6ec7c54ed0b19e74f9c3478831fef9bbc24f1c3917e29b338d76d8e58ad1c895a296e27c8f76cef4f3be1ccaad3bfaecb
-  languageName: node
-  linkType: hard
-
 "bail@npm:^2.0.0":
   version: 2.0.2
   resolution: "bail@npm:2.0.2"
@@ -15393,21 +13744,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base@npm:^0.11.1":
-  version: 0.11.2
-  resolution: "base@npm:0.11.2"
-  dependencies:
-    cache-base: "npm:^1.0.1"
-    class-utils: "npm:^0.3.5"
-    component-emitter: "npm:^1.2.1"
-    define-property: "npm:^1.0.0"
-    isobject: "npm:^3.0.1"
-    mixin-deep: "npm:^1.2.0"
-    pascalcase: "npm:^0.1.1"
-  checksum: 10/33b0c5d570840873cf370248e653d43e8d82ce4f03161ad3c58b7da6238583cfc65bf4bbb06b27050d6c2d8f40628777f3933f483c0a7c0274fcef4c51f70a7e
-  languageName: node
-  linkType: hard
-
 "batch-processor@npm:1.0.0":
   version: 1.0.0
   resolution: "batch-processor@npm:1.0.0"
@@ -15482,15 +13818,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bindings@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "bindings@npm:1.5.0"
-  dependencies:
-    file-uri-to-path: "npm:1.0.0"
-  checksum: 10/593d5ae975ffba15fbbb4788fe5abd1e125afbab849ab967ab43691d27d6483751805d98cb92f7ac24a2439a8a8678cd0131c535d5d63de84e383b0ce2786133
-  languageName: node
-  linkType: hard
-
 "bit-twiddle@npm:^1.0.0":
   version: 1.0.2
   resolution: "bit-twiddle@npm:1.0.2"
@@ -15639,35 +13966,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^1.8.2":
-  version: 1.8.5
-  resolution: "braces@npm:1.8.5"
-  dependencies:
-    expand-range: "npm:^1.8.1"
-    preserve: "npm:^0.2.0"
-    repeat-element: "npm:^1.1.2"
-  checksum: 10/0750559062fc484507bcf2c4ab1a5d11354ab85e8d08b3c96b684bebe1deaa533a879b8ae5061215603950d95831c49a01432641f94d1c0301b3dead480a9476
-  languageName: node
-  linkType: hard
-
-"braces@npm:^2.3.1":
-  version: 2.3.2
-  resolution: "braces@npm:2.3.2"
-  dependencies:
-    arr-flatten: "npm:^1.1.0"
-    array-unique: "npm:^0.3.2"
-    extend-shallow: "npm:^2.0.1"
-    fill-range: "npm:^4.0.0"
-    isobject: "npm:^3.0.1"
-    repeat-element: "npm:^1.1.2"
-    snapdragon: "npm:^0.8.1"
-    snapdragon-node: "npm:^2.0.1"
-    split-string: "npm:^3.0.2"
-    to-regex: "npm:^3.0.1"
-  checksum: 10/7c0f0d962570812009b050ee2e6243fd425ea80d3136aace908d0038bde9e7a43e9326fa35538cebf7c753f0482655f08ea11be074c9a140394287980a5c66c9
-  languageName: node
-  linkType: hard
-
 "braces@npm:^3.0.2, braces@npm:~3.0.2":
   version: 3.0.2
   resolution: "braces@npm:3.0.2"
@@ -15714,15 +14012,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browser-resolve@npm:^1.11.3":
-  version: 1.11.3
-  resolution: "browser-resolve@npm:1.11.3"
-  dependencies:
-    resolve: "npm:1.1.7"
-  checksum: 10/9755391a7d26aa36dc9666c3335448b6f507588c57c30f9b49b46f39e91946459391d754c540016806c8edc15b5c549349876a6995da71cdec55b47422e57041
-  languageName: node
-  linkType: hard
-
 "browserify-zlib@npm:^0.1.4":
   version: 0.1.4
   resolution: "browserify-zlib@npm:0.1.4"
@@ -15788,15 +14077,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bs-logger@npm:0.x":
-  version: 0.2.6
-  resolution: "bs-logger@npm:0.2.6"
-  dependencies:
-    fast-json-stable-stringify: "npm:2.x"
-  checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212
-  languageName: node
-  linkType: hard
-
 "bser@npm:2.1.1":
   version: 2.1.1
   resolution: "bser@npm:2.1.1"
@@ -15820,7 +14100,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-from@npm:1.x, buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.0":
+"buffer-from@npm:^1.0.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
   checksum: 10/0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
@@ -15837,13 +14117,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"builtin-modules@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "builtin-modules@npm:1.1.1"
-  checksum: 10/0fbf69ffe77fecf11c441b9a7d1e664bb8119a7d3004831d9bd6ce0eacfd5d121ed4b667172870b5f66ecfce4bd54f7c20060d21c339c29049a7a5dd2bb7bf8c
-  languageName: node
-  linkType: hard
-
 "builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0":
   version: 3.3.0
   resolution: "builtin-modules@npm:3.3.0"
@@ -15945,23 +14218,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cache-base@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "cache-base@npm:1.0.1"
-  dependencies:
-    collection-visit: "npm:^1.0.0"
-    component-emitter: "npm:^1.2.1"
-    get-value: "npm:^2.0.6"
-    has-value: "npm:^1.0.0"
-    isobject: "npm:^3.0.1"
-    set-value: "npm:^2.0.0"
-    to-object-path: "npm:^0.3.0"
-    union-value: "npm:^1.0.0"
-    unset-value: "npm:^1.0.0"
-  checksum: 10/50dd11af5ce4aaa8a8bff190a870c940db80234cf087cd47dd177be8629c36ad8cd0716e62418ec1e135f2d01b28aafff62cd22d33412c3d18b2109dd9073711
-  languageName: node
-  linkType: hard
-
 "cacheable-lookup@npm:^5.0.3":
   version: 5.0.4
   resolution: "cacheable-lookup@npm:5.0.4"
@@ -15969,21 +14225,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacheable-request@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "cacheable-request@npm:6.1.0"
-  dependencies:
-    clone-response: "npm:^1.0.2"
-    get-stream: "npm:^5.1.0"
-    http-cache-semantics: "npm:^4.0.0"
-    keyv: "npm:^3.0.0"
-    lowercase-keys: "npm:^2.0.0"
-    normalize-url: "npm:^4.1.0"
-    responselike: "npm:^1.0.2"
-  checksum: 10/804f6c377ce6fef31c584babde31d55c69305569058ad95c24a41bb7b33d0ea188d388467a9da6cb340e95a3a1f8a94e1f3a709fef5eaf9c6b88e62448fa29be
-  languageName: node
-  linkType: hard
-
 "cacheable-request@npm:^7.0.2":
   version: 7.0.4
   resolution: "cacheable-request@npm:7.0.4"
@@ -15999,13 +14240,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cachedir@npm:2.3.0":
-  version: 2.3.0
-  resolution: "cachedir@npm:2.3.0"
-  checksum: 10/ec90cb0f2e6336e266aa748dbadf3da9e0b20e843e43f1591acab7a3f1451337dc2f26cb9dd833ae8cfefeffeeb43ef5b5ff62782a685f4e3c2305dd98482fcb
-  languageName: node
-  linkType: hard
-
 "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
   version: 1.0.2
   resolution: "call-bind@npm:1.0.2"
@@ -16016,7 +14250,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+"call-bind@npm:^1.0.5, call-bind@npm:^1.0.7":
   version: 1.0.7
   resolution: "call-bind@npm:1.0.7"
   dependencies:
@@ -16172,15 +14406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"capture-exit@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "capture-exit@npm:1.2.0"
-  dependencies:
-    rsvp: "npm:^3.3.3"
-  checksum: 10/8d38f66d36cdc891fc5371315c0e6e8e094bfb86d769f0781d8acf1551ef513a43f5b8bd4c984255fc85ce4cc7a111f334d2aae454b86eef535d44ddec344ec7
-  languageName: node
-  linkType: hard
-
 "capture-stack-trace@npm:^1.0.0":
   version: 1.0.2
   resolution: "capture-stack-trace@npm:1.0.2"
@@ -16248,7 +14473,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.3.1, chalk@npm:^2.3.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+"chalk@npm:^2.0.1, chalk@npm:^2.3.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -16269,7 +14494,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
+"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
@@ -16279,13 +14504,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "chalk@npm:5.3.0"
-  checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea
-  languageName: node
-  linkType: hard
-
 "chalk@npm:~0.4.0":
   version: 0.4.0
   resolution: "chalk@npm:0.4.0"
@@ -16373,13 +14591,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chardet@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "chardet@npm:0.7.0"
-  checksum: 10/b0ec668fba5eeec575ed2559a0917ba41a6481f49063c8445400e476754e0957ee09e44dc032310f526182b8f1bf25e9d4ed371f74050af7be1383e06bc44952
-  languageName: node
-  linkType: hard
-
 "chart.js@npm:^1.0.2":
   version: 1.1.1
   resolution: "chart.js@npm:1.1.1"
@@ -16487,18 +14698,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"class-utils@npm:^0.3.5":
-  version: 0.3.6
-  resolution: "class-utils@npm:0.3.6"
-  dependencies:
-    arr-union: "npm:^3.1.0"
-    define-property: "npm:^0.2.5"
-    isobject: "npm:^3.0.0"
-    static-extend: "npm:^0.1.1"
-  checksum: 10/b236d9deb6594828966e45c5f48abac9a77453ee0dbdb89c635ce876f59755d7952309d554852b6f7d909198256c335a4bd51b09c1d238b36b92152eb2b9d47a
-  languageName: node
-  linkType: hard
-
 "classnames@npm:*, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.0, classnames@npm:^2.3.1, classnames@npm:^2.3.2":
   version: 2.3.2
   resolution: "classnames@npm:2.3.2"
@@ -16546,15 +14745,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-cursor@npm:^2.0.0, cli-cursor@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-cursor@npm:2.1.0"
-  dependencies:
-    restore-cursor: "npm:^2.0.0"
-  checksum: 10/d88e97bfdac01046a3ffe7d49f06757b3126559d7e44aa2122637eb179284dc6cd49fca2fac4f67c19faaf7e6dab716b6fe1dfcd309977407d8c7578ec2d044d
-  languageName: node
-  linkType: hard
-
 "cli-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "cli-cursor@npm:3.1.0"
@@ -16607,23 +14797,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-truncate@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "cli-truncate@npm:0.2.1"
-  dependencies:
-    slice-ansi: "npm:0.0.4"
-    string-width: "npm:^1.0.1"
-  checksum: 10/c2b0de7c08915eab1e660884251411ad31691c5036a876f98e1bf747f1c165dc8345afdba92b7efb3678478c9fc17c9c9c47c76d181e35478aaa1047459f98aa
-  languageName: node
-  linkType: hard
-
-"cli-width@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cli-width@npm:3.0.0"
-  checksum: 10/8730848b04fb189666ab037a35888d191c8f05b630b1d770b0b0e4c920b47bb5cc14bddf6b8ffe5bfc66cee97c8211d4d18e756c1ffcc75d7dbe7e1186cd7826
-  languageName: node
-  linkType: hard
-
 "clipanion@npm:^4.0.0-rc.2":
   version: 4.0.0-rc.2
   resolution: "clipanion@npm:4.0.0-rc.2"
@@ -16635,17 +14808,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cliui@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "cliui@npm:4.1.0"
-  dependencies:
-    string-width: "npm:^2.1.1"
-    strip-ansi: "npm:^4.0.0"
-    wrap-ansi: "npm:^2.0.0"
-  checksum: 10/b73eea68d48774dc178ac6aeb411c7000c1d9a5ae532e5a1d496f395acb797c47337e32285d54448d60d7d703e4ac6398d65f2db26bcadc3c73e59a2027471f3
-  languageName: node
-  linkType: hard
-
 "cliui@npm:^5.0.0":
   version: 5.0.0
   resolution: "cliui@npm:5.0.0"
@@ -16762,16 +14924,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"collection-visit@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "collection-visit@npm:1.0.0"
-  dependencies:
-    map-visit: "npm:^1.0.0"
-    object-visit: "npm:^1.0.0"
-  checksum: 10/15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9
-  languageName: node
-  linkType: hard
-
 "color-convert@npm:^1.9.0, color-convert@npm:^1.9.3":
   version: 1.9.3
   resolution: "color-convert@npm:1.9.3"
@@ -16854,7 +15006,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colors@npm:^1.1.2, colors@npm:^1.3.2":
+"colors@npm:^1.1.2":
   version: 1.4.0
   resolution: "colors@npm:1.4.0"
   checksum: 10/90b2d5465159813a3983ea72ca8cff75f784824ad70f2cc2b32c233e95bcfbcda101ebc6d6766bc50f57263792629bfb4f1f8a4dfbd1d240f229fc7f69b785fc
@@ -16894,7 +15046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:2, commander@npm:^2.12.1, commander@npm:^2.14.1, commander@npm:^2.20.0, commander@npm:^2.9.0":
+"commander@npm:2, commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
   checksum: 10/90c5b6898610cd075984c58c4f88418a4fb44af08c1b1415e9854c03171bec31b336b7f3e4cefe33de994b3f12b03c5e2d638da4316df83593b9e82554e7e95b
@@ -16934,32 +15086,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commitizen@npm:^4.0.3, commitizen@npm:^4.1.2":
-  version: 4.3.0
-  resolution: "commitizen@npm:4.3.0"
-  dependencies:
-    cachedir: "npm:2.3.0"
-    cz-conventional-changelog: "npm:3.3.0"
-    dedent: "npm:0.7.0"
-    detect-indent: "npm:6.1.0"
-    find-node-modules: "npm:^2.1.2"
-    find-root: "npm:1.1.0"
-    fs-extra: "npm:9.1.0"
-    glob: "npm:7.2.3"
-    inquirer: "npm:8.2.5"
-    is-utf8: "npm:^0.2.1"
-    lodash: "npm:4.17.21"
-    minimist: "npm:1.2.7"
-    strip-bom: "npm:4.0.0"
-    strip-json-comments: "npm:3.1.1"
-  bin:
-    commitizen: bin/commitizen
-    cz: bin/git-cz
-    git-cz: bin/git-cz
-  checksum: 10/45a82b7fdeb901654b39de37567995ef99c6e33e02406b25dd1059a75f880d9cd593fa4d52a32b2e70baef8754bb32c1bf8e5b9d9336f32087bf7f451cb3f72c
-  languageName: node
-  linkType: hard
-
 "commondir@npm:^1.0.1":
   version: 1.0.1
   resolution: "commondir@npm:1.0.1"
@@ -16987,20 +15113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "compare-versions@npm:3.6.0"
-  checksum: 10/7492a50cdaa2c27f5254eee7c4b38856e1c164991bab3d98d7fd067fe4b570d47123ecb92523b78338be86aa221668fd3868bfe8caa5587dc3ebbe1a03d52b5d
-  languageName: node
-  linkType: hard
-
-"component-emitter@npm:^1.2.1":
-  version: 1.3.1
-  resolution: "component-emitter@npm:1.3.1"
-  checksum: 10/94550aa462c7bd5a61c1bc480e28554aa306066930152d1b1844a0dd3845d4e5db7e261ddec62ae184913b3e59b55a2ad84093b9d3596a8f17c341514d6c483d
-  languageName: node
-  linkType: hard
-
 "compressible@npm:~2.0.16":
   version: 2.0.18
   resolution: "compressible@npm:2.0.18"
@@ -17194,13 +15306,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"conventional-commit-types@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "conventional-commit-types@npm:3.0.0"
-  checksum: 10/1c6d9b9693b5c40b67b86780d15baf607b4893c3014aa857015ab59d0c8915bf67cdf0d6def820c0d157da796ad75ca9c9174a642a936db18072683f58d40666
-  languageName: node
-  linkType: hard
-
 "conventional-commits-filter@npm:^2.0.0, conventional-commits-filter@npm:^2.0.7":
   version: 2.0.7
   resolution: "conventional-commits-filter@npm:2.0.7"
@@ -17328,13 +15433,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-descriptor@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "copy-descriptor@npm:0.1.1"
-  checksum: 10/edf4651bce36166c7fcc60b5c1db2c5dad1d87820f468507331dd154b686ece8775f5d383127d44aeef813462520c866f83908aa2d4291708f898df776816860
-  languageName: node
-  linkType: hard
-
 "copy-to-clipboard@npm:^3.3.1":
   version: 3.3.3
   resolution: "copy-to-clipboard@npm:3.3.3"
@@ -17429,19 +15527,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig-typescript-loader@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "cosmiconfig-typescript-loader@npm:5.0.0"
-  dependencies:
-    jiti: "npm:^1.19.1"
-  peerDependencies:
-    "@types/node": "*"
-    cosmiconfig: ">=8.2"
-    typescript: ">=4"
-  checksum: 10/ccbb367fe92e623207cb33a85c1fe2e2b592e2af845b38c39c0781e0b05c1a72642eec9bea1ed589d0ac95b47c5d1f232f43cbbe0f68b6218f7d887d9813f850
-  languageName: node
-  linkType: hard
-
 "cosmiconfig@npm:^5.0.0, cosmiconfig@npm:^5.2.0":
   version: 5.2.1
   resolution: "cosmiconfig@npm:5.2.1"
@@ -17497,38 +15582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "cosmiconfig@npm:9.0.0"
-  dependencies:
-    env-paths: "npm:^2.2.1"
-    import-fresh: "npm:^3.3.0"
-    js-yaml: "npm:^4.1.0"
-    parse-json: "npm:^5.2.0"
-  peerDependencies:
-    typescript: ">=4.9.5"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10/8bdf1dfbb6fdb3755195b6886dc0649a3c742ec75afa4cb8da7b070936aed22a4f4e5b7359faafe03180358f311dbc300d248fd6586c458203d376a40cc77826
-  languageName: node
-  linkType: hard
-
-"coveralls@npm:^3.0.2":
-  version: 3.1.1
-  resolution: "coveralls@npm:3.1.1"
-  dependencies:
-    js-yaml: "npm:^3.13.1"
-    lcov-parse: "npm:^1.0.0"
-    log-driver: "npm:^1.2.7"
-    minimist: "npm:^1.2.5"
-    request: "npm:^2.88.2"
-  bin:
-    coveralls: bin/coveralls.js
-  checksum: 10/2508710c0b29a92e45c1cd401f55da0ac1a1b57b3ccf8b359690648e50f4f13fd34c53eeda7fd8e6817ce285f70f666b972937c959785b1b82bd00450011445d
-  languageName: node
-  linkType: hard
-
 "create-error-class@npm:^3.0.0":
   version: 3.0.2
   resolution: "create-error-class@npm:3.0.2"
@@ -17950,13 +16003,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssom@npm:0.3.x, cssom@npm:>= 0.3.2 < 0.4.0, cssom@npm:~0.3.6":
-  version: 0.3.8
-  resolution: "cssom@npm:0.3.8"
-  checksum: 10/49eacc88077555e419646c0ea84ddc73c97e3a346ad7cb95e22f9413a9722d8964b91d781ce21d378bd5ae058af9a745402383fa4e35e9cdfd19654b63f892a9
-  languageName: node
-  linkType: hard
-
 "cssom@npm:^0.4.4":
   version: 0.4.4
   resolution: "cssom@npm:0.4.4"
@@ -17964,12 +16010,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^1.0.0":
-  version: 1.4.0
-  resolution: "cssstyle@npm:1.4.0"
-  dependencies:
-    cssom: "npm:0.3.x"
-  checksum: 10/cc8ed156d75767f4e84757726a3a2ed2044812f43da875e5bb486fddfda0473e33d63505956e44349ffbabb99fc1bf7f27863463a126524a111a4cea3c59bad1
+"cssom@npm:~0.3.6":
+  version: 0.3.8
+  resolution: "cssom@npm:0.3.8"
+  checksum: 10/49eacc88077555e419646c0ea84ddc73c97e3a346ad7cb95e22f9413a9722d8964b91d781ce21d378bd5ae058af9a745402383fa4e35e9cdfd19654b63f892a9
   languageName: node
   linkType: hard
 
@@ -18035,24 +16079,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cz-conventional-changelog@npm:3.3.0, cz-conventional-changelog@npm:^3.2.0":
-  version: 3.3.0
-  resolution: "cz-conventional-changelog@npm:3.3.0"
-  dependencies:
-    "@commitlint/load": "npm:>6.1.1"
-    chalk: "npm:^2.4.1"
-    commitizen: "npm:^4.0.3"
-    conventional-commit-types: "npm:^3.0.0"
-    lodash.map: "npm:^4.5.1"
-    longest: "npm:^2.0.1"
-    word-wrap: "npm:^1.0.3"
-  dependenciesMeta:
-    "@commitlint/load":
-      optional: true
-  checksum: 10/790c201a7fbbf082f780fa0542843a3f85bb6894d29194e544440edaacc727ad9c11cfd526de766bf8e1c89ddec66bc7d489e2b2af2bcf092022b554f3d1ee73
-  languageName: node
-  linkType: hard
-
 "d3-array@npm:1, d3-array@npm:^1.1.1, d3-array@npm:^1.2.0":
   version: 1.2.4
   resolution: "d3-array@npm:1.2.4"
@@ -18621,17 +16647,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "data-urls@npm:1.1.0"
-  dependencies:
-    abab: "npm:^2.0.0"
-    whatwg-mimetype: "npm:^2.2.0"
-    whatwg-url: "npm:^7.0.0"
-  checksum: 10/dc4bd9621df0dff336d7c4c0517c792488ef3cf11cd37e72ab80f3a7f0a0aa14bad677ac97cf22c87c6eb9518e58b98590e1c8c756b56240940f0e470c81612e
-  languageName: node
-  linkType: hard
-
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -18643,39 +16658,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-view-buffer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "data-view-buffer@npm:1.0.1"
-  dependencies:
-    call-bind: "npm:^1.0.6"
-    es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10/5919a39a18ee919573336158fd162fdf8ada1bc23a139f28543fd45fac48e0ea4a3ad3bfde91de124d4106e65c4a7525f6a84c20ba0797ec890a77a96d13a82a
-  languageName: node
-  linkType: hard
-
-"data-view-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "data-view-byte-length@npm:1.0.1"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10/f33c65e58d8d0432ad79761f2e8a579818d724b5dc6dc4e700489b762d963ab30873c0f1c37d8f2ed12ef51c706d1195f64422856d25f067457aeec50cc40aac
-  languageName: node
-  linkType: hard
-
-"data-view-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "data-view-byte-offset@npm:1.0.0"
-  dependencies:
-    call-bind: "npm:^1.0.6"
-    es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10/96f34f151bf02affb7b9f98762fb7aca1dd5f4553cb57b80bce750ca609c15d33ca659568ef1d422f7e35680736cbccb893a3d4b012760c758c1446bbdc4c6db
-  languageName: node
-  linkType: hard
-
 "date-fns-tz@npm:^2.0.0":
   version: 2.0.1
   resolution: "date-fns-tz@npm:2.0.1"
@@ -18685,13 +16667,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^1.27.2":
-  version: 1.30.1
-  resolution: "date-fns@npm:1.30.1"
-  checksum: 10/24c0937f4e5704f25627c9d1e92e1fe03cd6165d9f32334b7f923a737a57ef992c287cad0694356071e617fbbfa6bd10dec9192ea9035a3e6d0745b9d1594883
-  languageName: node
-  linkType: hard
-
 "date-fns@npm:^2.15.0, date-fns@npm:^2.28.0":
   version: 2.30.0
   resolution: "date-fns@npm:2.30.0"
@@ -18708,7 +16683,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8, debug@npm:^2.6.9":
+"debug@npm:2.6.9":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
@@ -18747,18 +16722,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^4.0.1":
-  version: 4.3.5
-  resolution: "debug@npm:4.3.5"
-  dependencies:
-    ms: "npm:2.1.2"
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 10/cb6eab424c410e07813ca1392888589972ce9a32b8829c6508f5e1f25f3c3e70a76731610ae55b4bbe58d1a2fffa1424b30e97fa8d394e49cd2656a9643aedd2
-  languageName: node
-  linkType: hard
-
 "debuglog@npm:*, debuglog@npm:^1.0.1":
   version: 1.0.1
   resolution: "debuglog@npm:1.0.1"
@@ -18776,7 +16739,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decamelize@npm:^1.1.0, decamelize@npm:^1.1.1, decamelize@npm:^1.2.0":
+"decamelize@npm:^1.1.0, decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
   checksum: 10/ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
@@ -18813,15 +16776,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decompress-response@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "decompress-response@npm:3.3.0"
-  dependencies:
-    mimic-response: "npm:^1.0.0"
-  checksum: 10/952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380
-  languageName: node
-  linkType: hard
-
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -18831,7 +16785,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dedent@npm:0.7.0, dedent@npm:^0.7.0":
+"dedent@npm:^0.7.0":
   version: 0.7.0
   resolution: "dedent@npm:0.7.0"
   checksum: 10/87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
@@ -18904,15 +16858,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"default-require-extensions@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "default-require-extensions@npm:1.0.0"
-  dependencies:
-    strip-bom: "npm:^2.0.0"
-  checksum: 10/8be10a3e1f997c8a579c3f00fdd8117c30fa3a12d2ac544dc1ee93fd6138c77fba69fe69546c76d0299d7f74c26416301b9a1dc775557e99991a6ebe2f850df4
-  languageName: node
-  linkType: hard
-
 "defaults@npm:^1.0.3":
   version: 1.0.4
   resolution: "defaults@npm:1.0.4"
@@ -18922,13 +16867,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"defer-to-connect@npm:^1.0.1":
-  version: 1.1.3
-  resolution: "defer-to-connect@npm:1.1.3"
-  checksum: 10/9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930
-  languageName: node
-  linkType: hard
-
 "defer-to-connect@npm:^2.0.0":
   version: 2.0.1
   resolution: "defer-to-connect@npm:2.0.1"
@@ -18965,7 +16903,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -18976,34 +16914,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-property@npm:^0.2.5":
-  version: 0.2.5
-  resolution: "define-property@npm:0.2.5"
-  dependencies:
-    is-descriptor: "npm:^0.1.0"
-  checksum: 10/85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394
-  languageName: node
-  linkType: hard
-
-"define-property@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "define-property@npm:1.0.0"
-  dependencies:
-    is-descriptor: "npm:^1.0.0"
-  checksum: 10/5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a
-  languageName: node
-  linkType: hard
-
-"define-property@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "define-property@npm:2.0.2"
-  dependencies:
-    is-descriptor: "npm:^1.0.2"
-    isobject: "npm:^3.0.1"
-  checksum: 10/3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99
-  languageName: node
-  linkType: hard
-
 "defu@npm:^6.1.3":
   version: 6.1.4
   resolution: "defu@npm:6.1.4"
@@ -19011,20 +16921,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"del@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "del@npm:3.0.0"
-  dependencies:
-    globby: "npm:^6.1.0"
-    is-path-cwd: "npm:^1.0.0"
-    is-path-in-cwd: "npm:^1.0.0"
-    p-map: "npm:^1.1.1"
-    pify: "npm:^3.0.0"
-    rimraf: "npm:^2.2.8"
-  checksum: 10/88192c10411b55ba644456ac4881c6ed92029b53b882bb6067011af05e8da8d9c87f5ddacf2999cc45a05a9f03af345b83f17f341a88f456417c7daa04458d38
-  languageName: node
-  linkType: hard
-
 "del@npm:^6.0.0":
   version: 6.1.1
   resolution: "del@npm:6.1.1"
@@ -19099,29 +16995,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-file@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "detect-file@npm:1.0.0"
-  checksum: 10/1861e4146128622e847abe0e1ed80fef01e78532665858a792267adf89032b7a9c698436137707fcc6f02956c2a6a0052d6a0cef5be3d4b76b1ff0da88e2158a
-  languageName: node
-  linkType: hard
-
-"detect-indent@npm:6.1.0, detect-indent@npm:^6.1.0":
+"detect-indent@npm:^6.1.0":
   version: 6.1.0
   resolution: "detect-indent@npm:6.1.0"
   checksum: 10/ab953a73c72dbd4e8fc68e4ed4bfd92c97eb6c43734af3900add963fd3a9316f3bc0578b018b24198d4c31a358571eff5f0656e81a1f3b9ad5c547d58b2d093d
   languageName: node
   linkType: hard
 
-"detect-indent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "detect-indent@npm:4.0.0"
-  dependencies:
-    repeating: "npm:^2.0.0"
-  checksum: 10/328f273915c1610899bc7d4784ce874413d0a698346364cd3ee5d79afba1c5cf4dbc97b85a801e20f4d903c0598bd5096af32b800dfb8696b81464ccb3dfda2c
-  languageName: node
-  linkType: hard
-
 "detect-indent@npm:~5.0.0":
   version: 5.0.0
   resolution: "detect-indent@npm:5.0.0"
@@ -19219,13 +17099,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff@npm:^3.1.0, diff@npm:^3.2.0":
-  version: 3.5.0
-  resolution: "diff@npm:3.5.0"
-  checksum: 10/cfbc2df98d6f8eb82c0f7735c8468695f65189d31f95a708d4c97cd96a8083fdfd83d87a067a29924ae7d8ff64f578e7da78391af537815750268555fe0df9f0
-  languageName: node
-  linkType: hard
-
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -19276,16 +17149,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"doctrine@npm:0.7.2":
-  version: 0.7.2
-  resolution: "doctrine@npm:0.7.2"
-  dependencies:
-    esutils: "npm:^1.1.6"
-    isarray: "npm:0.0.1"
-  checksum: 10/b8da8df16b22fdb3cdc9956ac2c02cc240b2ca1444f1df7c5d301fcc0f7774f322cf628cbd0aa08db9ebeec188d2bb896d22bf72acd9d9ac6d2c189d319e8076
-  languageName: node
-  linkType: hard
-
 "doctrine@npm:^3.0.0":
   version: 3.0.0
   resolution: "doctrine@npm:3.0.0"
@@ -19372,15 +17235,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domexception@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "domexception@npm:1.0.1"
-  dependencies:
-    webidl-conversions: "npm:^4.0.2"
-  checksum: 10/1cf5a22ffe5aeab51a2235b882c688719ed22112bf83758410bd64f5dfd1f24e53132f355b930be18e57bcd05857ba74967cf8977d6be5b9d7945b15acdee9bc
-  languageName: node
-  linkType: hard
-
 "domexception@npm:^2.0.1":
   version: 2.0.1
   resolution: "domexception@npm:2.0.1"
@@ -19682,13 +17536,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elegant-spinner@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "elegant-spinner@npm:1.0.1"
-  checksum: 10/d6a773d950c5d403b5f0fa402787e37dde99989ab6c943558fe8491cf7cd0df0e2747a9ff4d391d5a5f20a447cc9e9a63bdc956354ba47bea462f1603a5b04fe
-  languageName: node
-  linkType: hard
-
 "element-resize-detector@npm:^1.2.1":
   version: 1.2.4
   resolution: "element-resize-detector@npm:1.2.4"
@@ -19799,7 +17646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
+"env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
   checksum: 10/65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
@@ -19840,7 +17687,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"error-ex@npm:^1.2.0, error-ex@npm:^1.3.1":
+"error-ex@npm:^1.3.1":
   version: 1.3.2
   resolution: "error-ex@npm:1.3.2"
   dependencies:
@@ -19896,60 +17743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2":
-  version: 1.23.3
-  resolution: "es-abstract@npm:1.23.3"
-  dependencies:
-    array-buffer-byte-length: "npm:^1.0.1"
-    arraybuffer.prototype.slice: "npm:^1.0.3"
-    available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
-    data-view-buffer: "npm:^1.0.1"
-    data-view-byte-length: "npm:^1.0.1"
-    data-view-byte-offset: "npm:^1.0.0"
-    es-define-property: "npm:^1.0.0"
-    es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
-    es-set-tostringtag: "npm:^2.0.3"
-    es-to-primitive: "npm:^1.2.1"
-    function.prototype.name: "npm:^1.1.6"
-    get-intrinsic: "npm:^1.2.4"
-    get-symbol-description: "npm:^1.0.2"
-    globalthis: "npm:^1.0.3"
-    gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.2"
-    has-proto: "npm:^1.0.3"
-    has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.2"
-    internal-slot: "npm:^1.0.7"
-    is-array-buffer: "npm:^3.0.4"
-    is-callable: "npm:^1.2.7"
-    is-data-view: "npm:^1.0.1"
-    is-negative-zero: "npm:^2.0.3"
-    is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.3"
-    is-string: "npm:^1.0.7"
-    is-typed-array: "npm:^1.1.13"
-    is-weakref: "npm:^1.0.2"
-    object-inspect: "npm:^1.13.1"
-    object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.5"
-    regexp.prototype.flags: "npm:^1.5.2"
-    safe-array-concat: "npm:^1.1.2"
-    safe-regex-test: "npm:^1.0.3"
-    string.prototype.trim: "npm:^1.2.9"
-    string.prototype.trimend: "npm:^1.0.8"
-    string.prototype.trimstart: "npm:^1.0.8"
-    typed-array-buffer: "npm:^1.0.2"
-    typed-array-byte-length: "npm:^1.0.1"
-    typed-array-byte-offset: "npm:^1.0.2"
-    typed-array-length: "npm:^1.0.6"
-    unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.15"
-  checksum: 10/2da795a6a1ac5fc2c452799a409acc2e3692e06dc6440440b076908617188899caa562154d77263e3053bcd9389a07baa978ab10ac3b46acc399bd0c77be04cb
-  languageName: node
-  linkType: hard
-
 "es-array-method-boxes-properly@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-array-method-boxes-properly@npm:1.0.0"
@@ -19966,7 +17759,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+"es-errors@npm:^1.3.0":
   version: 1.3.0
   resolution: "es-errors@npm:1.3.0"
   checksum: 10/96e65d640156f91b707517e8cdc454dd7d47c32833aa3e85d79f24f9eb7ea85f39b63e36216ef0114996581969b59fe609a94e30316b08f5f4df1d44134cf8d5
@@ -20011,15 +17804,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-object-atoms@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-object-atoms@npm:1.0.0"
-  dependencies:
-    es-errors: "npm:^1.3.0"
-  checksum: 10/f8910cf477e53c0615f685c5c96210591841850871b81924fcf256bfbaa68c254457d994a4308c60d15b20805e7f61ce6abc669375e01a5349391a8c1767584f
-  languageName: node
-  linkType: hard
-
 "es-set-tostringtag@npm:^2.0.1":
   version: 2.0.1
   resolution: "es-set-tostringtag@npm:2.0.1"
@@ -20031,17 +17815,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "es-set-tostringtag@npm:2.0.3"
-  dependencies:
-    get-intrinsic: "npm:^1.2.4"
-    has-tostringtag: "npm:^1.0.2"
-    hasown: "npm:^2.0.1"
-  checksum: 10/7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129
-  languageName: node
-  linkType: hard
-
 "es-to-primitive@npm:^1.2.1":
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
@@ -20418,7 +18191,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.4, escape-string-regexp@npm:^1.0.5":
+"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
   checksum: 10/6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
@@ -20439,25 +18212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^1.9.1":
-  version: 1.14.3
-  resolution: "escodegen@npm:1.14.3"
-  dependencies:
-    esprima: "npm:^4.0.1"
-    estraverse: "npm:^4.2.0"
-    esutils: "npm:^2.0.2"
-    optionator: "npm:^0.8.1"
-    source-map: "npm:~0.6.1"
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 10/70f095ca9393535f9f1c145ef99dc0b3ff14cca6bc4a79d90ff3352f90c3f2e07f75af6d6c05174ea67c45271f75e80dd440dd7d04ed2cf44c9452c3042fa84a
-  languageName: node
-  linkType: hard
-
 "escodegen@npm:^2.0.0, escodegen@npm:^2.1.0":
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
@@ -20633,13 +18387,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esutils@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "esutils@npm:1.1.6"
-  checksum: 10/1657640cda545532db1d7096c7ef7ec2c50b29469ab50bba43d59388b32e1a13f29b9bcf9a079a41eb86118b269d8c72caaee3fdc328ab29fba6b495ba152c86
-  languageName: node
-  linkType: hard
-
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -20710,15 +18457,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"exec-sh@npm:^0.2.0":
-  version: 0.2.2
-  resolution: "exec-sh@npm:0.2.2"
-  dependencies:
-    merge: "npm:^1.2.0"
-  checksum: 10/f0e2bdc9fded34f33a6473293cf06dd89f09da1dd7850369001e56b055bb00dae449dbf2e1dd0a1bce2083f13e30e0a0e1b9ab9e42efb1954a538349340c5562
-  languageName: node
-  linkType: hard
-
 "execa@npm:^0.7.0":
   version: 0.7.0
   resolution: "execa@npm:0.7.0"
@@ -20808,39 +18546,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expand-brackets@npm:^0.1.4":
-  version: 0.1.5
-  resolution: "expand-brackets@npm:0.1.5"
-  dependencies:
-    is-posix-bracket: "npm:^0.1.0"
-  checksum: 10/71b2971027eb026f055a1c310d24d18a266427b84fc18cadddcedb4de2e07aaef6084e252406b20e58f7aa7613f6bfbe6136962955562529a66675bf49bb10d7
-  languageName: node
-  linkType: hard
-
-"expand-brackets@npm:^2.1.4":
-  version: 2.1.4
-  resolution: "expand-brackets@npm:2.1.4"
-  dependencies:
-    debug: "npm:^2.3.3"
-    define-property: "npm:^0.2.5"
-    extend-shallow: "npm:^2.0.1"
-    posix-character-classes: "npm:^0.1.0"
-    regex-not: "npm:^1.0.0"
-    snapdragon: "npm:^0.8.1"
-    to-regex: "npm:^3.0.1"
-  checksum: 10/aa4acc62084638c761ecdbe178bd3136f01121939f96bbfc3be27c46c66625075f77fe0a446b627c9071b1aaf6d93ccf5bde5ff34b7ef883e4f46067a8e63e41
-  languageName: node
-  linkType: hard
-
-"expand-range@npm:^1.8.1":
-  version: 1.8.2
-  resolution: "expand-range@npm:1.8.2"
-  dependencies:
-    fill-range: "npm:^2.1.0"
-  checksum: 10/8383d0ced4f992dab75b4116720b54715d3e0507d0b7663b2e04e2b9178f91c37134c93cbc5abac27a20464640e3880f60021d63d359c6f7180107d74d32c64e
-  languageName: node
-  linkType: hard
-
 "expand-template@npm:^2.0.3":
   version: 2.0.3
   resolution: "expand-template@npm:2.0.3"
@@ -20848,29 +18553,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expand-tilde@npm:^2.0.0, expand-tilde@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "expand-tilde@npm:2.0.2"
-  dependencies:
-    homedir-polyfill: "npm:^1.0.1"
-  checksum: 10/2efe6ed407d229981b1b6ceb552438fbc9e5c7d6a6751ad6ced3e0aa5cf12f0b299da695e90d6c2ac79191b5c53c613e508f7149e4573abfbb540698ddb7301a
-  languageName: node
-  linkType: hard
-
-"expect@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "expect@npm:23.6.0"
-  dependencies:
-    ansi-styles: "npm:^3.2.0"
-    jest-diff: "npm:^23.6.0"
-    jest-get-type: "npm:^22.1.0"
-    jest-matcher-utils: "npm:^23.6.0"
-    jest-message-util: "npm:^23.4.0"
-    jest-regex-util: "npm:^23.3.0"
-  checksum: 10/98e3b394e5a5002d144fe66cb198a0dd7b5902223091564ea9eceab51ea797caa50061f7feb9fdee7c2f2943d7d51cb7c023b7e71043e99d7bb12527d8b4a400
-  languageName: node
-  linkType: hard
-
 "expect@npm:^27.5.1":
   version: 27.5.1
   resolution: "expect@npm:27.5.1"
@@ -20968,25 +18650,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend-shallow@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "extend-shallow@npm:2.0.1"
-  dependencies:
-    is-extendable: "npm:^0.1.0"
-  checksum: 10/8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
-  languageName: node
-  linkType: hard
-
-"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "extend-shallow@npm:3.0.2"
-  dependencies:
-    assign-symbols: "npm:^1.0.0"
-    is-extendable: "npm:^1.0.1"
-  checksum: 10/a920b0cd5838a9995ace31dfd11ab5e79bf6e295aa566910ce53dff19f4b1c0fda2ef21f26b28586c7a2450ca2b42d97bd8c0f5cec9351a819222bf861e02461
-  languageName: node
-  linkType: hard
-
 "extend@npm:^3.0.0, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
@@ -20994,42 +18657,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"external-editor@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "external-editor@npm:3.1.0"
-  dependencies:
-    chardet: "npm:^0.7.0"
-    iconv-lite: "npm:^0.4.24"
-    tmp: "npm:^0.0.33"
-  checksum: 10/776dff1d64a1d28f77ff93e9e75421a81c062983fd1544279d0a32f563c0b18c52abbb211f31262e2827e48edef5c9dc8f960d06dd2d42d1654443b88568056b
-  languageName: node
-  linkType: hard
-
-"extglob@npm:^0.3.1":
-  version: 0.3.2
-  resolution: "extglob@npm:0.3.2"
-  dependencies:
-    is-extglob: "npm:^1.0.0"
-  checksum: 10/c1c8d5365fe4992fc5b007140cbb37292ffadcd767cb602606de4d572ff96f38620e42855f8cb75020c050aacf1eeb51212dd6312de46eab42e2200277b5fc45
-  languageName: node
-  linkType: hard
-
-"extglob@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "extglob@npm:2.0.4"
-  dependencies:
-    array-unique: "npm:^0.3.2"
-    define-property: "npm:^1.0.0"
-    expand-brackets: "npm:^2.1.4"
-    extend-shallow: "npm:^2.0.1"
-    fragment-cache: "npm:^0.2.1"
-    regex-not: "npm:^1.0.0"
-    snapdragon: "npm:^0.8.1"
-    to-regex: "npm:^3.0.1"
-  checksum: 10/6869edd48d40c322e1cda9bf494ed2407c69a19063fd2897184cb62d6d35c14fa7402b01d9dedd65d77ed1ccc74a291235a702c68b4f28a7314da0cdee97c85b
-  languageName: node
-  linkType: hard
-
 "extsprintf@npm:1.3.0":
   version: 1.3.0
   resolution: "extsprintf@npm:1.3.0"
@@ -21108,7 +18735,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0":
+"fast-json-stable-stringify@npm:^2.0.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
   checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e
@@ -21217,7 +18844,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"figures@npm:^1.0.1, figures@npm:^1.7.0":
+"figures@npm:^1.0.1":
   version: 1.7.0
   resolution: "figures@npm:1.7.0"
   dependencies:
@@ -21276,13 +18903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-uri-to-path@npm:1.0.0":
-  version: 1.0.0
-  resolution: "file-uri-to-path@npm:1.0.0"
-  checksum: 10/b648580bdd893a008c92c7ecc96c3ee57a5e7b6c4c18a9a09b44fb5d36d79146f8e442578bc0e173dc027adf3987e254ba1dfd6e3ec998b7c282873010502144
-  languageName: node
-  linkType: hard
-
 "filelist@npm:^1.0.4":
   version: 1.0.4
   resolution: "filelist@npm:1.0.4"
@@ -21292,23 +18912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filename-regex@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "filename-regex@npm:2.0.1"
-  checksum: 10/ac181f8184cf49d2f08889a446995537c3967e6f6195752d903b69c7d85f134425fb1446c4e384e77390bac488b60a9658805debc5a91e8c0bc9f81340505371
-  languageName: node
-  linkType: hard
-
-"fileset@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "fileset@npm:2.0.3"
-  dependencies:
-    glob: "npm:^7.0.3"
-    minimatch: "npm:^3.0.3"
-  checksum: 10/7da22f3a6675ac892957c7349b872eb9f0fd259c0e19f807f2d9519d023430539c45ba9db2a67a1eb3e0f76aa77a2b0645efed5d27f177a77f435aa865d05c6a
-  languageName: node
-  linkType: hard
-
 "filesize@npm:^6.1.0":
   version: 6.4.0
   resolution: "filesize@npm:6.4.0"
@@ -21316,31 +18919,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fill-range@npm:^2.1.0":
-  version: 2.2.4
-  resolution: "fill-range@npm:2.2.4"
-  dependencies:
-    is-number: "npm:^2.1.0"
-    isobject: "npm:^2.0.0"
-    randomatic: "npm:^3.0.0"
-    repeat-element: "npm:^1.1.2"
-    repeat-string: "npm:^1.5.2"
-  checksum: 10/ad71c3d699bb6b9dc8b2da5c246ab03335f8824c5a7500285cf045814a375c6f847410b4e75c0fca035ad00c4faf1247537f53e26251abbc72e311d10f31e069
-  languageName: node
-  linkType: hard
-
-"fill-range@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "fill-range@npm:4.0.0"
-  dependencies:
-    extend-shallow: "npm:^2.0.1"
-    is-number: "npm:^3.0.0"
-    repeat-string: "npm:^1.6.1"
-    to-regex-range: "npm:^2.1.0"
-  checksum: 10/68be23b3c40d5a3fd2847ce18e3a5eac25d9f4c05627291e048ba1346ed0e429668b58a3429e61c0db9fa5954c4402fe99322a65d8a0eb06ebed8d3a18fbb09a
-  languageName: node
-  linkType: hard
-
 "fill-range@npm:^7.0.1":
   version: 7.0.1
   resolution: "fill-range@npm:7.0.1"
@@ -21401,16 +18979,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-node-modules@npm:^2.1.2":
-  version: 2.1.3
-  resolution: "find-node-modules@npm:2.1.3"
-  dependencies:
-    findup-sync: "npm:^4.0.0"
-    merge: "npm:^2.1.1"
-  checksum: 10/4b8a194ffd56ccf1a1033de35e2ee8209869b05cce68ff7c4ab0dbf04e63fd7196283383eee4c84596c7b311755b2836815209d558234cadc330a87881e5a3f4
-  languageName: node
-  linkType: hard
-
 "find-npm-prefix@npm:^1.0.2":
   version: 1.0.2
   resolution: "find-npm-prefix@npm:1.0.2"
@@ -21418,23 +18986,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-root@npm:1.1.0, find-root@npm:^1.1.0":
+"find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
   checksum: 10/caa799c976a14925ba7f31ca1a226fe73d3aa270f4f1b623fcfeb1c6e263111db4beb807d8acd31bd4d48d44c343b93688a9288dfbccca27463c36a0301b0bb9
   languageName: node
   linkType: hard
 
-"find-up@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "find-up@npm:1.1.2"
-  dependencies:
-    path-exists: "npm:^2.0.0"
-    pinkie-promise: "npm:^2.0.0"
-  checksum: 10/a2cb9f4c9f06ee3a1e92ed71d5aed41ac8ae30aefa568132f6c556fac7678a5035126153b59eaec68da78ac409eef02503b2b059706bdbf232668d7245e3240a
-  languageName: node
-  linkType: hard
-
 "find-up@npm:^2.0.0, find-up@npm:^2.1.0":
   version: 2.1.0
   resolution: "find-up@npm:2.1.0"
@@ -21482,15 +19040,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-versions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "find-versions@npm:4.0.0"
-  dependencies:
-    semver-regex: "npm:^3.1.2"
-  checksum: 10/2b4c749dc33e3fa73a457ca4df616ac13b4b32c53f6297bc862b0814d402a6cfec93a0d308d5502eeb47f2c125906e0f861bf01b756f08395640892186357711
-  languageName: node
-  linkType: hard
-
 "find-yarn-workspace-root@npm:^2.0.0":
   version: 2.0.0
   resolution: "find-yarn-workspace-root@npm:2.0.0"
@@ -21500,18 +19049,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"findup-sync@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "findup-sync@npm:4.0.0"
-  dependencies:
-    detect-file: "npm:^1.0.0"
-    is-glob: "npm:^4.0.0"
-    micromatch: "npm:^4.0.2"
-    resolve-dir: "npm:^1.0.1"
-  checksum: 10/94131e1107ad63790ed00c4c39ca131a93ea602607bd97afeffd92b69a9a63cf2c6f57d6db88cb753fe748ac7fde79e1e76768ff784247026b7c5ebf23ede3a0
-  languageName: node
-  linkType: hard
-
 "flow-parser@npm:0.*":
   version: 0.227.0
   resolution: "flow-parser@npm:0.227.0"
@@ -21529,13 +19066,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fn-name@npm:~2.0.1":
-  version: 2.0.1
-  resolution: "fn-name@npm:2.0.1"
-  checksum: 10/ea06f4a99be824edf774f8314be9b1e7eeef62a9e462f243f452b1422c73f7b98a5dafe734256e57212239d1ac1204a7b79fdb8cc920af1ec414684a1b00ae66
-  languageName: node
-  linkType: hard
-
 "focus-lock@npm:^0.11.6":
   version: 0.11.6
   resolution: "focus-lock@npm:0.11.6"
@@ -21574,22 +19104,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"for-in@npm:^1.0.1, for-in@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "for-in@npm:1.0.2"
-  checksum: 10/09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d
-  languageName: node
-  linkType: hard
-
-"for-own@npm:^0.1.4":
-  version: 0.1.5
-  resolution: "for-own@npm:0.1.5"
-  dependencies:
-    for-in: "npm:^1.0.1"
-  checksum: 10/07eb0a2e98eb55ce13b56dd11ef4fb5e619ba7380aaec388b9eec1946153d74fa734ce409e8434020557e9489a50c34bc004d55754f5863bf7d77b441d8dee8c
-  languageName: node
-  linkType: hard
-
 "foreground-child@npm:^3.1.0":
   version: 3.1.1
   resolution: "foreground-child@npm:3.1.1"
@@ -21668,15 +19182,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fragment-cache@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "fragment-cache@npm:0.2.1"
-  dependencies:
-    map-cache: "npm:^0.2.2"
-  checksum: 10/1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc
-  languageName: node
-  linkType: hard
-
 "fresh@npm:0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
@@ -21733,18 +19238,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:9.1.0, fs-extra@npm:^9.0.0, fs-extra@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "fs-extra@npm:9.1.0"
-  dependencies:
-    at-least-node: "npm:^1.0.0"
-    graceful-fs: "npm:^4.2.0"
-    jsonfile: "npm:^6.0.1"
-    universalify: "npm:^2.0.0"
-  checksum: 10/08600da1b49552ed23dfac598c8fc909c66776dd130fea54fbcad22e330f7fcc13488bb995f6bc9ce5651aa35b65702faf616fe76370ee56f1aade55da982dca
-  languageName: node
-  linkType: hard
-
 "fs-extra@npm:^11.1.0":
   version: 11.2.0
   resolution: "fs-extra@npm:11.2.0"
@@ -21756,14 +19249,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "fs-extra@npm:7.0.1"
+"fs-extra@npm:^9.0.0, fs-extra@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "fs-extra@npm:9.1.0"
   dependencies:
-    graceful-fs: "npm:^4.1.2"
-    jsonfile: "npm:^4.0.0"
-    universalify: "npm:^0.1.0"
-  checksum: 10/3fc6e56ba2f07c00d452163f27f21a7076b72ef7da8a50fef004336d59ef4c34deda11d10ecd73fd8fbcf20e4f575f52857293090b3c9f8741d4e0598be30fea
+    at-least-node: "npm:^1.0.0"
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10/08600da1b49552ed23dfac598c8fc909c66776dd130fea54fbcad22e330f7fcc13488bb995f6bc9ce5651aa35b65702faf616fe76370ee56f1aade55da982dca
   languageName: node
   linkType: hard
 
@@ -21838,17 +19332,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^1.2.3":
-  version: 1.2.13
-  resolution: "fsevents@npm:1.2.13"
-  dependencies:
-    bindings: "npm:^1.5.0"
-    nan: "npm:^2.12.1"
-  checksum: 10/ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
 "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
   version: 2.3.3
   resolution: "fsevents@npm:2.3.3"
@@ -21859,16 +19342,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@npm%3A^1.2.3#optional!builtin<compat/fsevents>":
-  version: 1.2.13
-  resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin<compat/fsevents>::version=1.2.13&hash=d11327"
-  dependencies:
-    bindings: "npm:^1.5.0"
-    nan: "npm:^2.12.1"
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
 "fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
   version: 2.3.3
   resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
@@ -21911,17 +19384,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"g-status@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "g-status@npm:2.0.2"
-  dependencies:
-    arrify: "npm:^1.0.1"
-    matcher: "npm:^1.0.0"
-    simple-git: "npm:^1.85.0"
-  checksum: 10/df405d086f61d77e67bebaf380b9d4454245e26387463656d8badf0dbbb90b771611d1b53b2e2336d3c52e9b8a85ddd90f087c83fea03c7273265140b95abe5c
-  languageName: node
-  linkType: hard
-
 "gauge@npm:^4.0.3":
   version: 4.0.4
   resolution: "gauge@npm:4.0.4"
@@ -22050,13 +19512,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-caller-file@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "get-caller-file@npm:1.0.3"
-  checksum: 10/0b776558c1d94ac131ec0d47bf9da4e00a38e7d3a6cbde534e0e4656c13ead344e69ef7ed2c0bca16620cc2e1e26529f90e2336c8962736517b64890d583a2a0
-  languageName: node
-  linkType: hard
-
 "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
@@ -22076,7 +19531,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -22110,13 +19565,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-own-enumerable-property-symbols@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
-  checksum: 10/8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede
-  languageName: node
-  linkType: hard
-
 "get-package-type@npm:^0.1.0":
   version: 0.1.0
   resolution: "get-package-type@npm:0.1.0"
@@ -22213,17 +19661,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "get-symbol-description@npm:1.0.2"
-  dependencies:
-    call-bind: "npm:^1.0.5"
-    es-errors: "npm:^1.3.0"
-    get-intrinsic: "npm:^1.2.4"
-  checksum: 10/e1cb53bc211f9dbe9691a4f97a46837a553c4e7caadd0488dc24ac694db8a390b93edd412b48dcdd0b4bbb4c595de1709effc75fc87c0839deedc6968f5bd973
-  languageName: node
-  linkType: hard
-
 "get-tsconfig@npm:^4.7.5":
   version: 4.7.5
   resolution: "get-tsconfig@npm:4.7.5"
@@ -22233,13 +19670,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-value@npm:^2.0.3, get-value@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "get-value@npm:2.0.6"
-  checksum: 10/5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb
-  languageName: node
-  linkType: hard
-
 "getpass@npm:^0.1.1":
   version: 0.1.7
   resolution: "getpass@npm:0.1.7"
@@ -22334,25 +19764,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob-base@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "glob-base@npm:0.3.0"
-  dependencies:
-    glob-parent: "npm:^2.0.0"
-    is-glob: "npm:^2.0.0"
-  checksum: 10/106477297e0e2a120a2ba530a0b443d82a2750dc614c21b8d1ac064d100e3ba262397501828cb768c21e0b2d645da717d06ff58d7979a0d6ce6cbb29aa2d62e0
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "glob-parent@npm:2.0.0"
-  dependencies:
-    is-glob: "npm:^2.0.0"
-  checksum: 10/734fc461d9d2753dd490dd072df6ce41fe4ebb60e9319b108bc538707b21780af3a61c3961ec2264131fad5d3d9a493e013a775aef11a69ac2f49fd7d8f46457
-  languageName: node
-  linkType: hard
-
 "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
@@ -22389,20 +19800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.2.3, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
-  dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^3.1.1"
-    once: "npm:^1.3.0"
-    path-is-absolute: "npm:^1.0.0"
-  checksum: 10/59452a9202c81d4508a43b8af7082ca5c76452b9fcc4a9ab17655822e6ce9b21d4f8fbadabe4fe3faef448294cec249af305e2cd824b7e9aaf689240e5e96a7b
-  languageName: node
-  linkType: hard
-
 "glob@npm:^10.0.0":
   version: 10.3.10
   resolution: "glob@npm:10.3.10"
@@ -22433,12 +19830,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"global-directory@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "global-directory@npm:4.0.1"
+"glob@npm:^7.0.0, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
   dependencies:
-    ini: "npm:4.1.1"
-  checksum: 10/5b4df24438a4e5f21e43fbdd9e54f5e12bb48dce01a0a83b415d8052ce91be2d3a97e0c8f98a535e69649b2190036155e9f0f7d3c62f9318f31bdc3fd4f235f5
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^3.1.1"
+    once: "npm:^1.3.0"
+    path-is-absolute: "npm:^1.0.0"
+  checksum: 10/59452a9202c81d4508a43b8af7082ca5c76452b9fcc4a9ab17655822e6ce9b21d4f8fbadabe4fe3faef448294cec249af305e2cd824b7e9aaf689240e5e96a7b
   languageName: node
   linkType: hard
 
@@ -22451,30 +19853,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"global-modules@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "global-modules@npm:1.0.0"
-  dependencies:
-    global-prefix: "npm:^1.0.1"
-    is-windows: "npm:^1.0.1"
-    resolve-dir: "npm:^1.0.0"
-  checksum: 10/e4031a01c0c7401349bb69e1499c7268d636552b16374c0002d677c7a6185da6782a2927a7a3a7c046eb7be97cd26b3c7b1b736f9818ecc7ac09e9d61449065e
-  languageName: node
-  linkType: hard
-
-"global-prefix@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "global-prefix@npm:1.0.2"
-  dependencies:
-    expand-tilde: "npm:^2.0.2"
-    homedir-polyfill: "npm:^1.0.1"
-    ini: "npm:^1.3.4"
-    is-windows: "npm:^1.0.1"
-    which: "npm:^1.2.14"
-  checksum: 10/68cf78f81cd85310095ca1f0ec22dd5f43a1059646b2c7b3fc4a7c9ce744356e66ca833adda4e5753e38021847aaec393a159a029ba2d257c08ccb3f00ca2899
-  languageName: node
-  linkType: hard
-
 "global@npm:~4.4.0":
   version: 4.4.0
   resolution: "global@npm:4.4.0"
@@ -22501,13 +19879,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^9.18.0":
-  version: 9.18.0
-  resolution: "globals@npm:9.18.0"
-  checksum: 10/492600be44eb7ae107d37fa8536fb98f36a6f051c1420cd912a6de307758d502b9930a8f7beda0e74a98a5613aae464c828bb81418fc335c9ff4707ba9fd9070
-  languageName: node
-  linkType: hard
-
 "globalthis@npm:^1.0.3":
   version: 1.0.3
   resolution: "globalthis@npm:1.0.3"
@@ -22567,19 +19938,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "globby@npm:6.1.0"
-  dependencies:
-    array-union: "npm:^1.0.1"
-    glob: "npm:^7.0.3"
-    object-assign: "npm:^4.0.1"
-    pify: "npm:^2.0.0"
-    pinkie-promise: "npm:^2.0.0"
-  checksum: 10/18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424
-  languageName: node
-  linkType: hard
-
 "globrex@npm:^0.1.2":
   version: 0.1.2
   resolution: "globrex@npm:0.1.2"
@@ -22634,25 +19992,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"got@npm:^9.1.0":
-  version: 9.6.0
-  resolution: "got@npm:9.6.0"
-  dependencies:
-    "@sindresorhus/is": "npm:^0.14.0"
-    "@szmarczak/http-timer": "npm:^1.1.2"
-    cacheable-request: "npm:^6.0.0"
-    decompress-response: "npm:^3.3.0"
-    duplexer3: "npm:^0.1.4"
-    get-stream: "npm:^4.1.0"
-    lowercase-keys: "npm:^1.0.1"
-    mimic-response: "npm:^1.0.1"
-    p-cancelable: "npm:^1.0.0"
-    to-readable-stream: "npm:^1.0.0"
-    url-parse-lax: "npm:^3.0.0"
-  checksum: 10/fae3273b44392b6b1d88071d04ea984784e63dbf8ba3f70b04cb7edda53c7668ee17288ac46af507a9f2aa60c183c5ea1732339141d253dda3eb19f92985c771
-  languageName: node
-  linkType: hard
-
 "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
@@ -22681,13 +20020,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"growly@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "growly@npm:1.3.0"
-  checksum: 10/77f9abc3a854ec628580939f004ba8f05c677f9a6c957be817525f20f68f75368c4879c64d12551f262a9a00de33fbefc4deb24f8f2124429c906ef20ec3c678
-  languageName: node
-  linkType: hard
-
 "gunzip-maybe@npm:^1.4.2":
   version: 1.4.2
   resolution: "gunzip-maybe@npm:1.4.2"
@@ -22736,7 +20068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"handlebars@npm:^4.0.3, handlebars@npm:^4.0.6, handlebars@npm:^4.7.6, handlebars@npm:^4.7.7":
+"handlebars@npm:^4.7.6, handlebars@npm:^4.7.7":
   version: 4.7.8
   resolution: "handlebars@npm:4.7.8"
   dependencies:
@@ -22868,13 +20200,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has-proto@npm:1.0.3"
-  checksum: 10/0b67c2c94e3bea37db3e412e3c41f79d59259875e636ba471e94c009cdfb1fa82bf045deeffafc7dbb9c148e36cae6b467055aaa5d9fad4316e11b41e3ba551a
-  languageName: node
-  linkType: hard
-
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
@@ -22891,15 +20216,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "has-tostringtag@npm:1.0.2"
-  dependencies:
-    has-symbols: "npm:^1.0.3"
-  checksum: 10/c74c5f5ceee3c8a5b8bc37719840dc3749f5b0306d818974141dda2471a1a2ca6c8e46b9d6ac222c5345df7a901c9b6f350b1e6d62763fec877e26609a401bfe
-  languageName: node
-  linkType: hard
-
 "has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1, has-unicode@npm:~2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
@@ -22907,45 +20223,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-value@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "has-value@npm:0.3.1"
-  dependencies:
-    get-value: "npm:^2.0.3"
-    has-values: "npm:^0.1.4"
-    isobject: "npm:^2.0.0"
-  checksum: 10/29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f
-  languageName: node
-  linkType: hard
-
-"has-value@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-value@npm:1.0.0"
-  dependencies:
-    get-value: "npm:^2.0.6"
-    has-values: "npm:^1.0.0"
-    isobject: "npm:^3.0.0"
-  checksum: 10/b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847
-  languageName: node
-  linkType: hard
-
-"has-values@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "has-values@npm:0.1.4"
-  checksum: 10/ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc
-  languageName: node
-  linkType: hard
-
-"has-values@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-values@npm:1.0.0"
-  dependencies:
-    is-number: "npm:^3.0.0"
-    kind-of: "npm:^4.0.0"
-  checksum: 10/77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11
-  languageName: node
-  linkType: hard
-
 "has@npm:^1.0.0, has@npm:^1.0.3":
   version: 1.0.3
   resolution: "has@npm:1.0.3"
@@ -22962,7 +20239,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
+"hasown@npm:^2.0.0":
   version: 2.0.2
   resolution: "hasown@npm:2.0.2"
   dependencies:
@@ -23097,13 +20374,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"highlight.js@npm:^9.0.0":
-  version: 9.18.5
-  resolution: "highlight.js@npm:9.18.5"
-  checksum: 10/56ddbd562ece7da84847770d96e8e52bd0e6151f69efb95e249d8e1fde2b5ed78cdaa2c0d33e4c838caa434cb0fe1aeeca4edca9c2c3343daf23dcf2ffbd3dc9
-  languageName: node
-  linkType: hard
-
 "history@npm:^4.9.0":
   version: 4.10.1
   resolution: "history@npm:4.10.1"
@@ -23136,25 +20406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"home-or-tmp@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "home-or-tmp@npm:2.0.0"
-  dependencies:
-    os-homedir: "npm:^1.0.0"
-    os-tmpdir: "npm:^1.0.1"
-  checksum: 10/ad0a101a56ecd159d531f640e5949e7d58f4a6f464f07c16f1c8cb14d9c35895e80d834ef0de416887596506b90e7566235880e37eeb70ebc8c873363b3ded93
-  languageName: node
-  linkType: hard
-
-"homedir-polyfill@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "homedir-polyfill@npm:1.0.3"
-  dependencies:
-    parse-passwd: "npm:^1.0.0"
-  checksum: 10/18dd4db87052c6a2179d1813adea0c4bfcfa4f9996f0e226fefb29eb3d548e564350fa28ec46b0bf1fbc0a1d2d6922ceceb80093115ea45ff8842a4990139250
-  languageName: node
-  linkType: hard
-
 "hook-std@npm:^2.0.0":
   version: 2.0.0
   resolution: "hook-std@npm:2.0.0"
@@ -23224,15 +20475,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-encoding-sniffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "html-encoding-sniffer@npm:1.0.2"
-  dependencies:
-    whatwg-encoding: "npm:^1.0.1"
-  checksum: 10/d8984b63836abadc5e1270c648d5b3c447ba9473d687b730c3ea8397f4cb15b33ca271e93f987150203717eeb8bfb5ec82646f84419a0bef040cd41f7cc428df
-  languageName: node
-  linkType: hard
-
 "html-encoding-sniffer@npm:^2.0.1":
   version: 2.0.1
   resolution: "html-encoding-sniffer@npm:2.0.1"
@@ -23589,27 +20831,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"husky@npm:^4.2.5":
-  version: 4.3.8
-  resolution: "husky@npm:4.3.8"
-  dependencies:
-    chalk: "npm:^4.0.0"
-    ci-info: "npm:^2.0.0"
-    compare-versions: "npm:^3.6.0"
-    cosmiconfig: "npm:^7.0.0"
-    find-versions: "npm:^4.0.0"
-    opencollective-postinstall: "npm:^2.0.2"
-    pkg-dir: "npm:^5.0.0"
-    please-upgrade-node: "npm:^3.2.0"
-    slash: "npm:^3.0.0"
-    which-pm-runs: "npm:^1.0.0"
-  bin:
-    husky-run: bin/run.js
-    husky-upgrade: lib/upgrader/bin.js
-  checksum: 10/bf525b1133ac68131a50acfea1b6348ed4b3230ff471492852edd97f3038e858ccf075eac431db47c27d928638a108eef70bc3940f289f5a3ac0eca20808969a
-  languageName: node
-  linkType: hard
-
 "hyphenate-style-name@npm:^1.0.2":
   version: 1.0.4
   resolution: "hyphenate-style-name@npm:1.0.4"
@@ -23624,7 +20845,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
+"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -23788,18 +21009,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-local@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "import-local@npm:1.0.0"
-  dependencies:
-    pkg-dir: "npm:^2.0.0"
-    resolve-cwd: "npm:^2.0.0"
-  bin:
-    import-local-fixture: fixtures/cli.js
-  checksum: 10/e7918eb5e20dcc755d6aa6b710ef0a346478256a3d7d7cde9e813c8f33019eda0fa3fe7427a9874314512f514c66c8156b7859e75ce8639769f25f2509ebd013
-  languageName: node
-  linkType: hard
-
 "import-local@npm:^3.0.2":
   version: 3.1.0
   resolution: "import-local@npm:3.1.0"
@@ -23812,13 +21021,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-meta-resolve@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "import-meta-resolve@npm:4.1.0"
-  checksum: 10/40162f67eb406c8d5d49266206ef12ff07b54f5fad8cfd806db9efe3a055958e9969be51d6efaf82e34b8bea6758113dcc17bb79ff148292a4badcabc3472f22
-  languageName: node
-  linkType: hard
-
 "imurmurhash@npm:*, imurmurhash@npm:^0.1.4":
   version: 0.1.4
   resolution: "imurmurhash@npm:0.1.4"
@@ -23888,13 +21090,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ini@npm:4.1.1":
-  version: 4.1.1
-  resolution: "ini@npm:4.1.1"
-  checksum: 10/64c7102301742a7527bb17257d18451410eacf63b4b5648a20e108816c355c21c4e8a1761bbcbf3fe8c4ded3297f1b832b885d5e3e485d781e293ebfaf56fea6
-  languageName: node
-  linkType: hard
-
 "ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:^1.3.8, ini@npm:~1.3.0":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
@@ -23944,29 +21139,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:8.2.5":
-  version: 8.2.5
-  resolution: "inquirer@npm:8.2.5"
-  dependencies:
-    ansi-escapes: "npm:^4.2.1"
-    chalk: "npm:^4.1.1"
-    cli-cursor: "npm:^3.1.0"
-    cli-width: "npm:^3.0.0"
-    external-editor: "npm:^3.0.3"
-    figures: "npm:^3.0.0"
-    lodash: "npm:^4.17.21"
-    mute-stream: "npm:0.0.8"
-    ora: "npm:^5.4.1"
-    run-async: "npm:^2.4.0"
-    rxjs: "npm:^7.5.5"
-    string-width: "npm:^4.1.0"
-    strip-ansi: "npm:^6.0.0"
-    through: "npm:^2.3.6"
-    wrap-ansi: "npm:^7.0.0"
-  checksum: 10/50a240dfeaca37a14e6a6d11d7d6f7da947be3a9fe1e34ac41db6a49fc27022e7b3875ebe8ccd739497359808694488f3509792cc986f9ac48c43135f4e14172
-  languageName: node
-  linkType: hard
-
 "internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
   version: 1.0.5
   resolution: "internal-slot@npm:1.0.5"
@@ -23978,17 +21150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "internal-slot@npm:1.0.7"
-  dependencies:
-    es-errors: "npm:^1.3.0"
-    hasown: "npm:^2.0.0"
-    side-channel: "npm:^1.0.4"
-  checksum: 10/3e66720508831153ecf37d13def9f6856f9f2960989ec8a0a0476c98f887fca9eff0163127466485cb825c900c2d6fc601aa9117b7783b90ffce23a71ea5d053
-  languageName: node
-  linkType: hard
-
 "internmap@npm:1 - 2":
   version: 2.0.3
   resolution: "internmap@npm:2.0.3"
@@ -24036,13 +21197,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"invert-kv@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "invert-kv@npm:2.0.0"
-  checksum: 10/0a03bfaa5b01406250ff7daae34fe5d4103db2b7d967655c7935b70f5fd8b2543fd98320a564a0ed037803c927156d2f77bb3bcf1fee489b3651cab955af7684
-  languageName: node
-  linkType: hard
-
 "io-ts@npm:^2.1.2":
   version: 2.2.20
   resolution: "io-ts@npm:2.2.20"
@@ -24115,15 +21269,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-accessor-descriptor@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-accessor-descriptor@npm:1.0.1"
-  dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10/df0d1da1a320e57c594e6f9b52dab8a6bece6dc90e51689d05ac8e5247164aa3eb3e9c66b37027bebfc0ea5fcce6d9503dbc41dccd82f4b57add79a307735365
-  languageName: node
-  linkType: hard
-
 "is-alphabetical@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-alphabetical@npm:1.0.4"
@@ -24179,16 +21324,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "is-array-buffer@npm:3.0.4"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10/34a26213d981d58b30724ef37a1e0682f4040d580fa9ff58fdfdd3cefcb2287921718c63971c1c404951e7b747c50fdc7caf6e867e951353fa71b369c04c969b
-  languageName: node
-  linkType: hard
-
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
@@ -24231,7 +21366,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-buffer@npm:^1.0.2, is-buffer@npm:^1.1.5":
+"is-buffer@npm:^1.0.2":
   version: 1.1.6
   resolution: "is-buffer@npm:1.1.6"
   checksum: 10/f63da109e74bbe8947036ed529d43e4ae0c5fcd0909921dce4917ad3ea212c6a87c29f525ba1d17c0858c18331cf1046d4fc69ef59ed26896b25c8288a627133
@@ -24304,24 +21439,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-data-descriptor@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-data-descriptor@npm:1.0.1"
-  dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10/49b36e903b31623b0c5b416e182e366810ef97a3a19ab0e6cd501eb5599112680b7d9e768b07a84fb52aa2510a92b3eb51a3e18ce8d5f7978a49f4b50e6ec6dd
-  languageName: node
-  linkType: hard
-
-"is-data-view@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-data-view@npm:1.0.1"
-  dependencies:
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10/4ba4562ac2b2ec005fefe48269d6bd0152785458cd253c746154ffb8a8ab506a29d0cfb3b74af87513843776a88e4981ae25c89457bf640a33748eab1a7216b5
-  languageName: node
-  linkType: hard
-
 "is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
@@ -24352,26 +21469,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-descriptor@npm:^0.1.0":
-  version: 0.1.7
-  resolution: "is-descriptor@npm:0.1.7"
-  dependencies:
-    is-accessor-descriptor: "npm:^1.0.1"
-    is-data-descriptor: "npm:^1.0.1"
-  checksum: 10/38783182c3d83f839a9fa3e87b4d6de11fa9639833ed98993ea51aea2296b2da155121956e148695a738228871d1057c5f963d0b1c857bb8a4a38d8dd9ceeb56
-  languageName: node
-  linkType: hard
-
-"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "is-descriptor@npm:1.0.3"
-  dependencies:
-    is-accessor-descriptor: "npm:^1.0.1"
-    is-data-descriptor: "npm:^1.0.1"
-  checksum: 10/b940d04d93adaffb749b3ca7f7f6d73dd3c5582b674f372513ecb5511a8a3f3ff4a24f4c1161cb10e48fe4886f9e84c09fa71785def27905ca8df1197e563dc6
-  languageName: node
-  linkType: hard
-
 "is-directory@npm:^0.3.1":
   version: 0.3.1
   resolution: "is-directory@npm:0.3.1"
@@ -24388,45 +21485,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-dotfile@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "is-dotfile@npm:1.0.3"
-  checksum: 10/5257760d998d50ba2d5b4707007c043c69da0b62172f2221505edc6671ff634581c05df494a19d8d7206d248154c2f29f8432193ee199d33b09733e66371fb35
-  languageName: node
-  linkType: hard
-
-"is-equal-shallow@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "is-equal-shallow@npm:0.1.3"
-  dependencies:
-    is-primitive: "npm:^2.0.0"
-  checksum: 10/1a296b660b8749ba1449017d9572e81fe8a96764877d5f9739c523a20cc7cdfa49594c16fa17052d0c3ee4711e35fd6919b06bf1b11b7126feab61abb9503ce6
-  languageName: node
-  linkType: hard
-
-"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "is-extendable@npm:0.1.1"
-  checksum: 10/3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
-  languageName: node
-  linkType: hard
-
-"is-extendable@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-extendable@npm:1.0.1"
-  dependencies:
-    is-plain-object: "npm:^2.0.4"
-  checksum: 10/db07bc1e9de6170de70eff7001943691f05b9d1547730b11be01c0ebfe67362912ba743cf4be6fd20a5e03b4180c685dad80b7c509fe717037e3eee30ad8e84f
-  languageName: node
-  linkType: hard
-
-"is-extglob@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-extglob@npm:1.0.0"
-  checksum: 10/5eea8517feeae5206547c0fc838c1416ec763b30093c286e1965a05f46b74a59ad391f912565f3b67c9c31cab4769ab9c35420e016b608acb47309be8d0d6e94
-  languageName: node
-  linkType: hard
-
 "is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
@@ -24434,13 +21492,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-finite@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "is-finite@npm:1.1.0"
-  checksum: 10/532b97ed3d03e04c6bd203984d9e4ba3c0c390efee492bad5d1d1cd1802a68ab27adbd3ef6382f6312bed6c8bb1bd3e325ea79a8dc8fe080ed7a06f5f97b93e7
-  languageName: node
-  linkType: hard
-
 "is-fullwidth-code-point@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-fullwidth-code-point@npm:1.0.0"
@@ -24471,13 +21522,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-generator-fn@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-generator-fn@npm:1.0.0"
-  checksum: 10/9ea6404bdcbafc1edf2881e8fc57a7e2e8f48b2c04f24e4e889e670837d538c7e5a6ee645ee5217abb3e327ae511ed143824f8fde9c5c8e83129b20df9d2c78e
-  languageName: node
-  linkType: hard
-
 "is-generator-fn@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-generator-fn@npm:2.1.0"
@@ -24494,16 +21538,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-glob@npm:^2.0.0, is-glob@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "is-glob@npm:2.0.1"
-  dependencies:
-    is-extglob: "npm:^1.0.0"
-  checksum: 10/089f5f93640072491396a5f075ce73e949a90f35832b782bc49a6b7637d58e392d53cb0b395e059ccab70fcb82ff35d183f6f9ebbcb43227a1e02e3fed5430c9
-  languageName: node
-  linkType: hard
-
-"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
+"is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
   dependencies:
@@ -24595,13 +21630,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "is-negative-zero@npm:2.0.3"
-  checksum: 10/8fe5cffd8d4fb2ec7b49d657e1691889778d037494c6f40f4d1a524cadd658b4b53ad7b6b73a59bcb4b143ae9a3d15829af864b2c0f9d65ac1e678c4c80f17e5
-  languageName: node
-  linkType: hard
-
 "is-npm@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-npm@npm:1.0.0"
@@ -24618,31 +21646,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-number@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "is-number@npm:2.1.0"
-  dependencies:
-    kind-of: "npm:^3.0.2"
-  checksum: 10/d80e041a43a8de31ecc02037d532f1f448ec9c5b6c02fe7ee67bdd45d21cd9a4b3b4cf07e428ae5adafc2f17408c49fcb0a227915916d94a16d576c39e689f60
-  languageName: node
-  linkType: hard
-
-"is-number@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-number@npm:3.0.0"
-  dependencies:
-    kind-of: "npm:^3.0.2"
-  checksum: 10/0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9
-  languageName: node
-  linkType: hard
-
-"is-number@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "is-number@npm:4.0.0"
-  checksum: 10/7f25967eb4fd92c4c5c282f6510c86d257de5894501b831ae6ab44a964c690ba721eef931eb2aaad2aacf35fd0cf57b9d2135b0bd25147dc5bc64f99fbca1785
-  languageName: node
-  linkType: hard
-
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
@@ -24650,7 +21653,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-obj@npm:^1.0.0, is-obj@npm:^1.0.1":
+"is-obj@npm:^1.0.0":
   version: 1.0.1
   resolution: "is-obj@npm:1.0.1"
   checksum: 10/3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c
@@ -24664,22 +21667,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-observable@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-observable@npm:1.1.0"
-  dependencies:
-    symbol-observable: "npm:^1.1.0"
-  checksum: 10/ab3d7e740915e6b53a81d96ce7d581f4dd26dacceb95278b74e7bf3123221073ea02cde810f864cff94ed5c394f18248deefd6a8f2d40137d868130eb5be6f85
-  languageName: node
-  linkType: hard
-
-"is-path-cwd@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-path-cwd@npm:1.0.0"
-  checksum: 10/ade6d8d59bb6a00079fb515ad78a741b757a66bc6208a2dab2c9f8ad535bc61e21b6823ae8b23df2bf4d2b9dac8df4f3df2e68105698eb3e15ceb5ca90dac097
-  languageName: node
-  linkType: hard
-
 "is-path-cwd@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-path-cwd@npm:2.2.0"
@@ -24687,15 +21674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-path-in-cwd@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-path-in-cwd@npm:1.0.1"
-  dependencies:
-    is-path-inside: "npm:^1.0.0"
-  checksum: 10/bacfc67c0dacd09002668abb1565fa77ee9593914f1502ec8ecae9821ddd39a2a98e7a95053e3446421b3429c3b3df1a26669c95cecc9f4f556609ec9760ba2a
-  languageName: node
-  linkType: hard
-
 "is-path-inside@npm:^1.0.0":
   version: 1.0.1
   resolution: "is-path-inside@npm:1.0.1"
@@ -24740,7 +21718,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4":
+"is-plain-object@npm:^2.0.4":
   version: 2.0.4
   resolution: "is-plain-object@npm:2.0.4"
   dependencies:
@@ -24749,13 +21727,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-posix-bracket@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "is-posix-bracket@npm:0.1.1"
-  checksum: 10/8a6391b41e7acef6898e64b00e06885b28c14b0c76398d3251a6ab1e5350d495dd32ec3f7f88f3f877558ce4b970939356fb315ee607f8f99a1716d4db7bdd40
-  languageName: node
-  linkType: hard
-
 "is-potential-custom-element-name@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-potential-custom-element-name@npm:1.0.1"
@@ -24763,20 +21734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-primitive@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-primitive@npm:2.0.0"
-  checksum: 10/4d63fe952e31a4bc1d1a65d72f8485f5952407dce8d1cd8d8f070586936ea9ae2df79e0a83956b224aa7776cbbf5767eba3277f28119c36a616b20a439f057c0
-  languageName: node
-  linkType: hard
-
-"is-promise@npm:^2.1.0":
-  version: 2.2.2
-  resolution: "is-promise@npm:2.2.2"
-  checksum: 10/18bf7d1c59953e0ad82a1ed963fb3dc0d135c8f299a14f89a17af312fc918373136e56028e8831700e1933519630cc2fd4179a777030330fde20d34e96f40c78
-  languageName: node
-  linkType: hard
-
 "is-redirect@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-redirect@npm:1.0.0"
@@ -24812,13 +21769,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-regexp@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-regexp@npm:1.0.0"
-  checksum: 10/be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef
-  languageName: node
-  linkType: hard
-
 "is-resolvable@npm:^1.0.0":
   version: 1.1.0
   resolution: "is-resolvable@npm:1.1.0"
@@ -24849,15 +21799,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "is-shared-array-buffer@npm:1.0.3"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-  checksum: 10/bc5402900dc62b96ebb2548bf5b0a0bcfacc2db122236fe3ab3b3e3c884293a0d5eb777e73f059bcbf8dc8563bb65eae972fee0fb97e38a9ae27c8678f62bcfe
-  languageName: node
-  linkType: hard
-
 "is-stream@npm:^1.0.0, is-stream@npm:^1.0.1, is-stream@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-stream@npm:1.1.0"
@@ -24915,15 +21856,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.13":
-  version: 1.1.13
-  resolution: "is-typed-array@npm:1.1.13"
-  dependencies:
-    which-typed-array: "npm:^1.1.14"
-  checksum: 10/f850ba08286358b9a11aee6d93d371a45e3c59b5953549ee1c1a9a55ba5c1dd1bd9952488ae194ad8f32a9cf5e79c8fa5f0cc4d78c00720aa0bbcf238b38062d
-  languageName: node
-  linkType: hard
-
 "is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "is-typedarray@npm:1.0.0"
@@ -24938,13 +21870,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-utf8@npm:^0.2.0, is-utf8@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "is-utf8@npm:0.2.1"
-  checksum: 10/167ccd2be869fc228cc62c1a28df4b78c6b5485d15a29027d3b5dceb09b383e86a3522008b56dcac14b592b22f0a224388718c2505027a994fd8471465de54b3
-  languageName: node
-  linkType: hard
-
 "is-weakmap@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-weakmap@npm:2.0.1"
@@ -24971,20 +21896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-windows@npm:^1.0.1, is-windows@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-windows@npm:1.0.2"
-  checksum: 10/438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7
-  languageName: node
-  linkType: hard
-
-"is-wsl@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-wsl@npm:1.1.0"
-  checksum: 10/ea157d232351e68c92bd62fc541771096942fe72f69dff452dd26dcc31466258c570a3b04b8cda2e01cd2968255b02951b8670d08ea4ed76d6b1a646061ac4fe
-  languageName: node
-  linkType: hard
-
 "is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
@@ -25001,13 +21912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isarray@npm:1.0.0, isarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "isarray@npm:1.0.0"
-  checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
-  languageName: node
-  linkType: hard
-
 "isarray@npm:^2.0.1, isarray@npm:^2.0.5":
   version: 2.0.5
   resolution: "isarray@npm:2.0.5"
@@ -25015,6 +21919,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isarray@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "isarray@npm:1.0.0"
+  checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
+  languageName: node
+  linkType: hard
+
 "isbot-fast@npm:1.2.0":
   version: 1.2.0
   resolution: "isbot-fast@npm:1.2.0"
@@ -25029,16 +21940,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isobject@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "isobject@npm:2.1.0"
-  dependencies:
-    isarray: "npm:1.0.0"
-  checksum: 10/811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f
-  languageName: node
-  linkType: hard
-
-"isobject@npm:^3.0.0, isobject@npm:^3.0.1":
+"isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
   checksum: 10/db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
@@ -25075,32 +21977,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-api@npm:^1.3.1":
-  version: 1.3.7
-  resolution: "istanbul-api@npm:1.3.7"
-  dependencies:
-    async: "npm:^2.1.4"
-    fileset: "npm:^2.0.2"
-    istanbul-lib-coverage: "npm:^1.2.1"
-    istanbul-lib-hook: "npm:^1.2.2"
-    istanbul-lib-instrument: "npm:^1.10.2"
-    istanbul-lib-report: "npm:^1.1.5"
-    istanbul-lib-source-maps: "npm:^1.2.6"
-    istanbul-reports: "npm:^1.5.1"
-    js-yaml: "npm:^3.7.0"
-    mkdirp: "npm:^0.5.1"
-    once: "npm:^1.4.0"
-  checksum: 10/080f3d3cf9e98a2bf037b910f504d23b6708dc199c65ff540dc6b9be2c95ec2a7471c6e84586a2fd63490ee463990c7600ed386a95d83c47f9a4f4e7c75e44de
-  languageName: node
-  linkType: hard
-
-"istanbul-lib-coverage@npm:^1.2.0, istanbul-lib-coverage@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "istanbul-lib-coverage@npm:1.2.1"
-  checksum: 10/d22f18573e6c8b1de731a00297d1c2fe22e6b959243765f184d4441c41700c1e94111efa4160a0f22e2c7d23294ec412905e382adef12d1064e9dfbd1572606a
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
@@ -25108,30 +21984,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-hook@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "istanbul-lib-hook@npm:1.2.2"
-  dependencies:
-    append-transform: "npm:^0.4.0"
-  checksum: 10/5fdde55b0abd162acd8b53214b2fe2e6f6f8e0d9ed9d9e5d434e1e2734e18df02a17057937b4a59953ceb58aa251cbabe40ef65dbe2501f04ce679d219772204
-  languageName: node
-  linkType: hard
-
-"istanbul-lib-instrument@npm:^1.10.1, istanbul-lib-instrument@npm:^1.10.2":
-  version: 1.10.2
-  resolution: "istanbul-lib-instrument@npm:1.10.2"
-  dependencies:
-    babel-generator: "npm:^6.18.0"
-    babel-template: "npm:^6.16.0"
-    babel-traverse: "npm:^6.18.0"
-    babel-types: "npm:^6.18.0"
-    babylon: "npm:^6.18.0"
-    istanbul-lib-coverage: "npm:^1.2.1"
-    semver: "npm:^5.3.0"
-  checksum: 10/0a821b3e2d0a798c0ee5e26782c4c0b4c7a10f3a78be631aed21545654d412516d1c75e7eae4783b62c4e32f4656ca8d52270ba95f58a3fd6bdab78e05a00417
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0":
   version: 5.2.1
   resolution: "istanbul-lib-instrument@npm:5.2.1"
@@ -25145,18 +21997,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-report@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "istanbul-lib-report@npm:1.1.5"
-  dependencies:
-    istanbul-lib-coverage: "npm:^1.2.1"
-    mkdirp: "npm:^0.5.1"
-    path-parse: "npm:^1.0.5"
-    supports-color: "npm:^3.1.2"
-  checksum: 10/0063ef8af0ca4a4bee69d9b0e5b40cc219a6b5faee39aa5b824725a2e2ccb6a41f376767b69dbf00d275916b6371c32a0a9ecb94812a9663d23f973a6147073d
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-report@npm:^3.0.0":
   version: 3.0.1
   resolution: "istanbul-lib-report@npm:3.0.1"
@@ -25168,19 +22008,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-source-maps@npm:^1.2.4, istanbul-lib-source-maps@npm:^1.2.6":
-  version: 1.2.6
-  resolution: "istanbul-lib-source-maps@npm:1.2.6"
-  dependencies:
-    debug: "npm:^3.1.0"
-    istanbul-lib-coverage: "npm:^1.2.1"
-    mkdirp: "npm:^0.5.1"
-    rimraf: "npm:^2.6.1"
-    source-map: "npm:^0.5.3"
-  checksum: 10/c3db201497e7345e9ce9cb59b076253b506a56d18842228e033ccbf793c6438cd34b3331465be220addf4b74789b70421926f7495a85b6ff94177c6917a4810d
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-source-maps@npm:^4.0.0":
   version: 4.0.1
   resolution: "istanbul-lib-source-maps@npm:4.0.1"
@@ -25192,15 +22019,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-reports@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "istanbul-reports@npm:1.5.1"
-  dependencies:
-    handlebars: "npm:^4.0.3"
-  checksum: 10/4f97372bf38c2158a18b231665728b2aec15bb8852e290e9b1d2fa91314dc80eef7fb9fa3ec864329deefd6b11f66354d7632e0ca6bc4ce46d3bd5fba8c5d9d2
-  languageName: node
-  linkType: hard
-
 "istanbul-reports@npm:^3.1.3":
   version: 3.1.6
   resolution: "istanbul-reports@npm:3.1.6"
@@ -25258,15 +22076,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^23.4.2":
-  version: 23.4.2
-  resolution: "jest-changed-files@npm:23.4.2"
-  dependencies:
-    throat: "npm:^4.0.0"
-  checksum: 10/07dad83c96f8caea732884cc8c328145f146c17ee9a288d5d72d6db3e83b4e74fa009ae576b8bdc82849c21cae035fb87fe4dec0c3724f64d0dbe61a0b1ecc61
-  languageName: node
-  linkType: hard
-
 "jest-changed-files@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-changed-files@npm:27.5.1"
@@ -25305,52 +22114,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-cli@npm:23.6.0"
-  dependencies:
-    ansi-escapes: "npm:^3.0.0"
-    chalk: "npm:^2.0.1"
-    exit: "npm:^0.1.2"
-    glob: "npm:^7.1.2"
-    graceful-fs: "npm:^4.1.11"
-    import-local: "npm:^1.0.0"
-    is-ci: "npm:^1.0.10"
-    istanbul-api: "npm:^1.3.1"
-    istanbul-lib-coverage: "npm:^1.2.0"
-    istanbul-lib-instrument: "npm:^1.10.1"
-    istanbul-lib-source-maps: "npm:^1.2.4"
-    jest-changed-files: "npm:^23.4.2"
-    jest-config: "npm:^23.6.0"
-    jest-environment-jsdom: "npm:^23.4.0"
-    jest-get-type: "npm:^22.1.0"
-    jest-haste-map: "npm:^23.6.0"
-    jest-message-util: "npm:^23.4.0"
-    jest-regex-util: "npm:^23.3.0"
-    jest-resolve-dependencies: "npm:^23.6.0"
-    jest-runner: "npm:^23.6.0"
-    jest-runtime: "npm:^23.6.0"
-    jest-snapshot: "npm:^23.6.0"
-    jest-util: "npm:^23.4.0"
-    jest-validate: "npm:^23.6.0"
-    jest-watcher: "npm:^23.4.0"
-    jest-worker: "npm:^23.2.0"
-    micromatch: "npm:^2.3.11"
-    node-notifier: "npm:^5.2.1"
-    prompts: "npm:^0.1.9"
-    realpath-native: "npm:^1.0.0"
-    rimraf: "npm:^2.5.4"
-    slash: "npm:^1.0.0"
-    string-length: "npm:^2.0.0"
-    strip-ansi: "npm:^4.0.0"
-    which: "npm:^1.2.12"
-    yargs: "npm:^11.0.0"
-  bin:
-    jest: ./bin/jest.js
-  checksum: 10/35d94c7da75f4e0eddbf17fc85149db904e146e552af2c6c5b391680e751221edfdc620277120d304bbcb649004dd6775ca07fbd4aa76e6f2a073df77edf732e
-  languageName: node
-  linkType: hard
-
 "jest-cli@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-cli@npm:27.5.1"
@@ -25378,28 +22141,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-config@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-config@npm:23.6.0"
-  dependencies:
-    babel-core: "npm:^6.0.0"
-    babel-jest: "npm:^23.6.0"
-    chalk: "npm:^2.0.1"
-    glob: "npm:^7.1.1"
-    jest-environment-jsdom: "npm:^23.4.0"
-    jest-environment-node: "npm:^23.4.0"
-    jest-get-type: "npm:^22.1.0"
-    jest-jasmine2: "npm:^23.6.0"
-    jest-regex-util: "npm:^23.3.0"
-    jest-resolve: "npm:^23.6.0"
-    jest-util: "npm:^23.4.0"
-    jest-validate: "npm:^23.6.0"
-    micromatch: "npm:^2.3.11"
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/801633d9fecfc44bf9a0935b35e4e223d3716adb70b2f2db069fc49e63dc71b234d0e8b44eecc1b96dbc2292cfa39c5391f3cce6208d599de3fe22cffae345b6
-  languageName: node
-  linkType: hard
-
 "jest-config@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-config@npm:27.5.1"
@@ -25437,18 +22178,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-diff@npm:23.6.0"
-  dependencies:
-    chalk: "npm:^2.0.1"
-    diff: "npm:^3.2.0"
-    jest-get-type: "npm:^22.1.0"
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/358360b5ed3d48d569579be074b3e0f4e72ae7d37f0f720c5a2c8ef16a674741f9c4fad5cf0a8666debd022a5df11276794c409ccc6b0ec3b77e37e60ae4dadc
-  languageName: node
-  linkType: hard
-
 "jest-diff@npm:^26.0.0":
   version: 26.6.2
   resolution: "jest-diff@npm:26.6.2"
@@ -25473,15 +22202,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^23.2.0":
-  version: 23.2.0
-  resolution: "jest-docblock@npm:23.2.0"
-  dependencies:
-    detect-newline: "npm:^2.1.0"
-  checksum: 10/1b225189884751ad3503f901ebc157457d495a53a033390ac0093b20312bff18593bb3c963cbe860b0c2b9cb33e0da5761ce1f444498e5013ac80b5c06e4e52c
-  languageName: node
-  linkType: hard
-
 "jest-docblock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-docblock@npm:27.5.1"
@@ -25491,16 +22211,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-each@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-each@npm:23.6.0"
-  dependencies:
-    chalk: "npm:^2.0.1"
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/7b32903697701101330c92f5ec4984d3e8a2c154b87fb828e8fbf4e0bb283578e9e037e3cf2f726877df744f57252eac72d9d5a2a9050726bf98fde93d7450f5
-  languageName: node
-  linkType: hard
-
 "jest-each@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-each@npm:27.5.1"
@@ -25514,17 +22224,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom@npm:^23.4.0":
-  version: 23.4.0
-  resolution: "jest-environment-jsdom@npm:23.4.0"
-  dependencies:
-    jest-mock: "npm:^23.2.0"
-    jest-util: "npm:^23.4.0"
-    jsdom: "npm:^11.5.1"
-  checksum: 10/b13e29cfdfd566a5976d8c91507409de64097aea81be2782042904960e29c1ca746966688b5e5e6b222629bd1434304b6d4d3b099ec620786bd014a95f40d3f5
-  languageName: node
-  linkType: hard
-
 "jest-environment-jsdom@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-environment-jsdom@npm:27.5.1"
@@ -25540,16 +22239,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^23.4.0":
-  version: 23.4.0
-  resolution: "jest-environment-node@npm:23.4.0"
-  dependencies:
-    jest-mock: "npm:^23.2.0"
-    jest-util: "npm:^23.4.0"
-  checksum: 10/a0f117a3ab2c25e26c55a1c02cf48439459a36f5889211483999c64d602d8a9169a7e3dbfcd174256a31536a6520c891b2736462ac6fa9d4357476f5e6b3e65e
-  languageName: node
-  linkType: hard
-
 "jest-environment-node@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-environment-node@npm:27.5.1"
@@ -25564,13 +22253,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^22.1.0":
-  version: 22.4.3
-  resolution: "jest-get-type@npm:22.4.3"
-  checksum: 10/f2daab7cb762457cdcd5500e3b0222cc96856649b685c40a621fe7395147ee67bbb594a2285b28c0b3cb9d80819eca4f99dd450df1bcac8a7cffa8a2dbaeec31
-  languageName: node
-  linkType: hard
-
 "jest-get-type@npm:^26.3.0":
   version: 26.3.0
   resolution: "jest-get-type@npm:26.3.0"
@@ -25585,22 +22267,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-haste-map@npm:23.6.0"
-  dependencies:
-    fb-watchman: "npm:^2.0.0"
-    graceful-fs: "npm:^4.1.11"
-    invariant: "npm:^2.2.4"
-    jest-docblock: "npm:^23.2.0"
-    jest-serializer: "npm:^23.0.1"
-    jest-worker: "npm:^23.2.0"
-    micromatch: "npm:^2.3.11"
-    sane: "npm:^2.0.0"
-  checksum: 10/a2b549031fdba127e704d0a06e567847378c2bdc84f78188754c610ab36e8bd0a01b1a057b5d07c1a7254d92b38e00122c5c24ce8d08e64dc64268bb72fe8852
-  languageName: node
-  linkType: hard
-
 "jest-haste-map@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-haste-map@npm:27.5.1"
@@ -25625,26 +22291,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-jasmine2@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-jasmine2@npm:23.6.0"
-  dependencies:
-    babel-traverse: "npm:^6.0.0"
-    chalk: "npm:^2.0.1"
-    co: "npm:^4.6.0"
-    expect: "npm:^23.6.0"
-    is-generator-fn: "npm:^1.0.0"
-    jest-diff: "npm:^23.6.0"
-    jest-each: "npm:^23.6.0"
-    jest-matcher-utils: "npm:^23.6.0"
-    jest-message-util: "npm:^23.4.0"
-    jest-snapshot: "npm:^23.6.0"
-    jest-util: "npm:^23.4.0"
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/a4126092f8bc81d7fd7801eb2bdfea08b6f0dd7fa75e2a389d9868000cef808ad8051aa538d6c5fd4e5ed6cace4b75f0d6cb85e4f90161b95b938068d0f72d34
-  languageName: node
-  linkType: hard
-
 "jest-jasmine2@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-jasmine2@npm:27.5.1"
@@ -25670,15 +22316,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-leak-detector@npm:23.6.0"
-  dependencies:
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/f17357685e62d6188838f3309cdef3148762362d525aee3732db0e7dc356779ede12d760cb030079df028affb2d6ff70e0f8b8a47f68f1ebe4f182370bbef334
-  languageName: node
-  linkType: hard
-
 "jest-leak-detector@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-leak-detector@npm:27.5.1"
@@ -25689,17 +22326,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-matcher-utils@npm:23.6.0"
-  dependencies:
-    chalk: "npm:^2.0.1"
-    jest-get-type: "npm:^22.1.0"
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/ae2d864c8fda68f32f783d0bf22b6793915e1ce0a3fc038104cc12df43adb0cca02715642998c7a90d425fd2ad4fb40ae9affa09024b604221c642d85fcb5fe4
-  languageName: node
-  linkType: hard
-
 "jest-matcher-utils@npm:^27.0.0, jest-matcher-utils@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-matcher-utils@npm:27.5.1"
@@ -25712,19 +22338,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-message-util@npm:^23.4.0":
-  version: 23.4.0
-  resolution: "jest-message-util@npm:23.4.0"
-  dependencies:
-    "@babel/code-frame": "npm:^7.0.0-beta.35"
-    chalk: "npm:^2.0.1"
-    micromatch: "npm:^2.3.11"
-    slash: "npm:^1.0.0"
-    stack-utils: "npm:^1.0.1"
-  checksum: 10/f6235c559b8bf9f4ff3b8f31fc2cda24125b9e07efd8ab7460f8117d0f8459ca197e45b1f685c625047e5a420ea6dce5b647e9ac9b56e8ab0a7343a49590b3f7
-  languageName: node
-  linkType: hard
-
 "jest-message-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-message-util@npm:27.5.1"
@@ -25742,13 +22355,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^23.2.0":
-  version: 23.2.0
-  resolution: "jest-mock@npm:23.2.0"
-  checksum: 10/520339b81e8399aa69ac438c95581f419d5160d6b4315978716cc99021054eadce6e339eb322f5f10a7a68f569dcde36eb25103cb48c7b7603352edc56a8717f
-  languageName: node
-  linkType: hard
-
 "jest-mock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-mock@npm:27.5.1"
@@ -25771,13 +22377,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^23.3.0":
-  version: 23.3.0
-  resolution: "jest-regex-util@npm:23.3.0"
-  checksum: 10/5cdf684fe11d224a38c4191fae158edb879f93e3b8b21e3554df1b4171e84f5113f61ce085ea8ef8b2a286d7d8af59d64a1c04a9da484aeacb70040a455517bc
-  languageName: node
-  linkType: hard
-
 "jest-regex-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-regex-util@npm:27.5.1"
@@ -25785,16 +22384,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-resolve-dependencies@npm:23.6.0"
-  dependencies:
-    jest-regex-util: "npm:^23.3.0"
-    jest-snapshot: "npm:^23.6.0"
-  checksum: 10/a6de3b97a2f637c8af4876eba544bc43af907aa017e2efcc8d42ba432daa2d4e8cff63052938d6db05d077054161542278e39e0631735af163ef1b25036a6a5e
-  languageName: node
-  linkType: hard
-
 "jest-resolve-dependencies@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-resolve-dependencies@npm:27.5.1"
@@ -25806,17 +22395,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-resolve@npm:23.6.0"
-  dependencies:
-    browser-resolve: "npm:^1.11.3"
-    chalk: "npm:^2.0.1"
-    realpath-native: "npm:^1.0.0"
-  checksum: 10/76cd6eacfc08dadcaecc819fec7f7e354279def0982038059af03e15828712f10163a6dca898357acbba70f78728e247c553f434d0ea14e5e36b081fe40069b7
-  languageName: node
-  linkType: hard
-
 "jest-resolve@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-resolve@npm:27.5.1"
@@ -25835,27 +22413,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-runner@npm:23.6.0"
-  dependencies:
-    exit: "npm:^0.1.2"
-    graceful-fs: "npm:^4.1.11"
-    jest-config: "npm:^23.6.0"
-    jest-docblock: "npm:^23.2.0"
-    jest-haste-map: "npm:^23.6.0"
-    jest-jasmine2: "npm:^23.6.0"
-    jest-leak-detector: "npm:^23.6.0"
-    jest-message-util: "npm:^23.4.0"
-    jest-runtime: "npm:^23.6.0"
-    jest-util: "npm:^23.4.0"
-    jest-worker: "npm:^23.2.0"
-    source-map-support: "npm:^0.5.6"
-    throat: "npm:^4.0.0"
-  checksum: 10/9e09d67fa4aef0f100b89411dea669b28f3b2fc4c695f4409786731b43fac3ef3f8bc187f71dbc96d95140e4c6919d0ba70a6e7541d8da08f75db3791b1b968f
-  languageName: node
-  linkType: hard
-
 "jest-runner@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-runner@npm:27.5.1"
@@ -25885,37 +22442,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-runtime@npm:23.6.0"
-  dependencies:
-    babel-core: "npm:^6.0.0"
-    babel-plugin-istanbul: "npm:^4.1.6"
-    chalk: "npm:^2.0.1"
-    convert-source-map: "npm:^1.4.0"
-    exit: "npm:^0.1.2"
-    fast-json-stable-stringify: "npm:^2.0.0"
-    graceful-fs: "npm:^4.1.11"
-    jest-config: "npm:^23.6.0"
-    jest-haste-map: "npm:^23.6.0"
-    jest-message-util: "npm:^23.4.0"
-    jest-regex-util: "npm:^23.3.0"
-    jest-resolve: "npm:^23.6.0"
-    jest-snapshot: "npm:^23.6.0"
-    jest-util: "npm:^23.4.0"
-    jest-validate: "npm:^23.6.0"
-    micromatch: "npm:^2.3.11"
-    realpath-native: "npm:^1.0.0"
-    slash: "npm:^1.0.0"
-    strip-bom: "npm:3.0.0"
-    write-file-atomic: "npm:^2.1.0"
-    yargs: "npm:^11.0.0"
-  bin:
-    jest-runtime: ./bin/jest-runtime.js
-  checksum: 10/aff7d15e2fe0fcdad66d936b710c54499cb09a4fa56337289550c0060d14bbe0cef4af3beea9adbd10b61bebebfb6d98c607bca50e9086d6ce491d5b1487cc9f
-  languageName: node
-  linkType: hard
-
 "jest-runtime@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-runtime@npm:27.5.1"
@@ -25946,13 +22472,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-serializer@npm:^23.0.1":
-  version: 23.0.1
-  resolution: "jest-serializer@npm:23.0.1"
-  checksum: 10/04243d06fef006566d6ed035e56bfce996bb8b91ddb5509c79e15a51e9b273fcd553843600161ea463e3104f2eb9b33ede92d23799fd9b6ed6dd073f05739c9f
-  languageName: node
-  linkType: hard
-
 "jest-serializer@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-serializer@npm:27.5.1"
@@ -25963,24 +22482,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-snapshot@npm:23.6.0"
-  dependencies:
-    babel-types: "npm:^6.0.0"
-    chalk: "npm:^2.0.1"
-    jest-diff: "npm:^23.6.0"
-    jest-matcher-utils: "npm:^23.6.0"
-    jest-message-util: "npm:^23.4.0"
-    jest-resolve: "npm:^23.6.0"
-    mkdirp: "npm:^0.5.1"
-    natural-compare: "npm:^1.4.0"
-    pretty-format: "npm:^23.6.0"
-    semver: "npm:^5.5.0"
-  checksum: 10/5ae44966202a79bed59344fdc2923639cf4b47ecef0727d4795b6008dfced0f08a02177e375b63fe9edbba03f4538cb2ebbd6d8bc2c7ef140fd06acaae33ba01
-  languageName: node
-  linkType: hard
-
 "jest-snapshot@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-snapshot@npm:27.5.1"
@@ -26011,22 +22512,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-util@npm:^23.4.0":
-  version: 23.4.0
-  resolution: "jest-util@npm:23.4.0"
-  dependencies:
-    callsites: "npm:^2.0.0"
-    chalk: "npm:^2.0.1"
-    graceful-fs: "npm:^4.1.11"
-    is-ci: "npm:^1.0.10"
-    jest-message-util: "npm:^23.4.0"
-    mkdirp: "npm:^0.5.1"
-    slash: "npm:^1.0.0"
-    source-map: "npm:^0.6.0"
-  checksum: 10/ded9d5d3b5fe4c2b84085160ed741fe8e3f5faf040ccd31acd0027c591e53d3b7ac95cc3bfd4c8817d9914cdd30e94b56f11239798de440314b87ff062d078c1
-  languageName: node
-  linkType: hard
-
 "jest-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-util@npm:27.5.1"
@@ -26041,18 +22526,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest-validate@npm:23.6.0"
-  dependencies:
-    chalk: "npm:^2.0.1"
-    jest-get-type: "npm:^22.1.0"
-    leven: "npm:^2.1.0"
-    pretty-format: "npm:^23.6.0"
-  checksum: 10/d57b37b97748c17cbc226da6753efb2be8cb62d3aadfffac186eee3af0d5be098235b30a43adb0bffbf1cd2a211173846a54ef2d194520b1e8a8fe45192b9db2
-  languageName: node
-  linkType: hard
-
 "jest-validate@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-validate@npm:27.5.1"
@@ -26067,17 +22540,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^23.4.0":
-  version: 23.4.0
-  resolution: "jest-watcher@npm:23.4.0"
-  dependencies:
-    ansi-escapes: "npm:^3.0.0"
-    chalk: "npm:^2.0.1"
-    string-length: "npm:^2.0.0"
-  checksum: 10/c7285cd595644f824ca60bbcb1b342ae0c72f8a4f87f89a20c1326fa19efc80dbe0b14972660f1e037ffa64c3541ea1d06990836b2cf6b767ffa0006505d6c24
-  languageName: node
-  linkType: hard
-
 "jest-watcher@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-watcher@npm:27.5.1"
@@ -26093,15 +22555,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^23.2.0":
-  version: 23.2.0
-  resolution: "jest-worker@npm:23.2.0"
-  dependencies:
-    merge-stream: "npm:^1.0.1"
-  checksum: 10/13f0428e17fa4ee79455d699b2ccdb9b871619164acd3838a1d93d3e89317b50c2b284cb9a2e275741374718251272fda0a4096e5f9197d32c160dfe53d5c516
-  languageName: node
-  linkType: hard
-
 "jest-worker@npm:^26.2.1":
   version: 26.6.2
   resolution: "jest-worker@npm:26.6.2"
@@ -26124,18 +22577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "jest@npm:23.6.0"
-  dependencies:
-    import-local: "npm:^1.0.0"
-    jest-cli: "npm:^23.6.0"
-  bin:
-    jest: ./bin/jest.js
-  checksum: 10/a8b0e0229cbd6e00bc1e56900229bdb6523a6298901809bd0ececd8665af8cd006c6f0640d7919650ea18a32dca16d8e977fc98a3a0e2398ffddb3347780e48b
-  languageName: node
-  linkType: hard
-
 "jest@npm:^27.4.7":
   version: 27.5.1
   resolution: "jest@npm:27.5.1"
@@ -26154,15 +22595,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.19.1":
-  version: 1.21.3
-  resolution: "jiti@npm:1.21.3"
-  bin:
-    jiti: bin/jiti.js
-  checksum: 10/5a9f36c610f8a5f750ebdea9295d7966dbf77129e8daaa8fc6ea2e60f38019a61bd79fced4e917023305ffdd66f4fc5bddcbdd6be450881393121a55d02b2241
-  languageName: node
-  linkType: hard
-
 "jose@npm:^5.1.2":
   version: 5.1.3
   resolution: "jose@npm:5.1.3"
@@ -26191,13 +22623,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-tokens@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "js-tokens@npm:3.0.2"
-  checksum: 10/a2d47dbe77c2d7d1abd99f25fcec61c825797e5775a187101879c4fb8e7bbbf89eb83bd315157b92c35d5eed5951962a47b1fedc8c778824b5d95cfb164a310c
-  languageName: node
-  linkType: hard
-
 "js-yaml@npm:=4.1.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -26209,7 +22634,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.7.0":
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
@@ -26263,40 +22688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^11.5.1":
-  version: 11.12.0
-  resolution: "jsdom@npm:11.12.0"
-  dependencies:
-    abab: "npm:^2.0.0"
-    acorn: "npm:^5.5.3"
-    acorn-globals: "npm:^4.1.0"
-    array-equal: "npm:^1.0.0"
-    cssom: "npm:>= 0.3.2 < 0.4.0"
-    cssstyle: "npm:^1.0.0"
-    data-urls: "npm:^1.0.0"
-    domexception: "npm:^1.0.1"
-    escodegen: "npm:^1.9.1"
-    html-encoding-sniffer: "npm:^1.0.2"
-    left-pad: "npm:^1.3.0"
-    nwsapi: "npm:^2.0.7"
-    parse5: "npm:4.0.0"
-    pn: "npm:^1.1.0"
-    request: "npm:^2.87.0"
-    request-promise-native: "npm:^1.0.5"
-    sax: "npm:^1.2.4"
-    symbol-tree: "npm:^3.2.2"
-    tough-cookie: "npm:^2.3.4"
-    w3c-hr-time: "npm:^1.0.1"
-    webidl-conversions: "npm:^4.0.2"
-    whatwg-encoding: "npm:^1.0.3"
-    whatwg-mimetype: "npm:^2.1.0"
-    whatwg-url: "npm:^6.4.1"
-    ws: "npm:^5.2.0"
-    xml-name-validator: "npm:^3.0.0"
-  checksum: 10/60c2ba990ec5cdb44b1434a312fb41a20734ffb3888e7547e36851b0060c62d4719a5f7ef8b93c7b131ecb9beeb6927d9000bb20971b68742a35a300addc8229
-  languageName: node
-  linkType: hard
-
 "jsdom@npm:^16.6.0":
   version: 16.7.0
   resolution: "jsdom@npm:16.7.0"
@@ -26344,15 +22735,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsesc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "jsesc@npm:1.3.0"
-  bin:
-    jsesc: bin/jsesc
-  checksum: 10/d6aa8ebbd57fb5bafeeb31df3ff9580b30e655a049a196bdd1630bc53026e8dc07b462bb4251e33888e83fe53f76f1bebfde4ddfd30f0af78acc0efccb130572
-  languageName: node
-  linkType: hard
-
 "jsesc@npm:^2.5.1":
   version: 2.5.2
   resolution: "jsesc@npm:2.5.2"
@@ -26371,13 +22753,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-buffer@npm:3.0.0":
-  version: 3.0.0
-  resolution: "json-buffer@npm:3.0.0"
-  checksum: 10/6e364585600598c42f1cc85d1305569aeb1a6a13e7c67960f17b403f087e2700104ec8e49fc681ab6d6278ee4d132ac033f2625c22a9777ed9b83b403b40f23e
-  languageName: node
-  linkType: hard
-
 "json-buffer@npm:3.0.1":
   version: 3.0.1
   resolution: "json-buffer@npm:3.0.1"
@@ -26439,24 +22814,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:2.x, json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2, json5@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "json5@npm:2.2.3"
-  bin:
-    json5: lib/cli.js
-  checksum: 10/1db67b853ff0de3534085d630691d3247de53a2ed1390ba0ddff681ea43e9b3e30ecbdb65c5e9aab49435e44059c23dbd6fee8ee619419ba37465bb0dd7135da
-  languageName: node
-  linkType: hard
-
-"json5@npm:^0.5.1":
-  version: 0.5.1
-  resolution: "json5@npm:0.5.1"
-  bin:
-    json5: lib/cli.js
-  checksum: 10/1d95c1cb98d884b4620321b5361062ed0febcef78576687beec014382e51ee07a8c8118421bd327e55080e8ccc4c394f4940ee5d8aedc050b8df7b7a261c9add
-  languageName: node
-  linkType: hard
-
 "json5@npm:^1.0.1":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
@@ -26468,6 +22825,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2, json5@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
+  bin:
+    json5: lib/cli.js
+  checksum: 10/1db67b853ff0de3534085d630691d3247de53a2ed1390ba0ddff681ea43e9b3e30ecbdb65c5e9aab49435e44059c23dbd6fee8ee619419ba37465bb0dd7135da
+  languageName: node
+  linkType: hard
+
 "jsonfile@npm:^4.0.0":
   version: 4.0.0
   resolution: "jsonfile@npm:4.0.0"
@@ -26538,15 +22904,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keyv@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "keyv@npm:3.1.0"
-  dependencies:
-    json-buffer: "npm:3.0.0"
-  checksum: 10/6de272b3f78975a9a0b12259953c09d5bbe9de9acfd845471ebd758928b523f70563462f0c16a866fe9b447ff5bdebda72c62bc23734eb72cd1fb8f1d7076843
-  languageName: node
-  linkType: hard
-
 "keyv@npm:^4.0.0":
   version: 4.5.3
   resolution: "keyv@npm:4.5.3"
@@ -26556,25 +22913,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0":
-  version: 3.2.2
-  resolution: "kind-of@npm:3.2.2"
-  dependencies:
-    is-buffer: "npm:^1.1.5"
-  checksum: 10/b6e7eed10f9dea498500e73129c9bf289bc417568658648aecfc2e104aa32683b908e5d349563fc78d6752da0ea60c9ed1dda4b24dd85a0c8fc0c7376dc0acac
-  languageName: node
-  linkType: hard
-
-"kind-of@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "kind-of@npm:4.0.0"
-  dependencies:
-    is-buffer: "npm:^1.1.5"
-  checksum: 10/b35a90e0690f06bf07c8970b5290256b1740625fb3bf17ef8c9813a9e197302dbe9ad710b0d97a44556c9280becfc2132cbc3b370056f63b7e350a85f79088f1
-  languageName: node
-  linkType: hard
-
-"kind-of@npm:^6.0.0, kind-of@npm:^6.0.2, kind-of@npm:^6.0.3":
+"kind-of@npm:^6.0.2, kind-of@npm:^6.0.3":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
   checksum: 10/5873d303fb36aad875b7538798867da2ae5c9e328d67194b0162a3659a627d22f742fc9c4ae95cd1704132a24b00cae5041fc00c0f6ef937dc17080dc4dbb962
@@ -26622,13 +22961,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"kleur@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "kleur@npm:2.0.2"
-  checksum: 10/c00cbef88bb70b11035e81ae523469471db6ce7664e1bf30a76daaaf7c5f2f6ead61164a455f72b52fd1340d6a0ce6d4f6743665c8ad26d5694335669f914227
-  languageName: node
-  linkType: hard
-
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
@@ -26712,24 +23044,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lcid@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "lcid@npm:2.0.0"
-  dependencies:
-    invert-kv: "npm:^2.0.0"
-  checksum: 10/278e27b5a0707cf9ab682146963ebff2328795be10cd6f8ea8edae293439325d345ac5e33079cce77ac3a86a3dcfb97a34f279dbc46b03f3e419aa39b5915a16
-  languageName: node
-  linkType: hard
-
-"lcov-parse@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "lcov-parse@npm:1.0.0"
-  bin:
-    lcov-parse: ./bin/cli.js
-  checksum: 10/a30674716c5819ceb2e0119f50069ab7cfa11452dbb555119ac72b12d53744de8ebba3c21130ed9eab091d43a9d1f11c094ad9eefb27866f79ee0d40fc3a779c
-  languageName: node
-  linkType: hard
-
 "leaflet-hash@npm:^0.2.1":
   version: 0.2.1
   resolution: "leaflet-hash@npm:0.2.1"
@@ -26744,13 +23058,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"left-pad@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "left-pad@npm:1.3.0"
-  checksum: 10/13fa96e17b70a54836490de22d4bab706e2ed508338bbabecfac72ecce445a74139c5b009a8112252cab8fc4ab7ac4ebd870e5b35bd236b443b12be96f8745ac
-  languageName: node
-  linkType: hard
-
 "lerc@npm:^2.0.0":
   version: 2.0.0
   resolution: "lerc@npm:2.0.0"
@@ -26758,13 +23065,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"leven@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "leven@npm:2.1.0"
-  checksum: 10/f7b4a01b15c0ee2f92a04c0367ea025d10992b044df6f0d4ee1a845d4a488b343e99799e2f31212d72a2b1dea67124f57c1bb1b4561540df45190e44b5b8b394
-  languageName: node
-  linkType: hard
-
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
@@ -27059,94 +23359,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lint-staged@npm:^8.0.0":
-  version: 8.2.1
-  resolution: "lint-staged@npm:8.2.1"
-  dependencies:
-    chalk: "npm:^2.3.1"
-    commander: "npm:^2.14.1"
-    cosmiconfig: "npm:^5.2.0"
-    debug: "npm:^3.1.0"
-    dedent: "npm:^0.7.0"
-    del: "npm:^3.0.0"
-    execa: "npm:^1.0.0"
-    g-status: "npm:^2.0.2"
-    is-glob: "npm:^4.0.0"
-    is-windows: "npm:^1.0.2"
-    listr: "npm:^0.14.2"
-    listr-update-renderer: "npm:^0.5.0"
-    lodash: "npm:^4.17.11"
-    log-symbols: "npm:^2.2.0"
-    micromatch: "npm:^3.1.8"
-    npm-which: "npm:^3.0.1"
-    p-map: "npm:^1.1.1"
-    path-is-inside: "npm:^1.0.2"
-    pify: "npm:^3.0.0"
-    please-upgrade-node: "npm:^3.0.2"
-    staged-git-files: "npm:1.1.2"
-    string-argv: "npm:^0.0.2"
-    stringify-object: "npm:^3.2.2"
-    yup: "npm:^0.27.0"
-  bin:
-    lint-staged: index.js
-  checksum: 10/640933f1d581687caefcd43bd8ba94b728e84b08dc57780a2520116d143bc422f958b35eed7f852e162abf49206827a33eeb5051f7b3f61c6179aa706cd52df3
-  languageName: node
-  linkType: hard
-
-"listr-silent-renderer@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "listr-silent-renderer@npm:1.1.1"
-  checksum: 10/81982612e4d207be2e69c4dcf2a6e0aaa6080e41bfe0b73e8d0b040dcdb79874248b1040558793a2f0fcc9c2252ec8af47379650f59bf2a7656c11cd5a48c948
-  languageName: node
-  linkType: hard
-
-"listr-update-renderer@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "listr-update-renderer@npm:0.5.0"
-  dependencies:
-    chalk: "npm:^1.1.3"
-    cli-truncate: "npm:^0.2.1"
-    elegant-spinner: "npm:^1.0.1"
-    figures: "npm:^1.7.0"
-    indent-string: "npm:^3.0.0"
-    log-symbols: "npm:^1.0.2"
-    log-update: "npm:^2.3.0"
-    strip-ansi: "npm:^3.0.1"
-  peerDependencies:
-    listr: ^0.14.2
-  checksum: 10/2dddc763837a9086a684545ee9049fcb102d423b0c840ad929471ab461075ed78d5c79f1e8334cd7a76aa9076e7631c04a38733bb4d88c23ca6082c087335864
-  languageName: node
-  linkType: hard
-
-"listr-verbose-renderer@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "listr-verbose-renderer@npm:0.5.0"
-  dependencies:
-    chalk: "npm:^2.4.1"
-    cli-cursor: "npm:^2.1.0"
-    date-fns: "npm:^1.27.2"
-    figures: "npm:^2.0.0"
-  checksum: 10/3e504be729f9dd15b40db743e403673b76331774411dbc29d6f48136f6ba8bc1dee645a4e621c1cb781e6e69a58b78cb9aa8c153c7ceccfe4e4ea74d563bca3a
-  languageName: node
-  linkType: hard
-
-"listr@npm:^0.14.2":
-  version: 0.14.3
-  resolution: "listr@npm:0.14.3"
-  dependencies:
-    "@samverschueren/stream-to-observable": "npm:^0.3.0"
-    is-observable: "npm:^1.1.0"
-    is-promise: "npm:^2.1.0"
-    is-stream: "npm:^1.1.0"
-    listr-silent-renderer: "npm:^1.1.1"
-    listr-update-renderer: "npm:^0.5.0"
-    listr-verbose-renderer: "npm:^0.5.0"
-    p-map: "npm:^2.0.0"
-    rxjs: "npm:^6.3.3"
-  checksum: 10/6d5dc899c62b240bd28a22c26e88cf005696786a28e7239adbe044fd9ebcb5261b1503a555c8ba7f45b10d0eabb5d159c91791daee83d803b4caf64fd8adbdf9
-  languageName: node
-  linkType: hard
-
 "lmdb@npm:2.7.11":
   version: 2.7.11
   resolution: "lmdb@npm:2.7.11"
@@ -27182,19 +23394,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"load-json-file@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "load-json-file@npm:1.1.0"
-  dependencies:
-    graceful-fs: "npm:^4.1.2"
-    parse-json: "npm:^2.2.0"
-    pify: "npm:^2.0.0"
-    pinkie-promise: "npm:^2.0.0"
-    strip-bom: "npm:^2.0.0"
-  checksum: 10/bb16e169d87df38806f5ffa7efa3287921839fdfee2c20c8525f53b53ba43d14b56b6881901c04190f7da4a4ba6e0c9784d212e83ee3a32d49bb986b5a6094cb
-  languageName: node
-  linkType: hard
-
 "load-json-file@npm:^4.0.0":
   version: 4.0.0
   resolution: "load-json-file@npm:4.0.0"
@@ -27455,13 +23654,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.map@npm:^4.5.1":
-  version: 4.6.0
-  resolution: "lodash.map@npm:4.6.0"
-  checksum: 10/f1e69def35025be1e6213f1099df8acfa478442de8dfac3511e6eeeb5ef939b911f59db858251cc6b96076984d869fdd329ea360982d83240206124589f56f5d
-  languageName: node
-  linkType: hard
-
 "lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
@@ -27476,13 +23668,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.mergewith@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "lodash.mergewith@npm:4.6.2"
-  checksum: 10/aea75a4492541a4902ac7e551dc6c54b722da0c187f84385d02e8fc33a7ae3454b837822446e5f63fcd5ad1671534ea408740b776670ea4d9c7890b10105fce0
-  languageName: node
-  linkType: hard
-
 "lodash.restparam@npm:*":
   version: 3.6.1
   resolution: "lodash.restparam@npm:3.6.1"
@@ -27565,38 +23750,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:4.17.21, lodash@npm:^4.0.1, lodash@npm:^4.15.0, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.2.1, lodash@npm:^4.7.0":
+"lodash@npm:^4.0.1, lodash@npm:^4.15.0, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.2.1, lodash@npm:^4.7.0":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
   languageName: node
   linkType: hard
 
-"log-driver@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "log-driver@npm:1.2.7"
-  checksum: 10/0cd54adf0de8a3e28affc862550634855a1a66a3e5feb1e93c0900a3330634217e00c086e2e54aa60d92c4dd4bc67d4a00a899d97865d0025777a2d8e0a9ac90
-  languageName: node
-  linkType: hard
-
-"log-symbols@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "log-symbols@npm:1.0.2"
-  dependencies:
-    chalk: "npm:^1.0.0"
-  checksum: 10/5214ade9381db5d40528c171fdfd459b75cad7040eb6a347294ae47fa80cfebba4adbc3aa73a1c9da744cbfa240dd93b38f80df8615717affeea6c4bb6b8dfe7
-  languageName: node
-  linkType: hard
-
-"log-symbols@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "log-symbols@npm:2.2.0"
-  dependencies:
-    chalk: "npm:^2.0.1"
-  checksum: 10/4c95e3b65f0352dbe91dc4989c10baf7a44e2ef5b0db7e6721e1476268e2b6f7090c3aa880d4f833a05c5c3ff18f4ec5215a09bd0099986d64a8186cfeb48ac8
-  languageName: node
-  linkType: hard
-
 "log-symbols@npm:^4.1.0":
   version: 4.1.0
   resolution: "log-symbols@npm:4.1.0"
@@ -27607,17 +23767,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"log-update@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "log-update@npm:2.3.0"
-  dependencies:
-    ansi-escapes: "npm:^3.0.0"
-    cli-cursor: "npm:^2.0.0"
-    wrap-ansi: "npm:^3.0.1"
-  checksum: 10/84fd8e93bfc316eb6ca479a37743f2edcb7563fe5b9161205ce2980f0b3c822717b8f8f1871369697fcb0208521d7b8d00750c594edc3f8a8273dd8b48dd14a3
-  languageName: node
-  linkType: hard
-
 "long@npm:^5.0.0":
   version: 5.2.3
   resolution: "long@npm:5.2.3"
@@ -27632,13 +23781,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"longest@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "longest@npm:2.0.1"
-  checksum: 10/9587c153919a883ecbcc33e9439bc2592aa6fdbbd2d343f8ab17d8d3e0373c4e4350e3b428566fd689d704800a23f2b4d145cbdcca4ef3fd35742e5927f919a9
-  languageName: node
-  linkType: hard
-
 "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
@@ -27669,7 +23811,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lowercase-keys@npm:^1.0.0, lowercase-keys@npm:^1.0.1":
+"lowercase-keys@npm:^1.0.0":
   version: 1.0.1
   resolution: "lowercase-keys@npm:1.0.1"
   checksum: 10/12ba64572dc25ae9ee30d37a11f3a91aea046c1b6b905fdf8ac77e2f268f153ed36e60d39cb3bfa47a89f31d981dae9a8cc9915124a56fe51ff01ed6e8bb68fa
@@ -27833,7 +23975,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-error@npm:1.x, make-error@npm:^1.1.1":
+"make-error@npm:^1.1.1":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
   checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
@@ -27891,22 +24033,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-age-cleaner@npm:^0.1.1":
-  version: 0.1.3
-  resolution: "map-age-cleaner@npm:0.1.3"
-  dependencies:
-    p-defer: "npm:^1.0.0"
-  checksum: 10/cb2804a5bcb3cbdfe4b59066ea6d19f5e7c8c196cd55795ea4c28f792b192e4c442426ae52524e5e1acbccf393d3bddacefc3d41f803e66453f6c4eda3650bc1
-  languageName: node
-  linkType: hard
-
-"map-cache@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "map-cache@npm:0.2.2"
-  checksum: 10/3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969
-  languageName: node
-  linkType: hard
-
 "map-obj@npm:^1.0.0":
   version: 1.0.1
   resolution: "map-obj@npm:1.0.1"
@@ -27935,15 +24061,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-visit@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "map-visit@npm:1.0.0"
-  dependencies:
-    object-visit: "npm:^1.0.0"
-  checksum: 10/c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a
-  languageName: node
-  linkType: hard
-
 "mapbox-gl-controls@npm:^2.3.5":
   version: 2.3.5
   resolution: "mapbox-gl-controls@npm:2.3.5"
@@ -28039,15 +24156,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"marked@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "marked@npm:0.4.0"
-  bin:
-    marked: ./bin/marked
-  checksum: 10/8e8c67c92c2596ad6716ddbec1079519a88b9ff5b6ae7b529e2ca53c88d7626e8cb9537b6b17a86f6058add8c53b4c28b9ace8da9853c3d0e8e646a88c1332e7
-  languageName: node
-  linkType: hard
-
 "marked@npm:^0.7.0":
   version: 0.7.0
   resolution: "marked@npm:0.7.0"
@@ -28057,15 +24165,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"matcher@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "matcher@npm:1.1.1"
-  dependencies:
-    escape-string-regexp: "npm:^1.0.4"
-  checksum: 10/77bc490253901bb7b07bd4a1b7418201336d57029aa1320e6ec951744baf3acf07e907d3ed33d76f0bb2e399783c2b3d28049d29b1971073bbe11523b6ad059b
-  languageName: node
-  linkType: hard
-
 "material-colors@npm:^1.2.1":
   version: 1.2.6
   resolution: "material-colors@npm:1.2.6"
@@ -28080,13 +24179,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"math-random@npm:^1.0.1":
-  version: 1.0.4
-  resolution: "math-random@npm:1.0.4"
-  checksum: 10/9edf31ea337bba21994eb968218fd571d55fce86b51661158d8e241886b73121d9e1a35a5bb8997dba8ce67417a83c8dbd0811917248f886840035b7f1c667b9
-  languageName: node
-  linkType: hard
-
 "maxmin@npm:^2.1.0":
   version: 2.1.0
   resolution: "maxmin@npm:2.1.0"
@@ -28275,17 +24367,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mem@npm:^4.0.0":
-  version: 4.3.0
-  resolution: "mem@npm:4.3.0"
-  dependencies:
-    map-age-cleaner: "npm:^0.1.1"
-    mimic-fn: "npm:^2.0.0"
-    p-is-promise: "npm:^2.0.0"
-  checksum: 10/ae4afa1cac2b4d64e089ecd54e06ae857b6e5aae410802564032cb407aad13aa598c5aededae8cca6c5827f4057ec3f58415a078c80181dd08019ae1a9aa1226
-  languageName: node
-  linkType: hard
-
 "memfs@npm:^3.4.3":
   version: 3.5.3
   resolution: "memfs@npm:3.5.3"
@@ -28387,15 +24468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge-stream@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "merge-stream@npm:1.0.1"
-  dependencies:
-    readable-stream: "npm:^2.0.1"
-  checksum: 10/3be7887dffd8899da0f930c0f85812ab8993252f467dcd61e60a8d085836ebbb23756b8e481a7f71824206342afe1b1a2b80c05a1cd0ed0e792a09c5812a9082
-  languageName: node
-  linkType: hard
-
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
@@ -28410,20 +24482,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge@npm:^1.2.0":
-  version: 1.2.1
-  resolution: "merge@npm:1.2.1"
-  checksum: 10/2298c4fdcf64561f320b92338681f7ffcafafb579a6e294066ae3e7bd10ae25df363903d2f028072733b9f79a1f75d2b999aef98ad5d73de13641da39cda0913
-  languageName: node
-  linkType: hard
-
-"merge@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "merge@npm:2.1.1"
-  checksum: 10/1875521a8e429ba8d82c6d24bf3f229b4b64a348873c41a1245851b422c0caa7fbeb958118c24fbfcbb71e416a29924b3b1c4518911529db175f49eb5bcb5e62
-  languageName: node
-  linkType: hard
-
 "mersenne-twister@npm:^1.1.0":
   version: 1.1.0
   resolution: "mersenne-twister@npm:1.1.0"
@@ -28840,48 +24898,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^2.3.11":
-  version: 2.3.11
-  resolution: "micromatch@npm:2.3.11"
-  dependencies:
-    arr-diff: "npm:^2.0.0"
-    array-unique: "npm:^0.2.1"
-    braces: "npm:^1.8.2"
-    expand-brackets: "npm:^0.1.4"
-    extglob: "npm:^0.3.1"
-    filename-regex: "npm:^2.0.0"
-    is-extglob: "npm:^1.0.0"
-    is-glob: "npm:^2.0.1"
-    kind-of: "npm:^3.0.2"
-    normalize-path: "npm:^2.0.1"
-    object.omit: "npm:^2.0.0"
-    parse-glob: "npm:^3.0.4"
-    regex-cache: "npm:^0.4.2"
-  checksum: 10/25b10db54a95ac0b3409005cf74ccb267e4693f14171c88860a6505e8f1a51940fee1f0bf629a3f85c34ec725ecbf48986fb3edf2d8f9283c322fcdb0512ed42
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:^3.1.4, micromatch@npm:^3.1.8":
-  version: 3.1.10
-  resolution: "micromatch@npm:3.1.10"
-  dependencies:
-    arr-diff: "npm:^4.0.0"
-    array-unique: "npm:^0.3.2"
-    braces: "npm:^2.3.1"
-    define-property: "npm:^2.0.2"
-    extend-shallow: "npm:^3.0.2"
-    extglob: "npm:^2.0.4"
-    fragment-cache: "npm:^0.2.1"
-    kind-of: "npm:^6.0.2"
-    nanomatch: "npm:^1.2.9"
-    object.pick: "npm:^1.3.0"
-    regex-not: "npm:^1.0.0"
-    snapdragon: "npm:^0.8.1"
-    to-regex: "npm:^3.0.2"
-  checksum: 10/4102bac83685dc7882ca1a28443d158b464653f84450de68c07cf77dbd531ed98c25006e9d9f6082bf3b95aabbff4cf231b26fd3bc84f7c4e7f263376101fad6
-  languageName: node
-  linkType: hard
-
 "micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
@@ -28926,14 +24942,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-fn@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "mimic-fn@npm:1.2.0"
-  checksum: 10/69c08205156a1f4906d9c46f9b4dc08d18a50176352e77fdeb645cedfe9f20c0b19865d465bd2dec27a5c432347f24dc07fc3695e11159d193f892834233e939
-  languageName: node
-  linkType: hard
-
-"mimic-fn@npm:^2.0.0, mimic-fn@npm:^2.1.0":
+"mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
   checksum: 10/d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
@@ -28947,7 +24956,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1":
+"mimic-response@npm:^1.0.0":
   version: 1.0.1
   resolution: "mimic-response@npm:1.0.1"
   checksum: 10/034c78753b0e622bc03c983663b1cdf66d03861050e0c8606563d149bc2b02d63f62ce4d32be4ab50d0553ae0ffe647fc34d1f5281184c6e1e8cf4d85e8d9823
@@ -28993,7 +25002,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.3, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
+"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
@@ -29057,14 +25066,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist@npm:1.2.7":
-  version: 1.2.7
-  resolution: "minimist@npm:1.2.7"
-  checksum: 10/0202378a8eb1a9d98a44f623f43c89793a095f4bde6981bda29f6ae61e82a15c18b1690b5efc4c66ddbd402a3e9b7175e6ebdabb2b28037c279ac823b7360e00
-  languageName: node
-  linkType: hard
-
-"minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
+"minimist@npm:^1.1.0, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
   checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f
@@ -29206,16 +25208,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mixin-deep@npm:^1.2.0":
-  version: 1.3.2
-  resolution: "mixin-deep@npm:1.3.2"
-  dependencies:
-    for-in: "npm:^1.0.2"
-    is-extendable: "npm:^1.0.1"
-  checksum: 10/820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d
-  languageName: node
-  linkType: hard
-
 "mkdirp-classic@npm:^0.5.2, mkdirp-classic@npm:^0.5.3":
   version: 0.5.3
   resolution: "mkdirp-classic@npm:0.5.3"
@@ -29234,7 +25226,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:0.x, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.0, mkdirp@npm:~0.5.1":
+"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.0, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
   dependencies:
@@ -29400,14 +25392,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4":
+"mute-stream@npm:~0.0.4":
   version: 0.0.8
   resolution: "mute-stream@npm:0.0.8"
   checksum: 10/a2d2e79dde87e3424ffc8c334472c7f3d17b072137734ca46e6f221131f1b014201cc593b69a38062e974fb2394d3d1cb4349f80f012bbf8b8ac1b28033e515f
   languageName: node
   linkType: hard
 
-"nan@npm:^2.12.1, nan@npm:^2.14.0, nan@npm:^2.17.0, nan@npm:^2.18.0":
+"nan@npm:^2.14.0, nan@npm:^2.17.0, nan@npm:^2.18.0":
   version: 2.19.0
   resolution: "nan@npm:2.19.0"
   dependencies:
@@ -29434,25 +25426,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanomatch@npm:^1.2.9":
-  version: 1.2.13
-  resolution: "nanomatch@npm:1.2.13"
-  dependencies:
-    arr-diff: "npm:^4.0.0"
-    array-unique: "npm:^0.3.2"
-    define-property: "npm:^2.0.2"
-    extend-shallow: "npm:^3.0.2"
-    fragment-cache: "npm:^0.2.1"
-    is-windows: "npm:^1.0.2"
-    kind-of: "npm:^6.0.2"
-    object.pick: "npm:^1.3.0"
-    regex-not: "npm:^1.0.0"
-    snapdragon: "npm:^0.8.1"
-    to-regex: "npm:^3.0.1"
-  checksum: 10/5c4ec7d6264b93795248f22d19672f0b972f900772c057bc67e43ae4999165b5fea7b937359efde78707930a460ceaa6d93e0732ac1d993dab8654655a2e959b
-  languageName: node
-  linkType: hard
-
 "napi-build-utils@npm:^1.0.1":
   version: 1.0.2
   resolution: "napi-build-utils@npm:1.0.2"
@@ -29735,19 +25708,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-notifier@npm:^5.2.1":
-  version: 5.4.5
-  resolution: "node-notifier@npm:5.4.5"
-  dependencies:
-    growly: "npm:^1.3.0"
-    is-wsl: "npm:^1.1.0"
-    semver: "npm:^5.5.0"
-    shellwords: "npm:^0.1.1"
-    which: "npm:^1.3.0"
-  checksum: 10/1c4de3fd0ace1401889cca349b2abad16f798a1df8677d0774e41cce6e1878d8c0749b0194fc069fd1f62284d86e49792060b37ef0e6b3e0ef01fb852c14fe62
-  languageName: node
-  linkType: hard
-
 "node-releases@npm:^2.0.13":
   version: 2.0.13
   resolution: "node-releases@npm:2.0.13"
@@ -29819,15 +25779,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-path@npm:^2.0.1, normalize-path@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "normalize-path@npm:2.1.1"
-  dependencies:
-    remove-trailing-separator: "npm:^1.0.1"
-  checksum: 10/7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea
-  languageName: node
-  linkType: hard
-
 "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
@@ -29849,7 +25800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-url@npm:^4.0.0, normalize-url@npm:^4.1.0":
+"normalize-url@npm:^4.0.0":
   version: 4.5.1
   resolution: "normalize-url@npm:4.5.1"
   checksum: 10/20ced2845fcfaa46da74efc0aa39b7bed22f3db39e6e8b844261613082a36a2dcd468decad89fa9313b5464bebab4034f96bda7880e8fc468027fecf6a6fa254
@@ -29965,17 +25916,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-path@npm:^2.0.2":
-  version: 2.0.4
-  resolution: "npm-path@npm:2.0.4"
-  dependencies:
-    which: "npm:^1.2.10"
-  bin:
-    npm-path: bin/npm-path
-  checksum: 10/b62f5c7739da994684a1df64ccc987f232dc348ae307986eadf2234338b54714ba44b5372e0327cff9794ed0f57e4c0382dab79af710ce0e33bd1f124b1d6e35
-  languageName: node
-  linkType: hard
-
 "npm-pick-manifest@npm:^3.0.0, npm-pick-manifest@npm:^3.0.2":
   version: 3.0.2
   resolution: "npm-pick-manifest@npm:3.0.2"
@@ -30068,19 +26008,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-which@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "npm-which@npm:3.0.1"
-  dependencies:
-    commander: "npm:^2.9.0"
-    npm-path: "npm:^2.0.2"
-    which: "npm:^1.2.10"
-  bin:
-    npm-which: bin/npm-which.js
-  checksum: 10/742e24acdd6503edd6093bf8fa88f437760143301c6c5d846f532cf02ff40e815a7c28c96eca170398dfbbed97e7ab4dff07fbdcbb2ae3000a6a9845bc77b8c7
-  languageName: node
-  linkType: hard
-
 "npm@npm:^6.10.3":
   version: 6.14.18
   resolution: "npm@npm:6.14.18"
@@ -30271,13 +26198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.0.7":
-  version: 2.2.10
-  resolution: "nwsapi@npm:2.2.10"
-  checksum: 10/b310e9dd0886da338cbbb1be9fec473a50269e2935d537f95a03d0038f7ea831ce12b4816d97f42e458e5273158aea2a6c86bc4bb60f79911226154aa66740f7
-  languageName: node
-  linkType: hard
-
 "nwsapi@npm:^2.2.0":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
@@ -30306,24 +26226,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
+"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: 10/fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
   languageName: node
   linkType: hard
 
-"object-copy@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "object-copy@npm:0.1.0"
-  dependencies:
-    copy-descriptor: "npm:^0.1.0"
-    define-property: "npm:^0.2.5"
-    kind-of: "npm:^3.0.3"
-  checksum: 10/a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783
-  languageName: node
-  linkType: hard
-
 "object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
@@ -30362,15 +26271,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-visit@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "object-visit@npm:1.0.1"
-  dependencies:
-    isobject: "npm:^3.0.0"
-  checksum: 10/77abf807de86fa65bf1ba92699b45b1e5485f2d899300d5cb92cca0863909e9528b6cbf366c237c9f5d2264dab6cfbeda2201252ed0e605ae1b3e263515c5cea
-  languageName: node
-  linkType: hard
-
 "object.assign@npm:^4.1.4":
   version: 4.1.4
   resolution: "object.assign@npm:4.1.4"
@@ -30383,18 +26283,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.5":
-  version: 4.1.5
-  resolution: "object.assign@npm:4.1.5"
-  dependencies:
-    call-bind: "npm:^1.0.5"
-    define-properties: "npm:^1.2.1"
-    has-symbols: "npm:^1.0.3"
-    object-keys: "npm:^1.1.1"
-  checksum: 10/dbb22da4cda82e1658349ea62b80815f587b47131b3dd7a4ab7f84190ab31d206bbd8fe7e26ae3220c55b65725ac4529825f6142154211220302aa6b1518045d
-  languageName: node
-  linkType: hard
-
 "object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.0":
   version: 2.1.7
   resolution: "object.getownpropertydescriptors@npm:2.1.7"
@@ -30408,40 +26296,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.getownpropertydescriptors@npm:^2.1.6":
-  version: 2.1.8
-  resolution: "object.getownpropertydescriptors@npm:2.1.8"
-  dependencies:
-    array.prototype.reduce: "npm:^1.0.6"
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-    gopd: "npm:^1.0.1"
-    safe-array-concat: "npm:^1.1.2"
-  checksum: 10/8c50f52e0d702d30836f3d2772ba02807ca25a5381be6f9470c6d143ee0bad01bce3fff0fedea2bdbc0c9297e4eb7785ffee5739f6a3a7c60fcd622b42f8a9fb
-  languageName: node
-  linkType: hard
-
-"object.omit@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "object.omit@npm:2.0.1"
-  dependencies:
-    for-own: "npm:^0.1.4"
-    is-extendable: "npm:^0.1.1"
-  checksum: 10/431088be6af5860560b61a252e5f020ca1894f111743ee7ffa329a32c084b1b7fa8d7d70ab45fdcb2c2872648a67170d8120d109fae32b4b4bbe2491ac9a3719
-  languageName: node
-  linkType: hard
-
-"object.pick@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "object.pick@npm:1.3.0"
-  dependencies:
-    isobject: "npm:^3.0.1"
-  checksum: 10/92d7226a6b581d0d62694a5632b6a1594c81b3b5a4eb702a7662e0b012db532557067d6f773596c577f75322eba09cdca37ca01ea79b6b29e3e17365f15c615e
-  languageName: node
-  linkType: hard
-
 "object.values@npm:^1.1.0":
   version: 1.1.7
   resolution: "object.values@npm:1.1.7"
@@ -30506,15 +26360,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"onetime@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "onetime@npm:2.0.1"
-  dependencies:
-    mimic-fn: "npm:^1.0.0"
-  checksum: 10/5b4f6079e6b4973244017e157833ab5a7a3de4bd2612d69411e3ee46f61fe8bb57b7c2e243b0b23dbaa5bad7641a15f9100a5c80295ff64c0d87aab5d1576ef9
-  languageName: node
-  linkType: hard
-
 "onetime@npm:^5.1.0, onetime@npm:^5.1.2":
   version: 5.1.2
   resolution: "onetime@npm:5.1.2"
@@ -30554,15 +26399,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"opencollective-postinstall@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "opencollective-postinstall@npm:2.0.3"
-  bin:
-    opencollective-postinstall: index.js
-  checksum: 10/69d63778087cd10c9d707d9ed360556780cfdd0cd6241ded0e26632f467f1d5a064f4a9aec19a30c187770c17adba034d988f7684b226f3a73e79f44e73fab0e
-  languageName: node
-  linkType: hard
-
 "opener@npm:^1.5.2":
   version: 1.5.2
   resolution: "opener@npm:1.5.2"
@@ -30626,17 +26462,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-locale@npm:^3.0.0, os-locale@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "os-locale@npm:3.1.0"
-  dependencies:
-    execa: "npm:^1.0.0"
-    lcid: "npm:^2.0.0"
-    mem: "npm:^4.0.0"
-  checksum: 10/53c542b11af3c5fe99624b09c7882b6944f9ae7c69edbc6006b7d42cff630b1f7fd9d63baf84ed31d1ef02b34823b6b31f23a1ecdd593757873d716bc6374099
-  languageName: node
-  linkType: hard
-
 "os-name@npm:^3.1.0":
   version: 3.1.0
   resolution: "os-name@npm:3.1.0"
@@ -30647,7 +26472,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-tmpdir@npm:^1.0.0, os-tmpdir@npm:^1.0.1, os-tmpdir@npm:~1.0.2":
+"os-tmpdir@npm:^1.0.0, os-tmpdir@npm:~1.0.2":
   version: 1.0.2
   resolution: "os-tmpdir@npm:1.0.2"
   checksum: 10/5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
@@ -30664,13 +26489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-cancelable@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "p-cancelable@npm:1.1.0"
-  checksum: 10/2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece
-  languageName: node
-  linkType: hard
-
 "p-cancelable@npm:^2.0.0":
   version: 2.1.1
   resolution: "p-cancelable@npm:2.1.1"
@@ -30678,13 +26496,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-defer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "p-defer@npm:1.0.0"
-  checksum: 10/1d8fb7138a0ccebb65479160fd93f245303c06c977c976105d75838f7f504a9a6ef11b7e058f98b4c957a6a8df268c616da1ee339285d565f9e5ba00304e027b
-  languageName: node
-  linkType: hard
-
 "p-filter@npm:^2.0.0":
   version: 2.1.0
   resolution: "p-filter@npm:2.1.0"
@@ -30708,13 +26519,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-is-promise@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "p-is-promise@npm:2.1.0"
-  checksum: 10/c9a8248c8b5e306475a5d55ce7808dbce4d4da2e3d69526e4991a391a7809bfd6cfdadd9bf04f1c96a3db366c93d9a0f5ee81d949e7b1684c4e0f61f747199ef
-  languageName: node
-  linkType: hard
-
 "p-is-promise@npm:^3.0.0":
   version: 3.0.0
   resolution: "p-is-promise@npm:3.0.0"
@@ -30785,13 +26589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-map@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "p-map@npm:1.2.0"
-  checksum: 10/e7fd1175f5be449e3664a2fbceb4f53a5c1a4a1f078387f5e83dc4110b1421fd01e172c9de97ca03ae2b95401270918fd6f76778c0b52bd70edcdc2202d26ea8
-  languageName: node
-  linkType: hard
-
 "p-map@npm:^2.0.0":
   version: 2.1.0
   resolution: "p-map@npm:2.1.0"
@@ -30825,15 +26622,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-retry@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "p-retry@npm:3.0.1"
-  dependencies:
-    retry: "npm:^0.12.0"
-  checksum: 10/702efc63fc13ef7fc0bab9a1b08432ab38a0236efcbce64af0cf692030ba6ed8009f29ba66e3301cb98dc69ef33e7ccab29ba1ac2bea897f802f81f4f7e468dd
-  languageName: node
-  linkType: hard
-
 "p-retry@npm:^4.0.0, p-retry@npm:^4.5.0":
   version: 4.6.2
   resolution: "p-retry@npm:4.6.2"
@@ -31033,18 +26821,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-glob@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "parse-glob@npm:3.0.4"
-  dependencies:
-    glob-base: "npm:^0.3.0"
-    is-dotfile: "npm:^1.0.0"
-    is-extglob: "npm:^1.0.0"
-    is-glob: "npm:^2.0.0"
-  checksum: 10/447bc442d76522c5e03b5babc8582d4a37fe9d59b3e5ef8d7ddae4e03060637ae38d5d28686e03c27e4d20be34983b5cb053cf8b066d34be0f9d1867eb677e45
-  languageName: node
-  linkType: hard
-
 "parse-headers@npm:^2.0.0":
   version: 2.0.5
   resolution: "parse-headers@npm:2.0.5"
@@ -31052,15 +26828,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-json@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "parse-json@npm:2.2.0"
-  dependencies:
-    error-ex: "npm:^1.2.0"
-  checksum: 10/39924c0ddbf6f2544ab92acea61d91a0fb0ac959b0d19d273468cf8aa977522f8076e8fbb29cdab75c1440ebc2e172389988274890373d95fe308837074cc7e0
-  languageName: node
-  linkType: hard
-
 "parse-json@npm:^4.0.0":
   version: 4.0.0
   resolution: "parse-json@npm:4.0.0"
@@ -31083,20 +26850,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-passwd@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "parse-passwd@npm:1.0.0"
-  checksum: 10/4e55e0231d58f828a41d0f1da2bf2ff7bcef8f4cb6146e69d16ce499190de58b06199e6bd9b17fbf0d4d8aef9052099cdf8c4f13a6294b1a522e8e958073066e
-  languageName: node
-  linkType: hard
-
-"parse5@npm:4.0.0":
-  version: 4.0.0
-  resolution: "parse5@npm:4.0.0"
-  checksum: 10/ba851b10a328e21b437f7c685ef52e078cc75e7bfbff7449c4ff5e0734343ebd65e5f3e338830d9b970862eca94e92a4e55e36cefb934e1e027e3d17138d1db4
-  languageName: node
-  linkType: hard
-
 "parse5@npm:6.0.1":
   version: 6.0.1
   resolution: "parse5@npm:6.0.1"
@@ -31121,13 +26874,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pascalcase@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "pascalcase@npm:0.1.1"
-  checksum: 10/f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925
-  languageName: node
-  linkType: hard
-
 "patch-package@npm:^8.0.0":
   version: 8.0.0
   resolution: "patch-package@npm:8.0.0"
@@ -31170,15 +26916,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-exists@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "path-exists@npm:2.1.0"
-  dependencies:
-    pinkie-promise: "npm:^2.0.0"
-  checksum: 10/fdb734f1d00f225f7a0033ce6d73bff6a7f76ea08936abf0e5196fa6e54a645103538cd8aedcb90d6d8c3fa3705ded0c58a4da5948ae92aa8834892c1ab44a84
-  languageName: node
-  linkType: hard
-
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
@@ -31193,7 +26930,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-is-absolute@npm:^1.0.0, path-is-absolute@npm:^1.0.1":
+"path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
   checksum: 10/060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
@@ -31228,7 +26965,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-parse@npm:^1.0.5, path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
+"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
   checksum: 10/49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
@@ -31261,17 +26998,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-type@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "path-type@npm:1.1.0"
-  dependencies:
-    graceful-fs: "npm:^4.1.2"
-    pify: "npm:^2.0.0"
-    pinkie-promise: "npm:^2.0.0"
-  checksum: 10/59a4b2c0e566baf4db3021a1ed4ec09a8b36fca960a490b54a6bcefdb9987dafe772852982b6011cd09579478a96e57960a01f75fa78a794192853c9d468fc79
-  languageName: node
-  linkType: hard
-
 "path-type@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-type@npm:3.0.0"
@@ -31373,13 +27099,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pify@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "pify@npm:2.3.0"
-  checksum: 10/9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
-  languageName: node
-  linkType: hard
-
 "pify@npm:^3.0.0":
   version: 3.0.0
   resolution: "pify@npm:3.0.0"
@@ -31401,22 +27120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pinkie-promise@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "pinkie-promise@npm:2.0.1"
-  dependencies:
-    pinkie: "npm:^2.0.0"
-  checksum: 10/b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca
-  languageName: node
-  linkType: hard
-
-"pinkie@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "pinkie@npm:2.0.4"
-  checksum: 10/11d207257a044d1047c3755374d36d84dda883a44d030fe98216bf0ea97da05a5c9d64e82495387edeb9ee4f52c455bca97cdb97629932be65e6f54b29f5aec8
-  languageName: node
-  linkType: hard
-
 "pirates@npm:^4.0.4, pirates@npm:^4.0.6":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
@@ -31434,15 +27137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "pkg-dir@npm:2.0.0"
-  dependencies:
-    find-up: "npm:^2.1.0"
-  checksum: 10/8c72b712305b51e1108f0ffda5ec1525a8307e54a5855db8fb1dcf77561a5ae98e2ba3b4814c9806a679f76b2f7e5dd98bde18d07e594ddd9fdd25e9cf242ea1
-  languageName: node
-  linkType: hard
-
 "pkg-dir@npm:^3.0.0":
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"
@@ -31470,22 +27164,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"please-upgrade-node@npm:^3.0.2, please-upgrade-node@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "please-upgrade-node@npm:3.2.0"
-  dependencies:
-    semver-compare: "npm:^1.0.0"
-  checksum: 10/d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb
-  languageName: node
-  linkType: hard
-
-"pn@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "pn@npm:1.1.0"
-  checksum: 10/f597172ff5d83166b66179dc31b65e8601caf0d6d0691f07613b58d9ac439154a017c081b5ba5f6432dd5bbedfa90d7a2d2d7a5b2e799c1ebb11545ea254213c
-  languageName: node
-  linkType: hard
-
 "pngjs@npm:^3.3.3":
   version: 3.4.0
   resolution: "pngjs@npm:3.4.0"
@@ -31502,20 +27180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"posix-character-classes@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "posix-character-classes@npm:0.1.1"
-  checksum: 10/dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442
-  languageName: node
-  linkType: hard
-
-"possible-typed-array-names@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "possible-typed-array-names@npm:1.0.0"
-  checksum: 10/8ed3e96dfeea1c5880c1f4c9cb707e5fb26e8be22f14f82ef92df20fd2004e635c62ba47fbe8f2bb63bfd80dac1474be2fb39798da8c2feba2815435d1f749af
-  languageName: node
-  linkType: hard
-
 "postcss-calc@npm:^7.0.1":
   version: 7.0.5
   resolution: "postcss-calc@npm:7.0.5"
@@ -32443,20 +28107,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prepend-http@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "prepend-http@npm:2.0.0"
-  checksum: 10/7694a9525405447662c1ffd352fcb41b6410c705b739b6f4e3a3e21cf5fdede8377890088e8934436b8b17ba55365a615f153960f30877bf0d0392f9e93503ea
-  languageName: node
-  linkType: hard
-
-"preserve@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "preserve@npm:0.2.0"
-  checksum: 10/dd31d4fd0e6b218cac7178712ae0683c96e6eaa3e5490a37aba6d47095f87c47ffe980a3061ebe72ca07cb2a9a4f1a41bbeecee8944ec77be311c294e05b2e43
-  languageName: node
-  linkType: hard
-
 "prettier@npm:^2.0.5, prettier@npm:^2.7.1":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
@@ -32501,16 +28151,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^23.6.0":
-  version: 23.6.0
-  resolution: "pretty-format@npm:23.6.0"
-  dependencies:
-    ansi-regex: "npm:^3.0.0"
-    ansi-styles: "npm:^3.2.0"
-  checksum: 10/7fda1f30c374e24b4ff2ce1d517ecd42a25b0eb759e3289b04ca93d95d38e84a56fc240e76bdd90b0ac471e77088e543ac581223cafcb56e9be05c9d6ac10516
-  languageName: node
-  linkType: hard
-
 "pretty-format@npm:^26.0.0, pretty-format@npm:^26.6.2":
   version: 26.6.2
   resolution: "pretty-format@npm:26.6.2"
@@ -32555,13 +28195,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"private@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "private@npm:0.1.8"
-  checksum: 10/192ce0764e1708a40e42ad3b679c8553c275e4ee9d5dcfdf3de99b01d43a6ee3047f0d293e892c003276cde3829f0548e60f77fa49e2e51b380939e662794a1e
-  languageName: node
-  linkType: hard
-
 "process-nextick-args@npm:~1.0.6":
   version: 1.0.7
   resolution: "process-nextick-args@npm:1.0.7"
@@ -32583,13 +28216,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"progress@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "progress@npm:2.0.3"
-  checksum: 10/e6f0bcb71f716eee9dfac0fe8a2606e3704d6a64dd93baaf49fbadbc8499989a610fe14cf1bc6f61b6d6653c49408d94f4a94e124538084efd8e4cf525e0293d
-  languageName: node
-  linkType: hard
-
 "promise-inflight@npm:^1.0.1, promise-inflight@npm:~1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -32646,16 +28272,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prompts@npm:^0.1.9":
-  version: 0.1.14
-  resolution: "prompts@npm:0.1.14"
-  dependencies:
-    kleur: "npm:^2.0.1"
-    sisteransi: "npm:^0.1.1"
-  checksum: 10/dba88d7ed11dcc76952a83ab4f0ec1f23f040a540499cb8af2b6380f7bacee3ddcbb2c24c2d119064a432ac2dcf6b0e909022c10388c4a16ec0bb81ca2ca158c
-  languageName: node
-  linkType: hard
-
 "prompts@npm:^2.0.1, prompts@npm:^2.4.0":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -32686,13 +28302,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"property-expr@npm:^1.5.0":
-  version: 1.5.1
-  resolution: "property-expr@npm:1.5.1"
-  checksum: 10/8d5bd40224ed502fc09c20749f27bb680a2645a5d4ee51978eb534e241ea9dbb05813dee6a0471b7c00ffec37e8b202f7b4ead90ad80e52cea15431522707bfe
-  languageName: node
-  linkType: hard
-
 "property-information@npm:^5.0.0":
   version: 5.6.0
   resolution: "property-information@npm:5.6.0"
@@ -33038,17 +28647,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"randomatic@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "randomatic@npm:3.1.1"
-  dependencies:
-    is-number: "npm:^4.0.0"
-    kind-of: "npm:^6.0.0"
-    math-random: "npm:^1.0.1"
-  checksum: 10/fd7517e78425722b67ad6ddbf930f668bf00624d7210546e32562888d8558d0fcca9b5b7ca8639943eea6dc1b03ea666d5af0a7fd698b7b08e1cdb84c94fd5b5
-  languageName: node
-  linkType: hard
-
 "randombytes@npm:^2.1.0":
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"
@@ -34163,16 +29761,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "read-pkg-up@npm:1.0.1"
-  dependencies:
-    find-up: "npm:^1.0.0"
-    read-pkg: "npm:^1.0.0"
-  checksum: 10/d18399a0f46e2da32beb2f041edd0cda49d2f2cc30195a05c759ef3ed9b5e6e19ba1ad1bae2362bdec8c6a9f2c3d18f4d5e8c369e808b03d498d5781cb9122c7
-  languageName: node
-  linkType: hard
-
 "read-pkg-up@npm:^3.0.0":
   version: 3.0.0
   resolution: "read-pkg-up@npm:3.0.0"
@@ -34194,17 +29782,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "read-pkg@npm:1.1.0"
-  dependencies:
-    load-json-file: "npm:^1.0.0"
-    normalize-package-data: "npm:^2.3.2"
-    path-type: "npm:^1.0.0"
-  checksum: 10/a0f5d5e32227ec8e6a028dd5c5134eab229768dcb7a5d9a41a284ed28ad4b9284fecc47383dc1593b5694f4de603a7ffaee84b738956b9b77e0999567485a366
-  languageName: node
-  linkType: hard
-
 "read-pkg@npm:^3.0.0":
   version: 3.0.0
   resolution: "read-pkg@npm:3.0.0"
@@ -34310,15 +29887,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"realpath-native@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "realpath-native@npm:1.1.0"
-  dependencies:
-    util.promisify: "npm:^1.0.0"
-  checksum: 10/75ef0595dea6186384b785a9e0993c58ec604f8be2e39b602fec6d7837c7f770af4a4eb3c81f864a7d81c518a7167a6eaabbc7695b7a88c56e1ef04b91c1d586
-  languageName: node
-  linkType: hard
-
 "recast@npm:^0.23.3":
   version: 0.23.4
   resolution: "recast@npm:0.23.4"
@@ -34508,25 +30076,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regex-cache@npm:^0.4.2":
-  version: 0.4.4
-  resolution: "regex-cache@npm:0.4.4"
-  dependencies:
-    is-equal-shallow: "npm:^0.1.3"
-  checksum: 10/06b605c4ffd411f36ebf2d201f51f37bc23aa7e1f71d30d1c241833697ab8d33122d19701e982be2dc925cfee8cf03e007d374cafa3e1028674729665e0f2a15
-  languageName: node
-  linkType: hard
-
-"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "regex-not@npm:1.0.2"
-  dependencies:
-    extend-shallow: "npm:^3.0.2"
-    safe-regex: "npm:^1.1.0"
-  checksum: 10/3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77
-  languageName: node
-  linkType: hard
-
 "regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
   version: 1.5.1
   resolution: "regexp.prototype.flags@npm:1.5.1"
@@ -34538,18 +30087,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "regexp.prototype.flags@npm:1.5.2"
-  dependencies:
-    call-bind: "npm:^1.0.6"
-    define-properties: "npm:^1.2.1"
-    es-errors: "npm:^1.3.0"
-    set-function-name: "npm:^2.0.1"
-  checksum: 10/9fffc01da9c4e12670ff95bc5204364615fcc12d86fc30642765af908675678ebb0780883c874b2dbd184505fb52fa603d80073ecf69f461ce7f56b15d10be9c
-  languageName: node
-  linkType: hard
-
 "regexpu-core@npm:^5.3.1":
   version: 5.3.2
   resolution: "regexpu-core@npm:5.3.2"
@@ -34689,13 +30226,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remove-trailing-separator@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "remove-trailing-separator@npm:1.1.0"
-  checksum: 10/d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419
-  languageName: node
-  linkType: hard
-
 "renderkid@npm:^3.0.0":
   version: 3.0.0
   resolution: "renderkid@npm:3.0.0"
@@ -34709,13 +30239,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"repeat-element@npm:^1.1.2":
-  version: 1.1.4
-  resolution: "repeat-element@npm:1.1.4"
-  checksum: 10/1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9
-  languageName: node
-  linkType: hard
-
 "repeat-string@npm:^1.5.2, repeat-string@npm:^1.6.1":
   version: 1.6.1
   resolution: "repeat-string@npm:1.6.1"
@@ -34723,15 +30246,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"repeating@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "repeating@npm:2.0.1"
-  dependencies:
-    is-finite: "npm:^1.0.0"
-  checksum: 10/d2db0b69c5cb0c14dd750036e0abcd6b3c3f7b2da3ee179786b755cf737ca15fa0fff417ca72de33d6966056f4695440e680a352401fc02c95ade59899afbdd0
-  languageName: node
-  linkType: hard
-
 "replace-in-file@npm:^3.4.2":
   version: 3.4.4
   resolution: "replace-in-file@npm:3.4.4"
@@ -34745,31 +30259,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request-promise-core@npm:1.1.4":
-  version: 1.1.4
-  resolution: "request-promise-core@npm:1.1.4"
-  dependencies:
-    lodash: "npm:^4.17.19"
-  peerDependencies:
-    request: ^2.34
-  checksum: 10/79714e46b078c8de539c4de13e78878a3c7e3f33e194547c5ec3f0c8e47b0b222aa1718bbd2dbfb1a7990149041c6cc0be6c5916e03d99f4e75939f2a840046e
-  languageName: node
-  linkType: hard
-
-"request-promise-native@npm:^1.0.5":
-  version: 1.0.9
-  resolution: "request-promise-native@npm:1.0.9"
-  dependencies:
-    request-promise-core: "npm:1.1.4"
-    stealthy-require: "npm:^1.1.1"
-    tough-cookie: "npm:^2.3.3"
-  peerDependencies:
-    request: ^2.34
-  checksum: 10/6df0cf75cbddd08b568e462570fb63033f040efdf961f39af572e52821a831a13ee9027db7ba78f1d980759cc7913f2a12a34424deac5a0ec56c5d8ebbf45391
-  languageName: node
-  linkType: hard
-
-"request@npm:^2.44.0, request@npm:^2.87.0, request@npm:^2.88.0, request@npm:^2.88.2":
+"request@npm:^2.44.0, request@npm:^2.88.0, request@npm:^2.88.2":
   version: 2.88.2
   resolution: "request@npm:2.88.2"
   dependencies:
@@ -34811,13 +30301,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"require-main-filename@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "require-main-filename@npm:1.0.1"
-  checksum: 10/49e4586207c138dabe885cffb9484f3f4583fc839851cd6705466eb343d8bb6af7dfa3d8e611fbd44d40441d4cddaadb34b4d537092b92adafa6a6f440dc1da8
-  languageName: node
-  linkType: hard
-
 "require-main-filename@npm:^2.0.0":
   version: 2.0.0
   resolution: "require-main-filename@npm:2.0.0"
@@ -34870,15 +30353,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-cwd@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "resolve-cwd@npm:2.0.0"
-  dependencies:
-    resolve-from: "npm:^3.0.0"
-  checksum: 10/e7c16880c460656e77f102d537a6dc82b3657d9173697cd6ea82ffce37df96f6c1fc79d0bb35fd73fff8871ac13f21b4396958b5f0a13e5b99c97d69f5e319fa
-  languageName: node
-  linkType: hard
-
 "resolve-cwd@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-cwd@npm:3.0.0"
@@ -34888,16 +30362,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-dir@npm:^1.0.0, resolve-dir@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "resolve-dir@npm:1.0.1"
-  dependencies:
-    expand-tilde: "npm:^2.0.0"
-    global-modules: "npm:^1.0.0"
-  checksum: 10/ef736b8ed60d6645c3b573da17d329bfb50ec4e1d6c5ffd6df49e3497acef9226f9810ea6823b8ece1560e01dcb13f77a9f6180d4f242d00cc9a8f4de909c65c
-  languageName: node
-  linkType: hard
-
 "resolve-from@npm:5.0.0, resolve-from@npm:^5.0.0":
   version: 5.0.0
   resolution: "resolve-from@npm:5.0.0"
@@ -34951,13 +30415,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-url@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "resolve-url@npm:0.2.1"
-  checksum: 10/c8bbf6385730add6657103929ebd7e4aa623a2c2df29bba28a58fec73097c003edcce475efefa51c448a904aa344a4ebabe6ad85c8e75c72c4ce9a0c0b5652d2
-  languageName: node
-  linkType: hard
-
 "resolve.exports@npm:^1.1.0":
   version: 1.1.1
   resolution: "resolve.exports@npm:1.1.1"
@@ -34965,13 +30422,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:1.1.7":
-  version: 1.1.7
-  resolution: "resolve@npm:1.1.7"
-  checksum: 10/0a4ff8a102b1d059321caf77563cb2c495979c734f9dc400a70e3ceaaafe76a72bbcc625f9361756348d7b6af6d3cd2815cfbe3109be655a2b18e62d1cdadfc5
-  languageName: node
-  linkType: hard
-
 "resolve@npm:1.17.0":
   version: 1.17.0
   resolution: "resolve@npm:1.17.0"
@@ -34981,7 +30431,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:1.x, resolve@npm:^1.1.5, resolve@npm:^1.22.1, resolve@npm:^1.22.8, resolve@npm:^1.3.2":
+"resolve@npm:^1.1.5, resolve@npm:^1.22.1, resolve@npm:^1.22.8":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -35007,13 +30457,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A1.1.7#optional!builtin<compat/resolve>":
-  version: 1.1.7
-  resolution: "resolve@patch:resolve@npm%3A1.1.7#optional!builtin<compat/resolve>::version=1.1.7&hash=3bafbf"
-  checksum: 10/dc5c99fb47807d3771be3135ac6bdb892186973d0895ab17838f0b85bb575e03111214aa16cb68b6416df3c1dd658081a066dd7a9af6e668c28b0025080b615c
-  languageName: node
-  linkType: hard
-
 "resolve@patch:resolve@npm%3A1.17.0#optional!builtin<compat/resolve>":
   version: 1.17.0
   resolution: "resolve@patch:resolve@npm%3A1.17.0#optional!builtin<compat/resolve>::version=1.17.0&hash=c3c19d"
@@ -35023,7 +30466,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A1.x#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.1.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -35049,15 +30492,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"responselike@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "responselike@npm:1.0.2"
-  dependencies:
-    lowercase-keys: "npm:^1.0.0"
-  checksum: 10/2e9e70f1dcca3da621a80ce71f2f9a9cad12c047145c6ece20df22f0743f051cf7c73505e109814915f23f9e34fb0d358e22827723ee3d56b623533cab8eafcd
-  languageName: node
-  linkType: hard
-
 "responselike@npm:^2.0.0":
   version: 2.0.1
   resolution: "responselike@npm:2.0.1"
@@ -35067,16 +30501,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"restore-cursor@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "restore-cursor@npm:2.0.0"
-  dependencies:
-    onetime: "npm:^2.0.0"
-    signal-exit: "npm:^3.0.2"
-  checksum: 10/482e13d02d834b6e5e3aa90304a8b5e840775d6f06916cc92a50038adf9f098dcc72405b567da8a37e137ae40ad3e31896fa3136ae62f7a426c2fbf53d036536
-  languageName: node
-  linkType: hard
-
 "restore-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
@@ -35094,13 +30518,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ret@npm:~0.1.10":
-  version: 0.1.15
-  resolution: "ret@npm:0.1.15"
-  checksum: 10/07c9e7619b4c86053fa57689bf7606b5a40fc1231fc87682424d0b3e296641cc19c218c3b8a8917305fbcca3bfc43038a5b6a63f54755c1bbca2f91857253b03
-  languageName: node
-  linkType: hard
-
 "retry@npm:^0.10.0":
   version: 0.10.1
   resolution: "retry@npm:0.10.1"
@@ -35150,7 +30567,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^2.2.8, rimraf@npm:^2.5.2, rimraf@npm:^2.5.4, rimraf@npm:^2.6.1, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3, rimraf@npm:^2.7.1":
+"rimraf@npm:^2.5.2, rimraf@npm:^2.5.4, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3, rimraf@npm:^2.7.1":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
   dependencies:
@@ -35526,20 +30943,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rsvp@npm:^3.3.3":
-  version: 3.6.2
-  resolution: "rsvp@npm:3.6.2"
-  checksum: 10/ff38536f9a030f70ebdd18df16b521b0e4e6d24b48ef3d115d0d4135af14e1fb31fb13ace62a265e31850feb01497a64dc55cf2364d63595f3ca39a7b0b7b6e6
-  languageName: node
-  linkType: hard
-
-"run-async@npm:^2.4.0":
-  version: 2.4.1
-  resolution: "run-async@npm:2.4.1"
-  checksum: 10/c79551224dafa26ecc281cb1efad3510c82c79116aaf681f8a931ce70fdf4ca880d58f97d3b930a38992c7aad7955a08e065b32ec194e1dd49d7790c874ece50
-  languageName: node
-  linkType: hard
-
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -35572,24 +30975,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^6.3.3":
-  version: 6.6.7
-  resolution: "rxjs@npm:6.6.7"
-  dependencies:
-    tslib: "npm:^1.9.0"
-  checksum: 10/c8263ebb20da80dd7a91c452b9e96a178331f402344bbb40bc772b56340fcd48d13d1f545a1e3d8e464893008c5e306cc42a1552afe0d562b1a6d4e1e6262b03
-  languageName: node
-  linkType: hard
-
-"rxjs@npm:^7.5.5":
-  version: 7.8.1
-  resolution: "rxjs@npm:7.8.1"
-  dependencies:
-    tslib: "npm:^2.1.0"
-  checksum: 10/b10cac1a5258f885e9dd1b70d23c34daeb21b61222ee735d2ec40a8685bdca40429000703a44f0e638c27a684ac139e1c37e835d2a0dc16f6fc061a138ae3abb
-  languageName: node
-  linkType: hard
-
 "sade@npm:^1.7.3, sade@npm:^1.7.4":
   version: 1.8.1
   resolution: "sade@npm:1.8.1"
@@ -35611,18 +30996,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "safe-array-concat@npm:1.1.2"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    get-intrinsic: "npm:^1.2.4"
-    has-symbols: "npm:^1.0.3"
-    isarray: "npm:^2.0.5"
-  checksum: 10/a54f8040d7cb696a1ee38d19cc71ab3cfb654b9b81bae00c6459618cfad8214ece7e6666592f9c925aafef43d0a20c5e6fbb3413a2b618e1ce9d516a2e6dcfc5
-  languageName: node
-  linkType: hard
-
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
@@ -35655,26 +31028,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "safe-regex-test@npm:1.0.3"
-  dependencies:
-    call-bind: "npm:^1.0.6"
-    es-errors: "npm:^1.3.0"
-    is-regex: "npm:^1.1.4"
-  checksum: 10/b04de61114b10274d92e25b6de7ccb5de07f11ea15637ff636de4b5190c0f5cd8823fe586dde718504cf78055437d70fd8804976894df502fcf5a210c970afb3
-  languageName: node
-  linkType: hard
-
-"safe-regex@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "safe-regex@npm:1.1.0"
-  dependencies:
-    ret: "npm:~0.1.10"
-  checksum: 10/5405b5a3effed649e6133d51d45cecbbbb02a1dd8d5b78a5e7979a69035870c817a5d2682d0ebb62188d3a840f7b24ea00ebbad2e418d5afabed151e8db96d04
-  languageName: node
-  linkType: hard
-
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:^2.1.2, safer-buffer@npm:~2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
@@ -35682,28 +31035,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sane@npm:^2.0.0":
-  version: 2.5.2
-  resolution: "sane@npm:2.5.2"
-  dependencies:
-    anymatch: "npm:^2.0.0"
-    capture-exit: "npm:^1.2.0"
-    exec-sh: "npm:^0.2.0"
-    fb-watchman: "npm:^2.0.0"
-    fsevents: "npm:^1.2.3"
-    micromatch: "npm:^3.1.4"
-    minimist: "npm:^1.1.1"
-    walker: "npm:~1.0.5"
-    watch: "npm:~0.18.0"
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    sane: ./src/cli.js
-  checksum: 10/be4c3b5abde6c9d2c0f708158f5dc6d97e217b101c0b0403adae661499740ddf5cc667027c9b04dacde5e11a1b51bed5162b3dd04d6e93870ae7fc35b63b0073
-  languageName: node
-  linkType: hard
-
 "sass@npm:^1.32.8, sass@npm:^1.49.0, sass@npm:^1.49.8, sass@npm:^1.50.0":
   version: 1.68.0
   resolution: "sass@npm:1.68.0"
@@ -35717,13 +31048,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sax@npm:^1.2.4":
-  version: 1.4.1
-  resolution: "sax@npm:1.4.1"
-  checksum: 10/b1c784b545019187b53a0c28edb4f6314951c971e2963a69739c6ce222bfbc767e54d320e689352daba79b7d5e06d22b5d7113b99336219d6e93718e2f99d335
-  languageName: node
-  linkType: hard
-
 "sax@npm:~1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
@@ -35845,13 +31169,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver-compare@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "semver-compare@npm:1.0.0"
-  checksum: 10/75f9c7a7786d1756f64b1429017746721e07bd7691bdad6368f7643885d3a98a27586777e9699456564f4844b407e9f186cc1d588a3f9c0be71310e517e942c3
-  languageName: node
-  linkType: hard
-
 "semver-diff@npm:^2.0.0":
   version: 2.1.0
   resolution: "semver-diff@npm:2.1.0"
@@ -35868,14 +31185,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver-regex@npm:^3.1.2":
-  version: 3.1.4
-  resolution: "semver-regex@npm:3.1.4"
-  checksum: 10/3962105908e326aa2cd5c851a2f6d4cc7340d1b06560afc35cd5348d9fa5b1cc0ac0cad7e7cef2072bc12b992c5ae654d9e8d355c19d75d4216fced3b6c5d8a7
-  languageName: node
-  linkType: hard
-
-"semver@npm:2 || 3 || 4 || 5, semver@npm:2.x || 3.x || 4 || 5, semver@npm:^2.3.0 || 3.x || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.1":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:2.x || 3.x || 4 || 5, semver@npm:^2.3.0 || 3.x || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.1":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
   bin:
@@ -36031,30 +31341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-name@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "set-function-name@npm:2.0.2"
-  dependencies:
-    define-data-property: "npm:^1.1.4"
-    es-errors: "npm:^1.3.0"
-    functions-have-names: "npm:^1.2.3"
-    has-property-descriptors: "npm:^1.0.2"
-  checksum: 10/c7614154a53ebf8c0428a6c40a3b0b47dac30587c1a19703d1b75f003803f73cdfa6a93474a9ba678fa565ef5fbddc2fae79bca03b7d22ab5fd5163dbe571a74
-  languageName: node
-  linkType: hard
-
-"set-value@npm:^2.0.0, set-value@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "set-value@npm:2.0.1"
-  dependencies:
-    extend-shallow: "npm:^2.0.1"
-    is-extendable: "npm:^0.1.1"
-    is-plain-object: "npm:^2.0.3"
-    split-string: "npm:^3.0.1"
-  checksum: 10/4f1ccac2e9ad4d1b0851761d41df4bbd3780ed69805f24a80ab237a56d9629760b7b98551cd370931620defe5da329645834e1e9a18574cecad09ce7b2b83296
-  languageName: node
-  linkType: hard
-
 "setimmediate@npm:^1.0.5":
   version: 1.0.5
   resolution: "setimmediate@npm:1.0.5"
@@ -36174,7 +31460,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shelljs@npm:^0.8.2, shelljs@npm:^0.8.3":
+"shelljs@npm:^0.8.3":
   version: 0.8.5
   resolution: "shelljs@npm:0.8.5"
   dependencies:
@@ -36187,13 +31473,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shellwords@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "shellwords@npm:0.1.1"
-  checksum: 10/c122808ca53c828747ee69503755a5d35d8c1493e943d15ebfd6fe028517ec1af6f8a4c2dc9d995b0df75bd4246382c0dd2dc792a82ce5a6448307a643fc5a38
-  languageName: node
-  linkType: hard
-
 "short-unique-id@npm:^5.0.2":
   version: 5.0.3
   resolution: "short-unique-id@npm:5.0.3"
@@ -36270,15 +31549,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-git@npm:^1.85.0":
-  version: 1.132.0
-  resolution: "simple-git@npm:1.132.0"
-  dependencies:
-    debug: "npm:^4.0.1"
-  checksum: 10/a93bd2bf3cb14841ba471bd9b0fbaf4f2e09f4ce9ec76c24ff3fb10849cdcb74ba283b377f2cd62ef258f0d23d6b4a1fd1ec3ff6bc306104dca05a74e1de2491
-  languageName: node
-  linkType: hard
-
 "simple-swizzle@npm:^0.2.2":
   version: 0.2.2
   resolution: "simple-swizzle@npm:0.2.2"
@@ -36320,13 +31590,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sisteransi@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "sisteransi@npm:0.1.1"
-  checksum: 10/7bb2c4e54c43834a91352f12ca65a94c13a8c93cb1139ac62f383056c45cc9e44850cc4e5b6e0a3e3c16cf4ae1d00233917a2bfa6c8a0882210a2187cd21d01c
-  languageName: node
-  linkType: hard
-
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -36334,13 +31597,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slash@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "slash@npm:1.0.0"
-  checksum: 10/4b6e21b1fba6184a7e2efb1dd173f692d8a845584c1bbf9dc818ff86f5a52fc91b413008223d17cc684604ee8bb9263a420b1182027ad9762e35388434918860
-  languageName: node
-  linkType: hard
-
 "slash@npm:^2.0.0":
   version: 2.0.0
   resolution: "slash@npm:2.0.0"
@@ -36362,13 +31618,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slice-ansi@npm:0.0.4":
-  version: 0.0.4
-  resolution: "slice-ansi@npm:0.0.4"
-  checksum: 10/481d969c6aa771b27d7baacd6fe321751a0b9eb410274bda10ca81ea641bbfe747e428025d6d8f15bd635fdcfd57e8b2d54681ee6b0ce0c40f78644b144759e3
-  languageName: node
-  linkType: hard
-
 "slide@npm:^1.1.6, slide@npm:~1.1.3, slide@npm:~1.1.6":
   version: 1.1.6
   resolution: "slide@npm:1.1.6"
@@ -36393,42 +31642,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"snapdragon-node@npm:^2.0.1":
-  version: 2.1.1
-  resolution: "snapdragon-node@npm:2.1.1"
-  dependencies:
-    define-property: "npm:^1.0.0"
-    isobject: "npm:^3.0.0"
-    snapdragon-util: "npm:^3.0.1"
-  checksum: 10/093c3584efc51103d8607d28cb7a3079f7e371b2320a60c685a84a57956cf9693f3dec8b2f77250ba48063cf42cb5261f3970e6d3bb7e68fd727299c991e0bff
-  languageName: node
-  linkType: hard
-
-"snapdragon-util@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "snapdragon-util@npm:3.0.1"
-  dependencies:
-    kind-of: "npm:^3.2.0"
-  checksum: 10/b776b15bf683c9ac0243582d7b13f2070f85c9036d73c2ba31da61d1effe22d4a39845b6f43ce7e7ec82c7e686dc47d9c3cffa1a75327bb16505b9afc34f516d
-  languageName: node
-  linkType: hard
-
-"snapdragon@npm:^0.8.1":
-  version: 0.8.2
-  resolution: "snapdragon@npm:0.8.2"
-  dependencies:
-    base: "npm:^0.11.1"
-    debug: "npm:^2.2.0"
-    define-property: "npm:^0.2.5"
-    extend-shallow: "npm:^2.0.1"
-    map-cache: "npm:^0.2.2"
-    source-map: "npm:^0.5.6"
-    source-map-resolve: "npm:^0.5.0"
-    use: "npm:^3.1.0"
-  checksum: 10/cbe35b25dca5504be0ced90d907948d8efeda0b118d9a032bfc499e22b7f78515832f2706d9c9297c87906eaa51c12bfcaa8ea5a4f3e98ecf1116a73428e344a
-  languageName: node
-  linkType: hard
-
 "sockjs@npm:^0.3.24":
   version: 0.3.24
   resolution: "sockjs@npm:0.3.24"
@@ -36512,19 +31725,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-resolve@npm:^0.5.0":
-  version: 0.5.3
-  resolution: "source-map-resolve@npm:0.5.3"
-  dependencies:
-    atob: "npm:^2.1.2"
-    decode-uri-component: "npm:^0.2.0"
-    resolve-url: "npm:^0.2.1"
-    source-map-url: "npm:^0.4.0"
-    urix: "npm:^0.1.0"
-  checksum: 10/98e281cceb86b80c8bd3453110617b9df93132d6a50c7bf5847b5d74b4b5d6e1d4d261db276035b9b7e5ba7f32c2d6a0d2c13d581e37870a0219a524402efcab
-  languageName: node
-  linkType: hard
-
 "source-map-resolve@npm:^0.6.0":
   version: 0.6.0
   resolution: "source-map-resolve@npm:0.6.0"
@@ -36535,15 +31735,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:^0.4.15":
-  version: 0.4.18
-  resolution: "source-map-support@npm:0.4.18"
-  dependencies:
-    source-map: "npm:^0.5.6"
-  checksum: 10/673eced6927cd6ae91e52659a26cf0c9bca4cde182e46773198f1bf703cf56ffe21d03fe37a40cdb6ea15dd807e332c7fd9cf86a235491fc401e83ac359f1ce8
-  languageName: node
-  linkType: hard
-
 "source-map-support@npm:^0.5.0, source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20":
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
@@ -36554,14 +31745,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-url@npm:^0.4.0":
-  version: 0.4.1
-  resolution: "source-map-url@npm:0.4.1"
-  checksum: 10/7fec0460ca017330568e1a4d67c80c397871f27d75b034e1117eaa802076db5cda5944659144d26eafd2a95008ada19296c8e0d5ec116302c32c6daa4e430003
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.5.3, source-map@npm:^0.5.6, source-map@npm:^0.5.7":
+"source-map@npm:^0.5.6, source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
   checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269
@@ -36685,15 +31869,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split-string@npm:^3.0.1, split-string@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "split-string@npm:3.1.0"
-  dependencies:
-    extend-shallow: "npm:^3.0.0"
-  checksum: 10/f31f4709d2b14fe4ff46b4fb88b2fb68a1c59b59e573c5417907c182397ddb2cb67903232bdc3a8b9dd3bb660c6f533ff11b5d624aff7b1fe0a213e3e4c75f20
-  languageName: node
-  linkType: hard
-
 "split2@npm:^2.0.0":
   version: 2.2.0
   resolution: "split2@npm:2.2.0"
@@ -36797,15 +31972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stack-utils@npm:^1.0.1":
-  version: 1.0.5
-  resolution: "stack-utils@npm:1.0.5"
-  dependencies:
-    escape-string-regexp: "npm:^2.0.0"
-  checksum: 10/040a977495e5b38992111b338c5d236d1067297e74b2624a0efccfd614ee60ca1b7f7a416f270336d1627b322fb2ed23b5d3758877a2e26d94f13ded2742432f
-  languageName: node
-  linkType: hard
-
 "stack-utils@npm:^2.0.3":
   version: 2.0.6
   resolution: "stack-utils@npm:2.0.6"
@@ -36815,15 +31981,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"staged-git-files@npm:1.1.2":
-  version: 1.1.2
-  resolution: "staged-git-files@npm:1.1.2"
-  bin:
-    sgf: bin/cli.js
-  checksum: 10/077da24435bbadfb06a2d7e53fb8e7f2b437088279854113517d688b3b1d5f515c2c75a78ebcbc167b470112f6f20ceae35fbb754124ae1365216f17215e1953
-  languageName: node
-  linkType: hard
-
 "stampit@npm:^4.3.2":
   version: 4.3.2
   resolution: "stampit@npm:4.3.2"
@@ -36840,16 +31997,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"static-extend@npm:^0.1.1":
-  version: 0.1.2
-  resolution: "static-extend@npm:0.1.2"
-  dependencies:
-    define-property: "npm:^0.2.5"
-    object-copy: "npm:^0.1.0"
-  checksum: 10/8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c
-  languageName: node
-  linkType: hard
-
 "static-module@npm:^2.2.0":
   version: 2.2.5
   resolution: "static-module@npm:2.2.5"
@@ -36886,13 +32033,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stealthy-require@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "stealthy-require@npm:1.1.1"
-  checksum: 10/a408a51f5b6c1fe535e4459732ac0b66d7921583f89fc8289bfdc937a497fe8196219d1e04d234047349b90723ecff1a1cb4a92bef2315e01a3081dc72db8d41
-  languageName: node
-  linkType: hard
-
 "stop-iteration-iterator@npm:^1.0.0":
   version: 1.0.0
   resolution: "stop-iteration-iterator@npm:1.0.0"
@@ -36988,13 +32128,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-argv@npm:^0.0.2":
-  version: 0.0.2
-  resolution: "string-argv@npm:0.0.2"
-  checksum: 10/35f789c0288e9036a5bcfb1bd04645667f8e938d8e2672f4ad8ce116ce6c4523b100ce0575cfa278e800d814cbb947af59c59609632b76b730ce2d96158cecad
-  languageName: node
-  linkType: hard
-
 "string-hash@npm:^1.1.1":
   version: 1.1.3
   resolution: "string-hash@npm:1.1.3"
@@ -37002,16 +32135,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-length@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "string-length@npm:2.0.0"
-  dependencies:
-    astral-regex: "npm:^1.0.0"
-    strip-ansi: "npm:^4.0.0"
-  checksum: 10/3a339b63fd39d6a1077dfbbe3279545e1b67fa4b0a558906158cf0121632b280f34c8768ec7270fb25db732d6323eceb9c7254f6026509694b6a7533ca8cb89e
-  languageName: node
-  linkType: hard
-
 "string-length@npm:^4.0.1":
   version: 4.0.2
   resolution: "string-length@npm:4.0.2"
@@ -37115,18 +32238,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trim@npm:^1.2.9":
-  version: 1.2.9
-  resolution: "string.prototype.trim@npm:1.2.9"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.0"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10/b2170903de6a2fb5a49bb8850052144e04b67329d49f1343cdc6a87cb24fb4e4b8ad00d3e273a399b8a3d8c32c89775d93a8f43cb42fbff303f25382079fb58a
-  languageName: node
-  linkType: hard
-
 "string.prototype.trimend@npm:^1.0.7":
   version: 1.0.7
   resolution: "string.prototype.trimend@npm:1.0.7"
@@ -37138,17 +32249,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "string.prototype.trimend@npm:1.0.8"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10/c2e862ae724f95771da9ea17c27559d4eeced9208b9c20f69bbfcd1b9bc92375adf8af63a103194dba17c4cc4a5cb08842d929f415ff9d89c062d44689c8761b
-  languageName: node
-  linkType: hard
-
 "string.prototype.trimstart@npm:^1.0.7":
   version: 1.0.7
   resolution: "string.prototype.trimstart@npm:1.0.7"
@@ -37160,17 +32260,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "string.prototype.trimstart@npm:1.0.8"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10/160167dfbd68e6f7cb9f51a16074eebfce1571656fc31d40c3738ca9e30e35496f2c046fe57b6ad49f65f238a152be8c86fd9a2dd58682b5eba39dad995b3674
-  languageName: node
-  linkType: hard
-
 "string_decoder@npm:^1.1.1":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
@@ -37206,17 +32295,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stringify-object@npm:^3.2.2":
-  version: 3.3.0
-  resolution: "stringify-object@npm:3.3.0"
-  dependencies:
-    get-own-enumerable-property-symbols: "npm:^3.0.0"
-    is-obj: "npm:^1.0.1"
-    is-regexp: "npm:^1.0.0"
-  checksum: 10/973782f09a3df3f39a2cf07dbf43fb9ba6cb32976f3616cd0f6c10e0a5c5415dd72b7b700e72920e8da2bf57c3001b8e37b5af7174bab9a748ce0416989e19b1
-  languageName: node
-  linkType: hard
-
 "stringify-package@npm:^1.0.0, stringify-package@npm:^1.0.1":
   version: 1.0.1
   resolution: "stringify-package@npm:1.0.1"
@@ -37278,29 +32356,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-bom@npm:3.0.0, strip-bom@npm:^3.0.0":
+"strip-bom@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-bom@npm:3.0.0"
   checksum: 10/8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b
   languageName: node
   linkType: hard
 
-"strip-bom@npm:4.0.0, strip-bom@npm:^4.0.0":
+"strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
   checksum: 10/9dbcfbaf503c57c06af15fe2c8176fb1bf3af5ff65003851a102749f875a6dbe0ab3b30115eccf6e805e9d756830d3e40ec508b62b3f1ddf3761a20ebe29d3f3
   languageName: node
   linkType: hard
 
-"strip-bom@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strip-bom@npm:2.0.0"
-  dependencies:
-    is-utf8: "npm:^0.2.0"
-  checksum: 10/08efb746bc67b10814cd03d79eb31bac633393a782e3f35efbc1b61b5165d3806d03332a97f362822cf0d4dd14ba2e12707fcff44fe1c870c48a063a0c9e4944
-  languageName: node
-  linkType: hard
-
 "strip-eof@npm:^1.0.0":
   version: 1.0.0
   resolution: "strip-eof@npm:1.0.0"
@@ -37347,7 +32416,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1":
+"strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
   checksum: 10/492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
@@ -37481,7 +32550,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^3.1.2, supports-color@npm:^3.2.3":
+"supports-color@npm:^3.2.3":
   version: 3.2.3
   resolution: "supports-color@npm:3.2.3"
   dependencies:
@@ -37652,27 +32721,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"symbol-observable@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "symbol-observable@npm:1.2.0"
-  checksum: 10/4684327a2fef2453dcd4238b5bd8f69c460a4708fb8c024a824c6a707ca644b2b2a586e36e5197d0d1162ff48e288299a48844a8c46274ffcfd9260e03df7692
-  languageName: node
-  linkType: hard
-
-"symbol-tree@npm:^3.2.2, symbol-tree@npm:^3.2.4":
+"symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
   checksum: 10/c09a00aadf279d47d0c5c46ca3b6b2fbaeb45f0a184976d599637d412d3a70bbdc043ff33effe1206dea0e36e0ad226cb957112e7ce9a4bf2daedf7fa4f85c53
   languageName: node
   linkType: hard
 
-"synchronous-promise@npm:^2.0.6":
-  version: 2.0.17
-  resolution: "synchronous-promise@npm:2.0.17"
-  checksum: 10/dd74b1c05caab8ea34e26c8b52a0966efd70b0229ad39447ce066501dd6931d4d97a3f88b0f306880a699660cd334180a24d9738b385aed0bd0104a5be207ec1
-  languageName: node
-  linkType: hard
-
 "tabbable@npm:1.1.2":
   version: 1.1.2
   resolution: "tabbable@npm:1.1.2"
@@ -37859,19 +32914,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"test-exclude@npm:^4.2.1":
-  version: 4.2.3
-  resolution: "test-exclude@npm:4.2.3"
-  dependencies:
-    arrify: "npm:^1.0.1"
-    micromatch: "npm:^2.3.11"
-    object-assign: "npm:^4.1.0"
-    read-pkg-up: "npm:^1.0.1"
-    require-main-filename: "npm:^1.0.1"
-  checksum: 10/4093f0e7a5e37b7aba0977ccd790b03ac76e12cdc9130374c1982743105ee3b871f860ad9406f1851aada95fdefc7ae600e2725eae911d855804dc997d427267
-  languageName: node
-  linkType: hard
-
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -37904,13 +32946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"throat@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "throat@npm:4.1.0"
-  checksum: 10/43519b0cea6d3b2a8fe056fcbc319e289037be67d2204d4d33513d20d6ee9da6255f7ba8c89e2ec8c97b0f188a910b8666def38d1058d2bf4a39613812c36d98
-  languageName: node
-  linkType: hard
-
 "throat@npm:^6.0.1":
   version: 6.0.2
   resolution: "throat@npm:6.0.2"
@@ -37944,7 +32979,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6":
+"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
   checksum: 10/5da78346f70139a7d213b65a0106f3c398d6bc5301f9248b5275f420abc2c4b1e77c2abc72d218dedc28c41efb2e7c312cb76a7730d04f9c2d37d247da3f4198
@@ -38047,13 +33082,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-fast-properties@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "to-fast-properties@npm:1.0.3"
-  checksum: 10/bd0abb58c4722851df63419de3f6d901d5118f0440d3f71293ed776dd363f2657edaaf2dc470e3f6b7b48eb84aa411193b60db8a4a552adac30de9516c5cc580
-  languageName: node
-  linkType: hard
-
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
@@ -38061,32 +33089,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-object-path@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "to-object-path@npm:0.3.0"
-  dependencies:
-    kind-of: "npm:^3.0.2"
-  checksum: 10/9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70
-  languageName: node
-  linkType: hard
-
-"to-readable-stream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "to-readable-stream@npm:1.0.0"
-  checksum: 10/a99e23d49777d9d03686f03cc0bbbcb4648d991648990a98bc93b55cf91a2ae830c41b5efa36802f1c00a34bba93bd33b10346772fd3f49bcf1667a99c85f354
-  languageName: node
-  linkType: hard
-
-"to-regex-range@npm:^2.1.0":
-  version: 2.1.1
-  resolution: "to-regex-range@npm:2.1.1"
-  dependencies:
-    is-number: "npm:^3.0.0"
-    repeat-string: "npm:^1.6.1"
-  checksum: 10/2eed5f897188de8ec8745137f80c0f564810082d506278dd6a80db4ea313b6d363ce8d7dc0e0406beeaba0bb7f90f01b41fa3d08fb72dd02c329b2ec579cd4e8
-  languageName: node
-  linkType: hard
-
 "to-regex-range@npm:^5.0.1":
   version: 5.0.1
   resolution: "to-regex-range@npm:5.0.1"
@@ -38096,18 +33098,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "to-regex@npm:3.0.2"
-  dependencies:
-    define-property: "npm:^2.0.2"
-    extend-shallow: "npm:^3.0.2"
-    regex-not: "npm:^1.0.2"
-    safe-regex: "npm:^1.1.0"
-  checksum: 10/ab87c22f0719f7def00145b53e2c90d2fdcc75efa0fec1227b383aaf88ed409db2542b2b16bcbfbf95fe0727f879045803bb635b777c0306762241ca3e5562c6
-  languageName: node
-  linkType: hard
-
 "tocbot@npm:^4.20.1":
   version: 4.25.0
   resolution: "tocbot@npm:4.25.0"
@@ -38162,13 +33152,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"toposort@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "toposort@npm:2.0.2"
-  checksum: 10/6f128353e4ed9739e49a28fb756b0a00f3752b29fc9b862ff781446598ee3b486cd229697feebc4eabd916eac5de219f3dae450c585bf13673f6b133a7226e06
-  languageName: node
-  linkType: hard
-
 "totalist@npm:^3.0.0":
   version: 3.0.1
   resolution: "totalist@npm:3.0.1"
@@ -38176,16 +33159,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^2.3.3, tough-cookie@npm:^2.3.4, tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
-  dependencies:
-    psl: "npm:^1.1.28"
-    punycode: "npm:^2.1.1"
-  checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^4.0.0":
   version: 4.1.3
   resolution: "tough-cookie@npm:4.1.3"
@@ -38198,12 +33171,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "tr46@npm:1.0.1"
+"tough-cookie@npm:~2.5.0":
+  version: 2.5.0
+  resolution: "tough-cookie@npm:2.5.0"
   dependencies:
-    punycode: "npm:^2.1.0"
-  checksum: 10/6e80d75480cb6658f7f283c15f5f41c2d4dfa243ca99a0e1baf3de6cc823fc4c829f89782a7a11e029905781fccfea42d08d8a6674ba7948c7dbc595b6f27dd3
+    psl: "npm:^1.1.28"
+    punycode: "npm:^2.1.1"
+  checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f
   languageName: node
   linkType: hard
 
@@ -38240,28 +33214,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"travis-deploy-once@npm:^5.0.9":
-  version: 5.0.11
-  resolution: "travis-deploy-once@npm:5.0.11"
-  dependencies:
-    "@babel/core": "npm:^7.0.0"
-    "@babel/polyfill": "npm:^7.0.0"
-    "@babel/preset-env": "npm:^7.0.0"
-    "@babel/register": "npm:^7.0.0"
-    chalk: "npm:^2.1.0"
-    execa: "npm:^1.0.0"
-    got: "npm:^9.1.0"
-    p-retry: "npm:^3.0.0"
-    semver: "npm:^5.4.1"
-    update-notifier: "npm:^2.3.0"
-    url-join: "npm:^4.0.0"
-    yargs: "npm:^12.0.1"
-  bin:
-    travis-deploy-once: bin/travis-deploy-once.js
-  checksum: 10/71141db2295d92c26314b92ce4c57897bd869d1f081f6dbc6e8081cf4f7b59b5642cc54f352cafcfb78ec9e3318840fc8742b874d2658889a84d4d81d22ca93d
-  languageName: node
-  linkType: hard
-
 "tree-sitter-json@npm:=0.20.2":
   version: 0.20.2
   resolution: "tree-sitter-json@npm:0.20.2"
@@ -38328,13 +33280,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"trim-right@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "trim-right@npm:1.0.1"
-  checksum: 10/9120af534e006a7424a4f9358710e6e707887b6ccf7ea69e50d6ac6464db1fe22268400def01752f09769025d480395159778153fb98d4a2f6f40d4cf5d4f3b6
-  languageName: node
-  linkType: hard
-
 "trough@npm:^2.0.0":
   version: 2.1.0
   resolution: "trough@npm:2.1.0"
@@ -38358,27 +33303,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:^23.10.2":
-  version: 23.10.5
-  resolution: "ts-jest@npm:23.10.5"
-  dependencies:
-    bs-logger: "npm:0.x"
-    buffer-from: "npm:1.x"
-    fast-json-stable-stringify: "npm:2.x"
-    json5: "npm:2.x"
-    make-error: "npm:1.x"
-    mkdirp: "npm:0.x"
-    resolve: "npm:1.x"
-    semver: "npm:^5.5"
-    yargs-parser: "npm:10.x"
-  peerDependencies:
-    jest: ">=22 <24"
-  bin:
-    ts-jest: cli.js
-  checksum: 10/b13bfb5725b16d82119122d0ee874e666a7c481eca40a09672826185c690a42c8222ae3c49246f9dd8e37ab5d6bca6494573feffad957d7a9818771120dbad59
-  languageName: node
-  linkType: hard
-
 "ts-mixer@npm:^6.0.3":
   version: 6.0.4
   resolution: "ts-mixer@npm:6.0.4"
@@ -38424,24 +33348,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "ts-node@npm:7.0.1"
-  dependencies:
-    arrify: "npm:^1.0.0"
-    buffer-from: "npm:^1.1.0"
-    diff: "npm:^3.1.0"
-    make-error: "npm:^1.1.1"
-    minimist: "npm:^1.2.0"
-    mkdirp: "npm:^0.5.1"
-    source-map-support: "npm:^0.5.6"
-    yn: "npm:^2.0.0"
-  bin:
-    ts-node: dist/bin.js
-  checksum: 10/c1e0f1582867c34a03a25b1861e86922b9576931d473d48cd13275400832972350c4564e5f2c2df5817be6acbbb8e1dedf43bdd6f8c0f06b15d3530562a08a90
-  languageName: node
-  linkType: hard
-
 "ts-toolbelt@npm:^9.6.0":
   version: 9.6.0
   resolution: "ts-toolbelt@npm:9.6.0"
@@ -38460,13 +33366,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:1.9.0":
-  version: 1.9.0
-  resolution: "tslib@npm:1.9.0"
-  checksum: 10/3fb8dc249b5db6ff16289c1d6bf238996ff25b01c5f56db6559352ff17854d29a755d3cb4769074bf9be55dd0960aaacdf6650e07bcb6775d98b965a6c304792
-  languageName: node
-  linkType: hard
-
 "tslib@npm:2.0.1":
   version: 2.0.1
   resolution: "tslib@npm:2.0.1"
@@ -38474,7 +33373,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.13.0, tslib@npm:^1.8.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
+"tslib@npm:^1.13.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
@@ -38488,85 +33387,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslint-config-prettier@npm:^1.15.0":
-  version: 1.18.0
-  resolution: "tslint-config-prettier@npm:1.18.0"
-  bin:
-    tslint-config-prettier-check: bin/check.js
-  checksum: 10/f0c548a7a520f9247f8e4ddba1136f300d1b2ec48a8255b030c05e35866cc22c105d9120540dd5ee82e2a04a769d82f5d098b7eaf6928820f6dba1badad6704c
-  languageName: node
-  linkType: hard
-
-"tslint-config-standard@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "tslint-config-standard@npm:8.0.1"
-  dependencies:
-    tslint-eslint-rules: "npm:^5.3.1"
-  checksum: 10/38ccb6a85866cb92742750e687a87fbc100c9310909d1fad48cb915b219519787bc61b62867b3e313020e5ac1ff06849f38790eefca10a524bf2ad27afc14af5
-  languageName: node
-  linkType: hard
-
-"tslint-eslint-rules@npm:^5.3.1":
-  version: 5.4.0
-  resolution: "tslint-eslint-rules@npm:5.4.0"
-  dependencies:
-    doctrine: "npm:0.7.2"
-    tslib: "npm:1.9.0"
-    tsutils: "npm:^3.0.0"
-  peerDependencies:
-    tslint: ^5.0.0
-    typescript: ^2.2.0 || ^3.0.0
-  checksum: 10/603cb951c71a54a694cbb46c680bfd7ae734eb02263567fb6b88b8b9ad8d56b07be473d031d379bfaa41e4a2abbb77dfd836d55899892a7dd967969175cc9756
-  languageName: node
-  linkType: hard
-
-"tslint@npm:^5.11.0":
-  version: 5.20.1
-  resolution: "tslint@npm:5.20.1"
-  dependencies:
-    "@babel/code-frame": "npm:^7.0.0"
-    builtin-modules: "npm:^1.1.1"
-    chalk: "npm:^2.3.0"
-    commander: "npm:^2.12.1"
-    diff: "npm:^4.0.1"
-    glob: "npm:^7.1.1"
-    js-yaml: "npm:^3.13.1"
-    minimatch: "npm:^3.0.4"
-    mkdirp: "npm:^0.5.1"
-    resolve: "npm:^1.3.2"
-    semver: "npm:^5.3.0"
-    tslib: "npm:^1.8.0"
-    tsutils: "npm:^2.29.0"
-  peerDependencies:
-    typescript: ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev"
-  bin:
-    tslint: ./bin/tslint
-  checksum: 10/9cfcec0330beeb99ab67b5c6ec40fd182973841a1ebbc6a0ea266d7203efda4db9c615e433282ce6fcd0b8d2a5f1836a821d25a39c5f24f835bfc2a37908543f
-  languageName: node
-  linkType: hard
-
-"tsutils@npm:^2.29.0":
-  version: 2.29.0
-  resolution: "tsutils@npm:2.29.0"
-  dependencies:
-    tslib: "npm:^1.8.1"
-  peerDependencies:
-    typescript: ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev"
-  checksum: 10/9724fee9a21c399e5914f50d888467f6d116f2e466ba77d294de0437ee7bb4a60e0c919a36518845af8c6fa0aabf6b72a4a01d4464db16fa719ff4e0dd45cb82
-  languageName: node
-  linkType: hard
-
-"tsutils@npm:^3.0.0":
-  version: 3.21.0
-  resolution: "tsutils@npm:3.21.0"
-  dependencies:
-    tslib: "npm:^1.8.1"
-  peerDependencies:
-    typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-  checksum: 10/ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2
-  languageName: node
-  linkType: hard
-
 "tsx@npm:^4.11.2":
   version: 4.11.2
   resolution: "tsx@npm:4.11.2"
@@ -38792,17 +33612,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "typed-array-buffer@npm:1.0.2"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    es-errors: "npm:^1.3.0"
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10/02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b
-  languageName: node
-  linkType: hard
-
 "typed-array-byte-length@npm:^1.0.0":
   version: 1.0.0
   resolution: "typed-array-byte-length@npm:1.0.0"
@@ -38815,19 +33624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "typed-array-byte-length@npm:1.0.1"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
-    has-proto: "npm:^1.0.3"
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10/e4a38329736fe6a73b52a09222d4a9e8de14caaa4ff6ad8e55217f6705b017d9815b7284c85065b3b8a7704e226ccff1372a72b78c2a5b6b71b7bf662308c903
-  languageName: node
-  linkType: hard
-
 "typed-array-byte-offset@npm:^1.0.0":
   version: 1.0.0
   resolution: "typed-array-byte-offset@npm:1.0.0"
@@ -38841,20 +33637,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "typed-array-byte-offset@npm:1.0.2"
-  dependencies:
-    available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
-    for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
-    has-proto: "npm:^1.0.3"
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10/ac26d720ebb2aacbc45e231347c359e6649f52e0cfe0e76e62005912f8030d68e4cb7b725b1754e8fdd48e433cb68df5a8620a3e420ad1457d666e8b29bf9150
-  languageName: node
-  linkType: hard
-
 "typed-array-length@npm:^1.0.4":
   version: 1.0.4
   resolution: "typed-array-length@npm:1.0.4"
@@ -38866,20 +33648,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "typed-array-length@npm:1.0.6"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
-    has-proto: "npm:^1.0.3"
-    is-typed-array: "npm:^1.1.13"
-    possible-typed-array-names: "npm:^1.0.0"
-  checksum: 10/05e96cf4ff836743ebfc593d86133b8c30e83172cb5d16c56814d7bacfed57ce97e87ada9c4b2156d9aaa59f75cdef01c25bd9081c7826e0b869afbefc3e8c39
-  languageName: node
-  linkType: hard
-
 "typedarray-to-buffer@npm:^3.1.5":
   version: 3.1.5
   resolution: "typedarray-to-buffer@npm:3.1.5"
@@ -38903,40 +33671,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typedoc-default-themes@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "typedoc-default-themes@npm:0.5.0"
-  checksum: 10/575dfe4dab775484bfeeb32e1827c4ae5e4f0bc1f5522657f128d3e05ad0c188dbb2f4a8ec7427effedc5bd454f4aeec3336479b249e14de32e5b36bf7d7b7fb
-  languageName: node
-  linkType: hard
-
-"typedoc@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "typedoc@npm:0.12.0"
-  dependencies:
-    "@types/fs-extra": "npm:^5.0.3"
-    "@types/handlebars": "npm:^4.0.38"
-    "@types/highlight.js": "npm:^9.12.3"
-    "@types/lodash": "npm:^4.14.110"
-    "@types/marked": "npm:^0.4.0"
-    "@types/minimatch": "npm:3.0.3"
-    "@types/shelljs": "npm:^0.8.0"
-    fs-extra: "npm:^7.0.0"
-    handlebars: "npm:^4.0.6"
-    highlight.js: "npm:^9.0.0"
-    lodash: "npm:^4.17.10"
-    marked: "npm:^0.4.0"
-    minimatch: "npm:^3.0.0"
-    progress: "npm:^2.0.0"
-    shelljs: "npm:^0.8.2"
-    typedoc-default-themes: "npm:^0.5.0"
-    typescript: "npm:3.0.x"
-  bin:
-    typedoc: bin/typedoc
-  checksum: 10/05844776e1b148fc5b9bde16f13d6bd03bfd16f8f4985d8a9e79d7c67700ccad48524484f36adcdf520a9071cfe292ceb67721d4717ebfa4e37f6041fad9d731
-  languageName: node
-  linkType: hard
-
 "types-ramda@npm:^0.29.9":
   version: 0.29.9
   resolution: "types-ramda@npm:0.29.9"
@@ -38946,26 +33680,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:3.0.x":
-  version: 3.0.3
-  resolution: "typescript@npm:3.0.3"
-  bin:
-    tsc: ./bin/tsc
-    tsserver: ./bin/tsserver
-  checksum: 10/24e0eebc236f47e03094df146e86e40e1aa9de98c46fac9d9ff04006762d3d1887fb608c8e2349084139224d181fcd263fcf63b7aaa9ff1c18547eec70010ddf
-  languageName: node
-  linkType: hard
-
-"typescript@npm:^3.8.3":
-  version: 3.9.10
-  resolution: "typescript@npm:3.9.10"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/f86a085eea24fdd665850c6be4dd69c7a71fe3d27ecc712be88cdc7a52d866f4f2416ad91c554df60f499dedcf288a24b3d8052e502833d8acc661a9d21bb98f
-  languageName: node
-  linkType: hard
-
 "typescript@npm:^4.0.2, typescript@npm:^4.1.3, typescript@npm:^4.2.3, typescript@npm:^4.4.4, typescript@npm:^4.5.5":
   version: 4.9.5
   resolution: "typescript@npm:4.9.5"
@@ -38996,26 +33710,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A3.0.x#optional!builtin<compat/typescript>":
-  version: 3.0.3
-  resolution: "typescript@patch:typescript@npm%3A3.0.3#optional!builtin<compat/typescript>::version=3.0.3&hash=3bafbf"
-  bin:
-    tsc: ./bin/tsc
-    tsserver: ./bin/tsserver
-  checksum: 10/d70fd6871f62154e62e8f7e3728fa6d4f7ca63bbe217f6d342a4150a7dbcbcba4bc4c60ddfc450d2119d3de8ea8dc171011ab6331ac2ef528bf83cf5025f69e4
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A^3.8.3#optional!builtin<compat/typescript>":
-  version: 3.9.10
-  resolution: "typescript@patch:typescript@npm%3A3.9.10#optional!builtin<compat/typescript>::version=3.9.10&hash=3bd3d3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/77024c200e1f80d95185d5a973bcc4b0ecc12a77851390b1382e372195313769373a4b8b1642df4a8d4ae1df5911dcd9bde111cf6755eb4b6091f374e97c6dc5
-  languageName: node
-  linkType: hard
-
 "typescript@patch:typescript@npm%3A^4.0.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.1.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.2.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.4.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.5.5#optional!builtin<compat/typescript>":
   version: 4.9.5
   resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
@@ -39202,18 +33896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"union-value@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "union-value@npm:1.0.1"
-  dependencies:
-    arr-union: "npm:^3.1.0"
-    get-value: "npm:^2.0.6"
-    is-extendable: "npm:^0.1.1"
-    set-value: "npm:^2.0.1"
-  checksum: 10/a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba
-  languageName: node
-  linkType: hard
-
 "uniq@npm:^1.0.0, uniq@npm:^1.0.1":
   version: 1.0.1
   resolution: "uniq@npm:1.0.1"
@@ -39468,16 +34150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unset-value@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "unset-value@npm:1.0.0"
-  dependencies:
-    has-value: "npm:^0.3.1"
-    isobject: "npm:^3.0.0"
-  checksum: 10/0ca644870613dece963e4abb762b0da4c1cf6be4ac2f0859a463e4e9520c1ec85e512cfbfd73371ee0bb09ef536a0c4abd6f2c357715a08b43448aedc82acee6
-  languageName: node
-  linkType: hard
-
 "untildify@npm:^4.0.0":
   version: 4.0.0
   resolution: "untildify@npm:4.0.0"
@@ -39542,7 +34214,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1":
+"uri-js@npm:^4.2.2":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
   dependencies:
@@ -39558,13 +34230,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"urix@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "urix@npm:0.1.0"
-  checksum: 10/ebf5df5491c1d40ea88f7529ee9d8fd6501f44c47b8017d168fd1558d40f7d613c6f39869643344e58b71ba2da357a7c26f353a2a54d416492fcdca81f05b338
-  languageName: node
-  linkType: hard
-
 "url-join@npm:^4.0.0, url-join@npm:^4.0.1":
   version: 4.0.1
   resolution: "url-join@npm:4.0.1"
@@ -39581,15 +34246,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-parse-lax@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "url-parse-lax@npm:3.0.0"
-  dependencies:
-    prepend-http: "npm:^2.0.0"
-  checksum: 10/1040e357750451173132228036aff1fd04abbd43eac1fb3e4fca7495a078bcb8d33cb765fe71ad7e473d9c94d98fd67adca63bd2716c815a2da066198dd37217
-  languageName: node
-  linkType: hard
-
 "url-parse@npm:^1.5.10, url-parse@npm:^1.5.3":
   version: 1.5.10
   resolution: "url-parse@npm:1.5.10"
@@ -39741,13 +34397,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "use@npm:3.1.1"
-  checksum: 10/08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33
-  languageName: node
-  linkType: hard
-
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -39771,21 +34420,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util.promisify@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "util.promisify@npm:1.1.2"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    has-symbols: "npm:^1.0.3"
-    object.getownpropertydescriptors: "npm:^2.1.6"
-    safe-array-concat: "npm:^1.0.0"
-  checksum: 10/90c139773aedfe0cda48f2e43fb96bb0b45ab1d9544ed0cc1949d6acda17053dcb60ed1d3d0a1e121f0e2c26ca21e84dc589a5f06ec33059a4c742e7cba4584f
-  languageName: node
-  linkType: hard
-
 "util.promisify@npm:~1.0.0":
   version: 1.0.1
   resolution: "util.promisify@npm:1.0.1"
@@ -40218,7 +34852,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"w3c-hr-time@npm:^1.0.1, w3c-hr-time@npm:^1.0.2":
+"w3c-hr-time@npm:^1.0.2":
   version: 1.0.2
   resolution: "w3c-hr-time@npm:1.0.2"
   dependencies:
@@ -40236,7 +34870,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"walker@npm:^1.0.7, walker@npm:~1.0.5":
+"walker@npm:^1.0.7":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
   dependencies:
@@ -40254,18 +34888,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"watch@npm:~0.18.0":
-  version: 0.18.0
-  resolution: "watch@npm:0.18.0"
-  dependencies:
-    exec-sh: "npm:^0.2.0"
-    minimist: "npm:^1.2.0"
-  bin:
-    watch: ./cli.js
-  checksum: 10/459f10b6d57d836f9ab6cf5f6cd9af13fc196e29edd9c96d718a218a6120fc8975fe0ed7af95ffbc9be7a1f84f321c655acb37771b717f0a2cddc55d3cd558fc
-  languageName: node
-  linkType: hard
-
 "watchpack@npm:^2.2.0, watchpack@npm:^2.4.0":
   version: 2.4.0
   resolution: "watchpack@npm:2.4.0"
@@ -40329,13 +34951,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "webidl-conversions@npm:4.0.2"
-  checksum: 10/594187c36f2d7898f89c0ed3b9248a095fa549ecc1befb10a97bc884b5680dc96677f58df5579334d8e0d1018e5ef075689cfa2a6c459f45a61a9deb512cb59e
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -40568,7 +35183,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-encoding@npm:^1.0.1, whatwg-encoding@npm:^1.0.3, whatwg-encoding@npm:^1.0.5":
+"whatwg-encoding@npm:^1.0.5":
   version: 1.0.5
   resolution: "whatwg-encoding@npm:1.0.5"
   dependencies:
@@ -40584,7 +35199,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-mimetype@npm:^2.1.0, whatwg-mimetype@npm:^2.2.0, whatwg-mimetype@npm:^2.3.0":
+"whatwg-mimetype@npm:^2.3.0":
   version: 2.3.0
   resolution: "whatwg-mimetype@npm:2.3.0"
   checksum: 10/3582c1d74d708716013433bbab45cb9b31ef52d276adfbe2205d948be1ec9bb1a4ac05ce6d9045f3acc4104489e1344c857b14700002385a4b997a5673ff6416
@@ -40601,28 +35216,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^6.4.1":
-  version: 6.5.0
-  resolution: "whatwg-url@npm:6.5.0"
-  dependencies:
-    lodash.sortby: "npm:^4.7.0"
-    tr46: "npm:^1.0.1"
-    webidl-conversions: "npm:^4.0.2"
-  checksum: 10/fbe8e9d81f8f07343f60bc135962ff346d7d19efc9e2f842f54b5c525837dcf1a36d13be21902311a2922b6342799dd82454e552b4e460d74451794f187ba0a5
-  languageName: node
-  linkType: hard
-
-"whatwg-url@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "whatwg-url@npm:7.1.0"
-  dependencies:
-    lodash.sortby: "npm:^4.7.0"
-    tr46: "npm:^1.0.1"
-    webidl-conversions: "npm:^4.0.2"
-  checksum: 10/769fd35838b4e50536ae08d836472e86adbedda1d5493ea34353c55468147e7868b91d2535b59e01a9e7331ab7e4cdfdf5490c279c045da23c327cf33e32f755
-  languageName: node
-  linkType: hard
-
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"
@@ -40666,13 +35259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-pm-runs@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "which-pm-runs@npm:1.1.0"
-  checksum: 10/39a56ee50886fb33ec710e3b36dc9fe3d0096cac44850d9ca0c6186c4cb824d6c8125f013e0562e7c94744e1e8e4a6ab695592cdb12555777c7a4368143d822c
-  languageName: node
-  linkType: hard
-
 "which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
   version: 1.1.11
   resolution: "which-typed-array@npm:1.1.11"
@@ -40686,20 +35272,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15":
-  version: 1.1.15
-  resolution: "which-typed-array@npm:1.1.15"
-  dependencies:
-    available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
-    for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
-    has-tostringtag: "npm:^1.0.2"
-  checksum: 10/c3b6a99beadc971baa53c3ee5b749f2b9bdfa3b3b9a70650dd8511a48b61d877288b498d424712e9991d16019633086bd8b5923369460d93463c5825fa36c448
-  languageName: node
-  linkType: hard
-
-"which@npm:^1.2.10, which@npm:^1.2.12, which@npm:^1.2.14, which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1":
+"which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"
   dependencies:
@@ -40769,7 +35342,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"word-wrap@npm:^1.0.3, word-wrap@npm:~1.2.3":
+"word-wrap@npm:~1.2.3":
   version: 1.2.5
   resolution: "word-wrap@npm:1.2.5"
   checksum: 10/1ec6f6089f205f83037be10d0c4b34c9183b0b63fca0834a5b3cee55dd321429d73d40bb44c8fc8471b5203d6e8f8275717f49a8ff4b2b0ab41d7e1b563e0854
@@ -40810,26 +35383,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "wrap-ansi@npm:2.1.0"
-  dependencies:
-    string-width: "npm:^1.0.1"
-    strip-ansi: "npm:^3.0.1"
-  checksum: 10/cf66d33f62f2edf0aac52685da98194e47ddf4ceb81d9f98f294b46ffbbf8662caa72a905b343aeab8d6a16cade982be5fc45df99235b07f781ebf68f051ca98
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "wrap-ansi@npm:3.0.1"
-  dependencies:
-    string-width: "npm:^2.1.1"
-    strip-ansi: "npm:^4.0.0"
-  checksum: 10/bdd4248faa2142051ed5802c216076b25ada29778100483bb6f16a52a115bf7cb7e595bdbe9f1ed551dcd4822f3e2ece80c9febedc2b65acb2cc649705d47bc2
-  languageName: node
-  linkType: hard
-
 "wrap-ansi@npm:^5.1.0":
   version: 5.1.0
   resolution: "wrap-ansi@npm:5.1.0"
@@ -40870,7 +35423,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.1.0, write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.3":
+"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.3.0, write-file-atomic@npm:^2.4.3":
   version: 2.4.3
   resolution: "write-file-atomic@npm:2.4.3"
   dependencies:
@@ -40893,15 +35446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^5.2.0":
-  version: 5.2.3
-  resolution: "ws@npm:5.2.3"
-  dependencies:
-    async-limiter: "npm:~1.0.0"
-  checksum: 10/5adfa5f636fdae931ac258c5a6d5d2de2d5b7430010625919a429ace4edf59d8de753266acf2410897966ef0391119900779963f5b9a40dd278337736df0f308
-  languageName: node
-  linkType: hard
-
 "ws@npm:^7.4.6":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
@@ -41010,14 +35554,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"y18n@npm:^3.2.1":
-  version: 3.2.2
-  resolution: "y18n@npm:3.2.2"
-  checksum: 10/42ee58e321252ac87f85ccc7cee01c2e3e224737531e9e543963264194255132ce406e02993904b84ea974050d53b8959dcf9da695408553c32f2a8b4b59a667
-  languageName: node
-  linkType: hard
-
-"y18n@npm:^3.2.1 || ^4.0.0, y18n@npm:^4.0.0":
+"y18n@npm:^4.0.0":
   version: 4.0.3
   resolution: "y18n@npm:4.0.3"
   checksum: 10/392870b2a100bbc643bc035fe3a89cef5591b719c7bdc8721bcdb3d27ab39fa4870acdca67b0ee096e146d769f311d68eda6b8195a6d970f227795061923013f
@@ -41068,7 +35605,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:10.x, yargs-parser@npm:^10.0.0":
+"yargs-parser@npm:^10.0.0":
   version: 10.1.0
   resolution: "yargs-parser@npm:10.1.0"
   dependencies:
@@ -41077,16 +35614,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^11.1.1":
-  version: 11.1.1
-  resolution: "yargs-parser@npm:11.1.1"
-  dependencies:
-    camelcase: "npm:^5.0.0"
-    decamelize: "npm:^1.2.0"
-  checksum: 10/986c06d977534f28ddfbccbbb7d9ebe5d0edb1aef9e27d95c44d40307a0e6cd9cfe1698e7d33eb860a92b7a9d2ee44404904bd9e85ebf897ef197f084ea00873
-  languageName: node
-  linkType: hard
-
 "yargs-parser@npm:^13.1.2":
   version: 13.1.2
   resolution: "yargs-parser@npm:13.1.2"
@@ -41124,55 +35651,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "yargs-parser@npm:9.0.2"
-  dependencies:
-    camelcase: "npm:^4.1.0"
-  checksum: 10/e9912e00da647bd03eef60759410722fb3a374dd05c33151410637ee6ab67d12c594999ec6ea345a871f9174e732ea27f7c90aa901c59af99d6a816905b4bce6
-  languageName: node
-  linkType: hard
-
-"yargs@npm:^11.0.0":
-  version: 11.1.1
-  resolution: "yargs@npm:11.1.1"
-  dependencies:
-    cliui: "npm:^4.0.0"
-    decamelize: "npm:^1.1.1"
-    find-up: "npm:^2.1.0"
-    get-caller-file: "npm:^1.0.1"
-    os-locale: "npm:^3.1.0"
-    require-directory: "npm:^2.1.1"
-    require-main-filename: "npm:^1.0.1"
-    set-blocking: "npm:^2.0.0"
-    string-width: "npm:^2.0.0"
-    which-module: "npm:^2.0.0"
-    y18n: "npm:^3.2.1"
-    yargs-parser: "npm:^9.0.2"
-  checksum: 10/039bc1abd24b6d484b8ab16f46be3647a5ecdf95654e1f162b96c98be691aceb3aac77279c252f6f26d12e21124aaef5fa1c139eed073d33f8b77495acca3a24
-  languageName: node
-  linkType: hard
-
-"yargs@npm:^12.0.1":
-  version: 12.0.5
-  resolution: "yargs@npm:12.0.5"
-  dependencies:
-    cliui: "npm:^4.0.0"
-    decamelize: "npm:^1.2.0"
-    find-up: "npm:^3.0.0"
-    get-caller-file: "npm:^1.0.1"
-    os-locale: "npm:^3.0.0"
-    require-directory: "npm:^2.1.1"
-    require-main-filename: "npm:^1.0.1"
-    set-blocking: "npm:^2.0.0"
-    string-width: "npm:^2.0.0"
-    which-module: "npm:^2.0.0"
-    y18n: "npm:^3.2.1 || ^4.0.0"
-    yargs-parser: "npm:^11.1.1"
-  checksum: 10/d6e2772870d72da780a21bf7cf47d823e693aad9532bb2e76a696dd16a0873976280686a75f34ebc8eaf900729bfc53a6ea9d4308d98194dcb0eaff872ff7c83
-  languageName: node
-  linkType: hard
-
 "yargs@npm:^13.2.2":
   version: 13.3.2
   resolution: "yargs@npm:13.3.2"
@@ -41251,13 +35729,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yn@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "yn@npm:2.0.0"
-  checksum: 10/9d49527cb3e9a0948cc057223810bf30607bf04b9ff7666cc1681a6501d660b60d90000c16f9e29311b0f28d8a06222ada565ccdca5f1049cdfefb1908217572
-  languageName: node
-  linkType: hard
-
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"
@@ -41265,20 +35736,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yup@npm:^0.27.0":
-  version: 0.27.0
-  resolution: "yup@npm:0.27.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.0.0"
-    fn-name: "npm:~2.0.1"
-    lodash: "npm:^4.17.11"
-    property-expr: "npm:^1.5.0"
-    synchronous-promise: "npm:^2.0.6"
-    toposort: "npm:^2.0.2"
-  checksum: 10/a217125b796b3c8df8c4f414d7f5bf6090f9c5d687e3b93a6bb2d0f0842fabdb1e7ae05d1dbf6ef148c1a5b6f095a5fca7c73c6caf2cd465ea234eac18ed6d3c
-  languageName: node
-  linkType: hard
-
 "zenscroll@npm:^4.0.2":
   version: 4.0.2
   resolution: "zenscroll@npm:4.0.2"

From 1304dc0af865188ec925b0f7101656f3f101921f Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 14:03:20 -0400
Subject: [PATCH 144/151] locations changes

---
 src/pages/dev/test-site/main-page/+Page.mdx | 15 --------
 src/pages/dev/test-site/main-page/main.styl | 40 ++++++++++++++++++++-
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/pages/dev/test-site/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
index d4b7a554..27776b84 100644
--- a/src/pages/dev/test-site/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -49,21 +49,6 @@ import { MacrostratIcon } from "~/components";
     </div>
 </div>
 
-[//]: # "Geological Maps"
-<div class="geologic-maps">
-  <Image className="geology-img" src="geology-bgrnd.jpg"></Image>
-  <h1 class="title map-title">Geologic Maps</h1>
-  <div class="map-info">
-    With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).
-    \
-    \
-    Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!
-    \
-    \
-    Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.
-  </div>
-</div>
-
 [//]: # "Locations"
 <div id="locations">
   <div class="location">
diff --git a/src/pages/dev/test-site/main-page/main.styl b/src/pages/dev/test-site/main-page/main.styl
index d308d1b2..eaac9c90 100644
--- a/src/pages/dev/test-site/main-page/main.styl
+++ b/src/pages/dev/test-site/main-page/main.styl
@@ -389,4 +389,42 @@ a:hover
 .text-donate
   position:absolute
   z-index: 100
-  padding: 0 20px
\ No newline at end of file
+  padding: 0 20px
+
+
+.location
+  display: grid;
+  grid-template-columns: 25% 25% 25% 25%;
+  grid-template-rows: 40vh;
+
+.t1
+  margin-left: 10%
+
+.t2
+  margin-right: 10%
+
+.location-img
+  width: 100%
+  height: 40vh
+  display: flex;
+  margin: auto
+  object-fit: cover
+
+.location-text
+  color: black
+  display: grid;
+  grid-template-rows: 50% 50%;
+  
+  h1
+    font-size: 45px
+    font-weight: 600
+    display: grid
+    margin: auto
+    margin-top: 33%
+
+.caption
+  font-size: 15px
+  font-weight: 600
+  display: grid
+  margin: auto
+  margin-top: 4%
\ No newline at end of file

From d9fd0e78b95798ac662adada16cf7da7e09dc594 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 14:09:08 -0400
Subject: [PATCH 145/151] added new links

---
 src/pages/dev/test-site/main-page/+Page.mdx | 55 +++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/pages/dev/test-site/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
index 27776b84..857bc1b9 100644
--- a/src/pages/dev/test-site/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -49,6 +49,61 @@ import { MacrostratIcon } from "~/components";
     </div>
 </div>
 
+
+[//]: # "Map Interface"
+<div class="temp-class" id="map">
+  <div class="link-title">
+    <a href="/map"><h1>Map Interface</h1></a>
+  </div>
+  <p class="long">
+    <div class="temp">With over 225 maps from data providers around the world across every scale, Macrostrat is the world's largest homogenized geologic map database. Our data processing pipeline links geologic map polygons to Macrostrat column polygons, external stratigraphic name lexicons, and geochronological intervals, enabling the enhancement of the original map data and allowing for direct links into <a href="https://xdd.wisc.edu" target="_blank">xDD</a> (formly GeoDeepDive).</div>
+    \
+    <div class="temp">Are you affiliated with a state or national geologic survey? <a href="mailto:contact@macrostrat.org?Subject=Geologic%20Map%20Collaboration">Get in touch</a> with us - we'd love to collaborate and help publicize your maps!</div>
+    \
+    <div class="temp"> Get started by <a href="/map">exploring the map</a> or <a href="/map/sources">taking a look at</a> which maps are currently a part of Macrostrat.</div>
+  </p>
+</div>
+
+[//]: # "Maps"
+<div class="temp-class" id="maps">
+  <div class="link-title">
+    <a href="/maps"><h1>Maps</h1></a>
+  </div>
+  <p>
+    The spatial footprint of rocks on the Earth's surface
+  </p>
+</div>
+
+[//]: # "Columns"
+<div class="temp-class" id="columns">
+  <div class="link-title">
+    <a href="/columns"><h1>Columns</h1></a>
+  </div>
+  <p>
+    Stratigraphic and geological columns showing the organization of rocks in time
+  </p>
+</div>
+
+[//]: # "Geologic Lexicon"
+<div class="temp-class" id="lexicon">
+  <div class="link-title">
+    <a href="/lex"><h1>Geologic Lexicon</h1></a>
+  </div>
+  <p>
+    Geologic units and data dictionaries
+  </p>
+</div>
+
+[//]: # "Projects"
+<div class="temp-class" id="project">
+  <div class="link-title">
+    <a href="/projects"><h1>Projects</h1></a>
+  </div>
+  <p>
+    Projects for specific regions or geological problems
+  </p>
+</div>
+
 [//]: # "Locations"
 <div id="locations">
   <div class="location">

From 623576d8774a7dedeb3fbf9003549887a5bb34e8 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 14:11:43 -0400
Subject: [PATCH 146/151] moved around

---
 src/pages/dev/test-site/main-page/+Page.mdx | 55 +++++++++++----------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/pages/dev/test-site/main-page/+Page.mdx b/src/pages/dev/test-site/main-page/+Page.mdx
index 857bc1b9..fe1fad95 100644
--- a/src/pages/dev/test-site/main-page/+Page.mdx
+++ b/src/pages/dev/test-site/main-page/+Page.mdx
@@ -50,6 +50,34 @@ import { MacrostratIcon } from "~/components";
 </div>
 
 
+[//]: # "Locations"
+<div id="locations">
+  <div class="location">
+    <Image className="location-img t1" src="north_america_med.jpg"></Image>
+    <div class="location-text">
+      <h1>North America</h1>
+      <div class="caption">243 packages. 798 units. 897 collections.</div>
+    </div>
+    <Image className="location-img t2" src="caribbean_new_medium.jpg"></Image>
+    <div class="location-text">
+      <h1>Carribean</h1>
+      <div class="caption">243 packages. 798 units. 897 collections.</div>
+    </div>
+  </div>
+  <div class="location">
+    <div class="location-text">
+      <h1>New Zealand</h1>
+      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
+    </div>
+    <Image className="location-img t1" src="new_zealand_new_medium.jpg"></Image>
+    <div class="location-text">
+      <h1>Deep Sea</h1>
+      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
+    </div>
+    <Image className="location-img t2" src="deep_sea_new_medium.jpg"></Image>
+  </div>
+</div>
+
 [//]: # "Map Interface"
 <div class="temp-class" id="map">
   <div class="link-title">
@@ -104,33 +132,6 @@ import { MacrostratIcon } from "~/components";
   </p>
 </div>
 
-[//]: # "Locations"
-<div id="locations">
-  <div class="location">
-    <Image className="location-img t1" src="north_america_med.jpg"></Image>
-    <div class="location-text">
-      <h1>North America</h1>
-      <div class="caption">243 packages. 798 units. 897 collections.</div>
-    </div>
-    <Image className="location-img t2" src="caribbean_new_medium.jpg"></Image>
-    <div class="location-text">
-      <h1>Carribean</h1>
-      <div class="caption">243 packages. 798 units. 897 collections.</div>
-    </div>
-  </div>
-  <div class="location">
-    <div class="location-text">
-      <h1>New Zealand</h1>
-      <div class="caption">828 packages. 2,168 units. 328 collections.</div>
-    </div>
-    <Image className="location-img t1" src="new_zealand_new_medium.jpg"></Image>
-    <div class="location-text">
-      <h1>Deep Sea</h1>
-      <div class="caption">388 packages. 7,124 units. 0 collections.</div>
-    </div>
-    <Image className="location-img t2" src="deep_sea_new_medium.jpg"></Image>
-  </div>
-</div>
 
 [//]: # "Donate"
 <div class="donate-container" id="donate">

From 36a1399a96452456414283e7bea199be5cce950e Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 14:14:49 -0400
Subject: [PATCH 147/151] fixed yarn lock

---
 yarn.lock | 92 -------------------------------------------------------
 1 file changed, 92 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fa3d3059..19c29d34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8992,13 +8992,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/is@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@sindresorhus/is@npm:0.14.0"
-  checksum: 10/789cd128f0b43e158e657c4505539c8997905fcb5c06d750b7df778cab2b6887bc1eb8878026a20d84524528786ef69fc3d12a964ae56a478a87bcfc7f8272f3
-  languageName: node
-  linkType: hard
-
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -12785,24 +12778,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^5.5.3":
-  version: 5.7.4
-  resolution: "acorn@npm:5.7.4"
-  bin:
-    acorn: bin/acorn
-  checksum: 10/97f2ae55e99aed81a7aa9039719c60283a66817fadb3152beb323ba6038824770512f807436e99090be38602f23bcbf6021867d86442616da471f1dfaca7c3d9
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^6.0.1":
-  version: 6.4.2
-  resolution: "acorn@npm:6.4.2"
-  bin:
-    acorn: bin/acorn
-  checksum: 10/b430c346813289daf1b4e673333d10c54a7c452a776f097597c7b0bd71c7ff58f0e8f850f334963eac806a52928985ff20c0fa39c67cd5276d10e0ed4370f9c8
-  languageName: node
-  linkType: hard
-
 "acorn@npm:^7.1.1, acorn@npm:^7.4.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
@@ -13347,13 +13322,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assign-symbols@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "assign-symbols@npm:1.0.0"
-  checksum: 10/c0eb895911d05b6b2d245154f70461c5e42c107457972e5ebba38d48967870dee53bcdf6c7047990586daa80fab8dab3cc6300800fbd47b454247fdedd859a2c
-  languageName: node
-  linkType: hard
-
 "ast-types@npm:^0.16.1":
   version: 0.16.1
   resolution: "ast-types@npm:0.16.1"
@@ -17274,13 +17242,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff@npm:^3.1.0, diff@npm:^3.2.0":
-  version: 3.5.0
-  resolution: "diff@npm:3.5.0"
-  checksum: 10/cfbc2df98d6f8eb82c0f7735c8468695f65189d31f95a708d4c97cd96a8083fdfd83d87a067a29924ae7d8ff64f578e7da78391af537815750268555fe0df9f0
-  languageName: node
-  linkType: hard
-
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -22812,13 +22773,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-tokens@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "js-tokens@npm:3.0.2"
-  checksum: 10/a2d47dbe77c2d7d1abd99f25fcec61c825797e5775a187101879c4fb8e7bbbf89eb83bd315157b92c35d5eed5951962a47b1fedc8c778824b5d95cfb164a310c
-  languageName: node
-  linkType: hard
-
 "js-tokens@npm:^9.0.0":
   version: 9.0.0
   resolution: "js-tokens@npm:9.0.0"
@@ -27434,22 +27388,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"please-upgrade-node@npm:^3.0.2, please-upgrade-node@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "please-upgrade-node@npm:3.2.0"
-  dependencies:
-    semver-compare: "npm:^1.0.0"
-  checksum: 10/d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb
-  languageName: node
-  linkType: hard
-
-"pn@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "pn@npm:1.1.0"
-  checksum: 10/f597172ff5d83166b66179dc31b65e8601caf0d6d0691f07613b58d9ac439154a017c081b5ba5f6432dd5bbedfa90d7a2d2d7a5b2e799c1ebb11545ea254213c
-  languageName: node
-  linkType: hard
-
 "pngjs@npm:^3.3.3":
   version: 3.4.0
   resolution: "pngjs@npm:3.4.0"
@@ -32299,15 +32237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"staged-git-files@npm:1.1.2":
-  version: 1.1.2
-  resolution: "staged-git-files@npm:1.1.2"
-  bin:
-    sgf: bin/cli.js
-  checksum: 10/077da24435bbadfb06a2d7e53fb8e7f2b437088279854113517d688b3b1d5f515c2c75a78ebcbc167b470112f6f20ceae35fbb754124ae1365216f17215e1953
-  languageName: node
-  linkType: hard
-
 "stampit@npm:^4.3.2":
   version: 4.3.2
   resolution: "stampit@npm:4.3.2"
@@ -32367,13 +32296,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stealthy-require@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "stealthy-require@npm:1.1.1"
-  checksum: 10/a408a51f5b6c1fe535e4459732ac0b66d7921583f89fc8289bfdc937a497fe8196219d1e04d234047349b90723ecff1a1cb4a92bef2315e01a3081dc72db8d41
-  languageName: node
-  linkType: hard
-
 "stop-iteration-iterator@npm:^1.0.0":
   version: 1.0.0
   resolution: "stop-iteration-iterator@npm:1.0.0"
@@ -36198,20 +36120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yup@npm:^0.27.0":
-  version: 0.27.0
-  resolution: "yup@npm:0.27.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.0.0"
-    fn-name: "npm:~2.0.1"
-    lodash: "npm:^4.17.11"
-    property-expr: "npm:^1.5.0"
-    synchronous-promise: "npm:^2.0.6"
-    toposort: "npm:^2.0.2"
-  checksum: 10/a217125b796b3c8df8c4f414d7f5bf6090f9c5d687e3b93a6bb2d0f0842fabdb1e7ae05d1dbf6ef148c1a5b6f095a5fca7c73c6caf2cd465ea234eac18ed6d3c
-  languageName: node
-  linkType: hard
-
 "zenscroll@npm:^4.0.2":
   version: 4.0.2
   resolution: "zenscroll@npm:4.0.2"

From ae2cf9be9289be96912185cb35e5d7fb71401853 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 17:40:50 -0400
Subject: [PATCH 148/151] test

---
 yarn.lock | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index acbb1045..92c52dd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6667,6 +6667,8 @@ __metadata:
     vite: "npm:^5.2.11"
     vite-plugin-cesium: "npm:^1.2.22"
     vite-plugin-inspect: "npm:^0.8.4"
+    vite-plugin-rewrite-all: "npm:^1.0.1"
+    vitest: "npm:^1.6.0"
     zustand: "npm:^4.5.1"
   languageName: unknown
   linkType: soft
@@ -15353,6 +15355,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"connect-history-api-fallback@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "connect-history-api-fallback@npm:1.6.0"
+  checksum: 10/59f013870e987f2e921218b88ad99e6b469a058ee7dd35561a360968fd4260f236b5523b7387ddec8991f9f9fbddda098f830ddc701f12c1bfb1f49d5f4b13c1
+  languageName: node
+  linkType: hard
+
 "connect-history-api-fallback@npm:^2.0.0":
   version: 2.0.0
   resolution: "connect-history-api-fallback@npm:2.0.0"
@@ -35094,6 +35103,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-plugin-rewrite-all@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "vite-plugin-rewrite-all@npm:1.0.2"
+  dependencies:
+    connect-history-api-fallback: "npm:^1.6.0"
+  peerDependencies:
+    vite: ^2.0.0 || ^3.0.0 || ^4.0.0
+  checksum: 10/aa3f27309da1c1c84ff6f8de1838d7d1bf5089823ff5393873cf63aef3739eb3c291a3df28172af1945d5f86e9d530213aea08fce813282ab9ac47babcc680d2
+  languageName: node
+  linkType: hard
+
 "vite@npm:^4.4.9":
   version: 4.4.9
   resolution: "vite@npm:4.4.9"

From 832f9b6b145e47c6f489e100215eca76c6d1b8a8 Mon Sep 17 00:00:00 2001
From: David Sklar <davidsklar99@outlook.com>
Date: Mon, 1 Jul 2024 17:45:40 -0400
Subject: [PATCH 149/151] merged correctly

---
 package.json |   2 -
 yarn.lock    | 271 ---------------------------------------------------
 2 files changed, 273 deletions(-)

diff --git a/package.json b/package.json
index b6b32473..674cc258 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,6 @@
     "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
     "start": "yarn run build && yarn run server",
     "test": "vitest"
-    "start": "yarn run build && yarn run server",
-    "test": "vitest"
   },
   "workspaces": [
     "deps/web-components/packages/*",
diff --git a/yarn.lock b/yarn.lock
index 31b479e0..bc7b8b78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5535,15 +5535,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "@jest/schemas@npm:29.6.3"
-  dependencies:
-    "@sinclair/typebox": "npm:^0.27.8"
-  checksum: 10/910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
-  languageName: node
-  linkType: hard
-
 "@jest/source-map@npm:^27.5.1":
   version: 27.5.1
   resolution: "@jest/source-map@npm:27.5.1"
@@ -9011,13 +9002,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.27.8":
-  version: 0.27.8
-  resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: 10/297f95ff77c82c54de8c9907f186076e715ff2621c5222ba50b8d40a170661c0c5242c763cba2a4791f0f91cb1d8ffa53ea1d7294570cf8cd4694c0e383e484d
-  languageName: node
-  linkType: hard
-
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -12208,60 +12192,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitest/expect@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@vitest/expect@npm:1.6.0"
-  dependencies:
-    "@vitest/spy": "npm:1.6.0"
-    "@vitest/utils": "npm:1.6.0"
-    chai: "npm:^4.3.10"
-  checksum: 10/e82304a12e22b98c1ccea81e8f33c838561deb878588eac463164cc4f8fc0c401ace3a9e6758d9e3a6bcc01313e845e8478aaefb7548eaded04b8de12c1928f6
-  languageName: node
-  linkType: hard
-
-"@vitest/runner@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@vitest/runner@npm:1.6.0"
-  dependencies:
-    "@vitest/utils": "npm:1.6.0"
-    p-limit: "npm:^5.0.0"
-    pathe: "npm:^1.1.1"
-  checksum: 10/d83a608be36dace77f91a9d15ab7753f9c5923281188a8d9cb5ccec770df9cc9ba80e5e1e3465328c7605977be0f0708610855abf5f4af037a4ede5f51a83e47
-  languageName: node
-  linkType: hard
-
-"@vitest/snapshot@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@vitest/snapshot@npm:1.6.0"
-  dependencies:
-    magic-string: "npm:^0.30.5"
-    pathe: "npm:^1.1.1"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10/0bfc26a48b45814604ff0f7276d73a047b79f3618e0b620ff54ea2de548e9603a9770963ba6ebb19f7ea1ed51001cbca58d74aa0271651d4f8e88c6233885eba
-  languageName: node
-  linkType: hard
-
-"@vitest/spy@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@vitest/spy@npm:1.6.0"
-  dependencies:
-    tinyspy: "npm:^2.2.0"
-  checksum: 10/1c9698272a58aa47708bb8a1672d655fcec3285b02067cc3f70bfe76f4eda7a756eb379f8c945ccbe61677f5189aeb5ba93c2737a9d7db2de8c4e7bbdffcd372
-  languageName: node
-  linkType: hard
-
-"@vitest/utils@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@vitest/utils@npm:1.6.0"
-  dependencies:
-    diff-sequences: "npm:^29.6.3"
-    estree-walker: "npm:^3.0.3"
-    loupe: "npm:^2.3.7"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10/5c5d7295ac13fcea1da039232bcc7c3fc6f070070fe12ba2ad152456af6e216e48a3ae169016cfcd5055706a00dc567b8f62e4a9b1914f069f52b8f0a3c25e60
-  languageName: node
-  linkType: hard
-
 "@vx/axis@npm:0.0.198":
   version: 0.0.198
   resolution: "@vx/axis@npm:0.0.198"
@@ -13411,13 +13341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assertion-error@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "assertion-error@npm:1.1.0"
-  checksum: 10/fd9429d3a3d4fd61782eb3962ae76b6d08aa7383123fca0596020013b3ebd6647891a85b05ce821c47d1471ed1271f00b0545cf6a4326cf2fc91efcc3b0fbecf
-  languageName: node
-  linkType: hard
-
 "ast-types@npm:^0.16.1":
   version: 0.16.1
   resolution: "ast-types@npm:0.16.1"
@@ -14369,7 +14292,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.0.0, cac@npm:^6.7.14":
 "cac@npm:^6.0.0, cac@npm:^6.7.14":
   version: 6.7.14
   resolution: "cac@npm:6.7.14"
@@ -14666,21 +14588,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chai@npm:^4.3.10":
-  version: 4.4.1
-  resolution: "chai@npm:4.4.1"
-  dependencies:
-    assertion-error: "npm:^1.1.0"
-    check-error: "npm:^1.0.3"
-    deep-eql: "npm:^4.1.3"
-    get-func-name: "npm:^2.0.2"
-    loupe: "npm:^2.3.6"
-    pathval: "npm:^1.1.1"
-    type-detect: "npm:^4.0.8"
-  checksum: 10/c6d7aba913a67529c68dbec3673f94eb9c586c5474cc5142bd0b587c9c9ec9e5fbaa937e038ecaa6475aea31433752d5fabdd033b9248bde6ae53befcde774ae
-  languageName: node
-  linkType: hard
-
 "chalk@npm:2.3.1":
   version: 2.3.1
   resolution: "chalk@npm:2.3.1"
@@ -14839,15 +14746,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"check-error@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "check-error@npm:1.0.3"
-  dependencies:
-    get-func-name: "npm:^2.0.2"
-  checksum: 10/e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399
-  languageName: node
-  linkType: hard
-
 "chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.5.3":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
@@ -15444,13 +15342,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"confbox@npm:^0.1.7":
-  version: 0.1.7
-  resolution: "confbox@npm:0.1.7"
-  checksum: 10/3086687b9a2a70d44d4b40a2d376536fe7e1baec4a2a34261b21b8a836026b419cbf89ded6054216631823e7d63c415dad4b4d53591d6edbb202bb9820dfa6fa
-  languageName: node
-  linkType: hard
-
 "config-chain@npm:^1.1.13":
   version: 1.1.13
   resolution: "config-chain@npm:1.1.13"
@@ -17403,13 +17294,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "diff-sequences@npm:29.6.3"
-  checksum: 10/179daf9d2f9af5c57ad66d97cb902a538bcf8ed64963fa7aa0c329b3de3665ce2eb6ffdc2f69f29d445fa4af2517e5e55e5b6e00c00a9ae4f43645f97f7078cb
-  languageName: node
-  linkType: hard
-
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -18696,7 +18580,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3":
 "estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3":
   version: 3.0.3
   resolution: "estree-walker@npm:3.0.3"
@@ -19845,13 +19728,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "get-func-name@npm:2.0.2"
-  checksum: 10/3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
-  languageName: node
-  linkType: hard
-
 "get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
   version: 1.2.1
   resolution: "get-intrinsic@npm:1.2.1"
@@ -22992,13 +22868,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-tokens@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "js-tokens@npm:9.0.0"
-  checksum: 10/65e7a55a1a18d61f1cf94bfd7704da870b74337fa08d4c58118e69a8b10225b5ad887ff3ae595d720301b0924811a9b0594c679621a85ecbac6e3aac8533c53b
-  languageName: node
-  linkType: hard
-
 "js-yaml@npm:=4.1.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -23828,16 +23697,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"local-pkg@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "local-pkg@npm:0.5.0"
-  dependencies:
-    mlly: "npm:^1.4.2"
-    pkg-types: "npm:^1.0.3"
-  checksum: 10/20f4caba50dc6fb00ffcc1a78bc94b5acb33995e0aadf4d4edcdeab257e891aa08f50afddf02f3240b2c3d02432bc2078f2a916a280ed716b64753a3d250db70
-  languageName: node
-  linkType: hard
-
 "locate-path@npm:^2.0.0":
   version: 2.0.0
   resolution: "locate-path@npm:2.0.0"
@@ -24207,15 +24066,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^2.3.6, loupe@npm:^2.3.7":
-  version: 2.3.7
-  resolution: "loupe@npm:2.3.7"
-  dependencies:
-    get-func-name: "npm:^2.0.1"
-  checksum: 10/635c8f0914c2ce7ecfe4e239fbaf0ce1d2c00e4246fafcc4ed000bfdb1b8f89d05db1a220054175cca631ebf3894872a26fffba0124477fcb562f78762848fb1
-  languageName: node
-  linkType: hard
-
 "lower-case@npm:^2.0.2":
   version: 2.0.2
   resolution: "lower-case@npm:2.0.2"
@@ -24361,15 +24211,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.30.5":
-  version: 0.30.10
-  resolution: "magic-string@npm:0.30.10"
-  dependencies:
-    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
-  checksum: 10/9f8bf6363a14c98a9d9f32ef833b194702a5c98fb931b05ac511b76f0b06fd30ed92beda6ca3261d2d52d21e39e891ef1136fbd032023f6cbb02d0b7d5767201
-  languageName: node
-  linkType: hard
-
 "make-dir@npm:^1.0.0":
   version: 1.3.0
   resolution: "make-dir@npm:1.3.0"
@@ -27018,15 +26859,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "p-limit@npm:5.0.0"
-  dependencies:
-    yocto-queue: "npm:^1.0.0"
-  checksum: 10/87bf5837dee6942f0dbeff318436179931d9a97848d1b07dbd86140a477a5d2e6b90d9701b210b4e21fe7beaea2979dfde366e4f576fa644a59bd4d6a6371da7
-  languageName: node
-  linkType: hard
-
 "p-locate@npm:^2.0.0":
   version: 2.0.0
   resolution: "p-locate@npm:2.0.0"
@@ -27502,13 +27334,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pathval@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "pathval@npm:1.1.1"
-  checksum: 10/b50a4751068aa3a5428f5a0b480deecedc6f537666a3630a0c2ae2d5e7c0f4bf0ee77b48404441ec1220bef0c91625e6030b3d3cf5a32ab0d9764018d1d9dbb6
-  languageName: node
-  linkType: hard
-
 "pbf@npm:^3.2.1":
   version: 3.2.1
   resolution: "pbf@npm:3.2.1"
@@ -28691,17 +28516,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "pretty-format@npm:29.7.0"
-  dependencies:
-    "@jest/schemas": "npm:^29.6.3"
-    ansi-styles: "npm:^5.0.0"
-    react-is: "npm:^18.0.0"
-  checksum: 10/dea96bc83c83cd91b2bfc55757b6b2747edcaac45b568e46de29deee80742f17bc76fe8898135a70d904f4928eafd8bb693cd1da4896e8bdd3c5e82cadf1d2bb
-  languageName: node
-  linkType: hard
-
 "pretty-hrtime@npm:^1.0.3":
   version: 1.0.3
   resolution: "pretty-hrtime@npm:1.0.3"
@@ -29709,13 +29523,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^18.0.0":
-  version: 18.3.1
-  resolution: "react-is@npm:18.3.1"
-  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
-  languageName: node
-  linkType: hard
-
 "react-json-tree@npm:^0.15.0":
   version: 0.15.2
   resolution: "react-json-tree@npm:0.15.2"
@@ -32062,13 +31869,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"siginfo@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "siginfo@npm:2.0.0"
-  checksum: 10/e93ff66c6531a079af8fb217240df01f980155b5dc408d2d7bebc398dd284e383eb318153bf8acd4db3c4fe799aa5b9a641e38b0ba3b1975700b1c89547ea4e7
-  languageName: node
-  linkType: hard
-
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
@@ -32551,13 +32351,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stackback@npm:0.0.2":
-  version: 0.0.2
-  resolution: "stackback@npm:0.0.2"
-  checksum: 10/2d4dc4e64e2db796de4a3c856d5943daccdfa3dd092e452a1ce059c81e9a9c29e0b9badba91b43ef0d5ff5c04ee62feb3bcc559a804e16faf447bac2d883aa99
-  languageName: node
-  linkType: hard
-
 "stampit@npm:^4.3.2":
   version: 4.3.2
   resolution: "stampit@npm:4.3.2"
@@ -32617,13 +32410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"std-env@npm:^3.5.0":
-  version: 3.7.0
-  resolution: "std-env@npm:3.7.0"
-  checksum: 10/6ee0cca1add3fd84656b0002cfbc5bfa20340389d9ba4720569840f1caa34bce74322aef4c93f046391583e50649d0cf81a5f8fe1d411e50b659571690a45f12
-  languageName: node
-  linkType: hard
-
 "stop-iteration-iterator@npm:^1.0.0":
   version: 1.0.0
   resolution: "stop-iteration-iterator@npm:1.0.0"
@@ -33030,15 +32816,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-literal@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "strip-literal@npm:2.1.0"
-  dependencies:
-    js-tokens: "npm:^9.0.0"
-  checksum: 10/21c813aa1e669944e7e2318c8c927939fb90b0c52f53f57282bfc3dd6e19d53f70004f1f1693e33e5e790ad5ef102b0fce2b243808229d1ce07ae71f326c0e82
-  languageName: node
-  linkType: hard
-
 "style-inject@npm:^0.3.0":
   version: 0.3.0
   resolution: "style-inject@npm:0.3.0"
@@ -33668,13 +33445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinybench@npm:^2.5.1":
-  version: 2.8.0
-  resolution: "tinybench@npm:2.8.0"
-  checksum: 10/9731d070bedee6d44f3bb565862c284776e6adfd70d81a051a5c79b77479408509b448ad8d467d538d18bc0ae857b3ead8168d7e98d7f1355f8a0b01aa2f163b
-  languageName: node
-  linkType: hard
-
 "tinycolor2@npm:^1.4.1":
   version: 1.6.0
   resolution: "tinycolor2@npm:1.6.0"
@@ -33696,13 +33466,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinypool@npm:^0.8.3":
-  version: 0.8.4
-  resolution: "tinypool@npm:0.8.4"
-  checksum: 10/7365944c2532f240111443e7012be31a634faf1a02db08a91db3aa07361c26a374d0be00a0f2ea052c4bee39c107ba67f1f814c108d9d51dfc725c559c1a9c03
-  languageName: node
-  linkType: hard
-
 "tinyqueue@npm:^2.0.3":
   version: 2.0.3
   resolution: "tinyqueue@npm:2.0.3"
@@ -33717,13 +33480,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyspy@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "tinyspy@npm:2.2.1"
-  checksum: 10/170d6232e87f9044f537b50b406a38fbfd6f79a261cd12b92879947bd340939a833a678632ce4f5c4a6feab4477e9c21cd43faac3b90b68b77dd0536c4149736
-  languageName: node
-  linkType: hard
-
 "tmp@npm:^0.0.33":
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
@@ -34186,7 +33942,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8":
 "type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
@@ -34427,13 +34182,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ufo@npm:^1.5.3":
-  version: 1.5.3
-  resolution: "ufo@npm:1.5.3"
-  checksum: 10/2b30dddd873c643efecdb58cfe457183cd4d95937ccdacca6942c697b87a2c578232c25a5149fda85436696bf0fdbc213bf2b220874712bc3e58c0fb00a2c950
-  languageName: node
-  linkType: hard
-
 "uglify-js@npm:^3.1.4":
   version: 3.17.4
   resolution: "uglify-js@npm:3.17.4"
@@ -36066,18 +35814,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"why-is-node-running@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "why-is-node-running@npm:2.2.2"
-  dependencies:
-    siginfo: "npm:^2.0.0"
-    stackback: "npm:0.0.2"
-  bin:
-    why-is-node-running: cli.js
-  checksum: 10/f3582e0337f4b25537d492b1d40f00b978ce04b1d1eeea8f310bfa8aae8a7d11d118d672e2f0760c164ce3753a620a70aa29ff3620e340197624940cf9c08615
-  languageName: node
-  linkType: hard
-
 "wide-align@npm:^1.1.0, wide-align@npm:^1.1.5":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
@@ -36527,13 +36263,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yocto-queue@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "yocto-queue@npm:1.0.0"
-  checksum: 10/2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
-  languageName: node
-  linkType: hard
-
 "zenscroll@npm:^4.0.2":
   version: 4.0.2
   resolution: "zenscroll@npm:4.0.2"

From 9fae964d33812d50aa6695dfb92e70f9229c13c8 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Mon, 1 Jul 2024 01:41:51 -0500
Subject: [PATCH 150/151] Major improvements to correlation diagrams

- Combine some components of map and column correlation diagrams
- Unit popovers
- Refactor state
- Improve unit selection panel
- Slight improvements to styles
---
 deps/web-components                           |   2 +-
 package.json                                  |   1 +
 packages/utility-functions/package.json       |   5 +
 .../src/chronostratigraphy.ts                 |  68 +++++
 packages/utility-functions/src/index.ts       |   1 +
 src/components/unit-details/index.ts          | 166 ++++++++++++
 src/components/unit-details/main.module.sass  |  60 +++++
 src/pages/correlation/+Page.ts                | 232 +++++------------
 src/pages/correlation/column.module.scss      |  18 +-
 src/pages/correlation/column.ts               | 110 +++++---
 src/pages/correlation/correlation-chart.ts    | 100 ++++---
 src/pages/correlation/hash-string.ts          |  93 +++++--
 src/pages/correlation/main.module.sass        |  87 +++++--
 src/pages/correlation/state.ts                | 246 ++++++++++++++++++
 src/pages/maps/@id/correlation/+Page.ts       |  21 +-
 src/pages/maps/@id/correlation/legend-item.ts | 173 +++---------
 .../maps/@id/correlation/main.module.sass     |  43 +--
 .../maps/@id/correlation/prepare-data.ts      |  82 +-----
 src/pages/maps/@id/correlation/types.ts       |  12 +-
 yarn.lock                                     |   7 +
 20 files changed, 953 insertions(+), 574 deletions(-)
 create mode 100644 packages/utility-functions/package.json
 create mode 100644 packages/utility-functions/src/chronostratigraphy.ts
 create mode 100644 packages/utility-functions/src/index.ts
 create mode 100644 src/components/unit-details/index.ts
 create mode 100644 src/components/unit-details/main.module.sass
 create mode 100644 src/pages/correlation/state.ts

diff --git a/deps/web-components b/deps/web-components
index 8f5960d2..88251e8c 160000
--- a/deps/web-components
+++ b/deps/web-components
@@ -1 +1 @@
-Subproject commit 8f5960d2fc1365e9e999bfb7af4cc9e17a54f15c
+Subproject commit 88251e8ca31e9ad518bc5573a50af51494adbff6
diff --git a/package.json b/package.json
index a3bc58e6..0f980519 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "@macrostrat-web/security": "workspace:*",
     "@macrostrat-web/settings": "workspace:*",
     "@macrostrat-web/sift": "workspace:*",
+    "@macrostrat-web/utility-functions": "workspace:*",
     "@macrostrat/api-utils": "workspace:*",
     "@macrostrat/api-views": "workspace:*",
     "@macrostrat/auth-components": "workspace:*",
diff --git a/packages/utility-functions/package.json b/packages/utility-functions/package.json
new file mode 100644
index 00000000..83435158
--- /dev/null
+++ b/packages/utility-functions/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@macrostrat-web/utility-functions",
+  "version": "1.0.0",
+  "main": "src/index.ts"
+}
diff --git a/packages/utility-functions/src/chronostratigraphy.ts b/packages/utility-functions/src/chronostratigraphy.ts
new file mode 100644
index 00000000..cbe980ec
--- /dev/null
+++ b/packages/utility-functions/src/chronostratigraphy.ts
@@ -0,0 +1,68 @@
+export type AgeRange = [number, number];
+
+enum MergeMode {
+  Inner,
+  Outer,
+}
+
+export function mergeAgeRanges(
+  ranges: AgeRange[],
+  mergeMode: MergeMode = MergeMode.Outer
+): AgeRange {
+  /** Merge a set of age ranges to get the inner or outer bounds */
+  let min = Infinity;
+  let max = 0;
+  // Negative ages are not handled
+
+  if (mergeMode === MergeMode.Inner) {
+    min = Math.min(...ranges.map((d) => d[0]));
+    max = Math.max(...ranges.map((d) => d[1]));
+  } else {
+    min = Math.max(...ranges.map((d) => d[0]));
+    max = Math.min(...ranges.map((d) => d[1]));
+  }
+
+  // Age ranges should start with the oldest (largest) age
+  if (min < max) {
+    return [max, min];
+  }
+  return [min, max];
+}
+
+enum AgeRangeRelationship {
+  Disjoint,
+  Contains,
+  Contained,
+  Identical,
+}
+
+function convertToForwardOrdinal(a: AgeRange): AgeRange {
+  /** Age ranges are naturally expressed as [b_age, t_age] where
+   * b_age is the older age and t_age is the younger age. This function
+   * converts the age range to [min, max] where min is the oldest age,
+   * expressed as negative numbers. This assists with intuitive ordering
+   * in certain cases.
+   */
+  return [-a[0], -a[1]];
+}
+
+export function compareAgeRanges(
+  a: AgeRange,
+  b: AgeRange
+): AgeRangeRelationship {
+  const a1 = convertToForwardOrdinal(a);
+  const b1 = convertToForwardOrdinal(b);
+  /** Compare two age ranges */
+  if (a1[0] > b1[1] || a1[1] < b1[0]) {
+    return AgeRangeRelationship.Disjoint;
+  }
+  if (a1[0] === b1[0] && a1[1] === b1[1]) {
+    return AgeRangeRelationship.Identical;
+  }
+  if (a1[0] <= b1[0] && a1[1] >= b1[1]) {
+    return AgeRangeRelationship.Contains;
+  }
+  if (a1[0] >= b1[0] && a1[1] <= b1[1]) {
+    return AgeRangeRelationship.Contained;
+  }
+}
diff --git a/packages/utility-functions/src/index.ts b/packages/utility-functions/src/index.ts
new file mode 100644
index 00000000..59d0f38b
--- /dev/null
+++ b/packages/utility-functions/src/index.ts
@@ -0,0 +1 @@
+export * from "./chronostratigraphy";
diff --git a/src/components/unit-details/index.ts b/src/components/unit-details/index.ts
new file mode 100644
index 00000000..e55887cc
--- /dev/null
+++ b/src/components/unit-details/index.ts
@@ -0,0 +1,166 @@
+import classNames from "classnames";
+import { mergeAgeRanges } from "@macrostrat-web/utility-functions";
+import { LithologyTag } from "~/components";
+import h from "./main.module.sass";
+import { Button, Popover } from "@blueprintjs/core";
+import { DOMElement } from "react";
+import { JSONView } from "@macrostrat/ui-components";
+
+export function UnitDetailsPopover({
+  style,
+  children,
+  boundary,
+}: {
+  style: object;
+  children: React.ReactNode;
+  boundary?: DOMElement<any, any>;
+}) {
+  const content = h(LegendPopoverContainer, children);
+
+  return h(
+    "div.popover-main",
+    {
+      style,
+    },
+    h(
+      Popover,
+      { content, isOpen: true, usePortal: false, boundary },
+      h("span.popover-target")
+    )
+  );
+}
+
+export function LegendPopoverContainer({ children }) {
+  return h("div.legend-panel-outer", [h("div.legend-info-panel", children)]);
+}
+
+export function LegendPanelHeader({ title, id, onClose }) {
+  return h("header.legend-panel-header", [
+    h.if(title != null)("h3", title),
+    h("div.spacer"),
+    h.if(id != null)("code", id),
+    h.if(onClose != null)(Button, {
+      icon: "cross",
+      minimal: true,
+      small: true,
+      onClick() {
+        onClose();
+      },
+    }),
+  ]);
+}
+
+export function LegendJSONView({ data }) {
+  return h(JSONView, { data, hideRoot: true, className: "legend-json-view" });
+}
+
+export function DataField({
+  label,
+  value,
+  inline = true,
+  showIfEmpty = false,
+  className,
+  children,
+  unit,
+}: {
+  label?: string;
+  value?: any;
+  inline?: boolean;
+  showIfEmpty?: boolean;
+  className?: string;
+  children?: any;
+  unit?: string;
+}) {
+  if (!showIfEmpty && (value == null || value === "") && children == null) {
+    return null;
+  }
+
+  return h("div.data-field", { className: classNames(className, { inline }) }, [
+    h("div.label", label),
+    h("div.data-container", [
+      h.if(value != null)(Value, { value, unit }),
+      children,
+    ]),
+  ]);
+}
+
+export type IntervalShort = {
+  id: number;
+  b_age: number;
+  t_age: number;
+  name: string;
+  color: string;
+  rank: number;
+};
+
+export function IntervalField({ intervals }: { intervals: IntervalShort[] }) {
+  const unique = uniqueIntervals(...intervals);
+  const ageRange = mergeAgeRanges(unique.map((d) => [d.b_age, d.t_age]));
+  return h([
+    h(
+      DataField,
+      {
+        label: "Intervals",
+      },
+      [
+        unique.map((interval) => {
+          return h(Interval, {
+            key: interval.id,
+            interval,
+            showAgeRange: true,
+          });
+        }),
+        h(Value, { unit: "Ma", value: `${ageRange[0]} - ${ageRange[1]}` }),
+      ]
+    ),
+  ]);
+}
+
+function Value({
+  value,
+  unit,
+  children,
+}: {
+  value?: any;
+  unit?: string;
+  children?: any;
+}) {
+  const val = value ?? children;
+  return h("span.value-container", [
+    h("span.value", val),
+    h.if(unit != null)([" ", h("span.unit", unit)]),
+  ]);
+}
+
+function Interval({
+  interval,
+  showAgeRange = false,
+}: {
+  interval: IntervalShort;
+  showAgeRange?: boolean;
+}) {
+  return h(LithologyTag, {
+    data: interval,
+  });
+}
+
+function uniqueIntervals(
+  ...intervals: (IntervalShort | undefined)[]
+): IntervalShort[] {
+  const unique = new Map<number, IntervalShort>();
+  for (const interval of intervals) {
+    if (interval == null) continue;
+    unique.set(interval.id, interval);
+  }
+  return Array.from(unique.values()).sort((a, b) => b.b_age - a.b_age);
+}
+
+export function LithologyList({ lithologies }) {
+  return h(
+    DataField,
+    { label: "Lithologies" },
+    lithologies.map((lith) => {
+      return h(LithologyTag, { data: lith });
+    })
+  );
+}
diff --git a/src/components/unit-details/main.module.sass b/src/components/unit-details/main.module.sass
new file mode 100644
index 00000000..f44baabc
--- /dev/null
+++ b/src/components/unit-details/main.module.sass
@@ -0,0 +1,60 @@
+.popover-main
+  position: absolute
+  outline: 2px solid #f22
+
+  :global(.bp5-popover-target)
+    height: 100%
+    width: 100%
+    display: block
+    line-height: 0
+
+.legend-panel-outer
+  width: 25em
+  max-height: 60vh
+  overflow-y: scroll
+
+.legend-info-panel
+  padding: 1em
+
+.legend-json-view
+  padding-left: 0
+  margin-left: -0.5em
+
+.legend-panel-header
+  display: flex
+  justify-content: space-between
+  gap: 1em
+  code
+    font-size: 0.9em
+    color: var(--secondary-color)
+  align-items: baseline
+  .spacer
+    flex: 1
+  button
+    line-height: 1
+
+  h3
+    margin: 0 0 0.5em
+    font-size: 1.1em
+
+.data-field
+  margin: 0.2em 0 0.4em
+  &.inline
+    display: flex
+    flex-direction: row
+    align-items: baseline
+    gap: 1em
+    justify-content: space-between
+    .data-container
+      text-align: right
+  .label
+    font-size: 0.9em
+    font-weight: bold
+    display: block
+    color: var(--secondary-color)
+  .value-container
+    font-size: 0.9em
+    display: inline-block
+    break-inside: avoid
+  .unit
+    color: var(--secondary-color)
diff --git a/src/pages/correlation/+Page.ts b/src/pages/correlation/+Page.ts
index 59f34e62..1941fe11 100644
--- a/src/pages/correlation/+Page.ts
+++ b/src/pages/correlation/+Page.ts
@@ -8,86 +8,27 @@ import {
 import { LngLatBounds } from "mapbox-gl";
 import { FullscreenPage } from "~/layouts";
 import h from "./main.module.sass";
+import { compose, C } from "@macrostrat/hyper";
 import { baseMapURL, mapboxAccessToken } from "@macrostrat-web/settings";
 import { PageBreadcrumbs } from "~/renderer";
 import { Feature, FeatureCollection, LineString, Point } from "geojson";
 import { useEffect, useMemo } from "react";
-import { create } from "zustand";
 import { setGeoJSON } from "@macrostrat/mapbox-utils";
-import { ColumnGeoJSONRecord } from "~/pages/map/map-interface/app-state/handlers/columns";
-// Turf intersection
-import { lineIntersect } from "@turf/line-intersect";
-import { distance } from "@turf/distance";
-import { nearestPointOnLine } from "@turf/nearest-point-on-line";
-import { centroid } from "@turf/centroid";
+import { useCorrelationDiagramStore } from "./state";
+import { PatternProvider } from "~/_providers";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
-import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
-import {
-  getFocusedLineFromHashParams,
-  setHashStringForLine,
-} from "./hash-string";
-import { Button } from "@blueprintjs/core";
+import { Button, OverlaysProvider } from "@blueprintjs/core";
 import classNames from "classnames";
-import { ColumnIdentifier, CorrelationChart } from "./correlation-chart";
+import { CorrelationChart } from "./correlation-chart";
 import { DarkModeProvider } from "@macrostrat/ui-components";
 import { ErrorBoundary } from "@macrostrat/ui-components";
-
-interface CorrelationState {
-  focusedLine: LineString | null;
-  columns: ColumnGeoJSONRecord[];
-  focusedColumns: FocusedColumnGeoJSONRecord[];
-  mapExpanded: boolean;
-  onClickMap: (point: Point) => void;
-  toggleMapExpanded: () => void;
-  startup: () => Promise<void>;
-}
-
-/** Store management with Zustand.
- * This is a newer and somewhat more subtle approach than the Redux store
- * used in the mapping application.
- * */
-const useCorrelationDiagramStore = create<CorrelationState>((set) => ({
-  focusedLine: null as LineString | null,
-  columns: [],
-  focusedColumns: [],
-  mapExpanded: false,
-  toggleMapExpanded: () =>
-    set((state) => ({ mapExpanded: !state.mapExpanded })),
-  onClickMap: (point: Point) =>
-    set((state) => {
-      if (
-        state.focusedLine == null ||
-        state.focusedLine.coordinates.length == 2
-      ) {
-        return {
-          ...state,
-          focusedLine: { type: "LineString", coordinates: [point.coordinates] },
-          focusedColumns: [],
-        };
-      } else {
-        const focusedLine: LineString = {
-          type: "LineString",
-          coordinates: [...state.focusedLine.coordinates, point.coordinates],
-        };
-
-        setHashStringForLine(focusedLine);
-
-        return {
-          ...state,
-          focusedLine,
-          focusedColumns: buildCorrelationColumns(state.columns, focusedLine),
-        };
-      }
-    }),
-  async startup() {
-    const columns = await fetchAllColumns();
-    const focusedLine = getFocusedLineFromHashParams();
-    const focusedColumns = buildCorrelationColumns(columns, focusedLine);
-
-    set({ columns, focusedLine, focusedColumns });
-  },
-}));
+import { columnGeoJSONRecordToColumnIdentifier } from "./state";
+import {
+  UnitSelectionProvider,
+  useSelectedUnit,
+} from "@macrostrat/column-views";
+import { UnitDescription } from "~/pages/correlation/column";
 
 export function Page() {
   const startup = useCorrelationDiagramStore((state) => state.startup);
@@ -95,41 +36,78 @@ export function Page() {
     startup();
   }, []);
 
-  return h(FullscreenPage, [
+  const expanded = useCorrelationDiagramStore((state) => state.mapExpanded);
+
+  return h(PageWrapper, [
+    h("header", [h(PageBreadcrumbs)]),
     h(
-      DarkModeProvider,
-      h("div.main-panel", [
-        h("header", [h(PageBreadcrumbs)]),
-        h("div.diagram-container", [
+      "div.diagram-container",
+      { className: expanded ? "map-expanded" : "map-inset" },
+      [
+        h("div.main-area", [
           h(CorrelationDiagramWrapper),
-          h("div.assistant", [h(InsetMap)]),
+          h("div.overlay-safe-area"),
         ]),
-      ])
+        h("div.assistant", [h(InsetMap), h(UnitDetailsPanel)]),
+      ]
     ),
   ]);
 }
 
-function CorrelationDiagramWrapper() {
-  const focusedColumns = useCorrelationDiagramStore(
-    (state) => state.focusedColumns
+const PageWrapper = compose(
+  FullscreenPage,
+  DarkModeProvider,
+  PatternProvider,
+  UnitSelectionManager,
+  ({ children }) => h("div.main-panel", children)
+);
+
+function UnitSelectionManager({ children }) {
+  const selectedUnit = useCorrelationDiagramStore(
+    (state) => state.selectedUnit
+  );
+  const setSelectedUnit = useCorrelationDiagramStore(
+    (state) => state.setSelectedUnit
   );
-
-  const columns = focusedColumns.map(columnGeoJSONRecordToColumnIdentifier);
 
   return h(
-    "div.correlation-diagram",
-    h(ErrorBoundary, h(CorrelationChart, { columns }))
+    UnitSelectionProvider,
+    {
+      unit: selectedUnit,
+      setUnit: setSelectedUnit,
+    },
+    children
   );
 }
 
-function columnGeoJSONRecordToColumnIdentifier(
-  col: ColumnGeoJSONRecord
-): ColumnIdentifier {
-  return {
-    col_id: col.properties.col_id,
-    col_name: col.properties.col_name,
-    project_id: col.properties.project_id,
-  };
+function UnitDetailsPanel() {
+  const selectedUnit = useSelectedUnit();
+  const expanded = useCorrelationDiagramStore((state) => state.mapExpanded);
+  const setSelectedUnit = useCorrelationDiagramStore(
+    (state) => state.setSelectedUnit
+  );
+
+  if (selectedUnit == null || !expanded) {
+    return null;
+  }
+
+  return h("div.unit-details-panel", [
+    h(UnitDescription, {
+      unit: selectedUnit,
+      onClose: () => setSelectedUnit(null),
+    }),
+  ]);
+}
+
+function CorrelationDiagramWrapper() {
+  const chartData = useCorrelationDiagramStore((state) => state.chartData);
+
+  return h("div.correlation-diagram", [
+    h(
+      ErrorBoundary,
+      h(OverlaysProvider, [h(CorrelationChart, { data: chartData })])
+    ),
+  ]);
 }
 
 function InsetMap() {
@@ -183,7 +161,7 @@ function MapClickHandler() {
 
   useMapClickHandler(
     (e) => {
-      onClickMap({ type: "Point", coordinates: e.lngLat.toArray() });
+      onClickMap(e, { type: "Point", coordinates: e.lngLat.toArray() });
     },
     [onClickMap]
   );
@@ -191,35 +169,6 @@ function MapClickHandler() {
   return null;
 }
 
-function buildCorrelationColumns(
-  columns: ColumnGeoJSONRecord[],
-  line: LineString
-): FocusedColumnGeoJSONRecord[] {
-  let features = [];
-  if (columns == null && line == null) {
-    return [];
-  }
-  return orderColumnsByDistance(
-    computeIntersectingColumns(columns, line),
-    line
-  );
-}
-
-function computeIntersectingColumns(
-  columns: ColumnGeoJSONRecord[],
-  line: LineString
-): ColumnGeoJSONRecord[] {
-  if (columns == null || line == null) {
-    return [];
-  }
-
-  return columns.filter((col) => {
-    const poly = col.geometry;
-    const intersection = lineIntersect(line, poly);
-    return intersection.features.length > 0;
-  });
-}
-
 function SelectedColumnsLayer({ columns, focusedLine }) {
   const focusedColumns = useCorrelationDiagramStore(
     (state) => state.focusedColumns
@@ -255,45 +204,6 @@ function SelectedColumnsLayer({ columns, focusedLine }) {
   return null;
 }
 
-interface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {
-  properties: {
-    centroid: Point;
-    nearestPointOnLine: Point;
-    distanceAlongLine: number;
-  } & ColumnGeoJSONRecord["properties"];
-}
-
-function orderColumnsByDistance(
-  columns: ColumnGeoJSONRecord[],
-  line: LineString
-): FocusedColumnGeoJSONRecord[] {
-  const centroids = columns.map((col) => centroid(col.geometry));
-  const projectedPoints = centroids.map((point) =>
-    nearestPointOnLine(line, point)
-  );
-  const distances = projectedPoints.map((point) =>
-    distance(point.geometry.coordinates, line.coordinates[0])
-  );
-
-  let newColumns = columns.map((col, i) => {
-    return {
-      ...col,
-      properties: {
-        ...col.properties,
-        centroid: centroids[i],
-        nearestPointOnLine: projectedPoints[i],
-        distanceAlongLine: distances[i],
-      },
-    };
-  });
-
-  return sorted(newColumns, (d) => d.properties.distanceAlongLine);
-}
-
-function sorted(data, accessor: (d) => number) {
-  return data.sort((a, b) => accessor(a) - accessor(b));
-}
-
 function ColumnsLayer({ columns, enabled = true }) {
   useMapStyleOperator(
     (map) => {
diff --git a/src/pages/correlation/column.module.scss b/src/pages/correlation/column.module.scss
index 592cfa0c..6809fa73 100644
--- a/src/pages/correlation/column.module.scss
+++ b/src/pages/correlation/column.module.scss
@@ -64,10 +64,7 @@
   width: 100%;
   margin: 0 -10px;
 }
-.column-container :global div.section {
-  display: flex;
-  flex-direction: row;
-}
+
 .column-container :global div.section :global(.timescale) {
   transform: translateY(0.5);
 }
@@ -77,16 +74,13 @@
 .column-container :global rect.selection-overlay {
   fill: rgba(255,0,0,0.5);
 }
-//.column-container :global div.timescale {
-//  width: calc(3em + 2px);
-//  --timescale-level-size: 1.5em;
-//}
+
 .unconformity {
   height: 0px;
   font-size: 10px;
   font-style: italic;
   text-align: center;
-  margin-left: calc(6em + 4px + 40px);
+  margin-left: 0;
 }
 .unconformity-text {
   transform: translateY(-0.5em);
@@ -107,3 +101,9 @@
   width: calc(4.5em + 4px);
   --timescale-level-size: 1.5em;
 }
+
+.section {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+}
diff --git a/src/pages/correlation/column.ts b/src/pages/correlation/column.ts
index e0d1e629..9ea61f64 100644
--- a/src/pages/correlation/column.ts
+++ b/src/pages/correlation/column.ts
@@ -2,24 +2,30 @@ import {
   ColumnLayoutContext,
   ColumnProvider,
   ColumnSVG,
+  useColumn,
 } from "@macrostrat/column-components";
-import { hyperStyled } from "@macrostrat/hyper";
 import { Timescale, TimescaleOrientation } from "@macrostrat/timescale";
-import { useDarkMode } from "@macrostrat/ui-components";
+import { JSONView, useDarkMode } from "@macrostrat/ui-components";
 import classNames from "classnames";
-import { useContext, useMemo } from "react";
-import { AgeAxis } from "@macrostrat/column-views";
-import styles from "./column.module.scss";
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { AgeAxis, useSelectedUnit } from "@macrostrat/column-views";
+import h from "./column.module.scss";
 import { SectionRenderData } from "./types";
 import {
   CompositeUnitsColumn,
   TrackedLabeledUnit,
 } from "@macrostrat/column-views";
-import { IUnit } from "@macrostrat/column-views/src/units/types";
+import styles from "./main.module.sass";
 
 import { ColumnAxisType } from "@macrostrat/column-components";
 
-const h = hyperStyled(styles);
+import { UnitLong } from "@macrostrat/api-types";
+import {
+  LegendJSONView,
+  LegendPanelHeader,
+  UnitDetailsPopover,
+} from "~/components/unit-details";
+import { useCorrelationDiagramStore } from "~/pages/correlation/state";
 
 export function MacrostratColumnProvider(props) {
   // A column provider specialized the Macrostrat API
@@ -47,6 +53,8 @@ function Section(props: ISectionProps) {
     unitComponentProps,
   } = props;
 
+  const expanded = useCorrelationDiagramStore((s) => s.mapExpanded);
+
   const { units, bestPixelScale: pixelScale, t_age, b_age } = data;
   const range = [b_age, t_age];
 
@@ -95,6 +103,7 @@ function Section(props: ISectionProps) {
           clipToFrame: false,
         })
       ),
+      h.if(!expanded)(SelectedUnitPopover, { width }),
     ]
   );
 }
@@ -102,8 +111,6 @@ function Section(props: ISectionProps) {
 export function UnitComponent({ division, nColumns = 2, ...rest }) {
   const { width } = useContext(ColumnLayoutContext);
 
-  //const nCols = Math.min(nColumns, division.overlappingUnits.length+1)
-  //console.log(division);
   return h(TrackedLabeledUnit, {
     division,
     ...rest,
@@ -152,17 +159,8 @@ export function Column(props: IColumnProps) {
 
   const darkMode = useDarkMode();
 
-  // let sectionGroups = useMemo(() => {
-  //   let groups = Array.from(group(data, (d) => d.section_id));
-  //   console.log(groups);
-  //   groups.sort((a, b) => a[1][0].t_age - b[1][0].t_age);
-  //   return groups;
-  // }, [data]);
-
   const sectionGroups = [[0, data]];
 
-  console.log(data);
-
   const className = classNames(baseClassName, {
     "dark-mode": darkMode?.isEnabled ?? false,
   });
@@ -174,13 +172,13 @@ export function Column(props: IColumnProps) {
       h(
         "div.main-column",
         data.map((sectionData, i) => {
-          //const lastGroup = sectionGroups[i - 1]?.[1];
+          const lastGroup = sectionGroups[i - 1]?.[1];
           return h([
-            // h.if(unconformityLabels)(Unconformity, {
-            //   upperUnits: lastGroup,
-            //   lowerUnits: data,
-            //   style: { width: showLabels ? columnWidth : width },
-            // }),
+            h.if(unconformityLabels)(Unconformity, {
+              upperUnits: lastGroup,
+              lowerUnits: data,
+              style: { width: showLabels ? columnWidth : width },
+            }),
             h(`div.section.section-${i}`, [
               h(Section, {
                 data: sectionData,
@@ -208,15 +206,6 @@ export function TimescaleColumn(props: TimescaleColumnProps) {
 
   const darkMode = useDarkMode();
 
-  // let sectionGroups = useMemo(() => {
-  //   let groups = Array.from(group(data, (d) => d.section_id));
-  //   console.log(groups);
-  //   groups.sort((a, b) => a[1][0].t_age - b[1][0].t_age);
-  //   return groups;
-  // }, [data]);
-
-  const sectionGroups = [[0, []]];
-
   const className = classNames(baseClassName, {
     "dark-mode": darkMode?.isEnabled ?? false,
   });
@@ -283,3 +272,58 @@ function TimescaleSection(props: {
     ]
   );
 }
+
+export function UnitDescription({
+  unit,
+  onClose,
+}: {
+  unit: UnitLong;
+  onClose?: () => void;
+}) {
+  const { unit_name, unit_id, strat_name_long } = unit;
+  const name = strat_name_long ?? unit_name;
+  return h("div.unit-description", [
+    h(LegendPanelHeader, { title: name, id: unit_id, onClose }),
+    h(LegendJSONView, { data: unit }),
+  ]);
+}
+
+function SelectedUnitPopover<T>({ width }: { width: number }) {
+  const { scale, divisions } = useColumn();
+
+  const item0 = useSelectedUnit();
+  const item = divisions.find((d) => d.unit_id == item0?.unit_id);
+
+  const scrollParentRef = useRef(null);
+  useEffect(() => {
+    scrollParentRef.current = document.getElementsByClassName(
+      styles["overlay-safe-area"]
+    )[0];
+  }, []);
+
+  if (item == null) {
+    return null;
+  }
+
+  const { t_age, b_age } = item0;
+  const range = [b_age, t_age];
+
+  const content = h(UnitDescription, { unit: item });
+
+  const top = scale(range[1]) + 10;
+  const bottom = scale(range[0]) + 10;
+
+  return h(
+    UnitDetailsPopover,
+    {
+      style: {
+        top,
+        left: 0,
+        width,
+        height: bottom - top,
+      },
+      boundary: scrollParentRef.current,
+    },
+    content
+  );
+}
diff --git a/src/pages/correlation/correlation-chart.ts b/src/pages/correlation/correlation-chart.ts
index 48e1a4ba..8f5cd488 100644
--- a/src/pages/correlation/correlation-chart.ts
+++ b/src/pages/correlation/correlation-chart.ts
@@ -1,13 +1,15 @@
 /** Correlation chart */
-import { preprocessUnits } from "@macrostrat/column-views";
+import {
+  preprocessUnits,
+  useUnitSelectionDispatch,
+} from "@macrostrat/column-views";
 import { runColumnQuery } from "~/pages/map/map-interface/app-state/handlers/fetch";
-import { useState, useEffect } from "react";
-import { PatternProvider } from "~/_providers";
 import { Column, TimescaleColumn } from "./column";
 import { UnitLong } from "@macrostrat/api-types";
 import { GapBoundPackage, SectionRenderData, AgeComparable } from "./types";
 
 import h from "./main.module.sass";
+import { useCorrelationDiagramStore } from "~/pages/correlation/state";
 
 export interface ColumnIdentifier {
   col_id: number;
@@ -21,45 +23,52 @@ export interface CorrelationChartData {
   columnData: SectionRenderData[][]; // Units for each column
 }
 
-export function CorrelationChart({ columns }: { columns: ColumnIdentifier[] }) {
-  const [chartData, setChartData] = useState<CorrelationChartData | null>(null);
+export async function buildCorrelationChartData(
+  columns: ColumnIdentifier[],
+  ageMode: AgeScaleMode = AgeScaleMode.Broken
+): Promise<CorrelationChartData> {
+  const promises = columns.map((col) => fetchUnitsForColumn(col.col_id));
+  return Promise.all(promises).then((data) => buildColumnData(data, ageMode));
+}
 
-  useEffect(() => {
-    const promises = columns.map((col) => fetchUnitsForColumn(col.col_id));
-    Promise.all(promises).then((data) =>
-      setChartData(buildColumnData(data, AgeScaleMode.Broken))
-    );
-  }, [columns]);
+export function CorrelationChart({ data }: { data: CorrelationChartData }) {
+  const chartData = data;
 
   if (chartData == null || chartData.columnData.length == 0) {
     return null;
   }
 
-  console.log(chartData);
-
-  const targetUnitHeight = 20;
+  const firstColumn = chartData.columnData[0];
 
-  const { t_age, b_age } = chartData;
-  const range = [b_age, t_age];
+  return h(ChartArea, [
+    h(TimescaleColumnExt, {
+      key: "timescale",
+      packages: firstColumn,
+    }),
+    h(
+      chartData.columnData.map((packages, i) =>
+        h(SingleColumn, {
+          packages,
+          key: i,
+        })
+      )
+    ),
+  ]);
+}
 
-  const firstColumn = chartData.columnData[0];
+function ChartArea({ children }) {
+  const setSelectedUnit = useCorrelationDiagramStore(
+    (state) => state.setSelectedUnit
+  );
 
   return h(
-    PatternProvider,
-    h("div.correlation-chart-inner", [
-      h(TimescaleColumnExt, {
-        key: "timescale",
-        packages: firstColumn,
-      }),
-      h(
-        chartData.columnData.map((packages, i) =>
-          h(SingleColumn, {
-            packages,
-            key: i,
-          })
-        )
-      ),
-    ])
+    "div.correlation-chart-inner",
+    {
+      onClick() {
+        setSelectedUnit(null);
+      },
+    },
+    children
   );
 }
 
@@ -104,14 +113,7 @@ async function fetchUnitsForColumn(col_id: number): Promise<ColumnData> {
 
 const targetUnitHeight = 20;
 
-function preprocessChartData(
-  columnData: SectionRenderData[][]
-): CorrelationChartData {
-  const [b_age, t_age] = findEncompassingScaleBounds(columnData.flat());
-  return { columnData, b_age, t_age };
-}
-
-enum AgeScaleMode {
+export enum AgeScaleMode {
   Continuous = "continuous",
   Broken = "broken",
 }
@@ -153,29 +155,25 @@ function buildColumnData(
 
   // Get the best pixel scale for each gap-bound package
   const pixelScales = pkgs.map(findBestPixelScale);
-  console.log(pixelScales);
 
-  const columnData = columns.map((d, i) => {
-    return pkgs.map((pkg): SectionRenderData => {
+  const columnData = columns.map((d) => {
+    return pkgs.map((pkg, i): SectionRenderData => {
       const { t_age, b_age } = pkg;
+      let units = pkg.unitIndex.get(d.columnID) ?? [];
+
+      units.sort((a, b) => a.b_age - b.b_age);
+
       return {
         t_age,
         b_age,
         columnID: d.columnID,
         bestPixelScale: pixelScales[i],
-        units: pkg.unitIndex.get(d.columnID) ?? [],
+        units,
       };
     });
   });
 
   return { columnData, b_age, t_age };
-
-  // const packages = findGapBoundPackagesSharedByMultipleColumns(units);
-  // console.log(packages);
-  // const columns = units.map((d, i) =>
-  //   recoverGapBoundPackagesForColumn(packages, i)
-  // );
-  // return preprocessChartData(columns);
 }
 
 function findBestPixelScale(pkg: GapBoundPackage) {
diff --git a/src/pages/correlation/hash-string.ts b/src/pages/correlation/hash-string.ts
index 254477f2..bbd79231 100644
--- a/src/pages/correlation/hash-string.ts
+++ b/src/pages/correlation/hash-string.ts
@@ -1,47 +1,92 @@
 import { LineString } from "geojson";
 import { getHashString, setHashString } from "@macrostrat/ui-components";
-import { chunk } from "underscore";
-import { useEffect } from "react";
-import { fmt2 } from "~/pages/map/map-interface/utils";
+import type { CorrelationState } from "./state";
 
-export function getFocusedLineFromHashParams(): LineString | null {
+interface CorrelationHashParams {
+  section?: LineString | null;
+  unit?: number;
+}
+
+export function getCorrelationHashParams(): CorrelationHashParams {
   if (typeof window === "undefined") {
     return null;
   }
-  let hash = getHashString(window.location.hash);
 
-  if (hash?.line == null) {
+  const hash = new URLSearchParams(window.location.hash.slice(1));
+  const _section = hash.get("section");
+  const _unit = hash.get("unit");
+
+  let section = parseSectionFromHash(_section);
+  let unit: number = null;
+
+  if (_unit != null) {
+    unit = parseNumber(_unit);
+  }
+
+  return {
+    section,
+    unit,
+  };
+}
+
+function parseSectionFromHash(section: any): LineString | null {
+  /* Section should be specified as space-separated coordinates */
+  if (section == null || typeof section !== "string") {
     return null;
   }
 
-  try {
-    let coords = hash.line;
-    if (!Array.isArray(coords)) {
-      console.error("Invalid line coordinates in hash string");
-      return null;
-    }
-
-    if (coords.length < 2) {
-      return null;
-    }
-    if (coords.length % 2 != 0) {
-      console.error("Invalid number of coordinates in hash string");
-      return null;
-    }
+  console.log(section);
 
+  try {
+    let coords = section.split(" ").map(parseCoordinates);
     return {
       type: "LineString",
-      coordinates: chunk(coords.map(Number), 2),
+      coordinates: coords,
     };
   } catch (e) {
-    console.error("Error parsing hash string", e);
+    console.warn(e);
     return null;
   }
 }
 
-export function setHashStringForLine(focusedLine: LineString) {
+function parseCoordinates(s: string): [number, number] {
+  let [x, y] = s.split(",").map(parseNumber);
+  if (x == null || y == null || isNaN(x) || isNaN(y)) {
+    throw new Error("Invalid coordinate string");
+  }
+  if (x > 180 || x < -180 || y > 90 || y < -90) {
+    throw new Error("Invalid coordinate value");
+  }
+  return [x, y];
+}
+
+function parseNumber(s: string): number {
+  let s1 = s;
+  // For some reason, we sometimes get en-dashes in the hash string
+  if (s1[0] == "−") {
+    s1 = "-" + s1.slice(1);
+  }
+  return Number(s1);
+}
+
+export function setHashStringForCorrelation(state: CorrelationHashParams) {
+  const { section, unit } = state;
+  if (section == null) {
+    return;
+  }
+  if (section.coordinates.length < 2) {
+    return;
+  }
+  let _unit = unit;
+  if (unit == null) {
+    _unit = undefined;
+  }
+
   let hash = {
-    line: focusedLine.coordinates.flatMap((coord) => coord.map(fmt2)),
+    section: section.coordinates
+      .map((coord) => coord.map((d) => d.toFixed(2)).join(","))
+      .join(" "),
+    unit: _unit,
   };
   setHashString(hash);
 }
diff --git a/src/pages/correlation/main.module.sass b/src/pages/correlation/main.module.sass
index 29ffdcf2..35226eab 100644
--- a/src/pages/correlation/main.module.sass
+++ b/src/pages/correlation/main.module.sass
@@ -1,34 +1,66 @@
 $map-size: 40em
 $map-size-inset: 12em
 
-.column-selection-map
+.diagram-container
+  flex: 1
+  position: relative
+  min-height: 0
+  display: flex
+  flex-direction: row
+  gap: 1em
+  overflow: hidden
+  &.map-inset
+    .column-selection-map
+      position: absolute
+      top: 1em
+      right: 2em
+      height: $map-size-inset
+      width: $map-size-inset
+      z-index: 1000
+
+  &.map-expanded
+    .assistant
+      width: 40em
+      position: relative
+
+.column-selection-map, .unit-details-panel, .correlation-diagram
   box-shadow: 0 0 0.3em 0 rgba(0, 0, 0, 0.5)
   border-radius: 6px
+
+.column-selection-map
   overflow: hidden
-  height: $map-size-inset
-  width: $map-size-inset
-  position: absolute
-  top: 1em
-  right: 1em
   :global(.main-view)
     height: 100%
-  &.expanded
-    height: $map-size
-    width: $map-size
-    position: relative
-    top: 0
-    right: 0
-    margin-left: 1em
+  flex: 1
+  min-height: $map-size-inset
+  max-height: $map-size
+  width: $map-size
+  position: relative
+  top: 0
+  right: 0
 
-.correlation-diagram
+.unit-details-panel
+  overflow: scroll
+  background: var(--panel-secondary-background-color)
+  flex: 2
+  padding: 1em
+  max-width: 100%
+
+.main-area
+  position: relative
   flex: 1
+  min-height: 0
+  min-width: 0
+
+
+.correlation-diagram
   overflow: scroll
   min-height: 0
   height: 100%
+  width: 100%
   padding: 1em
   background-color: var(--panel-secondary-background-color)
   box-shadow: 0 0 0.3em 0 var(--card-shadow-color)
-  border-radius: 6px
   --column-background-color: var(--background-color)
   --column-stroke-color: var(--text-color)
 
@@ -45,16 +77,27 @@ $map-size-inset: 12em
   display: flex
   flex-direction: column
 
-.diagram-container
-  flex: 1
-  position: relative
-  min-height: 0
-  display: flex
-  flex-direction: row
-
 
 .correlation-chart-inner
   display: flex
   flex-direction: row
 
+.overlay-safe-area
+  position: absolute
+  top: 1em
+  left: 1em
+  right: 1em
+  bottom: 1em
+  pointer-events: none
+
+.map-inset
+  .overlay-safe-area
+    margin-right: $map-size-inset + 1em
+
+  .column-selection-map
+    z-index: 1000
 
+.assistant
+  display: flex
+  flex-direction: column
+  gap: 1em
diff --git a/src/pages/correlation/state.ts b/src/pages/correlation/state.ts
new file mode 100644
index 00000000..639f9b69
--- /dev/null
+++ b/src/pages/correlation/state.ts
@@ -0,0 +1,246 @@
+import { LineString, Point } from "geojson";
+import { create } from "zustand";
+import { ColumnGeoJSONRecord } from "~/pages/map/map-interface/app-state/handlers/columns";
+// Turf intersection
+import { fetchAllColumns } from "~/pages/map/map-interface/app-state/handlers/fetch";
+import {
+  getCorrelationHashParams,
+  setHashStringForCorrelation,
+} from "./hash-string";
+// Turf intersection
+import { lineIntersect } from "@turf/line-intersect";
+import { distance } from "@turf/distance";
+import { nearestPointOnLine } from "@turf/nearest-point-on-line";
+import { centroid } from "@turf/centroid";
+import {
+  ColumnIdentifier,
+  CorrelationChartData,
+  buildCorrelationChartData,
+  AgeScaleMode,
+} from "./correlation-chart";
+import { UnitLong } from "@macrostrat/api-types";
+import { LocalStorage } from "@macrostrat/ui-components";
+import { SectionRenderData } from "./types";
+import mapboxgl from "mapbox-gl";
+
+export interface CorrelationState {
+  focusedLine: LineString | null;
+  columns: ColumnGeoJSONRecord[];
+  focusedColumns: FocusedColumnGeoJSONRecord[];
+  chartData: CorrelationChartData | null;
+  mapExpanded: boolean;
+  selectedUnit: UnitLong | null;
+  onClickMap: (event: mapboxgl.MapMouseEvent, point: Point) => void;
+  toggleMapExpanded: () => void;
+  startup: () => Promise<void>;
+  setSelectedUnit: (unit: UnitLong) => void;
+}
+
+interface CorrelationLocalStorageState {
+  mapExpanded: boolean;
+}
+
+const localStorage = new LocalStorage<CorrelationLocalStorageState>(
+  "macrostrat.correlation.settings"
+);
+
+/** Store management with Zustand.
+ * This is a newer and somewhat more subtle approach than the Redux store
+ * used in the mapping application.
+ * */
+export const useCorrelationDiagramStore = create<CorrelationState>(
+  (set, get) => {
+    const { mapExpanded } = localStorage.get() ?? {
+      mapExpanded: false,
+    };
+
+    const { section, unit } = getCorrelationHashParams();
+
+    return {
+      focusedLine: section,
+      columns: [],
+      focusedColumns: [],
+      mapExpanded,
+      selectedUnit: null,
+      setSelectedUnit(selectedUnit: UnitLong | null) {
+        set({ selectedUnit });
+
+        const { focusedLine } = get();
+
+        setHashStringForCorrelation({
+          section: focusedLine,
+          unit: selectedUnit?.unit_id ?? null,
+        });
+      },
+      toggleMapExpanded: () =>
+        set((state) => {
+          const partial = { mapExpanded: !state.mapExpanded };
+          localStorage.set(partial);
+          return partial;
+        }),
+      onClickMap(event: mapboxgl.MapMouseEvent, point: Point) {
+        const state = get();
+
+        console.log(event, point);
+        // Check if shift key is pressed
+        const shiftKeyPressed = event.originalEvent.shiftKey;
+
+        if (
+          state.focusedLine == null ||
+          (state.focusedLine.coordinates.length >= 2 && !shiftKeyPressed)
+        ) {
+          return set({
+            focusedLine: {
+              type: "LineString",
+              coordinates: [point.coordinates],
+            },
+            focusedColumns: [],
+            chartData: null,
+            selectedUnit: null,
+          });
+        }
+        const focusedLine: LineString = {
+          type: "LineString",
+          coordinates: [...state.focusedLine.coordinates, point.coordinates],
+        };
+
+        const columns = buildCorrelationColumns(state.columns, focusedLine);
+
+        set({
+          focusedLine,
+          focusedColumns: columns,
+          selectedUnit: null,
+        });
+
+        buildCorrelationChartData(
+          columns.map(columnGeoJSONRecordToColumnIdentifier),
+          AgeScaleMode.Broken
+        ).then((data) => set({ chartData: data }));
+
+        setHashStringForCorrelation({
+          section: focusedLine,
+          unit: null,
+        });
+      },
+      async startup() {
+        const columns = await fetchAllColumns();
+        set({ columns });
+
+        const { focusedLine } = get();
+        if (focusedLine == null) {
+          return;
+        }
+
+        const focusedColumns = buildCorrelationColumns(columns, focusedLine);
+        set({ focusedColumns });
+
+        const chartData = await buildCorrelationChartData(
+          focusedColumns.map(columnGeoJSONRecordToColumnIdentifier),
+          AgeScaleMode.Broken
+        );
+
+        // Actually set the selected unit from the hash string once column data has been downloaded
+        if (unit != null) {
+          const selectedUnit = findMatchingUnit(chartData.columnData, unit);
+          set({ selectedUnit });
+        }
+
+        set({ chartData });
+      },
+    };
+  }
+);
+
+function findMatchingUnit(
+  columns: SectionRenderData[][],
+  unit_id: number
+): UnitLong {
+  for (const column of columns) {
+    for (const section of column) {
+      for (const unit of section.units) {
+        if (unit.unit_id == unit_id) {
+          return unit;
+        }
+      }
+    }
+  }
+  return null;
+}
+
+function buildCorrelationColumns(
+  columns: ColumnGeoJSONRecord[],
+  line: LineString
+): FocusedColumnGeoJSONRecord[] {
+  let features = [];
+  if (columns == null && line == null) {
+    return [];
+  }
+  return orderColumnsByDistance(
+    computeIntersectingColumns(columns, line),
+    line
+  );
+}
+
+function computeIntersectingColumns(
+  columns: ColumnGeoJSONRecord[],
+  line: LineString
+): ColumnGeoJSONRecord[] {
+  if (columns == null || line == null) {
+    return [];
+  }
+
+  return columns.filter((col) => {
+    const poly = col.geometry;
+    const intersection = lineIntersect(line, poly);
+    return intersection.features.length > 0;
+  });
+}
+
+interface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {
+  properties: {
+    centroid: Point;
+    nearestPointOnLine: Point;
+    distanceAlongLine: number;
+  } & ColumnGeoJSONRecord["properties"];
+}
+
+function orderColumnsByDistance(
+  columns: ColumnGeoJSONRecord[],
+  line: LineString
+): FocusedColumnGeoJSONRecord[] {
+  const centroids = columns.map((col) => centroid(col.geometry));
+  const projectedPoints = centroids.map((point) =>
+    nearestPointOnLine(line, point)
+  );
+  const distances = projectedPoints.map((point) =>
+    distance(point.geometry.coordinates, line.coordinates[0])
+  );
+
+  let newColumns = columns.map((col, i) => {
+    return {
+      ...col,
+      properties: {
+        ...col.properties,
+        centroid: centroids[i],
+        nearestPointOnLine: projectedPoints[i],
+        distanceAlongLine: distances[i],
+      },
+    };
+  });
+
+  return sorted(newColumns, (d) => d.properties.distanceAlongLine);
+}
+
+function sorted(data, accessor: (d) => number) {
+  return data.sort((a, b) => accessor(a) - accessor(b));
+}
+
+export function columnGeoJSONRecordToColumnIdentifier(
+  col: ColumnGeoJSONRecord
+): ColumnIdentifier {
+  return {
+    col_id: col.properties.col_id,
+    col_name: col.properties.col_name,
+    project_id: col.properties.project_id,
+  };
+}
diff --git a/src/pages/maps/@id/correlation/+Page.ts b/src/pages/maps/@id/correlation/+Page.ts
index 6bbe96bc..cf38d17a 100644
--- a/src/pages/maps/@id/correlation/+Page.ts
+++ b/src/pages/maps/@id/correlation/+Page.ts
@@ -6,8 +6,7 @@ import {
   Button,
 } from "@blueprintjs/core";
 import { FullscreenPage } from "~/layouts";
-import hyper from "@macrostrat/hyper";
-import styles from "./main.module.sass";
+import h from "./main.module.sass";
 import { PageBreadcrumbs } from "~/renderer";
 import { useLegendData, MapInfo } from "../utils";
 import { useElementSize, useInDarkMode } from "@macrostrat/ui-components";
@@ -27,8 +26,7 @@ import {
   getBestAgeRange,
 } from "./prepare-data";
 import { LegendItemInformation } from "./legend-item";
-
-const h = hyper.styled(styles);
+import { UnitDetailsPopover } from "~/components/unit-details";
 
 export function Page({ map }) {
   const ref = useRef(null);
@@ -279,20 +277,11 @@ function SelectedLegendItemPopover({
   const bottom = yScale(range[0]);
 
   return h(
-    "div.popover-main",
+    UnitDetailsPopover,
     {
-      style: {
-        top: top,
-        left: xv,
-        width: xScale.bandwidth(),
-        height: bottom - top,
-      },
+      style: { top, left: xv, width: xScale.bandwidth(), height: bottom - top },
     },
-    h(
-      Popover,
-      { content, isOpen: true, usePortal: true },
-      h("span.popover-target")
-    )
+    content
   );
 }
 
diff --git a/src/pages/maps/@id/correlation/legend-item.ts b/src/pages/maps/@id/correlation/legend-item.ts
index 35103f02..b97c2996 100644
--- a/src/pages/maps/@id/correlation/legend-item.ts
+++ b/src/pages/maps/@id/correlation/legend-item.ts
@@ -1,147 +1,44 @@
-import hyper from "@macrostrat/hyper";
-import { LegendItem, IntervalShort } from "./types";
-import { LithologyTag } from "~/components";
-import styles from "./main.module.sass";
-import classNames from "classnames";
-import { mergeAgeRanges } from "./prepare-data";
-
-const h = hyper.styled(styles);
+import { LegendItem } from "./types";
+import h from "./main.module.sass";
+import {
+  DataField,
+  IntervalField,
+  LithologyList,
+  LegendPanelHeader,
+} from "~/components/unit-details";
+import { Button } from "@blueprintjs/core";
 
 export function LegendItemInformation({
   legendItem,
 }: {
   legendItem: LegendItem;
 }) {
-  return h("div.legend-panel-outer", [
-    h("div.legend-info-panel", [
-      h("header", [h("h3", legendItem.name), h("code", legendItem.legend_id)]),
-      h("div.data", [
-        h(DataField, {
-          label: "Stratigraphic names",
-          value: legendItem.strat_name,
-        }),
-        h(DataField, { label: "Age", value: legendItem.age }),
-        h(DataField, {
-          label: "Description",
-          value: legendItem.descrip,
-          inline: false,
-        }),
-        h(DataField, { label: "Comments", value: legendItem.comments }),
-        h(DataField, { label: "Lithology", value: legendItem.lith }),
-        h(LithologyList, { lithologies: legendItem.liths }),
-        h(IntervalField, {
-          intervals: [legendItem.b_interval, legendItem.t_interval],
-        }),
-        h(DataField, {
-          label: "Best age",
-          value: `${legendItem.best_age_bottom} - ${legendItem.best_age_top}`,
-          unit: "Ma",
-        }),
-        h(DataField, { label: "Unit IDs", value: legendItem.unit_ids }),
-        h(DataField, { label: "Concept IDs", value: legendItem.concept_ids }),
-      ]),
-    ]),
-  ]);
-}
-
-function DataField({
-  label,
-  value,
-  inline = true,
-  showIfEmpty = false,
-  className,
-  children,
-  unit,
-}: {
-  label?: string;
-  value?: any;
-  inline?: boolean;
-  showIfEmpty?: boolean;
-  className?: string;
-  children?: any;
-  unit?: string;
-}) {
-  if (!showIfEmpty && (value == null || value === "") && children == null) {
-    return null;
-  }
-
-  return h("div.data-field", { className: classNames(className, { inline }) }, [
-    h("div.label", label),
-    h("div.data-container", [
-      h.if(value != null)(Value, { value, unit }),
-      children,
-    ]),
-  ]);
-}
-
-function IntervalField({ intervals }: { intervals: IntervalShort[] }) {
-  const unique = uniqueIntervals(...intervals);
-  const ageRange = mergeAgeRanges(unique.map((d) => [d.b_age, d.t_age]));
   return h([
-    h(
-      DataField,
-      {
-        label: "Intervals",
-      },
-      [
-        unique.map((interval) => {
-          return h(Interval, {
-            key: interval.id,
-            interval,
-            showAgeRange: true,
-          });
-        }),
-        h(Value, { unit: "Ma", value: `${ageRange[0]} - ${ageRange[1]}` }),
-      ]
-    ),
-  ]);
-}
-
-function Value({
-  value,
-  unit,
-  children,
-}: {
-  value?: any;
-  unit?: string;
-  children?: any;
-}) {
-  const val = value ?? children;
-  return h("span.value-container", [
-    h("span.value", val),
-    h.if(unit != null)([" ", h("span.unit", unit)]),
+    h(LegendPanelHeader, { title: legendItem.name, id: legendItem.legend_id }),
+    h("div.data", [
+      h(DataField, {
+        label: "Stratigraphic names",
+        value: legendItem.strat_name,
+      }),
+      h(DataField, { label: "Age", value: legendItem.age }),
+      h(DataField, {
+        label: "Description",
+        value: legendItem.descrip,
+        inline: false,
+      }),
+      h(DataField, { label: "Comments", value: legendItem.comments }),
+      h(DataField, { label: "Lithology", value: legendItem.lith }),
+      h(LithologyList, { lithologies: legendItem.liths }),
+      h(IntervalField, {
+        intervals: [legendItem.b_interval, legendItem.t_interval],
+      }),
+      h(DataField, {
+        label: "Best age",
+        value: `${legendItem.best_age_bottom} - ${legendItem.best_age_top}`,
+        unit: "Ma",
+      }),
+      h(DataField, { label: "Unit IDs", value: legendItem.unit_ids }),
+      h(DataField, { label: "Concept IDs", value: legendItem.concept_ids }),
+    ]),
   ]);
 }
-
-function Interval({
-  interval,
-  showAgeRange = false,
-}: {
-  interval: IntervalShort;
-  showAgeRange?: boolean;
-}) {
-  return h(LithologyTag, {
-    data: interval,
-  });
-}
-
-function uniqueIntervals(
-  ...intervals: (IntervalShort | undefined)[]
-): IntervalShort[] {
-  const unique = new Map<number, IntervalShort>();
-  for (const interval of intervals) {
-    if (interval == null) continue;
-    unique.set(interval.id, interval);
-  }
-  return Array.from(unique.values()).sort((a, b) => b.b_age - a.b_age);
-}
-
-function LithologyList({ lithologies }) {
-  return h(
-    DataField,
-    { label: "Lithologies" },
-    lithologies.map((lith) => {
-      return h(LithologyTag, { data: lith });
-    })
-  );
-}
diff --git a/src/pages/maps/@id/correlation/main.module.sass b/src/pages/maps/@id/correlation/main.module.sass
index 1b576064..1fe9b0bd 100644
--- a/src/pages/maps/@id/correlation/main.module.sass
+++ b/src/pages/maps/@id/correlation/main.module.sass
@@ -4,6 +4,12 @@ div.correlation-chart
 .bar
   position: absolute
 
+.popover-container
+  pointer-events: none
+  position: relative
+
+
+
 // Ideally this wouldn't be necessary
 .page-inner
   position: relative
@@ -17,39 +23,6 @@ div.correlation-chart
   flex: 1
   overflow: hidden
 
-.popover-container
-  pointer-events: none
-  position: relative
-
-.popover-main
-  position: absolute
-  outline: 2px solid #f22
-
-  :global(.bp5-popover-target)
-    height: 100%
-    width: 100%
-    display: block
-    line-height: 0
-
-.legend-panel-outer
-  width: 25em
-  max-height: 60vh
-  overflow-y: scroll
-
-.legend-info-panel
-  padding: 1em
-  header
-    display: flex
-    justify-content: space-between
-    code
-      font-size: 0.9em
-      color: var(--secondary-color)
-    align-items: baseline
-
-  h3
-    margin: 0 0 0.5em
-    font-size: 1.1em
-
 .data-field
   margin: 0.2em 0 0.4em
   &.inline
@@ -71,8 +44,8 @@ div.correlation-chart
     break-inside: avoid
   .unit
     color: var(--secondary-color)
-    
+
 .settings
   padding: 1em
   >h3:first-child
-    margin-top: 0
\ No newline at end of file
+    margin-top: 0
diff --git a/src/pages/maps/@id/correlation/prepare-data.ts b/src/pages/maps/@id/correlation/prepare-data.ts
index 8f04b919..839c508a 100644
--- a/src/pages/maps/@id/correlation/prepare-data.ts
+++ b/src/pages/maps/@id/correlation/prepare-data.ts
@@ -1,10 +1,8 @@
-import {
-  LegendItem,
-  IntervalShort,
-  CorrelationItem,
-  AgeRange,
-  AgeDisplayMode,
-} from "./types";
+import { LegendItem, CorrelationItem, AgeDisplayMode } from "./types";
+import { IntervalShort } from "~/components/unit-details";
+import { mergeAgeRanges, AgeRange } from "@macrostrat-web/utility-functions";
+
+export { mergeAgeRanges };
 
 export function buildCorrelationChartData(
   legendData: LegendItem[],
@@ -51,77 +49,13 @@ export function buildCorrelationChartData(
   );
 }
 
-function getAgeRangeForInterval(interval: IntervalShort): AgeRange | null {
-  /** Get the age range for an interval, building up an index as we go */
-  return [interval.b_age, interval.t_age];
-}
-
-enum MergeMode {
-  Inner,
-  Outer,
-}
-
-export function mergeAgeRanges(
-  ranges: AgeRange[],
-  mergeMode: MergeMode = MergeMode.Outer
-): AgeRange {
-  /** Merge a set of age ranges to get the inner or outer bounds */
-  let min = Infinity;
-  let max = 0;
-  // Negative ages are not handled
-
-  if (mergeMode === MergeMode.Inner) {
-    min = Math.min(...ranges.map((d) => d[0]));
-    max = Math.max(...ranges.map((d) => d[1]));
-  } else {
-    min = Math.max(...ranges.map((d) => d[0]));
-    max = Math.min(...ranges.map((d) => d[1]));
-  }
-
-  // Age ranges should start with the oldest (largest) age
-  if (min < max) {
-    return [max, min];
-  }
-  return [min, max];
-}
-
 function midpointAge(range: [number, number]) {
   return (range[0] + range[1]) / 2;
 }
 
-enum AgeRangeRelationship {
-  Disjoint,
-  Contains,
-  Contained,
-  Identical,
-}
-
-function convertToForwardOrdinal(a: AgeRange): AgeRange {
-  /** Age ranges are naturally expressed as [b_age, t_age] where
-   * b_age is the older age and t_age is the younger age. This function
-   * converts the age range to [min, max] where min is the oldest age,
-   * expressed as negative numbers. This assists with intuitive ordering
-   * in certain cases.
-   */
-  return [-a[0], -a[1]];
-}
-
-function compareAgeRanges(a: AgeRange, b: AgeRange): AgeRangeRelationship {
-  const a1 = convertToForwardOrdinal(a);
-  const b1 = convertToForwardOrdinal(b);
-  /** Compare two age ranges */
-  if (a1[0] > b1[1] || a1[1] < b1[0]) {
-    return AgeRangeRelationship.Disjoint;
-  }
-  if (a1[0] === b1[0] && a1[1] === b1[1]) {
-    return AgeRangeRelationship.Identical;
-  }
-  if (a1[0] <= b1[0] && a1[1] >= b1[1]) {
-    return AgeRangeRelationship.Contains;
-  }
-  if (a1[0] >= b1[0] && a1[1] <= b1[1]) {
-    return AgeRangeRelationship.Contained;
-  }
+function getAgeRangeForInterval(interval: IntervalShort): AgeRange | null {
+  /** Get the age range for an interval, building up an index as we go */
+  return [interval.b_age, interval.t_age];
 }
 
 function intervalComparison(a: AgeRange, b: AgeRange) {
diff --git a/src/pages/maps/@id/correlation/types.ts b/src/pages/maps/@id/correlation/types.ts
index 71bb25aa..de5af63e 100644
--- a/src/pages/maps/@id/correlation/types.ts
+++ b/src/pages/maps/@id/correlation/types.ts
@@ -1,4 +1,5 @@
-export type AgeRange = [number, number];
+import type { IntervalShort } from "~/components/unit-details";
+import type { AgeRange } from "@macrostrat-web/utility-functions";
 
 export type CorrelationItem = {
   color: string;
@@ -8,15 +9,6 @@ export type CorrelationItem = {
   id: number;
 };
 
-export type IntervalShort = {
-  id: number;
-  b_age: number;
-  t_age: number;
-  name: string;
-  color: string;
-  rank: number;
-};
-
 export interface LegendItem {
   legend_id: number;
   name: string;
diff --git a/yarn.lock b/yarn.lock
index 0b0451a3..45254cb1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5954,6 +5954,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@macrostrat-web/utility-functions@workspace:*, @macrostrat-web/utility-functions@workspace:packages/utility-functions":
+  version: 0.0.0-use.local
+  resolution: "@macrostrat-web/utility-functions@workspace:packages/utility-functions"
+  languageName: unknown
+  linkType: soft
+
 "@macrostrat/api-types@workspace:deps/web-components/packages/api-types":
   version: 0.0.0-use.local
   resolution: "@macrostrat/api-types@workspace:deps/web-components/packages/api-types"
@@ -6568,6 +6574,7 @@ __metadata:
     "@macrostrat-web/security": "workspace:*"
     "@macrostrat-web/settings": "workspace:*"
     "@macrostrat-web/sift": "workspace:*"
+    "@macrostrat-web/utility-functions": "workspace:*"
     "@macrostrat/api-utils": "workspace:*"
     "@macrostrat/api-views": "workspace:*"
     "@macrostrat/auth-components": "workspace:*"

From db1f5e0d6cdcdf3d438af12efe672c4b84ef93c0 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Tue, 2 Jul 2024 23:13:57 -0500
Subject: [PATCH 151/151] Created a small script to set repository
 configuration

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..fb209c1e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+# Initialize the development environment with common settings
+all:
+	git config --local submodule.recurse true
+	git submodule update --init --recursive
+	yarn install